From 962d9dd1fc5fe530dc9a7e29c95a0a2c1e7aa885 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Fri, 20 Apr 2012 23:31:41 +0200 Subject: Clean up headers && fix compilation with (the upcoming) qt 4.8.2 Conflicts: src/adblock/adblockwidget.h src/application.h src/history/historymanager.h src/tabpreviewpopup.cpp Backported from master branch --- src/adblock/adblockmanager.cpp | 2 ++ src/adblock/adblockmanager.h | 2 +- src/adblock/adblockwidget.h | 3 +-- src/analyzer/analyzerpanel.cpp | 1 + src/analyzer/analyzerpanel.h | 4 +--- src/analyzer/networkanalyzer.cpp | 11 +++++++---- src/analyzer/networkanalyzer.h | 14 +++++++------- src/application.cpp | 3 +++ src/application.h | 14 ++++---------- src/bookmarks/bookmarkowner.cpp | 2 +- src/bookmarks/bookmarkscontextmenu.h | 1 + src/clicktoflash.cpp | 11 ++++++----- src/clicktoflash.h | 5 ++--- src/downloadmanager.cpp | 6 +++--- src/findbar.cpp | 12 ++++++------ src/findbar.h | 2 +- src/history/autosaver.cpp | 8 ++++---- src/history/autosaver.h | 2 +- src/history/historymanager.cpp | 22 ++++++++++++---------- src/history/historymanager.h | 21 ++++++++++----------- src/history/historymodels.cpp | 22 ++++++++++++---------- src/history/historymodels.h | 12 +++++------- src/history/historypanel.cpp | 3 ++- src/icondownloader.cpp | 2 ++ src/icondownloader.h | 5 ++++- src/iconmanager.cpp | 10 +++++----- src/iconmanager.h | 3 ++- src/mainview.cpp | 7 +++++++ src/mainview.h | 10 +++------- src/mainwindow.cpp | 1 + src/networkaccessmanager.h | 3 +++ src/newtabpage.cpp | 1 + src/newtabpage.h | 5 +++-- src/opensearch/opensearchmanager.cpp | 6 +++--- src/opensearch/opensearchmanager.h | 3 +-- src/opensearch/opensearchreader.cpp | 2 +- src/opensearch/opensearchreader.h | 2 +- src/paneltreeview.cpp | 4 ++-- src/paneltreeview.h | 2 +- src/previewselectorbar.cpp | 6 ++---- src/protocolhandler.cpp | 5 +++-- src/protocolhandler.h | 2 +- src/rekonqmenu.h | 3 +++ src/sessionmanager.cpp | 14 +++++++------- src/sessionmanager.h | 4 ++-- src/sslinfodialog.cpp | 19 ++++++++++--------- src/sslinfodialog.h | 12 +++++++++--- src/sync/syncmanager.cpp | 3 +++ src/tabbar.cpp | 14 ++++++++++---- src/tabbar.h | 5 +---- src/tabhighlighteffect.cpp | 13 ++++++++++--- src/tabhighlighteffect.h | 6 ++++-- src/tabpreviewpopup.cpp | 5 ++--- src/tabpreviewpopup.h | 7 ++++--- src/urlbar/bookmarkwidget.cpp | 8 ++++---- src/urlbar/bookmarkwidget.h | 2 +- src/urlbar/completionwidget.cpp | 12 ++++++------ src/urlbar/completionwidget.h | 5 ++++- src/urlbar/favoritewidget.cpp | 9 +++++---- src/urlbar/favoritewidget.h | 8 ++++---- src/urlbar/listitem.cpp | 6 +++--- src/urlbar/listitem.h | 15 +++++++++------ src/urlbar/rsswidget.cpp | 12 ++++++------ src/urlbar/rsswidget.h | 2 +- src/urlbar/sslwidget.cpp | 12 +++++++----- src/urlbar/sslwidget.h | 5 +++-- src/urlbar/urlbar.cpp | 9 +++++---- src/urlbar/urlresolver.h | 2 +- src/urlbar/webshortcutwidget.cpp | 1 + src/urlfilterproxymodel.h | 2 +- src/urlpanel.cpp | 6 +++--- src/urlpanel.h | 8 ++++---- src/useragent/useragentmanager.h | 2 ++ src/walletbar.h | 1 + src/webicon.cpp | 4 ++-- src/webicon.h | 2 +- src/webinspectorpanel.cpp | 4 ++-- src/webinspectorpanel.h | 8 ++++---- src/webpage.cpp | 5 ++++- src/webpluginfactory.cpp | 3 ++- src/websnap.h | 4 ++-- src/webview.cpp | 14 ++++++++------ src/webview.h | 11 +++++++---- src/zoombar.cpp | 8 ++++---- src/zoombar.h | 4 ++-- 85 files changed, 313 insertions(+), 248 deletions(-) (limited to 'src') diff --git a/src/adblock/adblockmanager.cpp b/src/adblock/adblockmanager.cpp index 5078f215..a9ac0612 100644 --- a/src/adblock/adblockmanager.cpp +++ b/src/adblock/adblockmanager.cpp @@ -44,6 +44,8 @@ // Qt Includes #include #include +#include +#include AdBlockManager::AdBlockManager(QObject *parent) diff --git a/src/adblock/adblockmanager.h b/src/adblock/adblockmanager.h index 9d746e18..07bed803 100644 --- a/src/adblock/adblockmanager.h +++ b/src/adblock/adblockmanager.h @@ -133,11 +133,11 @@ // Qt Includes #include -#include #include #include // Forward Includes +class QNetworkReply; class QNetworkRequest; class WebPage; diff --git a/src/adblock/adblockwidget.h b/src/adblock/adblockwidget.h index 3c7c667b..b54134e0 100644 --- a/src/adblock/adblockwidget.h +++ b/src/adblock/adblockwidget.h @@ -32,8 +32,7 @@ #include "ui_settings_adblock.h" // Qt Includes -#include -#include +#include class AdBlockWidget : public QWidget, private Ui::adblock diff --git a/src/analyzer/analyzerpanel.cpp b/src/analyzer/analyzerpanel.cpp index 099a4123..3bd17e9c 100644 --- a/src/analyzer/analyzerpanel.cpp +++ b/src/analyzer/analyzerpanel.cpp @@ -30,6 +30,7 @@ #include "analyzerpanel.moc" // Local Includes +#include "mainwindow.h" #include "networkanalyzer.h" #include "networkaccessmanager.h" #include "webtab.h" diff --git a/src/analyzer/analyzerpanel.h b/src/analyzer/analyzerpanel.h index 8441a395..591e5947 100644 --- a/src/analyzer/analyzerpanel.h +++ b/src/analyzer/analyzerpanel.h @@ -31,13 +31,11 @@ // Rekonq Includes #include "rekonq_defines.h" -// Local Includes -#include "mainwindow.h" - // Qt Includes #include // Forward Declarations +class MainWindow; class NetworkAnalyzer; diff --git a/src/analyzer/networkanalyzer.cpp b/src/analyzer/networkanalyzer.cpp index 0cf26f90..882318d4 100644 --- a/src/analyzer/networkanalyzer.cpp +++ b/src/analyzer/networkanalyzer.cpp @@ -37,14 +37,17 @@ #include // Qt Includes -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include +#include +#include + NetworkAnalyzer::NetworkAnalyzer(QWidget *parent) : QWidget(parent) diff --git a/src/analyzer/networkanalyzer.h b/src/analyzer/networkanalyzer.h index f5824b07..af1e1145 100644 --- a/src/analyzer/networkanalyzer.h +++ b/src/analyzer/networkanalyzer.h @@ -34,21 +34,21 @@ #include "rekonq_defines.h" // Qt Includes -#include -#include +#include -#include +#include +#include -#include -#include -#include -#include +#include // Forward Declarations class QTreeWidgetItem; class QSignalMapper; class QTreeWidget; +class QNetworkReply; +class QNetworkRequest; + class NetworkAnalyzer : public QWidget { diff --git a/src/application.cpp b/src/application.cpp index e0570a5b..def8b865 100644 --- a/src/application.cpp +++ b/src/application.cpp @@ -51,6 +51,7 @@ #include "stackedurlbar.h" #include "tabbar.h" #include "urlbar.h" +#include "urlresolver.h" #include "useragentmanager.h" #include "webtab.h" @@ -70,6 +71,8 @@ // Qt Includes #include +#include +#include using namespace ThreadWeaver; diff --git a/src/application.h b/src/application.h index 2689e3f5..bc1ddc72 100644 --- a/src/application.h +++ b/src/application.h @@ -40,11 +40,12 @@ #include // Qt Includes -#include -#include - +#include // Forward Declarations +class KAction; + + class AdBlockManager; class BookmarkManager; class DownloadManager; @@ -56,13 +57,6 @@ class SessionManager; class UserAgentManager; class SyncManager; -class KAction; - -namespace ThreadWeaver -{ -class Job; -} - typedef QList< QWeakPointer > MainWindowList; diff --git a/src/bookmarks/bookmarkowner.cpp b/src/bookmarks/bookmarkowner.cpp index a53b888b..be28448c 100644 --- a/src/bookmarks/bookmarkowner.cpp +++ b/src/bookmarks/bookmarkowner.cpp @@ -44,7 +44,7 @@ #include // Qt Includes -#include +#include BookmarkOwner::BookmarkOwner(KBookmarkManager *manager, QObject *parent) diff --git a/src/bookmarks/bookmarkscontextmenu.h b/src/bookmarks/bookmarkscontextmenu.h index 34ef66e0..c927f3a6 100644 --- a/src/bookmarks/bookmarkscontextmenu.h +++ b/src/bookmarks/bookmarkscontextmenu.h @@ -33,6 +33,7 @@ // Forward Declarations class BookmarkOwner; + class BookmarksContextMenu : public KBookmarkContextMenu { public: diff --git a/src/clicktoflash.cpp b/src/clicktoflash.cpp index 94ae40ae..baa61367 100644 --- a/src/clicktoflash.cpp +++ b/src/clicktoflash.cpp @@ -33,11 +33,12 @@ #include // Qt Includes -#include -#include -#include -#include -#include +#include +#include + +#include +#include +#include ClickToFlash::ClickToFlash(const QUrl &pluginUrl, QWidget *parent) diff --git a/src/clicktoflash.h b/src/clicktoflash.h index d7648204..fcafea59 100644 --- a/src/clicktoflash.h +++ b/src/clicktoflash.h @@ -33,8 +33,8 @@ #include "rekonq_defines.h" // Qt Includes -#include -#include +#include +#include // Forward Declarations class QWebElement; @@ -63,4 +63,3 @@ private: }; #endif // CLICKTOFLASH_H - diff --git a/src/downloadmanager.cpp b/src/downloadmanager.cpp index a3165764..4dc7e670 100644 --- a/src/downloadmanager.cpp +++ b/src/downloadmanager.cpp @@ -52,9 +52,9 @@ #include #include -#include -#include -#include +#include +#include +#include DownloadManager::DownloadManager(QObject *parent) diff --git a/src/findbar.cpp b/src/findbar.cpp index 889d3921..d218340f 100644 --- a/src/findbar.cpp +++ b/src/findbar.cpp @@ -43,13 +43,13 @@ #include // Qt Includes -#include +#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include FindBar::FindBar(MainWindow *window) diff --git a/src/findbar.h b/src/findbar.h index 2b1ec602..04a6bd15 100644 --- a/src/findbar.h +++ b/src/findbar.h @@ -33,7 +33,7 @@ #include "rekonq_defines.h" // Qt Includes -#include +#include // Forward Declarations class MainWindow; diff --git a/src/history/autosaver.cpp b/src/history/autosaver.cpp index bb2a7683..ee84e299 100644 --- a/src/history/autosaver.cpp +++ b/src/history/autosaver.cpp @@ -30,10 +30,10 @@ #include "autosaver.moc" // Qt Includes -#include -#include -#include -#include +#include +#include +#include +#include const int AUTOSAVE_TIME = 1000 * 3; // seconds diff --git a/src/history/autosaver.h b/src/history/autosaver.h index f165377c..4c385ed6 100644 --- a/src/history/autosaver.h +++ b/src/history/autosaver.h @@ -33,7 +33,7 @@ #include "rekonq_defines.h" // Qt Includes -#include +#include // Forward Declarations class QBasicTimer; diff --git a/src/history/historymanager.cpp b/src/history/historymanager.cpp index 602e4606..95b2d586 100644 --- a/src/history/historymanager.cpp +++ b/src/history/historymanager.cpp @@ -44,16 +44,18 @@ #include // Qt Includes -#include -#include -#include -#include -#include -#include -#include -#include - -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include // generic algorithms #include diff --git a/src/history/historymanager.h b/src/history/historymanager.h index d4531e5c..5be32b9e 100644 --- a/src/history/historymanager.h +++ b/src/history/historymanager.h @@ -33,9 +33,6 @@ // Rekonq Includes #include "rekonq_defines.h" -// Local Includes -#include "urlresolver.h" - // KDE Includes #include @@ -43,13 +40,18 @@ #include #include #include -#include -#include -#include #include #include +// Forward Declarations +class AutoSaver; +class HistoryFilterModel; +class HistoryTreeModel; + +class QWebHistory; + + /** * Elements in this class represent an history item * @@ -100,6 +102,7 @@ public: // --------------------------------------------------------------------------------------------------------------- + class TabHistory { public: @@ -133,13 +136,9 @@ public: QByteArray history; }; -// --------------------------------------------------------------------------------------------------------------- +// --------------------------------------------------------------------------------------------------------------- -// Forward Declarations -class AutoSaver; -class HistoryFilterModel; -class HistoryTreeModel; /** * THE History Manager: diff --git a/src/history/historymodels.cpp b/src/history/historymodels.cpp index 16054054..8894b334 100644 --- a/src/history/historymodels.cpp +++ b/src/history/historymodels.cpp @@ -35,6 +35,7 @@ // Local Includes #include "application.h" +#include "historymanager.h" #include "iconmanager.h" // KDE Includes @@ -43,16 +44,17 @@ #include // Qt Includes -#include -#include -#include -#include -#include -#include -#include -#include - -#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include // generic algorithms #include diff --git a/src/history/historymodels.h b/src/history/historymodels.h index 9c3bfc36..7588c6ff 100644 --- a/src/history/historymodels.h +++ b/src/history/historymodels.h @@ -33,17 +33,16 @@ // Rekonq Includes #include "rekonq_defines.h" -// Local Includes -#include "historymanager.h" - // KDE Includes #include // Qt Includes #include -#include -#include -#include +#include +#include + +// Forward Declarations +class HistoryManager; class REKONQ_TESTS_EXPORT HistoryModel : public QAbstractTableModel @@ -175,7 +174,6 @@ private Q_SLOTS: private: int sourceDateRow(int row) const; mutable QList m_sourceRowCache; - }; diff --git a/src/history/historypanel.cpp b/src/history/historypanel.cpp index e09b4f48..5037a4d1 100644 --- a/src/history/historypanel.cpp +++ b/src/history/historypanel.cpp @@ -35,6 +35,7 @@ // Local Includes #include "application.h" #include "paneltreeview.h" +#include "historymanager.h" #include "historymodels.h" #include "urlfilterproxymodel.h" @@ -45,7 +46,7 @@ #include // Qt Includes -#include +#include HistoryPanel::HistoryPanel(const QString &title, QWidget *parent, Qt::WindowFlags flags) diff --git a/src/icondownloader.cpp b/src/icondownloader.cpp index 441c3ac2..6d1f3a5e 100644 --- a/src/icondownloader.cpp +++ b/src/icondownloader.cpp @@ -24,9 +24,11 @@ * ============================================================ */ +// Self Includes #include "icondownloader.h" #include "icondownloader.moc" +// Qt Includes #include #include #include diff --git a/src/icondownloader.h b/src/icondownloader.h index d2b1efb3..54fd60fb 100644 --- a/src/icondownloader.h +++ b/src/icondownloader.h @@ -27,13 +27,16 @@ #ifndef ICON_DOWNLOADER_H #define ICON_DOWNLOADER_H -// rekonq includes +// rekonq Includes #include "rekonq_defines.h" +// Qt Includes #include +// KDE Includes #include +// Forward Declarations class QNetworkReply; diff --git a/src/iconmanager.cpp b/src/iconmanager.cpp index 86fa5393..2876aa27 100644 --- a/src/iconmanager.cpp +++ b/src/iconmanager.cpp @@ -30,8 +30,8 @@ // Local Includes #include "application.h" -#include "webicon.h" #include "icondownloader.h" +#include "webicon.h" // KDE Includes #include @@ -41,11 +41,11 @@ #include // Qt Includes -#include +#include -#include -#include -#include +#include +#include +#include IconManager::IconManager(QObject *parent) diff --git a/src/iconmanager.h b/src/iconmanager.h index 4f4b9871..f5416a95 100644 --- a/src/iconmanager.h +++ b/src/iconmanager.h @@ -31,7 +31,8 @@ #include "rekonq_defines.h" // Qt Includes -#include +#include +#include // Forward Declarations class KIcon; diff --git a/src/mainview.cpp b/src/mainview.cpp index 419dc413..0cf1ef60 100644 --- a/src/mainview.cpp +++ b/src/mainview.cpp @@ -36,6 +36,7 @@ // Local Includes #include "application.h" +#include "historymanager.h" #include "iconmanager.h" #include "mainwindow.h" #include "sessionmanager.h" @@ -138,6 +139,12 @@ WebTab *MainView::currentWebTab() const } +QList MainView::recentlyClosedTabs() +{ + return m_recentlyClosedTabs; +} + + void MainView::updateTabBar() { if (ReKonfig::alwaysShowTabBar() || count() > 1) diff --git a/src/mainview.h b/src/mainview.h index f2ed7cba..a80ba521 100644 --- a/src/mainview.h +++ b/src/mainview.h @@ -34,16 +34,15 @@ // Rekonq Includes #include "rekonq_defines.h" -// Local Includes -#include "historymanager.h" - // KDE Includes #include // Forward Declarations class HistoryItem; +class MainWindow; class StackedUrlBar; class TabBar; +class TabHistory; class UrlBar; class WebTab; @@ -101,10 +100,7 @@ public: */ WebTab *newWebTab(bool focused = true); - inline QList recentlyClosedTabs() - { - return m_recentlyClosedTabs; - } + QList recentlyClosedTabs(); void restoreClosedTab(int i, bool inNewTab = true); diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index e954e7d3..1a34299b 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -43,6 +43,7 @@ #include "bookmarkstoolbar.h" #include "downloadmanager.h" #include "findbar.h" +#include "historymanager.h" #include "historypanel.h" #include "iconmanager.h" #include "mainview.h" diff --git a/src/networkaccessmanager.h b/src/networkaccessmanager.h index 216e0f3d..55a44ce4 100644 --- a/src/networkaccessmanager.h +++ b/src/networkaccessmanager.h @@ -35,6 +35,9 @@ // KDE Includes #include +// Qt Includes +#include + class REKONQ_TESTS_EXPORT NetworkAccessManager : public KIO::Integration::AccessManager { diff --git a/src/newtabpage.cpp b/src/newtabpage.cpp index 77a2f62f..aa38e37b 100644 --- a/src/newtabpage.cpp +++ b/src/newtabpage.cpp @@ -37,6 +37,7 @@ #include "bookmarkmanager.h" #include "downloadmanager.h" #include "iconmanager.h" +#include "historymanager.h" #include "historymodels.h" #include "mainview.h" #include "mainwindow.h" diff --git a/src/newtabpage.h b/src/newtabpage.h index b4f3bcd6..887d3cd1 100644 --- a/src/newtabpage.h +++ b/src/newtabpage.h @@ -36,8 +36,9 @@ #include // Qt Includes -#include -#include +#include +#include +#include // Forward Declarations class KBookmark; diff --git a/src/opensearch/opensearchmanager.cpp b/src/opensearch/opensearchmanager.cpp index 12b93ec2..480e9a26 100644 --- a/src/opensearch/opensearchmanager.cpp +++ b/src/opensearch/opensearchmanager.cpp @@ -31,10 +31,10 @@ #include "opensearchmanager.moc" // Local Includes +#include "application.h" #include "opensearchengine.h" #include "opensearchreader.h" #include "opensearchwriter.h" -#include "application.h" // KDE Includes #include @@ -47,8 +47,8 @@ #include // Qt Includes -#include -#include +#include +#include #include #include diff --git a/src/opensearch/opensearchmanager.h b/src/opensearch/opensearchmanager.h index 84272f26..e698e0ee 100644 --- a/src/opensearch/opensearchmanager.h +++ b/src/opensearch/opensearchmanager.h @@ -40,8 +40,7 @@ #include // Qt Includes -#include -#include +#include // Forward Declarations class OpenSearchEngine; diff --git a/src/opensearch/opensearchreader.cpp b/src/opensearch/opensearchreader.cpp index c2bf0f09..897fca29 100644 --- a/src/opensearch/opensearchreader.cpp +++ b/src/opensearch/opensearchreader.cpp @@ -38,7 +38,7 @@ #include // Qt Includes -#include +#include OpenSearchReader::OpenSearchReader() diff --git a/src/opensearch/opensearchreader.h b/src/opensearch/opensearchreader.h index 70b560f1..d1c644ae 100644 --- a/src/opensearch/opensearchreader.h +++ b/src/opensearch/opensearchreader.h @@ -34,7 +34,7 @@ #include "rekonq_defines.h" // Qt Includes -#include +#include // Forward Declarations class OpenSearchEngine; diff --git a/src/paneltreeview.cpp b/src/paneltreeview.cpp index a4966f1b..ebad68aa 100644 --- a/src/paneltreeview.cpp +++ b/src/paneltreeview.cpp @@ -36,8 +36,8 @@ #include // Qt Includes -#include -#include +#include +#include PanelTreeView::PanelTreeView(QWidget *parent) diff --git a/src/paneltreeview.h b/src/paneltreeview.h index 921fe3f2..1b640310 100644 --- a/src/paneltreeview.h +++ b/src/paneltreeview.h @@ -32,7 +32,7 @@ #include "rekonq_defines.h" // Qt Includes -#include +#include // Forward Declarations class KUrl; diff --git a/src/previewselectorbar.cpp b/src/previewselectorbar.cpp index d72e9eb1..b743e3c9 100644 --- a/src/previewselectorbar.cpp +++ b/src/previewselectorbar.cpp @@ -25,21 +25,19 @@ * ============================================================ */ -// Auto Includes +// Self Includes #include "previewselectorbar.h" #include "previewselectorbar.moc" // Auto Includes #include "rekonq.h" -// Self Includes -#include "websnap.h" - // Local Include #include "application.h" #include "mainwindow.h" #include "webpage.h" #include "webtab.h" +#include "websnap.h" // KDE Includes #include diff --git a/src/protocolhandler.cpp b/src/protocolhandler.cpp index c63c37af..fa7ca7f5 100644 --- a/src/protocolhandler.cpp +++ b/src/protocolhandler.cpp @@ -44,6 +44,7 @@ // KDE Includes #include #include +#include #include #include #include @@ -53,8 +54,8 @@ #include // Qt Includes -#include -#include +#include +#include #include diff --git a/src/protocolhandler.h b/src/protocolhandler.h index 80f37dfc..3bd44131 100644 --- a/src/protocolhandler.h +++ b/src/protocolhandler.h @@ -35,7 +35,7 @@ #include // Qt Includes -#include +#include // Forward Declarations class KDirLister; diff --git a/src/rekonqmenu.h b/src/rekonqmenu.h index e3d659f7..8bda008b 100644 --- a/src/rekonqmenu.h +++ b/src/rekonqmenu.h @@ -36,6 +36,9 @@ // KDE Includes #include +// Forward Declarations +class QWidget; + /** * Menu shown inside rekonq window. diff --git a/src/sessionmanager.cpp b/src/sessionmanager.cpp index b0ef1fce..02488801 100644 --- a/src/sessionmanager.cpp +++ b/src/sessionmanager.cpp @@ -32,16 +32,16 @@ // Local Includes #include "application.h" +#include "historymanager.h" #include "mainview.h" #include "mainwindow.h" -#include "tabbar.h" #include "webtab.h" // KDE Includes #include // Qt Includes -#include +#include // Only used internally @@ -148,7 +148,7 @@ void SessionManager::saveSession() tab.setAttribute("title", mv->webTab(tabNo)->view()->title()); // redundant, but needed for closedSites() // as there's not way to read out the historyData tab.setAttribute("url", u.url()); - if (mv->tabBar()->currentIndex() == tabNo) + if (mv->currentIndex() == tabNo) { tab.setAttribute("currentTab", 1); } @@ -188,7 +188,7 @@ bool SessionManager::restoreSessionFromScratch() int currentTab = loadViewTabs(mv, window, false); - mv->tabBar()->setCurrentIndex(currentTab); + mv->setCurrentIndex(currentTab); } return true; @@ -210,7 +210,7 @@ void SessionManager::restoreCrashedSession() int currentTab = loadViewTabs(mv, window, true); - mv->tabBar()->setCurrentIndex(currentTab); + mv->setCurrentIndex(currentTab); } setSessionManagementEnabled(true); @@ -234,7 +234,7 @@ int SessionManager::restoreSavedSession() int currentTab = loadViewTabs(mv, window, true); - mv->tabBar()->setCurrentIndex(currentTab); + mv->setCurrentIndex(currentTab); } return winNo; @@ -261,7 +261,7 @@ bool SessionManager::restoreMainWindow(MainWindow* window) int currentTab = loadViewTabs(mv, savedWindowElement, false); - mv->tabBar()->setCurrentIndex(currentTab); + mv->setCurrentIndex(currentTab); return true; } diff --git a/src/sessionmanager.h b/src/sessionmanager.h index b4748fde..810d9b5c 100644 --- a/src/sessionmanager.h +++ b/src/sessionmanager.h @@ -34,10 +34,10 @@ #include "rekonq_defines.h" // Qt Includes -#include +#include +#include // Forward Declarations -class QString; class TabHistory; class MainWindow; diff --git a/src/sslinfodialog.cpp b/src/sslinfodialog.cpp index 234dbb82..2f0b44e4 100644 --- a/src/sslinfodialog.cpp +++ b/src/sslinfodialog.cpp @@ -28,21 +28,22 @@ #include "sslinfodialog.h" #include "sslinfodialog.moc" - +// KDE Includes #include -#include -#include - -#include -#include - -#include - #include #include #include +// Qt Includes +#include +#include + +#include +#include + +#include + SslInfoDialog::SslInfoDialog(const QString &host, const WebSslInfo &info, QWidget *parent) : KDialog(parent) diff --git a/src/sslinfodialog.h b/src/sslinfodialog.h index 0c7f97ce..94f610c6 100644 --- a/src/sslinfodialog.h +++ b/src/sslinfodialog.h @@ -27,19 +27,25 @@ #ifndef SSL_INFO_DIALOG_H #define SSL_INFO_DIALOG_H + +// Rekonq Includes #include "rekonq_defines.h" +// Local Includes #include "websslinfo.h" // Ui Includes #include "ui_sslinfo.h" -#include +// KDE Includes +#include -#include +// Qt Includes +#include +// Forward Declarations class QSslCertificate; -class QString; + /** * Rekonq SSL Information Dialog diff --git a/src/sync/syncmanager.cpp b/src/sync/syncmanager.cpp index 5766f418..de14703c 100644 --- a/src/sync/syncmanager.cpp +++ b/src/sync/syncmanager.cpp @@ -42,6 +42,9 @@ // KDE Includes #include +// Qt Includes +#include + SyncManager::SyncManager(QObject *parent) : QObject(parent) diff --git a/src/tabbar.cpp b/src/tabbar.cpp index 326d8647..e3bcf3eb 100644 --- a/src/tabbar.cpp +++ b/src/tabbar.cpp @@ -35,6 +35,7 @@ #include "rekonq.h" #include "application.h" +#include "historymanager.h" #include "iconmanager.h" #include "mainview.h" #include "mainwindow.h" @@ -52,12 +53,14 @@ #include // Qt Includes -#include -#include -#include -#include +#include +#include +#include +#include #include #include +#include +#include static inline QByteArray highlightPropertyName(int index) @@ -66,6 +69,9 @@ static inline QByteArray highlightPropertyName(int index) } +// ---------------------------------------------- + + TabBar::TabBar(QWidget *parent) : KTabBar(parent) , m_actualIndex(-1) diff --git a/src/tabbar.h b/src/tabbar.h index 3e29b248..161612c2 100644 --- a/src/tabbar.h +++ b/src/tabbar.h @@ -37,9 +37,6 @@ // KDE Includes #include -//Qt Includes -#include - // Forward Declarations class TabPreviewPopup; class TabHighlightEffect; @@ -47,7 +44,7 @@ class TabHighlightEffect; class KActionMenu; class QPropertyAnimation; - +class QSignalMapper; /** * Tab bar with a few more features such as diff --git a/src/tabhighlighteffect.cpp b/src/tabhighlighteffect.cpp index b6f191d8..121afd15 100644 --- a/src/tabhighlighteffect.cpp +++ b/src/tabhighlighteffect.cpp @@ -24,18 +24,25 @@ * ============================================================ */ -//Self Includes +// Self Includes #include "tabhighlighteffect.h" #include "tabhighlighteffect.moc" -//Qt Includes +// Local Includes +#include "tabbar.h" + +// Qt Includes +#include +#include #include -#include const QByteArray prep("hAnim"); +// --------------------------------------------------------------------------- + + TabHighlightEffect::TabHighlightEffect(TabBar *tabBar) : QGraphicsEffect(tabBar) , m_tabBar(tabBar) diff --git a/src/tabhighlighteffect.h b/src/tabhighlighteffect.h index 6deaa285..88302283 100644 --- a/src/tabhighlighteffect.h +++ b/src/tabhighlighteffect.h @@ -30,12 +30,14 @@ // Qt Includes #include -#include -#include +#include // Forward Declarations class TabBar; +class QEvent; +class QPainter; + class TabHighlightEffect : public QGraphicsEffect { diff --git a/src/tabpreviewpopup.cpp b/src/tabpreviewpopup.cpp index 4466868d..e2df4989 100644 --- a/src/tabpreviewpopup.cpp +++ b/src/tabpreviewpopup.cpp @@ -29,11 +29,10 @@ #include "tabpreviewpopup.h" // Rekonq Includes -#include "webtab.h" -#include "tabbar.h" -#include "websnap.h" #include "application.h" #include "mainwindow.h" +#include "tabbar.h" +#include "webtab.h" //Qt Includes #include diff --git a/src/tabpreviewpopup.h b/src/tabpreviewpopup.h index 01995a20..5c62102f 100644 --- a/src/tabpreviewpopup.h +++ b/src/tabpreviewpopup.h @@ -53,9 +53,6 @@ public: virtual ~TabPreviewPopup(); private: - QLabel *m_thumbnail; - QLabel *m_url; - void setWebTab(WebTab *tab = 0); void setUrl(const QString& text); void setThumbnail(const QPixmap& pixmap); @@ -63,6 +60,10 @@ private: protected: void paintEvent(QPaintEvent *event); + +private: + QLabel *m_thumbnail; + QLabel *m_url; }; #endif // TABPREVIEWPOPUP_H diff --git a/src/urlbar/bookmarkwidget.cpp b/src/urlbar/bookmarkwidget.cpp index b36af2bc..536befb8 100644 --- a/src/urlbar/bookmarkwidget.cpp +++ b/src/urlbar/bookmarkwidget.cpp @@ -41,10 +41,10 @@ #include // Qt Includes -#include -#include -#include -#include +#include +#include +#include +#include BookmarkWidget::BookmarkWidget(const KBookmark &bookmark, QWidget *parent) diff --git a/src/urlbar/bookmarkwidget.h b/src/urlbar/bookmarkwidget.h index f70fc750..c2985759 100644 --- a/src/urlbar/bookmarkwidget.h +++ b/src/urlbar/bookmarkwidget.h @@ -29,7 +29,7 @@ #define BOOKMARKWIDGET_H // Qt Includes -#include +#include // Forward Declarations class KBookmark; diff --git a/src/urlbar/completionwidget.cpp b/src/urlbar/completionwidget.cpp index f4e7220a..92ef4fb9 100644 --- a/src/urlbar/completionwidget.cpp +++ b/src/urlbar/completionwidget.cpp @@ -33,7 +33,7 @@ // Local Includes #include "application.h" -#include "urlresolver.h" +#include "listitem.h" #include "searchengine.h" #include "urlbar.h" @@ -42,12 +42,12 @@ #include // Qt Includes -#include -#include -#include +#include +#include +#include -#include -#include +#include +#include diff --git a/src/urlbar/completionwidget.h b/src/urlbar/completionwidget.h index dc4eb3a4..92d1bd39 100644 --- a/src/urlbar/completionwidget.h +++ b/src/urlbar/completionwidget.h @@ -32,7 +32,7 @@ #include "rekonq_defines.h" // Local Includes -#include "listitem.h" +#include "urlresolver.h" // KDE Includes #include @@ -40,6 +40,9 @@ // Qt Includes #include +// Forward Declarations +class ListItem; + class CompletionWidget : public QFrame { diff --git a/src/urlbar/favoritewidget.cpp b/src/urlbar/favoritewidget.cpp index f72deace..6a4ffaba 100644 --- a/src/urlbar/favoritewidget.cpp +++ b/src/urlbar/favoritewidget.cpp @@ -35,6 +35,7 @@ #include "application.h" #include "bookmarkmanager.h" #include "bookmarkowner.h" +#include "webtab.h" // KDE Includes #include @@ -42,10 +43,10 @@ #include // Qt Includes -#include -#include -#include -#include +#include +#include +#include +#include FavoriteWidget::FavoriteWidget(WebTab *tab, QWidget *parent) diff --git a/src/urlbar/favoritewidget.h b/src/urlbar/favoritewidget.h index c75d2a7e..d0b05f14 100644 --- a/src/urlbar/favoritewidget.h +++ b/src/urlbar/favoritewidget.h @@ -29,11 +29,11 @@ // Qt Includes -#include -#include +#include +#include -// Local Includes -#include "webtab.h" +// Forward Declarations +class WebTab; class FavoriteWidget : public QMenu diff --git a/src/urlbar/listitem.cpp b/src/urlbar/listitem.cpp index c66d3727..92552e7e 100644 --- a/src/urlbar/listitem.cpp +++ b/src/urlbar/listitem.cpp @@ -49,7 +49,6 @@ #include #include #include -#include #include #include #include @@ -57,6 +56,7 @@ #include #include #include +#include ListItem::ListItem(const UrlSearchItem &item, QWidget *parent) @@ -392,14 +392,14 @@ ImageLabel::ImageLabel(const QString &url, int width, int height, QWidget *paren { KIO::TransferJob *job = KIO::get(KUrl(url), KIO::NoReload, KIO::HideProgressInfo); connect(job, SIGNAL(data(KIO::Job*,QByteArray)), - this, SLOT(slotData(KIO::Job*,QByteArray))); + this, SLOT(slotData(KJob*,QByteArray))); connect(job, SIGNAL(result(KJob*)), this, SLOT(slotResult(KJob*))); } } -void ImageLabel::slotData(KIO::Job *job, const QByteArray &data) +void ImageLabel::slotData(KJob *job, const QByteArray &data) { Q_UNUSED(job); m_data.append(data); diff --git a/src/urlbar/listitem.h b/src/urlbar/listitem.h index c2f79c93..84e3501b 100644 --- a/src/urlbar/listitem.h +++ b/src/urlbar/listitem.h @@ -31,22 +31,25 @@ // Rekonq Includes #include "rekonq_defines.h" -// Local Includes -#include "urlresolver.h" - // KDE Includes #include #include -#include +#include // Qt Includes #include -#include #include +#include +#include +#include // Forward Declarations class UrlSearchItem; + class KAction; +class KIcon; +class KJob; + class QActionGroup; @@ -258,7 +261,7 @@ private: QByteArray m_data; private Q_SLOTS: - void slotData(KIO::Job* job, const QByteArray& data); + void slotData(KJob* job, const QByteArray& data); void slotResult(KJob* job); }; diff --git a/src/urlbar/rsswidget.cpp b/src/urlbar/rsswidget.cpp index d4778cf5..2e452fbb 100644 --- a/src/urlbar/rsswidget.cpp +++ b/src/urlbar/rsswidget.cpp @@ -42,13 +42,13 @@ #include // Qt Includes -#include -#include +#include +#include -#include -#include -#include -#include +#include +#include +#include +#include RSSWidget::RSSWidget(const QMap< KUrl, QString > &map, QWidget *parent) diff --git a/src/urlbar/rsswidget.h b/src/urlbar/rsswidget.h index 702ea3ae..eaa3de7d 100644 --- a/src/urlbar/rsswidget.h +++ b/src/urlbar/rsswidget.h @@ -28,7 +28,7 @@ #define RSSWIDGET_H // Qt Includes -#include +#include // Forward Declarations class KComboBox; diff --git a/src/urlbar/sslwidget.cpp b/src/urlbar/sslwidget.cpp index 127dae86..52724733 100644 --- a/src/urlbar/sslwidget.cpp +++ b/src/urlbar/sslwidget.cpp @@ -34,11 +34,13 @@ #include "sslinfodialog.h" // Qt Includes -#include -#include -#include -#include -#include +#include + +#include +#include +#include +#include +#include SSLWidget::SSLWidget(const QUrl &url, const WebSslInfo &info, QWidget *parent) diff --git a/src/urlbar/sslwidget.h b/src/urlbar/sslwidget.h index bc1e2291..dd6f020d 100644 --- a/src/urlbar/sslwidget.h +++ b/src/urlbar/sslwidget.h @@ -32,8 +32,9 @@ #include "websslinfo.h" // Qt Includes -#include -#include +#include + +#include class SSLWidget : public QMenu diff --git a/src/urlbar/urlbar.cpp b/src/urlbar/urlbar.cpp index 43109db3..2b4b7bf0 100644 --- a/src/urlbar/urlbar.cpp +++ b/src/urlbar/urlbar.cpp @@ -55,11 +55,12 @@ #include // Qt Includes -#include -#include -#include -#include +#include +#include +#include +#include #include +#include diff --git a/src/urlbar/urlresolver.h b/src/urlbar/urlresolver.h index 57b3e11e..97a5e9a4 100644 --- a/src/urlbar/urlresolver.h +++ b/src/urlbar/urlresolver.h @@ -34,6 +34,7 @@ // Locale Includes #include "application.h" #include "opensearchmanager.h" +#include "suggestionparser.h" // KDE Includes #include @@ -42,7 +43,6 @@ // Qt Includes #include #include -#include "suggestionparser.h" class UrlSearchItem diff --git a/src/urlbar/webshortcutwidget.cpp b/src/urlbar/webshortcutwidget.cpp index d44f6f1a..409d0b32 100644 --- a/src/urlbar/webshortcutwidget.cpp +++ b/src/urlbar/webshortcutwidget.cpp @@ -42,6 +42,7 @@ #include #include + WebShortcutWidget::WebShortcutWidget(QWidget *parent) : QMenu(parent) , m_wsLineEdit(new QLineEdit(this)) diff --git a/src/urlfilterproxymodel.h b/src/urlfilterproxymodel.h index 3d0c6582..6cb8574e 100644 --- a/src/urlfilterproxymodel.h +++ b/src/urlfilterproxymodel.h @@ -33,7 +33,7 @@ #include "rekonq_defines.h" // Qt Includes -#include +#include /** diff --git a/src/urlpanel.cpp b/src/urlpanel.cpp index b4359148..8e0d425f 100644 --- a/src/urlpanel.cpp +++ b/src/urlpanel.cpp @@ -38,9 +38,9 @@ #include // Qt Includes -#include -#include -#include +#include +#include +#include UrlPanel::UrlPanel(const QString &title, QWidget *parent, Qt::WindowFlags flags) diff --git a/src/urlpanel.h b/src/urlpanel.h index 73ffc024..c8d15a8e 100644 --- a/src/urlpanel.h +++ b/src/urlpanel.h @@ -33,7 +33,7 @@ #include "rekonq_defines.h" // Qt Includes -#include +#include // Forward Declarations class PanelTreeView; @@ -69,12 +69,12 @@ protected Q_SLOTS: virtual void contextMenuGroup(const QPoint &pos) = 0; virtual void contextMenuEmpty(const QPoint &pos) = 0; +private Q_SLOTS: + void expandTreeView(); + private: PanelTreeView *_treeView; bool _loaded; - -private Q_SLOTS: - void expandTreeView(); }; diff --git a/src/useragent/useragentmanager.h b/src/useragent/useragentmanager.h index 84042cf6..6037cc7c 100644 --- a/src/useragent/useragentmanager.h +++ b/src/useragent/useragentmanager.h @@ -28,8 +28,10 @@ #define USER_AGENT_MANAGER_H +// Qt Includes #include +// Forward Declarations class WebTab; class KAction; diff --git a/src/walletbar.h b/src/walletbar.h index e63cb941..f1bbd2cb 100644 --- a/src/walletbar.h +++ b/src/walletbar.h @@ -36,6 +36,7 @@ // Qt Includes #include +#include class REKONQ_TESTS_EXPORT WalletBar : public KMessageWidget diff --git a/src/webicon.cpp b/src/webicon.cpp index 03097956..7943cfb6 100644 --- a/src/webicon.cpp +++ b/src/webicon.cpp @@ -33,8 +33,8 @@ #include "iconmanager.h" // Qt Includes -#include -#include +#include +#include WebIcon::WebIcon(const KUrl& url, QObject *parent) diff --git a/src/webicon.h b/src/webicon.h index df5cc828..39f98e7e 100644 --- a/src/webicon.h +++ b/src/webicon.h @@ -34,7 +34,7 @@ #include // Qt Includes -#include +#include class REKONQ_TESTS_EXPORT WebIcon : public QObject diff --git a/src/webinspectorpanel.cpp b/src/webinspectorpanel.cpp index 59e95167..06e98643 100644 --- a/src/webinspectorpanel.cpp +++ b/src/webinspectorpanel.cpp @@ -35,8 +35,8 @@ #include "webtab.h" // Qt Includes -#include -#include +#include +#include WebInspectorPanel::WebInspectorPanel(QString title, QWidget *parent) diff --git a/src/webinspectorpanel.h b/src/webinspectorpanel.h index 92da538b..ebe82267 100644 --- a/src/webinspectorpanel.h +++ b/src/webinspectorpanel.h @@ -33,16 +33,16 @@ #include "rekonq_defines.h" // Qt Includes -#include +#include // Forward class QWebInspector; /** - Docked web inspector - behaviour : hide/show by tab, not globally -*/ + * Docked web inspector + * behaviour : hide/show by tab, not globally +**/ class REKONQ_TESTS_EXPORT WebInspectorPanel : public QDockWidget { Q_OBJECT diff --git a/src/webpage.cpp b/src/webpage.cpp index f22d478b..f803643e 100644 --- a/src/webpage.cpp +++ b/src/webpage.cpp @@ -41,6 +41,7 @@ #include "adblockmanager.h" #include "application.h" #include "downloadmanager.h" +#include "historymanager.h" #include "iconmanager.h" #include "mainview.h" #include "mainwindow.h" @@ -70,7 +71,9 @@ #include // Qt Includes -#include +#include +#include +#include // Returns true if the scheme and domain of the two urls match... diff --git a/src/webpluginfactory.cpp b/src/webpluginfactory.cpp index 7713c74b..b62af1c8 100644 --- a/src/webpluginfactory.cpp +++ b/src/webpluginfactory.cpp @@ -29,9 +29,10 @@ #include "webpluginfactory.h" #include "webpluginfactory.moc" -// Local Includes +// Auto Includes #include "rekonq.h" +// Local Includes #include "clicktoflash.h" diff --git a/src/websnap.h b/src/websnap.h index fc5da869..3e9111f8 100644 --- a/src/websnap.h +++ b/src/websnap.h @@ -37,8 +37,8 @@ #include // Qt Includes -#include -#include +#include +#include // Forward Declarations class QPixmap; diff --git a/src/webview.cpp b/src/webview.cpp index 688816e6..cc3828c4 100644 --- a/src/webview.cpp +++ b/src/webview.cpp @@ -53,14 +53,16 @@ #include // Qt Includes -#include -#include +#include +#include -#include -#include +#include +#include +#include -#include -#include +#include +#include +#include WebView::WebView(QWidget* parent) diff --git a/src/webview.h b/src/webview.h index 18977798..09dc58e6 100644 --- a/src/webview.h +++ b/src/webview.h @@ -35,14 +35,17 @@ // KDE Includes #include -//Qt Includes -#include -#include -#include +// Qt Includes +#include +#include +#include // Forward Declarations class WebPage; +class QLabel; +class QTimer; + class REKONQ_TESTS_EXPORT WebView : public KWebView { diff --git a/src/zoombar.cpp b/src/zoombar.cpp index d709b38a..292ef413 100644 --- a/src/zoombar.cpp +++ b/src/zoombar.cpp @@ -44,10 +44,10 @@ #include // Qt Includes -#include -#include -#include -#include +#include +#include +#include +#include ZoomBar::ZoomBar(QWidget *parent) diff --git a/src/zoombar.h b/src/zoombar.h index 8261447b..e1ec1ced 100644 --- a/src/zoombar.h +++ b/src/zoombar.h @@ -33,12 +33,12 @@ #include "rekonq_defines.h" // Qt Includes -#include -#include +#include // Forward Declarations class MainWindow; +class QLabel; class QSlider; class QToolButton; -- cgit v1.2.1