Merge branch 'master' into local-svn

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/playground/network/rekonq@976901 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 0 insertions, 57 deletions

diff --git a/src/history.h b/src/history.h
index 7b3cbec9..7586ff9d 100644
--- a/src/history.h
+++ b/src/history.h
@@ -27,7 +27,6 @@
 #include "modelmenu.h"
 
 // KDE Includes
-#include <KAction>
 #include <KUrl>
 
 // Qt Includes
@@ -256,39 +255,6 @@ private:
 };
 
 
-// ---------------------------------------------------------------------------------------------
-
-/**
- * Menu that is dynamically populated from the history
- *
- */
-
-class HistoryMenu : public ModelMenu
-{
-    Q_OBJECT
-
-signals:
-    void openUrl(const KUrl &url);
-
-public:
-    HistoryMenu(QWidget *parent = 0);
-    void setInitialActions(QList<QAction*> actions);
-
-protected:
-    bool prePopulated();
-    void postPopulated();
-
-private slots:
-    void activated(const QModelIndex &index);
-    void showHistoryDialog();
-
-private:
-    HistoryManager *m_history;
-    HistoryMenuModel *m_historyMenuModel;
-    QList<QAction*> m_initialActions;
-};
-
-
 // ----------------------------------------------------------------------------------------
 
 /**
@@ -383,27 +349,4 @@ protected:
 };
 
 
-// ------------------------------------------------------------------------------------------
-
-
-// Ui includes
-#include "ui_history.h"
-
-class HistoryDialog : public QDialog, public Ui_HistoryDialog
-{
-    Q_OBJECT
-
-signals:
-    void openUrl(const KUrl &url);
-
-public:
-    explicit HistoryDialog(QWidget *parent = 0, HistoryManager *history = 0);
-
-private slots:
-    void customContextMenuRequested(const QPoint &pos);
-    void open();
-    void copy();
-
-};
-
 #endif // HISTORY_H