summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBradley T. Hughes <bradley.hughes@nokia.com>2009-06-26 10:03:45 (GMT)
committerBradley T. Hughes <bradley.hughes@nokia.com>2009-06-26 10:03:45 (GMT)
commit0015e9ba53ab0e6a7005b18823513aec63df6939 (patch)
treefb9e0172be5525b18214d365eaefca0e2861e58b
parenta5af8ab70d67f74811bb932ab2ed7459eb3e0f8e (diff)
downloadQt-0015e9ba53ab0e6a7005b18823513aec63df6939.zip
Qt-0015e9ba53ab0e6a7005b18823513aec63df6939.tar.gz
Qt-0015e9ba53ab0e6a7005b18823513aec63df6939.tar.bz2
Cleanup includes in public headers.
We don't want to pull in too much if we can avoid it.
-rw-r--r--examples/gestures/browser/webview.cpp1
-rw-r--r--src/gui/graphicsview/qgraphicsscene.cpp1
-rw-r--r--src/gui/graphicsview/qgraphicsscene.h3
-rw-r--r--src/gui/graphicsview/qgraphicssceneevent.cpp1
-rw-r--r--src/gui/kernel/qevent.cpp1
-rw-r--r--src/gui/kernel/qevent.h2
-rw-r--r--src/gui/kernel/qgesturestandardrecognizers_p.h1
-rw-r--r--src/gui/kernel/qwidget.h3
-rw-r--r--src/gui/kernel/qwidget_p.h1
9 files changed, 8 insertions, 6 deletions
diff --git a/examples/gestures/browser/webview.cpp b/examples/gestures/browser/webview.cpp
index 2eee119..aee061d 100644
--- a/examples/gestures/browser/webview.cpp
+++ b/examples/gestures/browser/webview.cpp
@@ -48,6 +48,7 @@
#include "webview.h"
#include <QtGui/QClipboard>
+#include <QtGui/QGesture>
#include <QtGui/QMenu>
#include <QtGui/QMessageBox>
#include <QtGui/QMouseEvent>
diff --git a/src/gui/graphicsview/qgraphicsscene.cpp b/src/gui/graphicsview/qgraphicsscene.cpp
index fb3a01c..0dc77cc 100644
--- a/src/gui/graphicsview/qgraphicsscene.cpp
+++ b/src/gui/graphicsview/qgraphicsscene.cpp
@@ -241,6 +241,7 @@
#include <QtGui/qstyleoption.h>
#include <QtGui/qtooltip.h>
#include <QtGui/qtransform.h>
+#include <QtGui/qgesture.h>
#include <private/qapplication_p.h>
#include <private/qobject_p.h>
#ifdef Q_WS_X11
diff --git a/src/gui/graphicsview/qgraphicsscene.h b/src/gui/graphicsview/qgraphicsscene.h
index aa9fd5d..4d65b91 100644
--- a/src/gui/graphicsview/qgraphicsscene.h
+++ b/src/gui/graphicsview/qgraphicsscene.h
@@ -50,7 +50,6 @@
#include <QtGui/qtransform.h>
#include <QtGui/qmatrix.h>
#include <QtGui/qpen.h>
-#include <QtGui/qevent.h>
QT_BEGIN_HEADER
@@ -191,7 +190,7 @@ public:
inline QGraphicsRectItem *addRect(qreal x, qreal y, qreal w, qreal h, const QPen &pen = QPen(), const QBrush &brush = QBrush())
{ return addRect(QRectF(x, y, w, h), pen, brush); }
void removeItem(QGraphicsItem *item);
-
+
QGraphicsItem *focusItem() const;
void setFocusItem(QGraphicsItem *item, Qt::FocusReason focusReason = Qt::OtherFocusReason);
bool hasFocus() const;
diff --git a/src/gui/graphicsview/qgraphicssceneevent.cpp b/src/gui/graphicsview/qgraphicssceneevent.cpp
index ec4f5f8..7906fb8 100644
--- a/src/gui/graphicsview/qgraphicssceneevent.cpp
+++ b/src/gui/graphicsview/qgraphicssceneevent.cpp
@@ -270,6 +270,7 @@
#include <QtCore/qstring.h>
#include "qgraphicsview.h"
#include "qgraphicsitem.h"
+#include <QtGui/qgesture.h>
#include <private/qevent_p.h>
QT_BEGIN_NAMESPACE
diff --git a/src/gui/kernel/qevent.cpp b/src/gui/kernel/qevent.cpp
index 1d1a73d..2467a62 100644
--- a/src/gui/kernel/qevent.cpp
+++ b/src/gui/kernel/qevent.cpp
@@ -49,6 +49,7 @@
#include "qmime.h"
#include "qdnd_p.h"
#include "qevent_p.h"
+#include "qgesture.h"
QT_BEGIN_NAMESPACE
diff --git a/src/gui/kernel/qevent.h b/src/gui/kernel/qevent.h
index 146ceed..136dd7f 100644
--- a/src/gui/kernel/qevent.h
+++ b/src/gui/kernel/qevent.h
@@ -54,7 +54,6 @@
#include <QtCore/qvariant.h>
#include <QtCore/qmap.h>
#include <QtCore/qset.h>
-#include <QtGui/qgesture.h>
QT_BEGIN_HEADER
@@ -63,6 +62,7 @@ QT_BEGIN_NAMESPACE
QT_MODULE(Gui)
class QAction;
+class QGesture;
class Q_GUI_EXPORT QInputEvent : public QEvent
{
diff --git a/src/gui/kernel/qgesturestandardrecognizers_p.h b/src/gui/kernel/qgesturestandardrecognizers_p.h
index 81db3e6..bfe60c0 100644
--- a/src/gui/kernel/qgesturestandardrecognizers_p.h
+++ b/src/gui/kernel/qgesturestandardrecognizers_p.h
@@ -57,6 +57,7 @@
#include "qbasictimer.h"
#include "qdebug.h"
+#include "qgesture.h"
#include "qgesturerecognizer.h"
#include "private/qdirectionrecognizer_p.h"
diff --git a/src/gui/kernel/qwidget.h b/src/gui/kernel/qwidget.h
index 82e9f36..1667275 100644
--- a/src/gui/kernel/qwidget.h
+++ b/src/gui/kernel/qwidget.h
@@ -59,8 +59,6 @@
#include <QtGui/qevent.h>
#endif
-#include <QtGui/qgesture.h>
-
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
@@ -98,6 +96,7 @@ class QIcon;
class QWindowSurface;
class QLocale;
class QGraphicsProxyWidget;
+class QGestureManager;
#if defined(Q_WS_X11)
class QX11Info;
#endif
diff --git a/src/gui/kernel/qwidget_p.h b/src/gui/kernel/qwidget_p.h
index cc31687..7385e83 100644
--- a/src/gui/kernel/qwidget_p.h
+++ b/src/gui/kernel/qwidget_p.h
@@ -61,7 +61,6 @@
#include "QtGui/qregion.h"
#include "QtGui/qsizepolicy.h"
#include "QtGui/qstyle.h"
-#include "QtGui/qevent.h"
#ifdef Q_WS_WIN
#include "QtCore/qt_windows.h"