summaryrefslogtreecommitdiff
path: root/src/webwindow/rekonqfactory.h
diff options
context:
space:
mode:
authorAndrea Diamantini <adjam7@gmail.com>2012-11-11 09:40:36 +0100
committerAndrea Diamantini <adjam7@gmail.com>2012-12-10 02:48:06 +0100
commit4f1dae7834becb7d7105a0cc9945d9a0c04383b8 (patch)
treebe823d81fe7ab1cc199b11bc5b32823d3cc9bdf7 /src/webwindow/rekonqfactory.h
parentClean up previous commit about adblock and fix enable/disable feature (diff)
downloadrekonq-4f1dae7834becb7d7105a0cc9945d9a0c04383b8.tar.xz
WARNING: BIG COMMIT
This commit reviews and partially fix the Q/K action mess in rekonq code. We now store actions in different actioncollections (one for each tab && one for each window). Related to this code review, you can find also fixes for some triggered actions NOT working (well) before: - fullscreen - bookmark all tabs - new (clean) tab
Diffstat (limited to 'src/webwindow/rekonqfactory.h')
-rw-r--r--src/webwindow/rekonqfactory.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/webwindow/rekonqfactory.h b/src/webwindow/rekonqfactory.h
index a0bf956d..4a4f46dd 100644
--- a/src/webwindow/rekonqfactory.h
+++ b/src/webwindow/rekonqfactory.h
@@ -30,7 +30,6 @@
// Rekonq Includes
#include "rekonq_defines.h"
-class KActionCollection;
class KMenu;
class KToolBar;
@@ -41,10 +40,11 @@ class QWidget;
namespace RekonqFactory
{
-QWidget *createWidget(const QString &name, QWidget *parent, KActionCollection *);
+QWidget *createWidget(const QString &name, QWidget *parent);
+
+void fillToolbar(KToolBar *, QDomNode);
+void fillMenu(KMenu *, QDomNode);
-void fillToolbar(KToolBar *, QDomNode, KActionCollection *);
-void fillMenu(KMenu *, QDomNode, KActionCollection *);
};
#endif