diff options
author | Andrea Diamantini <adjam7@gmail.com> | 2009-08-05 10:25:41 +0200 |
---|---|---|
committer | Andrea Diamantini <adjam7@gmail.com> | 2009-08-05 10:25:41 +0200 |
commit | bddbda6322eb69ad50dd2b7c7f520ad3b2366a5f (patch) | |
tree | b2fa4040f1d81fcc56319830861b9b60010bb3c7 | |
parent | Updated Changelog and TODO files. Removed unuseful FILES file (diff) | |
download | rekonq-bddbda6322eb69ad50dd2b7c7f520ad3b2366a5f.tar.xz |
Fix Include
Imported commit from KDE svn. Thanks to mlaurent for this..
-rw-r--r-- | src/application.cpp | 5 | ||||
-rw-r--r-- | src/application.h | 3 | ||||
-rw-r--r-- | src/bookmarks.cpp | 2 | ||||
-rw-r--r-- | src/cookiedialog.cpp | 1 | ||||
-rw-r--r-- | src/cookiedialog.h | 1 | ||||
-rw-r--r-- | src/cookiejar.cpp | 1 | ||||
-rw-r--r-- | src/findbar.cpp | 1 | ||||
-rw-r--r-- | src/findbar.h | 1 | ||||
-rw-r--r-- | src/history.cpp | 3 | ||||
-rw-r--r-- | src/historymenu.cpp | 1 | ||||
-rw-r--r-- | src/mainview.cpp | 3 | ||||
-rw-r--r-- | src/mainview.h | 3 | ||||
-rw-r--r-- | src/mainwindow.cpp | 14 | ||||
-rw-r--r-- | src/mainwindow.h | 2 | ||||
-rw-r--r-- | src/networkaccessmanager.cpp | 4 | ||||
-rw-r--r-- | src/panelhistory.cpp | 4 | ||||
-rw-r--r-- | src/settings.cpp | 3 | ||||
-rw-r--r-- | src/settings.h | 1 | ||||
-rw-r--r-- | src/tabbar.cpp | 2 | ||||
-rw-r--r-- | src/urlbar.h | 2 | ||||
-rw-r--r-- | src/webpage.cpp | 8 | ||||
-rw-r--r-- | src/webpage.h | 1 | ||||
-rw-r--r-- | src/webview.cpp | 11 | ||||
-rw-r--r-- | src/webview.h | 1 |
24 files changed, 6 insertions, 72 deletions
diff --git a/src/application.cpp b/src/application.cpp index abf56fbb..ad87cf93 100644 --- a/src/application.cpp +++ b/src/application.cpp @@ -38,12 +38,9 @@ // KDE Includes #include <KCmdLineArgs> -#include <KAboutData> #include <KStandardDirs> -#include <KConfig> #include <kio/job.h> #include <kio/jobclasses.h> -#include <KPassivePopup> #include <KToolInvocation> #include <KUriFilter> #include <KMessageBox> @@ -54,8 +51,6 @@ #include <QFile> #include <QFileInfo> #include <QtCore/QTimer> -#include <QtWebKit/QWebSettings> -#include <QtWebKit/QWebHistoryInterface> QPointer<HistoryManager> Application::s_historyManager; diff --git a/src/application.h b/src/application.h index e5637c90..e8f2f25f 100644 --- a/src/application.h +++ b/src/application.h @@ -25,10 +25,8 @@ // KDE Includes #include <KUniqueApplication> -#include <KCmdLineArgs> #include <KIcon> #include <KUrl> -#include <KJob> #include <kio/job.h> #include <kio/jobclasses.h> @@ -43,7 +41,6 @@ class CookieJar; class HistoryManager; class MainWindow; class NetworkAccessManager; -class WebView; namespace Rekonq diff --git a/src/bookmarks.cpp b/src/bookmarks.cpp index 1a42ca51..04faf891 100644 --- a/src/bookmarks.cpp +++ b/src/bookmarks.cpp @@ -33,13 +33,11 @@ #include <KActionCollection> #include <KBookmark> #include <KBookmarkAction> -#include <KBookmarkActionMenu> #include <KBookmarkGroup> #include <KBookmarkMenu> #include <KToolBar> #include <KDebug> #include <KMenu> -#include <KMimeType> #include <KStandardDirs> #include <KUrl> diff --git a/src/cookiedialog.cpp b/src/cookiedialog.cpp index 3177bc39..9d781ddb 100644 --- a/src/cookiedialog.cpp +++ b/src/cookiedialog.cpp @@ -28,7 +28,6 @@ // KDE Includes #include <KLocalizedString> - CookieModel::CookieModel(CookieJar *cookieJar, QObject *parent) : QAbstractTableModel(parent) , m_cookieJar(cookieJar) diff --git a/src/cookiedialog.h b/src/cookiedialog.h index 5c0de55f..79655f25 100644 --- a/src/cookiedialog.h +++ b/src/cookiedialog.h @@ -35,7 +35,6 @@ #include <QtGui/QTableView> #include <QtGui/QSortFilterProxyModel> -#include <QtNetwork/QNetworkCookieJar> class CookieModel : public QAbstractTableModel diff --git a/src/cookiejar.cpp b/src/cookiejar.cpp index 38544adf..41ec6a70 100644 --- a/src/cookiejar.cpp +++ b/src/cookiejar.cpp @@ -44,7 +44,6 @@ #include <QtGui/QSortFilterProxyModel> #include <QtGui/QCompleter> -#include <QtWebKit/QWebSettings> static const unsigned int JAR_VERSION = 23; diff --git a/src/findbar.cpp b/src/findbar.cpp index 0656eef5..a1cb0aba 100644 --- a/src/findbar.cpp +++ b/src/findbar.cpp @@ -24,7 +24,6 @@ // KDE Includes #include <KLineEdit> -#include <KAction> #include <KIcon> #include <KPushButton> #include <klocalizedstring.h> diff --git a/src/findbar.h b/src/findbar.h index f297e6d2..ce84b5e4 100644 --- a/src/findbar.h +++ b/src/findbar.h @@ -25,7 +25,6 @@ // KDE Includes #include <KLineEdit> -#include <KToolBar> // Qt Includes #include <QtGui/QWidget> diff --git a/src/history.cpp b/src/history.cpp index 3c63cb4e..c844a889 100644 --- a/src/history.cpp +++ b/src/history.cpp @@ -34,6 +34,7 @@ // KDE Includes #include <KDebug> #include <KStandardDirs> +#include <KLocale> // Qt Includes #include <QtCore/QList> @@ -47,8 +48,6 @@ #include <QtGui/QClipboard> -#include <QtWebKit/QWebHistoryInterface> -#include <QtWebKit/QWebSettings> // generic algorithms #include <QtAlgorithms> diff --git a/src/historymenu.cpp b/src/historymenu.cpp index cdf8d4d7..9b16f42c 100644 --- a/src/historymenu.cpp +++ b/src/historymenu.cpp @@ -32,7 +32,6 @@ #include <QtCore/QModelIndex> // KDE Includes -#include <KUrl> #include <KMessageBox> diff --git a/src/mainview.cpp b/src/mainview.cpp index c0294af5..990ef321 100644 --- a/src/mainview.cpp +++ b/src/mainview.cpp @@ -38,15 +38,12 @@ // KDE Includes #include <KUrl> -#include <KMenu> #include <KAction> #include <KShortcut> #include <KStandardShortcut> #include <KMessageBox> -#include <KActionCollection> #include <KDebug> #include <KStandardDirs> -#include <KToolInvocation> // Qt Includes #include <QtCore/QTimer> diff --git a/src/mainview.h b/src/mainview.h index 3b8ccfae..b5d01e2e 100644 --- a/src/mainview.h +++ b/src/mainview.h @@ -38,9 +38,6 @@ class QUrl; class QWebFrame; class QLabel; -class KAction; -class KMenu; -class KUrl; class StackedUrlBar; class TabBar; diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 7f00f201..0c44cfa6 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -47,8 +47,6 @@ // KDE Includes #include <KUrl> -#include <KStatusBar> -#include <KMenuBar> #include <KShortcut> #include <KStandardAction> #include <KAction> @@ -56,15 +54,13 @@ #include <KActionCollection> #include <KMessageBox> #include <KFileDialog> -#include <KMenu> #include <KGlobalSettings> #include <KPushButton> #include <KTemporaryFile> -#include <KJobUiDelegate> #include <KPassivePopup> -#include <KStandardDirs> -#include <KIconLoader> - +#include <KMenuBar> +#include <KToolBar> +#include <KJobUiDelegate> #include <kdeprintdialog.h> // Qt Includes @@ -83,11 +79,7 @@ #include <QtGui/QPrintDialog> #include <QtGui/QPrintPreviewDialog> -#include <QtWebKit/QWebFrame> #include <QtWebKit/QWebHistory> -#include <QtWebKit/QWebHistoryItem> -#include <QtWebKit/QWebPage> -#include <QtWebKit/QWebSettings> diff --git a/src/mainwindow.h b/src/mainwindow.h index b50c5867..7d951eca 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -31,12 +31,10 @@ // KDE Includes #include <KXmlGuiWindow> -#include <KToolBar> // Forward Declarations class QWebFrame; -class KUrl; class KAction; class KPassivePopup; diff --git a/src/networkaccessmanager.cpp b/src/networkaccessmanager.cpp index 4820346f..be2f7180 100644 --- a/src/networkaccessmanager.cpp +++ b/src/networkaccessmanager.cpp @@ -46,10 +46,6 @@ #include <QtGui/QTextDocument> #include <QtNetwork/QAuthenticator> -#include <QtNetwork/QNetworkProxy> -#include <QtNetwork/QNetworkReply> -#include <QtNetwork/QNetworkRequest> -#include <QtNetwork/QSslError> #include <QtNetwork/QNetworkDiskCache> diff --git a/src/panelhistory.cpp b/src/panelhistory.cpp index 9d38fcc6..ec9cfd47 100644 --- a/src/panelhistory.cpp +++ b/src/panelhistory.cpp @@ -28,10 +28,8 @@ #include <QtGui/QHeaderView> // KDE Includes -#include <KLocalizedString> #include <KLineEdit> -#include <KUrl> - +#include <KLocalizedString> PanelHistory::PanelHistory(QWidget *parent) : QWidget(parent) diff --git a/src/settings.cpp b/src/settings.cpp index fe176a27..c300b176 100644 --- a/src/settings.cpp +++ b/src/settings.cpp @@ -46,10 +46,7 @@ // KDE Includes #include <KConfig> #include <KStandardDirs> -#include <KConfigSkeleton> #include <KPageWidgetItem> -#include <KFontDialog> -#include <KUrl> #include <KShortcutsEditor> #include <KCModuleInfo> #include <KCModuleProxy> diff --git a/src/settings.h b/src/settings.h index 1ec76d5f..6fbf45e4 100644 --- a/src/settings.h +++ b/src/settings.h @@ -28,7 +28,6 @@ // Forward Declarations class QWidget; class Private; -class KCModuleProxy; class SettingsDialog : public KConfigDialog { diff --git a/src/tabbar.cpp b/src/tabbar.cpp index ece2ee8f..962ec20f 100644 --- a/src/tabbar.cpp +++ b/src/tabbar.cpp @@ -33,8 +33,6 @@ // KDE Includes #include <KShortcut> #include <KStandardShortcut> -#include <KMessageBox> -#include <KAction> #include <KDebug> #include <KGlobalSettings> diff --git a/src/urlbar.h b/src/urlbar.h index a943c916..8d17c78c 100644 --- a/src/urlbar.h +++ b/src/urlbar.h @@ -32,8 +32,6 @@ #include <KHistoryComboBox> // Qt Includes -#include <QIcon> -#include <QPointer> #include <QUrl> // Forward Declarations diff --git a/src/webpage.cpp b/src/webpage.cpp index 6bcc399e..a2890094 100644 --- a/src/webpage.cpp +++ b/src/webpage.cpp @@ -41,7 +41,6 @@ // KDE Includes #include <KStandardDirs> #include <KUrl> -#include <KActionCollection> #include <KDebug> @@ -60,14 +59,7 @@ #include <QtGui/QClipboard> #include <QtGui/QKeyEvent> -#include <QtNetwork/QNetworkReply> -#include <QtNetwork/QNetworkRequest> -#include <QtWebKit/QWebFrame> -#include <QtWebKit/QWebHitTestResult> -#include <QtWebKit/QWebPage> -#include <QtWebKit/QWebSettings> -#include <QtWebKit/QWebView> #include <QUiLoader> diff --git a/src/webpage.h b/src/webpage.h index 6a74c7bf..ef14793e 100644 --- a/src/webpage.h +++ b/src/webpage.h @@ -27,7 +27,6 @@ // KDE Includes -#include <KUrl> // Qt Includes #include <QWebPage> diff --git a/src/webview.cpp b/src/webview.cpp index a4621dd0..f1ef4c24 100644 --- a/src/webview.cpp +++ b/src/webview.cpp @@ -36,13 +36,11 @@ #include "webpage.h" // KDE Includes -#include <KStandardDirs> #include <KUrl> -#include <KActionCollection> #include <KDebug> -#include <KToolInvocation> #include <KService> #include <KUriFilterData> +#include <KStandardShortcut> // Qt Includes #include <QtGui/QContextMenuEvent> @@ -52,14 +50,7 @@ #include <QtGui/QKeyEvent> #include <QtGui/QAction> -#include <QtNetwork/QNetworkReply> -#include <QtNetwork/QNetworkRequest> -#include <QtWebKit/QWebFrame> -#include <QtWebKit/QWebHitTestResult> -#include <QtWebKit/QWebPage> -#include <QtWebKit/QWebSettings> -#include <QtWebKit/QWebView> WebView::WebView(QWidget* parent) diff --git a/src/webview.h b/src/webview.h index 9630162a..6ff303fc 100644 --- a/src/webview.h +++ b/src/webview.h @@ -26,7 +26,6 @@ #include <KUrl> // Qt Includes -#include <QWebPage> #include <QWebView> // Forward Declarations |