From c2e0bd8118fd5c7d3639e27c08eaa6e812f0dc4c Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Tue, 6 Oct 2009 11:48:17 +0200 Subject: Cleaning headers and so on... --- src/autosaver.h | 4 ++-- src/bookmarks.h | 3 ++- src/cookiejar.h | 2 +- src/history.cpp | 1 - src/history.h | 2 +- src/historymodels.cpp | 2 -- src/historymodels.h | 2 +- src/mainview.cpp | 1 + src/mainview.h | 4 ++-- src/mainwindow.cpp | 2 -- src/modelmenu.h | 2 +- src/networkaccessmanager.cpp | 1 - src/panelhistory.cpp | 1 + src/panelhistory.h | 1 + src/previewimage.cpp | 13 +++++++++---- src/previewimage.h | 3 ++- src/sessionmanager.h | 2 +- src/settings.h | 2 ++ src/tabbar.h | 3 ++- src/urlbar.h | 1 + src/webpluginfactory.cpp | 3 +++ src/webpluginfactory.h | 1 + src/websnap.cpp | 3 +++ src/websnap.h | 4 +++- 24 files changed, 40 insertions(+), 23 deletions(-) (limited to 'src') diff --git a/src/autosaver.h b/src/autosaver.h index 221c225c..80583f9c 100644 --- a/src/autosaver.h +++ b/src/autosaver.h @@ -28,14 +28,14 @@ #ifndef AUTOSAVER_H #define AUTOSAVER_H + // Qt Includes #include #include #include - -// Forward Declarations #include + /** * This class will call the save() slot on the parent object when the parent changes. * It will wait several seconds after changed() to combining multiple changes and diff --git a/src/bookmarks.h b/src/bookmarks.h index 5fd0ebee..0fde004f 100644 --- a/src/bookmarks.h +++ b/src/bookmarks.h @@ -29,6 +29,7 @@ #ifndef BOOKMARKS_H #define BOOKMARKS_H + // Local Includes #include "application.h" @@ -124,6 +125,7 @@ signals: // ------------------------------------------------------------------------------ +// KDE Includes #include @@ -243,4 +245,3 @@ private: }; #endif - diff --git a/src/cookiejar.h b/src/cookiejar.h index 3f9f366c..9ae24409 100644 --- a/src/cookiejar.h +++ b/src/cookiejar.h @@ -28,10 +28,10 @@ #ifndef RECOOKIEJAR_H #define RECOOKIEJAR_H + // Qt Includes #include - // Forward Declarations class QUrl; diff --git a/src/history.cpp b/src/history.cpp index aac3a66d..c3ccbad2 100644 --- a/src/history.cpp +++ b/src/history.cpp @@ -56,7 +56,6 @@ #include - // generic algorithms #include diff --git a/src/history.h b/src/history.h index bd7fd7fc..2ccf8cb4 100644 --- a/src/history.h +++ b/src/history.h @@ -29,6 +29,7 @@ #ifndef HISTORY_H #define HISTORY_H + // Local Includes #include "modelmenu.h" @@ -48,7 +49,6 @@ * Elements in this class represent an history item * */ - class HistoryItem { public: diff --git a/src/historymodels.cpp b/src/historymodels.cpp index 5209670b..446791ee 100644 --- a/src/historymodels.cpp +++ b/src/historymodels.cpp @@ -53,12 +53,10 @@ #include - // generic algorithms #include - HistoryModel::HistoryModel(HistoryManager *history, QObject *parent) : QAbstractTableModel(parent) , m_history(history) diff --git a/src/historymodels.h b/src/historymodels.h index 22a7bccd..93e72c6a 100644 --- a/src/historymodels.h +++ b/src/historymodels.h @@ -29,6 +29,7 @@ #ifndef HISTORYMODELS_H #define HISTORYMODELS_H + // Local Includes #include "history.h" #include "modelmenu.h" @@ -45,7 +46,6 @@ #include - class HistoryModel : public QAbstractTableModel { Q_OBJECT diff --git a/src/mainview.cpp b/src/mainview.cpp index 9b7978bc..a7ec6734 100644 --- a/src/mainview.cpp +++ b/src/mainview.cpp @@ -67,6 +67,7 @@ #include #include + MainView::MainView(QWidget *parent) : KTabWidget(parent) , m_urlBar(new UrlBar(this)) diff --git a/src/mainview.h b/src/mainview.h index 548bc0f1..f8c94032 100644 --- a/src/mainview.h +++ b/src/mainview.h @@ -29,6 +29,7 @@ #ifndef MAINVIEW_H #define MAINVIEW_H + // Local Includes #include "webview.h" #include "webpage.h" @@ -37,8 +38,6 @@ // KDE Includes #include -// Qt Includes - // Forward Declarations class QUrl; class QWebFrame; @@ -50,6 +49,7 @@ class UrlBar; class KPassivePopup; + /** * This class represent rekonq Main View. It contains all WebViews and a stack widget * of associated line edits. diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 1d7cff9c..ac9b83bb 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -470,10 +470,8 @@ void MainWindow::slotUpdateConfiguration() defaultSettings->setAttribute(QWebSettings::LocalStorageDatabaseEnabled, ReKonfig::localStorageDatabaseEnabled()); if(ReKonfig::localStorageDatabaseEnabled()) { - kDebug() << QWebSettings::offlineStoragePath(); QString path = KStandardDirs::locateLocal("cache", QString("WebkitLocalStorage/rekonq"), true); path.remove("rekonq"); - kDebug() << path; QWebSettings::setOfflineStoragePath(path); QWebSettings::setOfflineStorageDefaultQuota(50000); } diff --git a/src/modelmenu.h b/src/modelmenu.h index b30a9598..719319bc 100644 --- a/src/modelmenu.h +++ b/src/modelmenu.h @@ -45,12 +45,12 @@ class QPersistentModelIndex; class KIcon; + /** * A KMenu that is dynamically populated * from a QAbstractItemModel * */ - class ModelMenu : public KMenu { Q_OBJECT diff --git a/src/networkaccessmanager.cpp b/src/networkaccessmanager.cpp index 10a7978f..fd975062 100644 --- a/src/networkaccessmanager.cpp +++ b/src/networkaccessmanager.cpp @@ -54,7 +54,6 @@ #include - NetworkAccessManager::NetworkAccessManager(QObject *parent) : AccessManager(parent) { diff --git a/src/panelhistory.cpp b/src/panelhistory.cpp index d6367669..60338ef7 100644 --- a/src/panelhistory.cpp +++ b/src/panelhistory.cpp @@ -38,6 +38,7 @@ #include #include + PanelHistory::PanelHistory(QWidget *parent) : QWidget(parent) , m_historyTreeView(new QTreeView) diff --git a/src/panelhistory.h b/src/panelhistory.h index 81beefb5..68421c4e 100644 --- a/src/panelhistory.h +++ b/src/panelhistory.h @@ -28,6 +28,7 @@ #ifndef PANELHISTORY_H #define PANELHISTORY_H + // Local Includes #include "application.h" #include "historymodels.h" diff --git a/src/previewimage.cpp b/src/previewimage.cpp index 9d9009dc..07eca1b0 100644 --- a/src/previewimage.cpp +++ b/src/previewimage.cpp @@ -23,19 +23,24 @@ * * ============================================================ */ + +// Self Includes #include "previewimage.h" #include "previewimage.moc" +// Local Includes #include "application.h" -#include -#include -#include - +// KDE Includes #include #include #include +// Qt Includes +#include +#include +#include + PreviewImage::PreviewImage(const QUrl &url) : QLabel() diff --git a/src/previewimage.h b/src/previewimage.h index 96a11c20..b3f184aa 100644 --- a/src/previewimage.h +++ b/src/previewimage.h @@ -27,9 +27,10 @@ #ifndef PREVIEW_IMAGE_H #define PREVIEW_IMAGE_H - +// Local Includes #include "websnap.h" +// Qt Includes #include #include #include diff --git a/src/sessionmanager.h b/src/sessionmanager.h index 12435702..f1b7a71f 100644 --- a/src/sessionmanager.h +++ b/src/sessionmanager.h @@ -36,7 +36,7 @@ /** - * + * Session Management */ class SessionManager : public QObject { diff --git a/src/settings.h b/src/settings.h index 0be89173..3aa943c7 100644 --- a/src/settings.h +++ b/src/settings.h @@ -29,6 +29,7 @@ #ifndef SETTINGS_H #define SETTINGS_H + // KDE Includes #include @@ -36,6 +37,7 @@ class QWidget; class Private; + class SettingsDialog : public KConfigDialog { Q_OBJECT diff --git a/src/tabbar.h b/src/tabbar.h index a86ba4d6..5f43980f 100644 --- a/src/tabbar.h +++ b/src/tabbar.h @@ -30,6 +30,7 @@ #ifndef TABBAR_H #define TABBAR_H + // KDE Includes #include @@ -37,12 +38,12 @@ class QPoint; class QToolButton; + /** * Tab bar with a few more features such as * a context menu and shortcuts * */ - class TabBar : public KTabBar { Q_OBJECT diff --git a/src/urlbar.h b/src/urlbar.h index 80fbb759..28b1dc08 100644 --- a/src/urlbar.h +++ b/src/urlbar.h @@ -47,6 +47,7 @@ class QWidget; class KCompletion; class HistoryCompletionModel; + class UrlBar : public KHistoryComboBox { Q_OBJECT diff --git a/src/webpluginfactory.cpp b/src/webpluginfactory.cpp index 5d99ff6d..bb3f4d06 100644 --- a/src/webpluginfactory.cpp +++ b/src/webpluginfactory.cpp @@ -28,12 +28,15 @@ #include "webpluginfactory.h" #include "webpluginfactory.moc" +// Local Includes #include "application.h" #include "mainwindow.h" #include "previewimage.h" +// KDE Includes #include + WebPluginFactory::WebPluginFactory(QObject *parent) : QWebPluginFactory(parent) { diff --git a/src/webpluginfactory.h b/src/webpluginfactory.h index c63b0ce3..738605db 100644 --- a/src/webpluginfactory.h +++ b/src/webpluginfactory.h @@ -28,6 +28,7 @@ #define WEB_PLUGIN_FACTORY_H +// Qt Includes #include #include #include diff --git a/src/websnap.cpp b/src/websnap.cpp index 284e8fc5..35f1cd39 100644 --- a/src/websnap.cpp +++ b/src/websnap.cpp @@ -25,12 +25,15 @@ * ============================================================ */ +// Self Includes #include "websnap.h" #include "websnap.moc" +// KDE Includes #include #include +// Qt Includes #include #include #include diff --git a/src/websnap.h b/src/websnap.h index ee513154..7417456b 100644 --- a/src/websnap.h +++ b/src/websnap.h @@ -24,12 +24,14 @@ * * ============================================================ */ + #ifndef WEB_SNAP_H #define WEB_SNAP_H - +// KDE Includes #include +// Qt Includes #include #include #include -- cgit v1.2.1