diff options
| author | hjk <qtc-committer@nokia.com> | 2009-07-20 09:57:55 (GMT) |
|---|---|---|
| committer | hjk <qtc-committer@nokia.com> | 2009-07-20 09:57:55 (GMT) |
| commit | 9582eefb6004207028d3d50dbeffa2279aa55bbd (patch) | |
| tree | 6bbb7cfa9a7276f7b9e594715858922df10a0adf /src/gui | |
| parent | b2a9bdc7a72253ecba77b1a53c9a2497cfd21b7e (diff) | |
| download | Qt-9582eefb6004207028d3d50dbeffa2279aa55bbd.zip Qt-9582eefb6004207028d3d50dbeffa2279aa55bbd.tar.gz Qt-9582eefb6004207028d3d50dbeffa2279aa55bbd.tar.bz2 | |
Compile fix with namepaces
Some QT_{BEGIN,END}_HEADER macros had been missing or misplaced.
Reviewed-by: thiago
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/graphicsview/qgraphicsscenebsptreeindex.cpp | 2 | ||||
| -rw-r--r-- | src/gui/graphicsview/qgraphicsscenebsptreeindex_p.h | 13 | ||||
| -rw-r--r-- | src/gui/graphicsview/qgraphicsscenelinearindex_p.h | 14 |
3 files changed, 13 insertions, 16 deletions
diff --git a/src/gui/graphicsview/qgraphicsscenebsptreeindex.cpp b/src/gui/graphicsview/qgraphicsscenebsptreeindex.cpp index c409a9e..3cb33d1 100644 --- a/src/gui/graphicsview/qgraphicsscenebsptreeindex.cpp +++ b/src/gui/graphicsview/qgraphicsscenebsptreeindex.cpp @@ -75,6 +75,8 @@ \sa QGraphicsScene, QGraphicsView, QGraphicsSceneIndex */ +#include <QtCore/qglobal.h> + #ifndef QT_NO_GRAPHICSVIEW #include <private/qgraphicsscene_p.h> diff --git a/src/gui/graphicsview/qgraphicsscenebsptreeindex_p.h b/src/gui/graphicsview/qgraphicsscenebsptreeindex_p.h index ed5fa8e..2293a8e 100644 --- a/src/gui/graphicsview/qgraphicsscenebsptreeindex_p.h +++ b/src/gui/graphicsview/qgraphicsscenebsptreeindex_p.h @@ -53,11 +53,7 @@ #ifndef QGRAPHICSBSPTREEINDEX_H #define QGRAPHICSBSPTREEINDEX_H -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(Gui) +#include <QtCore/qglobal.h> #if !defined(QT_NO_GRAPHICSVIEW) || (QT_EDITION & QT_MODULE_GRAPHICSVIEW) != QT_MODULE_GRAPHICSVIEW @@ -65,10 +61,11 @@ QT_MODULE(Gui) #include "qgraphicsitem_p.h" #include "qgraphicsscene_bsp_p.h" -#include <QtCore/qglobal.h> #include <QtCore/qrect.h> #include <QtCore/qlist.h> +QT_BEGIN_NAMESPACE + static const int QGRAPHICSSCENE_INDEXTIMER_TIMEOUT = 2000; class QGraphicsScene; @@ -204,10 +201,8 @@ static inline bool QRectF_intersects(const QRectF &s, const QRectF &r) return !(t1 >= b2 || t2 >= b1); } -#endif // QT_NO_GRAPHICSVIEW - QT_END_NAMESPACE -QT_END_HEADER +#endif // QT_NO_GRAPHICSVIEW #endif // QGRAPHICSBSPTREEINDEX_H diff --git a/src/gui/graphicsview/qgraphicsscenelinearindex_p.h b/src/gui/graphicsview/qgraphicsscenelinearindex_p.h index 3dbbc63..1f3d58b 100644 --- a/src/gui/graphicsview/qgraphicsscenelinearindex_p.h +++ b/src/gui/graphicsview/qgraphicsscenelinearindex_p.h @@ -53,13 +53,7 @@ // We mean it. // -#include <QtCore/qlist.h> - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(Gui) +#include <QtCore/qglobal.h> #if !defined(QT_NO_GRAPHICSVIEW) || (QT_EDITION & QT_MODULE_GRAPHICSVIEW) != QT_MODULE_GRAPHICSVIEW @@ -68,6 +62,12 @@ QT_MODULE(Gui) #include <QtGui/qgraphicsitem.h> #include <private/qgraphicssceneindex_p.h> +QT_BEGIN_HEADER + +QT_BEGIN_NAMESPACE + +QT_MODULE(Gui) + class Q_AUTOTEST_EXPORT QGraphicsSceneLinearIndex : public QGraphicsSceneIndex { Q_OBJECT |