diff options
author | Andrea Diamantini <adjam7@gmail.com> | 2009-11-03 16:21:01 +0100 |
---|---|---|
committer | Andrea Diamantini <adjam7@gmail.com> | 2009-11-03 16:21:01 +0100 |
commit | 476733b553670df3d29aed8ae89539c5d0ad9b5c (patch) | |
tree | c1dfcc620fbaaca127e137c778fe476feba2fb71 | |
parent | Ctrl --> Alt (diff) | |
parent | source fixes (diff) | |
download | rekonq-476733b553670df3d29aed8ae89539c5d0ad9b5c.tar.xz |
Merge branch 'TT'
-rw-r--r-- | src/tabbar.cpp | 15 | ||||
-rw-r--r-- | src/webview.cpp | 13 |
2 files changed, 13 insertions, 15 deletions
diff --git a/src/tabbar.cpp b/src/tabbar.cpp index 7e83f69d..96d79d42 100644 --- a/src/tabbar.cpp +++ b/src/tabbar.cpp @@ -47,14 +47,13 @@ #include <KPassivePopup> // Qt Includes -#include <QtCore/QString> - -#include <QtGui/QFont> -#include <QtGui/QToolButton> -#include <QtGui/QLabel> -#include <QtGui/QMouseEvent> -#include <QtGui/QPainter> -#include <QtGui/QVBoxLayout> +#include <QString> +#include <QFont> +#include <QToolButton> +#include <QLabel> +#include <QMouseEvent> +#include <QPainter> +#include <QVBoxLayout> #define BASE_WIDTH_DIVISOR 4 diff --git a/src/webview.cpp b/src/webview.cpp index 60bb496b..7e2ca59c 100644 --- a/src/webview.cpp +++ b/src/webview.cpp @@ -39,19 +39,18 @@ #include "webpage.h" // KDE Includes -#include <KUrl> #include <KDebug> #include <KService> #include <KUriFilterData> #include <KStandardShortcut> // Qt Includes -#include <QtGui/QContextMenuEvent> -#include <QtGui/QWheelEvent> -#include <QtGui/QMouseEvent> -#include <QtGui/QClipboard> -#include <QtGui/QKeyEvent> -#include <QtGui/QAction> +#include <QContextMenuEvent> +#include <QWheelEvent> +#include <QMouseEvent> +#include <QClipboard> +#include <QKeyEvent> +#include <QAction> WebView::WebView(QWidget* parent) |