Merge commit 'refs/merge-requests/193' of git://gitorious.org/rekonq/mainline into m193

1 files changed, 9 insertions, 24 deletions

diff --git a/src/history/historypanel.h b/src/history/historypanel.h
index 68de2828..9c9d4a4e 100644
--- a/src/history/historypanel.h
+++ b/src/history/historypanel.h
@@ -33,43 +33,28 @@
 #include "rekonq_defines.h"
 
 // Local Includes
-#include "application.h"
-#include "paneltreeview.h"
+#include "urlpanel.h"
 
-// Qt Includes
-#include <QDockWidget>
 
-// Forward Declarations
-class KUrl;
-class QWidget;
-class QModelIndex;
-
-
-class REKONQ_TESTS_EXPORT HistoryPanel : public QDockWidget
+class REKONQ_TESTS_EXPORT HistoryPanel : public UrlPanel
 {
     Q_OBJECT
 
 public:
     explicit HistoryPanel(const QString &title, QWidget *parent = 0, Qt::WindowFlags flags = 0);
-    ~HistoryPanel();
-
-public slots:
-    void showing(bool);
-    
-signals:
-    void openUrl(const KUrl &, const Rekonq::OpenType &);
-    void itemHovered(const QString &);
+    virtual ~HistoryPanel();
 
 private slots:
-    void contextMenuItem(const QPoint &pos);
-    void contextMenuGroup(const QPoint &pos);
+    virtual void contextMenuItem(const QPoint &pos);
+    virtual void contextMenuGroup(const QPoint &pos);
+    virtual void contextMenuEmpty(const QPoint &pos);
+
     void openAll();
 
 private:
-    void setup();
-    PanelTreeView *m_treeView;
+    virtual void setup();
 
-    bool _loaded;
+    virtual QAbstractItemModel* getModel();
 };
 
 #endif // HISTORYPANEL_H