summaryrefslogtreecommitdiff
path: root/src/urlbar
diff options
context:
space:
mode:
authorAndrea Diamantini <adjam7@gmail.com>2010-04-30 17:22:18 +0200
committerAndrea Diamantini <adjam7@gmail.com>2010-04-30 17:22:18 +0200
commit6c1e962f097e1c75a5a7b2e621c5c235bb7a1d9a (patch)
tree48544c2f72b07eef1bc0ace0e602bfda3c25538b /src/urlbar
parentKrazy fixes (diff)
downloadrekonq-6c1e962f097e1c75a5a7b2e621c5c235bb7a1d9a.tar.xz
Include Fixes, first bunch
Diffstat (limited to 'src/urlbar')
-rw-r--r--src/urlbar/completionwidget.cpp13
-rw-r--r--src/urlbar/completionwidget.h3
-rw-r--r--src/urlbar/listitem.cpp3
-rw-r--r--src/urlbar/listitem.h4
-rw-r--r--src/urlbar/rsswidget.cpp15
-rw-r--r--src/urlbar/rsswidget.h6
-rw-r--r--src/urlbar/urlbar.cpp12
-rw-r--r--src/urlbar/urlresolver.cpp2
8 files changed, 31 insertions, 27 deletions
diff --git a/src/urlbar/completionwidget.cpp b/src/urlbar/completionwidget.cpp
index 230f96d4..6dae6285 100644
--- a/src/urlbar/completionwidget.cpp
+++ b/src/urlbar/completionwidget.cpp
@@ -41,12 +41,13 @@
#include <KUrl>
// Qt Includes
-#include <QPoint>
-#include <QSize>
-#include <QVBoxLayout>
-#include <QString>
-#include <QEvent>
-#include <QKeyEvent>
+#include <QtCore/QPoint>
+#include <QtCore/QSize>
+#include <QtCore/QEvent>
+
+#include <QtGui/QVBoxLayout>
+#include <QtGui/QKeyEvent>
+
CompletionWidget::CompletionWidget(QWidget *parent)
diff --git a/src/urlbar/completionwidget.h b/src/urlbar/completionwidget.h
index 8382742a..fc0798e7 100644
--- a/src/urlbar/completionwidget.h
+++ b/src/urlbar/completionwidget.h
@@ -32,11 +32,9 @@
#include "rekonq_defines.h"
// Local Includes
-#include "application.h"
#include "listitem.h"
// KDE Includes
-#include <KLineEdit>
#include <KService>
// Qt Includes
@@ -57,6 +55,7 @@ public:
{
return _searchEngine;
};
+
void setCurrentEngine(KService::Ptr engine)
{
_searchEngine = engine;
diff --git a/src/urlbar/listitem.cpp b/src/urlbar/listitem.cpp
index f8f93dcd..c6f75348 100644
--- a/src/urlbar/listitem.cpp
+++ b/src/urlbar/listitem.cpp
@@ -40,9 +40,10 @@
// KDE Includes
#include <KIcon>
-#include <QActionGroup>
+#include <KAction>
// Qt Includes
+#include <QActionGroup>
#include <QHBoxLayout>
#include <QVBoxLayout>
#include <QLabel>
diff --git a/src/urlbar/listitem.h b/src/urlbar/listitem.h
index 328e5af9..6737ed70 100644
--- a/src/urlbar/listitem.h
+++ b/src/urlbar/listitem.h
@@ -36,17 +36,17 @@
// KDE Includes
#include <KToolBar>
-#include <KAction>
#include <KService>
// Qt Includes
#include <QWidget>
-#include <QLayout>
#include <QStyleOptionViewItemV4>
#include <QLabel>
// Forward Declarations
class UrlSearchItem;
+class KAction;
+class QActionGroup;
class ListItem : public QWidget
diff --git a/src/urlbar/rsswidget.cpp b/src/urlbar/rsswidget.cpp
index 9e26164e..1cce6e8c 100644
--- a/src/urlbar/rsswidget.cpp
+++ b/src/urlbar/rsswidget.cpp
@@ -36,18 +36,19 @@
// KDE Includes
#include <KLocalizedString>
-#include <KComboBox>
#include <KIcon>
#include <KProcess>
#include <KMessageBox>
// Qt Includes
-#include <QFormLayout>
-#include <QDialogButtonBox>
-#include <QDBusInterface>
-#include <QDBusConnectionInterface>
-#include <QLabel>
-#include <QPushButton>
+#include <QtGui/QFormLayout>
+#include <QtGui/QDialogButtonBox>
+#include <QtGui/QLabel>
+#include <QtGui/QPushButton>
+
+#include <QtDBus/QDBusInterface>
+#include <QtDBus/QDBusConnectionInterface>
+
RSSWidget::RSSWidget(QMap< KUrl, QString > map, QWidget *parent)
diff --git a/src/urlbar/rsswidget.h b/src/urlbar/rsswidget.h
index a5bd7b2d..258107eb 100644
--- a/src/urlbar/rsswidget.h
+++ b/src/urlbar/rsswidget.h
@@ -32,10 +32,12 @@
// KDE Includes
#include <KComboBox>
+#include <KUrl>
// Qt Includes
-#include <QFrame>
-#include <KUrl>
+#include <QtCore/QMap>
+
+#include <QtGui/QFrame>
class RSSWidget : public QFrame
diff --git a/src/urlbar/urlbar.cpp b/src/urlbar/urlbar.cpp
index ef0ee45c..32e71c23 100644
--- a/src/urlbar/urlbar.cpp
+++ b/src/urlbar/urlbar.cpp
@@ -35,6 +35,7 @@
#include "rekonq.h"
// Local Includes
+#include "application.h"
#include "mainwindow.h"
#include "webtab.h"
#include "webpage.h"
@@ -45,11 +46,11 @@
#include <KCompletionBox>
// Qt Includes
-#include <QPainter>
-#include <QPaintEvent>
-#include <QPalette>
-#include <QTimer>
-#include <QVBoxLayout>
+#include <QtGui/QPainter>
+#include <QtGui/QPaintEvent>
+#include <QtGui/QPalette>
+#include <QtGui/QVBoxLayout>
+
IconButton::IconButton(QWidget *parent)
@@ -65,6 +66,7 @@ void IconButton::mouseReleaseEvent(QMouseEvent* event)
emit clicked(event->globalPos());
}
+
// -----------------------------------------------------------------------------------------------------------
diff --git a/src/urlbar/urlresolver.cpp b/src/urlbar/urlresolver.cpp
index 2fd02c10..276c2531 100644
--- a/src/urlbar/urlresolver.cpp
+++ b/src/urlbar/urlresolver.cpp
@@ -40,9 +40,7 @@
#include <KConfigGroup>
// Qt Includes
-#include <QString>
#include <QByteArray>
-#include <QUrl>
// defines
#define MAX_ELEMENTS 9