From 51ef0020a78bd216cb357eaa574161299fa0b608 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jon=20Ander=20Pe=C3=B1alba?= <jonan88@gmail.com>
Date: Mon, 30 Aug 2010 00:05:47 +0200
Subject: Use the same FilterProxyModel for the bookmarks and history panels

---
 src/history/historypanel.h | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

(limited to 'src/history/historypanel.h')

diff --git a/src/history/historypanel.h b/src/history/historypanel.h
index 68de2828..5a511e47 100644
--- a/src/history/historypanel.h
+++ b/src/history/historypanel.h
@@ -32,17 +32,11 @@
 // Rekonq Includes
 #include "rekonq_defines.h"
 
-// Local Includes
-#include "application.h"
-#include "paneltreeview.h"
-
 // Qt Includes
 #include <QDockWidget>
 
 // Forward Declarations
-class KUrl;
-class QWidget;
-class QModelIndex;
+class PanelTreeView;
 
 
 class REKONQ_TESTS_EXPORT HistoryPanel : public QDockWidget
@@ -51,11 +45,11 @@ class REKONQ_TESTS_EXPORT HistoryPanel : public QDockWidget
 
 public:
     explicit HistoryPanel(const QString &title, QWidget *parent = 0, Qt::WindowFlags flags = 0);
-    ~HistoryPanel();
+    virtual ~HistoryPanel();
 
 public slots:
     void showing(bool);
-    
+
 signals:
     void openUrl(const KUrl &, const Rekonq::OpenType &);
     void itemHovered(const QString &);
@@ -67,8 +61,8 @@ private slots:
 
 private:
     void setup();
-    PanelTreeView *m_treeView;
 
+    PanelTreeView *m_treeView;
     bool _loaded;
 };
 
-- 
cgit v1.2.1


From 0d53995507a369d5b4cfddbe365fc8a438fcf3cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jon=20Ander=20Pe=C3=B1alba?= <jonan88@gmail.com>
Date: Mon, 30 Aug 2010 01:40:33 +0200
Subject: New general panel class created and used by the bookmarks and history
 panel

---
 src/history/historypanel.h | 27 +++++++++------------------
 1 file changed, 9 insertions(+), 18 deletions(-)

(limited to 'src/history/historypanel.h')

diff --git a/src/history/historypanel.h b/src/history/historypanel.h
index 5a511e47..12ffe953 100644
--- a/src/history/historypanel.h
+++ b/src/history/historypanel.h
@@ -32,14 +32,11 @@
 // Rekonq Includes
 #include "rekonq_defines.h"
 
-// Qt Includes
-#include <QDockWidget>
+// Local Includes
+#include "panels/urlpanel.h"
 
-// Forward Declarations
-class PanelTreeView;
 
-
-class REKONQ_TESTS_EXPORT HistoryPanel : public QDockWidget
+class REKONQ_TESTS_EXPORT HistoryPanel : public UrlPanel
 {
     Q_OBJECT
 
@@ -47,23 +44,17 @@ public:
     explicit HistoryPanel(const QString &title, QWidget *parent = 0, Qt::WindowFlags flags = 0);
     virtual ~HistoryPanel();
 
-public slots:
-    void showing(bool);
-
-signals:
-    void openUrl(const KUrl &, const Rekonq::OpenType &);
-    void itemHovered(const QString &);
-
 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();
+    virtual void setup();
 
-    PanelTreeView *m_treeView;
-    bool _loaded;
+    virtual QAbstractItemModel* getModel();
 };
 
 #endif // HISTORYPANEL_H
-- 
cgit v1.2.1


From 5fcf9b79a80d24261ae79999c13dc023ba1b677d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jon=20Ander=20Pe=C3=B1alba?= <jonan88@gmail.com>
Date: Mon, 30 Aug 2010 17:10:04 +0200
Subject: panels directory removed

---
 src/history/historypanel.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/history/historypanel.h')

diff --git a/src/history/historypanel.h b/src/history/historypanel.h
index 12ffe953..9c9d4a4e 100644
--- a/src/history/historypanel.h
+++ b/src/history/historypanel.h
@@ -33,7 +33,7 @@
 #include "rekonq_defines.h"
 
 // Local Includes
-#include "panels/urlpanel.h"
+#include "urlpanel.h"
 
 
 class REKONQ_TESTS_EXPORT HistoryPanel : public UrlPanel
-- 
cgit v1.2.1