9 files changed, 26 insertions, 26 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1061f3e7..e214c7d9 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -12,13 +12,10 @@ SET( rekonq_KDEINIT_SRCS
     autosaver.cpp 
     bookmarks.cpp
     findbar.cpp
-    history.cpp
-    historymodels.cpp
     lineedit.cpp
     mainview.cpp
     mainwindow.cpp 
     modelmenu.cpp 
-    panelhistory.cpp
     previewimage.cpp
     sessionmanager.cpp
     sidepanel.cpp
@@ -29,6 +26,10 @@ SET( rekonq_KDEINIT_SRCS
     websnap.cpp
     webview.cpp
 #----------------------------------------
+    history/history.cpp
+    history/historymodels.cpp
+    history/historypanel.cpp
+#----------------------------------------
     rekonqpage/newtabpage.cpp
 #----------------------------------------
     settings/settingsdialog.cpp
@@ -56,9 +57,10 @@ KDE4_ADD_KCFG_FILES( rekonq_KDEINIT_SRCS rekonq.kcfgc )
 ### ------------- INCLUDING DIRECTORIES...
 
 INCLUDE_DIRECTORIES (   ${CMAKE_CURRENT_SOURCE_DIR}
+                        ${CMAKE_CURRENT_SOURCE_DIR}/adblock
+                        ${CMAKE_CURRENT_SOURCE_DIR}/history
                         ${CMAKE_CURRENT_SOURCE_DIR}/rekonqpage
                         ${CMAKE_CURRENT_SOURCE_DIR}/settings
-                        ${CMAKE_CURRENT_SOURCE_DIR}/adblock
                         ${CMAKE_CURRENT_BINARY_DIR}
                         ${KDE4_INCLUDES}
                         ${QT4_INCLUDES}
diff --git a/src/history.cpp b/src/history/history.cpp
index 07580433..07580433 100644
--- a/src/history.cpp
+++ b/src/history/history.cpp
diff --git a/src/history.h b/src/history/history.h
index 2ccf8cb4..2ccf8cb4 100644
--- a/src/history.h
+++ b/src/history/history.h
diff --git a/src/historymodels.cpp b/src/history/historymodels.cpp
index cf8d1aed..cf8d1aed 100644
--- a/src/historymodels.cpp
+++ b/src/history/historymodels.cpp
diff --git a/src/historymodels.h b/src/history/historymodels.h
index 93e72c6a..93e72c6a 100644
--- a/src/historymodels.h
+++ b/src/history/historymodels.h
diff --git a/src/panelhistory.cpp b/src/history/historypanel.cpp
index 1f7dcd07..42497f9e 100644
--- a/src/panelhistory.cpp
+++ b/src/history/historypanel.cpp
@@ -26,8 +26,8 @@
 
 
 // Self Includes
-#include "panelhistory.h"
-#include "panelhistory.moc"
+#include "historypanel.h"
+#include "historypanel.moc"
 
 // Qt Includes
 #include <QtGui/QLabel>
@@ -39,7 +39,7 @@
 #include <KLocalizedString>
 
 
-PanelHistory::PanelHistory(QWidget *parent)
+HistoryPanel::HistoryPanel(QWidget *parent)
         : QWidget(parent)
         , m_historyTreeView(new QTreeView)
         , m_treeProxyModel(new TreeProxyModel(this))
@@ -84,14 +84,14 @@ PanelHistory::PanelHistory(QWidget *parent)
 }
 
 
-PanelHistory::~PanelHistory()
+HistoryPanel::~HistoryPanel()
 {
     delete m_treeProxyModel;
     delete m_historyTreeView;
 }
 
 
-void PanelHistory::open()
+void HistoryPanel::open()
 {
     QModelIndex index = m_historyTreeView->currentIndex();
     if (!index.parent().isValid())
diff --git a/src/panelhistory.h b/src/history/historypanel.h
index 68421c4e..083b2741 100644
--- a/src/panelhistory.h
+++ b/src/history/historypanel.h
@@ -25,8 +25,8 @@
 * ============================================================ */
 
 
-#ifndef PANELHISTORY_H
-#define PANELHISTORY_H
+#ifndef HISTORYPANEL_H
+#define HISTORYPANEL_H
 
 
 // Local Includes
@@ -41,14 +41,13 @@
 class KUrl;
 
 
-class PanelHistory : public QWidget
+class HistoryPanel : public QWidget
 {
-    Q_OBJECT
-    Q_DISABLE_COPY(PanelHistory)
+Q_OBJECT
 
 public:
-    explicit PanelHistory(QWidget *parent = 0);
-    virtual ~PanelHistory();
+    explicit HistoryPanel(QWidget *parent = 0);
+    virtual ~HistoryPanel();
 
 signals:
     void openUrl(const KUrl &);
@@ -62,4 +61,4 @@ private:
 
 };
 
-#endif // PANELHISTORY_H
+#endif // HISTORYPANEL_H
diff --git a/src/sidepanel.cpp b/src/sidepanel.cpp
index 6e47f7db..7c42301c 100644
--- a/src/sidepanel.cpp
+++ b/src/sidepanel.cpp
@@ -33,21 +33,21 @@
 #include "rekonq.h"
 
 // Local Includes
-#include "panelhistory.h"
+#include "historypanel.h"
 
 
 SidePanel::SidePanel(const QString &title, QWidget *parent, Qt::WindowFlags flags)
         : QDockWidget(title, parent, flags)
-        , m_panelHistory(new PanelHistory(this))
+        , m_historyPanel(new HistoryPanel(this))
 {
     setObjectName("sidePanel");
     setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
 
     setShown(ReKonfig::showSideBar());
 
-    connect(m_panelHistory, SIGNAL(openUrl(const KUrl&)), this, SIGNAL(openUrl(const KUrl&)));
+    connect(m_historyPanel, SIGNAL(openUrl(const KUrl&)), this, SIGNAL(openUrl(const KUrl&)));
 
-    setWidget(m_panelHistory);
+    setWidget(m_historyPanel);
 }
 
 
@@ -56,5 +56,5 @@ SidePanel::~SidePanel()
     // Save side panel's state
     ReKonfig::setShowSideBar(!isHidden());
 
-    delete m_panelHistory;
+    delete m_historyPanel;
 }
diff --git a/src/sidepanel.h b/src/sidepanel.h
index 0b5a226e..6aca3587 100644
--- a/src/sidepanel.h
+++ b/src/sidepanel.h
@@ -36,14 +36,13 @@
 
 // Forward Declarations
 class KUrl;
-class PanelHistory;
+class HistoryPanel;
 
 
 class SidePanel : public QDockWidget
 {
     Q_OBJECT
-    Q_DISABLE_COPY(SidePanel)
-
+    
 public:
     explicit SidePanel(const QString &title, QWidget *parent = 0, Qt::WindowFlags flags = 0);
     ~SidePanel();
@@ -52,7 +51,7 @@ signals:
     void openUrl(const KUrl &);
 
 private:
-    PanelHistory *m_panelHistory;
+    HistoryPanel *m_historyPanel;
 
 };