diff options
author | Andrea Diamantini <adjam7@gmail.com> | 2009-05-07 01:57:35 +0200 |
---|---|---|
committer | Andrea Diamantini <adjam7@gmail.com> | 2009-05-07 01:57:35 +0200 |
commit | 7a8309f2f3336740ffcec1d89154750ffa86c7bc (patch) | |
tree | 76aad61b277fabdd4dd1cd3c969cc851b3f5f8d4 /src | |
parent | Fixing forgotten merging issues.. (diff) | |
download | rekonq-7a8309f2f3336740ffcec1d89154750ffa86c7bc.tar.xz |
EBN Krazy fixes. 2nd round..
Diffstat (limited to 'src')
-rw-r--r-- | src/download.h | 2 | ||||
-rw-r--r-- | src/history.cpp | 3 | ||||
-rw-r--r-- | src/lineedit.cpp | 11 | ||||
-rw-r--r-- | src/lineedit.h | 5 | ||||
-rw-r--r-- | src/mainview.cpp | 18 | ||||
-rw-r--r-- | src/mainwindow.cpp | 22 | ||||
-rw-r--r-- | src/modelmenu.cpp | 1 | ||||
-rw-r--r-- | src/modelmenu.h | 15 | ||||
-rw-r--r-- | src/webview.cpp | 1 |
9 files changed, 56 insertions, 22 deletions
diff --git a/src/download.h b/src/download.h index 0ad01e69..0502d500 100644 --- a/src/download.h +++ b/src/download.h @@ -31,7 +31,7 @@ #include <KIO/FileCopyJob> // Qt Includes -#include <QObject> +#include <QtCore/QObject> // Forward Declarations class KJob; diff --git a/src/history.cpp b/src/history.cpp index 0e822142..2bab72d8 100644 --- a/src/history.cpp +++ b/src/history.cpp @@ -45,9 +45,12 @@ #include <QtCore/QDataStream> #include <QtCore/QBuffer> +#include <QtGui/QClipboard> + #include <QtWebKit/QWebHistoryInterface> #include <QtWebKit/QWebSettings> +// generic algorithms #include <QtAlgorithms> diff --git a/src/lineedit.cpp b/src/lineedit.cpp index c9df7bfa..9ca963af 100644 --- a/src/lineedit.cpp +++ b/src/lineedit.cpp @@ -21,15 +21,14 @@ #include "lineedit.h" #include "lineedit.moc" -// Qt Includes -#include <QContextMenuEvent> -#include <QFocusEvent> -#include <QKeyEvent> - // KDE Includes #include <KDebug> -// Local Includes +// Qt Includes +#include <QtGui/QContextMenuEvent> +#include <QtGui/QFocusEvent> +#include <QtGui/QKeyEvent> + LineEdit::LineEdit(QWidget* parent) : KLineEdit(parent) diff --git a/src/lineedit.h b/src/lineedit.h index f1bd8f88..ba18f3db 100644 --- a/src/lineedit.h +++ b/src/lineedit.h @@ -21,17 +21,16 @@ #ifndef LINEEDIT_H #define LINEEDIT_H -// Qt Includes // KDE Includes #include <KLineEdit> -// Local Includes - +// Forward Declarations class QContextMenuEvent; class QFocusEvent; class QKeyEvent; + class LineEdit : public KLineEdit { Q_OBJECT diff --git a/src/mainview.cpp b/src/mainview.cpp index 5432fa51..8f3bf197 100644 --- a/src/mainview.cpp +++ b/src/mainview.cpp @@ -2,7 +2,7 @@ * * This file is a part of the rekonq project * -* Copyright (C) 2008 by Andrea Diamantini <adjam7 at gmail dot com> +* Copyright (C) 2008-2009 by Andrea Diamantini <adjam7 at gmail dot com> * Copyright (C) 2009 by Paweł Prażak <pawelprazak at gmail dot com> * * @@ -48,10 +48,18 @@ #include <KStandardDirs> // Qt Includes -#include <QtCore> -#include <QtGui> -#include <QtWebKit> - +#include <QtCore/QTimer> +#include <QtCore/QString> + +#include <QtGui/QAction> +#include <QtGui/QIcon> +#include <QtGui/QLabel> +#include <QtGui/QMovie> +#include <QtGui/QWidget> +#include <QtGui/QMouseEvent> + +#include <QtWebKit/QWebPage> + MainView::MainView(QWidget *parent) diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 5642ad01..5ffaa208 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -64,9 +64,25 @@ // Qt Includes -#include <QtGui> -#include <QtCore> -#include <QtWebKit> +#include <QtCore/QTimer> +#include <QtCore/QRect> +#include <QtCore/QSize> +#include <QtCore/QList> + +#include <QtGui/QWidget> +#include <QtGui/QVBoxLayout> +#include <QtGui/QAction> +#include <QtGui/QFont> +#include <QtGui/QDesktopWidget> +#include <QtGui/QPrinter> +#include <QtGui/QPrintDialog> + +#include <QtWebKit/QWebFrame> +#include <QtWebKit/QWebHistory> +#include <QtWebKit/QWebHistoryItem> +#include <QtWebKit/QWebPage> +#include <QtWebKit/QWebSettings> + MainWindow::MainWindow() diff --git a/src/modelmenu.cpp b/src/modelmenu.cpp index cc43a3f3..57b094ab 100644 --- a/src/modelmenu.cpp +++ b/src/modelmenu.cpp @@ -19,6 +19,7 @@ * ============================================================ */ +// Self Includes #include "modelmenu.h" diff --git a/src/modelmenu.h b/src/modelmenu.h index 3cc657b3..af0d1043 100644 --- a/src/modelmenu.h +++ b/src/modelmenu.h @@ -23,15 +23,24 @@ #ifndef MODELMENU_H #define MODELMENU_H -// Qt Includes -#include <QtGui> -#include <QtCore> // KDE Includes #include <KIcon> #include <KAction> #include <KMenu> +// Qt Includes +#include <QtCore/QAbstractItemModel> +#include <QtCore/QModelIndex> + +// Forward Declarations +class QString; +class QWidget; +class QObject; +class QPersistentModelIndex; + +class KIcon; + // A QMenu that is dynamically populated from a QAbstractItemModel class ModelMenu : public KMenu { diff --git a/src/webview.cpp b/src/webview.cpp index 5842ae4f..c90b65d5 100644 --- a/src/webview.cpp +++ b/src/webview.cpp @@ -37,7 +37,6 @@ #include "download.h" #include "history.h" - // KDE Includes #include <KStandardDirs> #include <KUrl> |