summaryrefslogtreecommitdiff
path: root/src/history
diff options
context:
space:
mode:
Diffstat (limited to 'src/history')
-rw-r--r--src/history/autosaver.cpp8
-rw-r--r--src/history/autosaver.h2
-rw-r--r--src/history/historymanager.cpp22
-rw-r--r--src/history/historymanager.h21
-rw-r--r--src/history/historymodels.cpp22
-rw-r--r--src/history/historymodels.h12
-rw-r--r--src/history/historypanel.cpp3
7 files changed, 44 insertions, 46 deletions
diff --git a/src/history/autosaver.cpp b/src/history/autosaver.cpp
index ee84e299..bb2a7683 100644
--- a/src/history/autosaver.cpp
+++ b/src/history/autosaver.cpp
@@ -30,10 +30,10 @@
#include "autosaver.moc"
// Qt Includes
-#include <QMetaObject>
-#include <QTimerEvent>
-#include <QBasicTimer>
-#include <QTime>
+#include <QtCore/QMetaObject>
+#include <QtCore/QTimerEvent>
+#include <QtCore/QBasicTimer>
+#include <QtCore/QTime>
const int AUTOSAVE_TIME = 1000 * 3; // seconds
diff --git a/src/history/autosaver.h b/src/history/autosaver.h
index 4c385ed6..f165377c 100644
--- a/src/history/autosaver.h
+++ b/src/history/autosaver.h
@@ -33,7 +33,7 @@
#include "rekonq_defines.h"
// Qt Includes
-#include <QObject>
+#include <QtCore/QObject>
// Forward Declarations
class QBasicTimer;
diff --git a/src/history/historymanager.cpp b/src/history/historymanager.cpp
index 95b2d586..602e4606 100644
--- a/src/history/historymanager.cpp
+++ b/src/history/historymanager.cpp
@@ -44,18 +44,16 @@
#include <KCompletion>
// Qt Includes
-#include <QList>
-#include <QUrl>
-#include <QDate>
-#include <QDateTime>
-#include <QString>
-#include <QFile>
-#include <QDataStream>
-#include <QBuffer>
-#include <QTemporaryFile>
-#include <QTimer>
-
-#include <QClipboard>
+#include <QtCore/QList>
+#include <QtCore/QUrl>
+#include <QtCore/QDate>
+#include <QtCore/QDateTime>
+#include <QtCore/QString>
+#include <QtCore/QFile>
+#include <QtCore/QDataStream>
+#include <QtCore/QBuffer>
+
+#include <QtGui/QClipboard>
// generic algorithms
#include <QtAlgorithms>
diff --git a/src/history/historymanager.h b/src/history/historymanager.h
index 5be32b9e..d4531e5c 100644
--- a/src/history/historymanager.h
+++ b/src/history/historymanager.h
@@ -33,6 +33,9 @@
// Rekonq Includes
#include "rekonq_defines.h"
+// Local Includes
+#include "urlresolver.h"
+
// KDE Includes
#include <KUrl>
@@ -40,18 +43,13 @@
#include <QDateTime>
#include <QHash>
#include <QObject>
+#include <QTimer>
+#include <QSortFilterProxyModel>
+#include <QWebHistoryInterface>
#include <QWebHistory>
#include <math.h>
-// Forward Declarations
-class AutoSaver;
-class HistoryFilterModel;
-class HistoryTreeModel;
-
-class QWebHistory;
-
-
/**
* Elements in this class represent an history item
*
@@ -102,7 +100,6 @@ public:
// ---------------------------------------------------------------------------------------------------------------
-
class TabHistory
{
public:
@@ -136,10 +133,14 @@ public:
QByteArray history;
};
-
// ---------------------------------------------------------------------------------------------------------------
+// Forward Declarations
+class AutoSaver;
+class HistoryFilterModel;
+class HistoryTreeModel;
+
/**
* THE History Manager:
* It manages rekonq history
diff --git a/src/history/historymodels.cpp b/src/history/historymodels.cpp
index 8894b334..16054054 100644
--- a/src/history/historymodels.cpp
+++ b/src/history/historymodels.cpp
@@ -35,7 +35,6 @@
// Local Includes
#include "application.h"
-#include "historymanager.h"
#include "iconmanager.h"
// KDE Includes
@@ -44,17 +43,16 @@
#include <KIcon>
// Qt Includes
-#include <QList>
-#include <QUrl>
-#include <QDate>
-#include <QDateTime>
-#include <QString>
-#include <QFile>
-#include <QDataStream>
-#include <QBuffer>
-
-#include <QClipboard>
-#include <QFileInfo>
+#include <QtCore/QList>
+#include <QtCore/QUrl>
+#include <QtCore/QDate>
+#include <QtCore/QDateTime>
+#include <QtCore/QString>
+#include <QtCore/QFile>
+#include <QtCore/QDataStream>
+#include <QtCore/QBuffer>
+
+#include <QtGui/QClipboard>
// generic algorithms
#include <QtAlgorithms>
diff --git a/src/history/historymodels.h b/src/history/historymodels.h
index 7588c6ff..9c3bfc36 100644
--- a/src/history/historymodels.h
+++ b/src/history/historymodels.h
@@ -33,16 +33,17 @@
// Rekonq Includes
#include "rekonq_defines.h"
+// Local Includes
+#include "historymanager.h"
+
// KDE Includes
#include <KUrl>
// Qt Includes
#include <QHash>
-#include <QAbstractTableModel>
-#include <QAbstractProxyModel>
-
-// Forward Declarations
-class HistoryManager;
+#include <QObject>
+#include <QSortFilterProxyModel>
+#include <QWebHistoryInterface>
class REKONQ_TESTS_EXPORT HistoryModel : public QAbstractTableModel
@@ -174,6 +175,7 @@ private Q_SLOTS:
private:
int sourceDateRow(int row) const;
mutable QList<int> m_sourceRowCache;
+
};
diff --git a/src/history/historypanel.cpp b/src/history/historypanel.cpp
index 5037a4d1..e09b4f48 100644
--- a/src/history/historypanel.cpp
+++ b/src/history/historypanel.cpp
@@ -35,7 +35,6 @@
// Local Includes
#include "application.h"
#include "paneltreeview.h"
-#include "historymanager.h"
#include "historymodels.h"
#include "urlfilterproxymodel.h"
@@ -46,7 +45,7 @@
#include <KMessageBox>
// Qt Includes
-#include <QHeaderView>
+#include <QtGui/QHeaderView>
HistoryPanel::HistoryPanel(const QString &title, QWidget *parent, Qt::WindowFlags flags)