diff options
| author | Andrea Diamantini <adjam7@gmail.com> | 2010-08-21 01:26:14 +0200 |
|---|---|---|
| committer | Andrea Diamantini <adjam7@gmail.com> | 2010-08-21 01:26:14 +0200 |
| commit | 8a752526177e37b7b8fc91abbd2952bdfe77d155 (patch) | |
| tree | b9b503ab044d0d2559668984f89224c6c1afe1bc /src/mainwindow.h | |
| parent | Merge branch 'opensearch2' (diff) | |
| parent | BookmarkProvider's code reordered (diff) | |
| download | rekonq-8a752526177e37b7b8fc91abbd2952bdfe77d155.tar.xz | |
Merge commit 'refs/merge-requests/182' of git://gitorious.org/rekonq/mainline into m182
Diffstat (limited to 'src/mainwindow.h')
| -rw-r--r-- | src/mainwindow.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/mainwindow.h b/src/mainwindow.h index 6ae99b5e..eeb58171 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -35,8 +35,8 @@ #include "rekonq_defines.h" // Local Includes -#include "bookmarksmanager.h" - +#include "bookmarkprovider.h" + // KDE Includes #include <KXmlGuiWindow> #include <KActionCollection> @@ -75,7 +75,7 @@ public: inline MainView *mainView() const { return m_view; } inline QAction *actionByName(const QString &name) { return actionCollection()->action(name); } - + WebTab *currentTab() const; virtual QSize sizeHint() const; void setWidgetsVisible(bool makeFullScreen); @@ -123,7 +123,7 @@ protected: void keyPressEvent(QKeyEvent *event); bool queryClose(); - + private slots: void postLaunch(); void browserLoading(bool); @@ -167,7 +167,7 @@ private slots: void enableNetworkAnalysis(bool); void initBookmarkBar(); - + private: MainView *m_view; FindBar *m_findBar; |