summaryrefslogtreecommitdiff
path: root/src/bookmarks/bookmarksmanager.h
diff options
context:
space:
mode:
authorAndrea Diamantini <adjam7@gmail.com>2010-08-18 23:08:59 +0200
committerAndrea Diamantini <adjam7@gmail.com>2010-08-18 23:08:59 +0200
commitaa3ddcce01572e968b4abce827d6d21e5604b360 (patch)
tree2e8a8dda71405d5d51e56df4c5b81317a198da5a /src/bookmarks/bookmarksmanager.h
parentMerge commit 'refs/merge-requests/178' of git://gitorious.org/rekonq/mainline... (diff)
parentFix a strange behaviour if a dragged item is dropped on itself (diff)
downloadrekonq-aa3ddcce01572e968b4abce827d6d21e5604b360.tar.xz
Merge commit 'refs/merge-requests/173' of git://gitorious.org/rekonq/mainline into m173
Diffstat (limited to 'src/bookmarks/bookmarksmanager.h')
-rw-r--r--src/bookmarks/bookmarksmanager.h74
1 files changed, 1 insertions, 73 deletions
diff --git a/src/bookmarks/bookmarksmanager.h b/src/bookmarks/bookmarksmanager.h
index b084b8ee..6f97e4ef 100644
--- a/src/bookmarks/bookmarksmanager.h
+++ b/src/bookmarks/bookmarksmanager.h
@@ -38,6 +38,7 @@
#include "application.h"
#include "urlresolver.h"
#include "bookmarkspanel.h"
+#include "bookmarkstoolbar.h"
// Qt Includes
#include <QWidget>
@@ -137,79 +138,6 @@ signals:
void openUrl(const KUrl &, const Rekonq::OpenType &);
};
-// ------------------------------------------------------------------------------
-
-
-// KDE Includes
-#include <KBookmarkMenu>
-
-/**
- * This class represent the rekonq bookmarks menu.
- * It's just a simple class inherited from KBookmarkMenu
- *
- */
-class BookmarkMenu : public KBookmarkMenu
-{
- Q_OBJECT
-
-public:
- BookmarkMenu(KBookmarkManager* manager,
- KBookmarkOwner* owner,
- KMenu* menu,
- KActionCollection* actionCollection);
- BookmarkMenu(KBookmarkManager *manager,
- KBookmarkOwner *owner,
- KMenu *parentMenu,
- const QString &parentAddress);
- ~BookmarkMenu();
-
-protected:
- virtual KMenu * contextMenu(QAction * act);
- virtual void refill();
- virtual QAction* actionForBookmark(const KBookmark &bookmark);
-
-private slots:
- void actionHovered();
-
-private:
- void addOpenFolderInTabs();
-
-};
-
-
-// ------------------------------------------------------------------------------
-
-#include <KToolBar>
-
-class BookmarkToolBar : public KToolBar
-{
- Q_OBJECT
-
-public:
-BookmarkToolBar(const QString &objectName,
- QMainWindow *parentWindow,
- Qt::ToolBarArea area,
- bool newLine = false,
- bool isMainToolBar = false,
- bool readConfig = true);
-~BookmarkToolBar();
-
-virtual void setVisible(bool visible);
-
-protected:
- bool eventFilter(QObject *watched, QEvent *event);
-
-private slots:
- void actionHovered();
- void menuDisplayed();
- void menuHidden();
- void hideMenu();
-
-private:
- bool m_filled;
- KMenu *m_currentMenu;
-};
-
// ------------------------------------------------------------------------------