diff options
author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-01-27 00:43:59 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-01-28 20:35:41 +0100 |
commit | 8b62bb86cd94287a29fd1474efe04822523600df (patch) | |
tree | 584a594fa71baa56b85fd18a8958d889de62b523 /src/quick | |
parent | d483a1bbaf7d3947dd18bacfa010b53300a7dbd6 (diff) |
Remove QT_{BEGIN,END}_HEADER macro usage
The macro was made empty in qtbase/ba3dc5f3b56d1fab6fe37fe7ae08096d7dc68bcb
and is no longer necessary or used.
Discussed-on: http://lists.qt-project.org/pipermail/development/2013-January/009284.html
Change-Id: Ia07e99676e0134fde5e32880edb95e57c779a7ff
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
Reviewed-by: Alan Alpert <aalpert@rim.com>
Diffstat (limited to 'src/quick')
107 files changed, 0 insertions, 421 deletions
diff --git a/src/quick/designer/designersupport.h b/src/quick/designer/designersupport.h index 63809c3c3b..c93cffa7fa 100644 --- a/src/quick/designer/designersupport.h +++ b/src/quick/designer/designersupport.h @@ -59,8 +59,6 @@ #include <QtCore/QHash> #include <QtCore/QRectF> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickItem; @@ -157,6 +155,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // DESIGNERSUPPORT_H diff --git a/src/quick/designer/designerwindowmanager_p.h b/src/quick/designer/designerwindowmanager_p.h index 878d236314..02aacf06bd 100644 --- a/src/quick/designer/designerwindowmanager_p.h +++ b/src/quick/designer/designerwindowmanager_p.h @@ -60,8 +60,6 @@ #include <QtQuick/private/qsgcontext_p.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickWindow; @@ -103,5 +101,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER #endif // DESIGNERWINDOWMANAGER_P_H diff --git a/src/quick/items/context2d/qquickcanvascontext_p.h b/src/quick/items/context2d/qquickcanvascontext_p.h index bfea0e5d5b..d15f5d945d 100644 --- a/src/quick/items/context2d/qquickcanvascontext_p.h +++ b/src/quick/items/context2d/qquickcanvascontext_p.h @@ -46,8 +46,6 @@ #include <private/qv8engine_p.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickCanvasItem; @@ -83,6 +81,4 @@ Q_SIGNALS: QT_END_NAMESPACE -QT_END_HEADER - #endif //QQUICKCANVASCONTEXT_P_H diff --git a/src/quick/items/context2d/qquickcanvasitem_p.h b/src/quick/items/context2d/qquickcanvasitem_p.h index d2a907554e..c53e4f952a 100644 --- a/src/quick/items/context2d/qquickcanvasitem_p.h +++ b/src/quick/items/context2d/qquickcanvasitem_p.h @@ -47,8 +47,6 @@ #include <QtCore/QThread> #include <QtGui/QImage> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickCanvasContext; @@ -207,6 +205,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QQuickCanvasItem) -QT_END_HEADER - #endif //QQUICKCANVASITEM_P_H diff --git a/src/quick/items/context2d/qquickcontext2d_p.h b/src/quick/items/context2d/qquickcontext2d_p.h index 8d96ab579b..24f5c44f18 100644 --- a/src/quick/items/context2d/qquickcontext2d_p.h +++ b/src/quick/items/context2d/qquickcontext2d_p.h @@ -62,8 +62,6 @@ #include <QElapsedTimer> #endif -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickContext2DCommandBuffer; @@ -257,6 +255,4 @@ public: QT_END_NAMESPACE QML_DECLARE_TYPE(QQuickContext2D) -QT_END_HEADER - #endif // QQUICKCONTEXT2D_P_H diff --git a/src/quick/items/context2d/qquickcontext2dcommandbuffer_p.h b/src/quick/items/context2d/qquickcontext2dcommandbuffer_p.h index 0247a9e286..ff0a3a4e20 100644 --- a/src/quick/items/context2d/qquickcontext2dcommandbuffer_p.h +++ b/src/quick/items/context2d/qquickcontext2dcommandbuffer_p.h @@ -45,8 +45,6 @@ #include <QtCore/qmutex.h> #include "qquickcontext2d_p.h" -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickCanvasItem; @@ -266,8 +264,6 @@ private: QMutex queueLock; }; -QT_END_HEADER - QT_END_NAMESPACE #endif // QQUICKCONTEXT2DCOMMANDBUFFER_P_H diff --git a/src/quick/items/context2d/qquickcontext2dtexture_p.h b/src/quick/items/context2d/qquickcontext2dtexture_p.h index 8fe3168533..df96a0eda1 100644 --- a/src/quick/items/context2d/qquickcontext2dtexture_p.h +++ b/src/quick/items/context2d/qquickcontext2dtexture_p.h @@ -53,8 +53,6 @@ #include <QtCore/QWaitCondition> #include <QtCore/QThread> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickContext2DTile; @@ -180,8 +178,6 @@ private: QSGPlainTexture* m_texture; }; -QT_END_HEADER - QT_END_NAMESPACE #endif // QQUICKCONTEXT2DTEXTURE_P_H diff --git a/src/quick/items/context2d/qquickcontext2dtile_p.h b/src/quick/items/context2d/qquickcontext2dtile_p.h index 60415ee63d..22cbbe6a30 100644 --- a/src/quick/items/context2d/qquickcontext2dtile_p.h +++ b/src/quick/items/context2d/qquickcontext2dtile_p.h @@ -45,8 +45,6 @@ #include "qquickcontext2d_p.h" #include <QOpenGLFramebufferObject> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickContext2DTexture; @@ -103,8 +101,6 @@ public: private: QImage m_image; }; -QT_END_HEADER - QT_END_NAMESPACE #endif // QQUICKCONTEXT2DTILE_P_H diff --git a/src/quick/items/qquickaccessibleattached_p.h b/src/quick/items/qquickaccessibleattached_p.h index 15261232b2..2124356a70 100644 --- a/src/quick/items/qquickaccessibleattached_p.h +++ b/src/quick/items/qquickaccessibleattached_p.h @@ -52,8 +52,6 @@ #include <QtGui/qaccessible.h> #include <private/qtquickglobal_p.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -165,8 +163,6 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QQuickAccessibleAttached) QML_DECLARE_TYPEINFO(QQuickAccessibleAttached, QML_HAS_ATTACHED_PROPERTIES) -QT_END_HEADER - #endif // QT_NO_ACCESSIBILITY #endif diff --git a/src/quick/items/qquickanchors_p.h b/src/quick/items/qquickanchors_p.h index df3577c42d..1f18961caf 100644 --- a/src/quick/items/qquickanchors_p.h +++ b/src/quick/items/qquickanchors_p.h @@ -48,8 +48,6 @@ #include <private/qtquickglobal_p.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickItem; @@ -200,6 +198,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QQuickAnchors) -QT_END_HEADER - #endif // QQUICKANCHORS_P_H diff --git a/src/quick/items/qquickanimatedimage_p.h b/src/quick/items/qquickanimatedimage_p.h index 83bae59af8..2775023d4e 100644 --- a/src/quick/items/qquickanimatedimage_p.h +++ b/src/quick/items/qquickanimatedimage_p.h @@ -46,8 +46,6 @@ #ifndef QT_NO_MOVIE -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QMovie; @@ -108,8 +106,6 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QQuickAnimatedImage) -QT_END_HEADER - #endif // QT_NO_MOVIE #endif // QQUICKANIMATEDIMAGE_P_H diff --git a/src/quick/items/qquickanimatedsprite_p.h b/src/quick/items/qquickanimatedsprite_p.h index 47dd51c3ee..6d0a821a47 100644 --- a/src/quick/items/qquickanimatedsprite_p.h +++ b/src/quick/items/qquickanimatedsprite_p.h @@ -46,8 +46,6 @@ #include <private/qquicksprite_p.h> #include <QTime> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QSGContext; @@ -378,6 +376,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QQUICKANIMATEDSPRITE_P_H diff --git a/src/quick/items/qquickborderimage_p.h b/src/quick/items/qquickborderimage_p.h index 1cc86bc832..2ba69a383d 100644 --- a/src/quick/items/qquickborderimage_p.h +++ b/src/quick/items/qquickborderimage_p.h @@ -44,7 +44,6 @@ #include "qquickimagebase_p.h" -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE class QQuickScaleGrid; @@ -102,6 +101,5 @@ private: QT_END_NAMESPACE QML_DECLARE_TYPE(QQuickBorderImage) -QT_END_HEADER #endif // QQUICKBORDERIMAGE_P_H diff --git a/src/quick/items/qquickdrag_p.h b/src/quick/items/qquickdrag_p.h index 5e1448aab6..c1835d9504 100644 --- a/src/quick/items/qquickdrag_p.h +++ b/src/quick/items/qquickdrag_p.h @@ -51,8 +51,6 @@ #ifndef QT_NO_DRAGANDDROP -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickItem; @@ -205,8 +203,6 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QT_NO_DRAGANDDROP #endif diff --git a/src/quick/items/qquickdroparea_p.h b/src/quick/items/qquickdroparea_p.h index 14921a2d28..bfc3f922b5 100644 --- a/src/quick/items/qquickdroparea_p.h +++ b/src/quick/items/qquickdroparea_p.h @@ -51,8 +51,6 @@ #ifndef QT_NO_DRAGANDDROP -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickDropAreaPrivate; @@ -162,8 +160,6 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QQuickDropEvent) QML_DECLARE_TYPE(QQuickDropArea) -QT_END_HEADER - #endif // QT_NO_DRAGANDDROP #endif // QQUICKDROPAREA_P_H diff --git a/src/quick/items/qquickflickable_p.h b/src/quick/items/qquickflickable_p.h index 2e16f11882..5d36ea01ac 100644 --- a/src/quick/items/qquickflickable_p.h +++ b/src/quick/items/qquickflickable_p.h @@ -45,8 +45,6 @@ #include "qquickitem.h" #include <private/qtquickglobal_p.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickFlickablePrivate; @@ -278,6 +276,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QQuickFlickable) -QT_END_HEADER - #endif // QQUICKFLICKABLE_P_H diff --git a/src/quick/items/qquickflipable_p.h b/src/quick/items/qquickflipable_p.h index 1bc6f4113d..795dc4f809 100644 --- a/src/quick/items/qquickflipable_p.h +++ b/src/quick/items/qquickflipable_p.h @@ -48,8 +48,6 @@ #include <QtGui/qvector3d.h> #include <QtCore/qobject.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickFlipablePrivate; @@ -96,6 +94,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QQuickFlipable) -QT_END_HEADER - #endif // QQUICKFLIPABLE_P_H diff --git a/src/quick/items/qquickfocusscope_p.h b/src/quick/items/qquickfocusscope_p.h index d72eae0805..965c7538bf 100644 --- a/src/quick/items/qquickfocusscope_p.h +++ b/src/quick/items/qquickfocusscope_p.h @@ -44,8 +44,6 @@ #include "qquickitem.h" -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class Q_AUTOTEST_EXPORT QQuickFocusScope : public QQuickItem @@ -60,6 +58,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QQuickFocusScope) -QT_END_HEADER - #endif // QQUICKFOCUSSCOPE_P_H diff --git a/src/quick/items/qquickgridview_p.h b/src/quick/items/qquickgridview_p.h index a1c0ce9389..d98de1050f 100644 --- a/src/quick/items/qquickgridview_p.h +++ b/src/quick/items/qquickgridview_p.h @@ -46,8 +46,6 @@ #include <private/qqmlguard_p.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickGridViewAttached; @@ -144,6 +142,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QQuickGridView) QML_DECLARE_TYPEINFO(QQuickGridView, QML_HAS_ATTACHED_PROPERTIES) -QT_END_HEADER - #endif // QQUICKGRIDVIEW_P_H diff --git a/src/quick/items/qquickimage_p.h b/src/quick/items/qquickimage_p.h index 9437b47635..b1f27a64ba 100644 --- a/src/quick/items/qquickimage_p.h +++ b/src/quick/items/qquickimage_p.h @@ -45,8 +45,6 @@ #include "qquickimagebase_p.h" #include <QtQuick/qsgtextureprovider.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickImagePrivate; @@ -114,6 +112,4 @@ private: QT_END_NAMESPACE QML_DECLARE_TYPE(QQuickImage) -QT_END_HEADER - #endif // QQUICKIMAGE_P_H diff --git a/src/quick/items/qquickimagebase_p.h b/src/quick/items/qquickimagebase_p.h index f5ed69129d..388873b4d3 100644 --- a/src/quick/items/qquickimagebase_p.h +++ b/src/quick/items/qquickimagebase_p.h @@ -45,8 +45,6 @@ #include "qquickimplicitsizeitem_p.h" #include <private/qtquickglobal_p.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickImageBasePrivate; @@ -114,6 +112,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QQUICKIMAGEBASE_P_H diff --git a/src/quick/items/qquickimplicitsizeitem_p.h b/src/quick/items/qquickimplicitsizeitem_p.h index 6e306d8375..54b94dd183 100644 --- a/src/quick/items/qquickimplicitsizeitem_p.h +++ b/src/quick/items/qquickimplicitsizeitem_p.h @@ -45,8 +45,6 @@ #include "qquickpainteditem.h" #include <private/qtquickglobal_p.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickImplicitSizeItemPrivate; @@ -70,6 +68,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QQUICKIMPLICITSIZEITEM_H diff --git a/src/quick/items/qquickitem.h b/src/quick/items/qquickitem.h index b3ac9339a6..e9c817a580 100644 --- a/src/quick/items/qquickitem.h +++ b/src/quick/items/qquickitem.h @@ -52,8 +52,6 @@ #include <QtGui/qfont.h> #include <QtGui/qaccessible.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickItem; @@ -446,6 +444,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QQuickItem) QML_DECLARE_TYPE(QQuickTransform) -QT_END_HEADER - #endif // QQUICKITEM_H diff --git a/src/quick/items/qquickitemanimation_p.h b/src/quick/items/qquickitemanimation_p.h index 1dfce5233c..796f6c8ade 100644 --- a/src/quick/items/qquickitemanimation_p.h +++ b/src/quick/items/qquickitemanimation_p.h @@ -46,8 +46,6 @@ #include <QtQuick/private/qquickanimation_p.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickParentAnimationPrivate; @@ -198,6 +196,4 @@ QML_DECLARE_TYPE(QQuickParentAnimation) QML_DECLARE_TYPE(QQuickAnchorAnimation) QML_DECLARE_TYPE(QQuickPathAnimation) -QT_END_HEADER - #endif // QQUICKITEMANIMATION_H diff --git a/src/quick/items/qquickitemsmodule_p.h b/src/quick/items/qquickitemsmodule_p.h index d21f182cc6..bbc7c5c9e2 100644 --- a/src/quick/items/qquickitemsmodule_p.h +++ b/src/quick/items/qquickitemsmodule_p.h @@ -44,8 +44,6 @@ #include <qqml.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickItemsModule @@ -56,7 +54,5 @@ public: QT_END_NAMESPACE -QT_END_HEADER - #endif // QQUICKITEMSMODULE_P_H diff --git a/src/quick/items/qquickitemview_p.h b/src/quick/items/qquickitemview_p.h index f94137100d..b0f910680a 100644 --- a/src/quick/items/qquickitemview_p.h +++ b/src/quick/items/qquickitemview_p.h @@ -44,8 +44,6 @@ #include "qquickflickable_p.h" -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQmlChangeSet; @@ -352,7 +350,5 @@ public: QT_END_NAMESPACE -QT_END_HEADER - #endif // QQUICKITEMVIEW_P_H diff --git a/src/quick/items/qquickitemview_p_p.h b/src/quick/items/qquickitemview_p_p.h index af895fb983..1fa933ebd1 100644 --- a/src/quick/items/qquickitemview_p_p.h +++ b/src/quick/items/qquickitemview_p_p.h @@ -50,8 +50,6 @@ #include <QtQml/private/qqmlchangeset_p.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -364,6 +362,4 @@ protected: QT_END_NAMESPACE -QT_END_HEADER - #endif // QQUICKITEMVIEW_P_P_H diff --git a/src/quick/items/qquickitemviewtransition_p.h b/src/quick/items/qquickitemviewtransition_p.h index 2667971fd7..4fb4386c57 100644 --- a/src/quick/items/qquickitemviewtransition_p.h +++ b/src/quick/items/qquickitemviewtransition_p.h @@ -44,8 +44,6 @@ #include <private/qquicktransitionmanager_p_p.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickItem; @@ -211,6 +209,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QQuickViewTransitionAttached) QML_DECLARE_TYPEINFO(QQuickViewTransitionAttached, QML_HAS_ATTACHED_PROPERTIES) -QT_END_HEADER - #endif // QQUICKITEMVIEWTRANSITION_P_P_H diff --git a/src/quick/items/qquicklistview_p.h b/src/quick/items/qquicklistview_p.h index e0ad1ffc1b..3e766f8068 100644 --- a/src/quick/items/qquicklistview_p.h +++ b/src/quick/items/qquicklistview_p.h @@ -46,8 +46,6 @@ #include <private/qqmlguard_p.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickListView; @@ -205,6 +203,4 @@ QML_DECLARE_TYPEINFO(QQuickListView, QML_HAS_ATTACHED_PROPERTIES) QML_DECLARE_TYPE(QQuickListView) QML_DECLARE_TYPE(QQuickViewSection) -QT_END_HEADER - #endif // QQUICKLISTVIEW_P_H diff --git a/src/quick/items/qquickloader_p.h b/src/quick/items/qquickloader_p.h index ebf9e16c1e..6a69ccd32f 100644 --- a/src/quick/items/qquickloader_p.h +++ b/src/quick/items/qquickloader_p.h @@ -44,8 +44,6 @@ #include "qquickimplicitsizeitem_p.h" -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickLoaderPrivate; @@ -115,6 +113,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QQuickLoader) -QT_END_HEADER - #endif // QQUICKLOADER_P_H diff --git a/src/quick/items/qquickmousearea_p.h b/src/quick/items/qquickmousearea_p.h index eb49535d95..ad15167b10 100644 --- a/src/quick/items/qquickmousearea_p.h +++ b/src/quick/items/qquickmousearea_p.h @@ -46,8 +46,6 @@ #include <private/qtquickglobal_p.h> #include <QtCore/qstringlist.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickMouseEvent; @@ -252,6 +250,4 @@ QML_DECLARE_TYPEINFO(QQuickDrag, QML_HAS_ATTACHED_PROPERTIES) #endif QML_DECLARE_TYPE(QQuickMouseArea) -QT_END_HEADER - #endif // QQUICKMOUSEAREA_P_H diff --git a/src/quick/items/qquickmultipointtoucharea_p.h b/src/quick/items/qquickmultipointtoucharea_p.h index 1ab934e06d..e2ae5ed24e 100644 --- a/src/quick/items/qquickmultipointtoucharea_p.h +++ b/src/quick/items/qquickmultipointtoucharea_p.h @@ -50,8 +50,6 @@ #include <QtGui/qguiapplication.h> #include <QtGui/qstylehints.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickMultiPointTouchArea; @@ -271,6 +269,4 @@ QML_DECLARE_TYPE(QQuickTouchPoint) QML_DECLARE_TYPE(QQuickGrabGestureEvent) QML_DECLARE_TYPE(QQuickMultiPointTouchArea) -QT_END_HEADER - #endif // QQUICKMULTIPOINTTOUCHAREA_H diff --git a/src/quick/items/qquickpainteditem.h b/src/quick/items/qquickpainteditem.h index d2d7a54467..88924003b8 100644 --- a/src/quick/items/qquickpainteditem.h +++ b/src/quick/items/qquickpainteditem.h @@ -45,8 +45,6 @@ #include <QtQuick/qquickitem.h> #include <QtGui/qcolor.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickPaintedItemPrivate; @@ -125,6 +123,4 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QQuickPaintedItem::PerformanceHints) QT_END_NAMESPACE -QT_END_HEADER - #endif // QQUICKPAINTEDITEM_P_H diff --git a/src/quick/items/qquickpathview_p.h b/src/quick/items/qquickpathview_p.h index 1ee23edf5b..998707aa41 100644 --- a/src/quick/items/qquickpathview_p.h +++ b/src/quick/items/qquickpathview_p.h @@ -46,8 +46,6 @@ #include <private/qquickpath_p.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQmlChangeSet; @@ -281,6 +279,5 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QQuickPathView) QML_DECLARE_TYPEINFO(QQuickPathView, QML_HAS_ATTACHED_PROPERTIES) -QT_END_HEADER #endif // QQUICKPATHVIEW_P_H diff --git a/src/quick/items/qquickpincharea_p.h b/src/quick/items/qquickpincharea_p.h index 2f22b4e4a7..4fc77d7f9c 100644 --- a/src/quick/items/qquickpincharea_p.h +++ b/src/quick/items/qquickpincharea_p.h @@ -44,8 +44,6 @@ #include "qquickitem.h" -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class Q_AUTOTEST_EXPORT QQuickPinch : public QObject @@ -301,7 +299,5 @@ QML_DECLARE_TYPE(QQuickPinch) QML_DECLARE_TYPE(QQuickPinchEvent) QML_DECLARE_TYPE(QQuickPinchArea) -QT_END_HEADER - #endif // QQUICKPINCHAREA_H diff --git a/src/quick/items/qquickpositioners_p.h b/src/quick/items/qquickpositioners_p.h index 784efea510..aeb722dd60 100644 --- a/src/quick/items/qquickpositioners_p.h +++ b/src/quick/items/qquickpositioners_p.h @@ -51,8 +51,6 @@ #include <QtCore/qobject.h> #include <QtCore/qstring.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickBasePositionerPrivate; @@ -318,6 +316,4 @@ QML_DECLARE_TYPE(QQuickFlow) QML_DECLARE_TYPE(QQuickBasePositioner) QML_DECLARE_TYPEINFO(QQuickBasePositioner, QML_HAS_ATTACHED_PROPERTIES) -QT_END_HEADER - #endif // QQUICKPOSITIONERS_P_H diff --git a/src/quick/items/qquickrectangle_p.h b/src/quick/items/qquickrectangle_p.h index 911c3fdf8b..2ad144aafd 100644 --- a/src/quick/items/qquickrectangle_p.h +++ b/src/quick/items/qquickrectangle_p.h @@ -48,8 +48,6 @@ #include <private/qtquickglobal_p.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class Q_AUTOTEST_EXPORT QQuickPen : public QObject @@ -178,6 +176,4 @@ QML_DECLARE_TYPE(QQuickGradientStop) QML_DECLARE_TYPE(QQuickGradient) QML_DECLARE_TYPE(QQuickRectangle) -QT_END_HEADER - #endif // QQUICKRECTANGLE_P_H diff --git a/src/quick/items/qquickrepeater_p.h b/src/quick/items/qquickrepeater_p.h index 8698b8224f..be9ed7266d 100644 --- a/src/quick/items/qquickrepeater_p.h +++ b/src/quick/items/qquickrepeater_p.h @@ -44,8 +44,6 @@ #include "qquickitem.h" -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQmlChangeSet; @@ -104,6 +102,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QQuickRepeater) -QT_END_HEADER - #endif // QQUICKREPEATER_P_H diff --git a/src/quick/items/qquickscalegrid_p_p.h b/src/quick/items/qquickscalegrid_p_p.h index b10785f60e..264c444229 100644 --- a/src/quick/items/qquickscalegrid_p_p.h +++ b/src/quick/items/qquickscalegrid_p_p.h @@ -50,8 +50,6 @@ #include <QtQuick/private/qquickpixmapcache_p.h> #include <private/qtquickglobal_p.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickScaleGrid : public QObject @@ -126,6 +124,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QQuickScaleGrid) -QT_END_HEADER - #endif // QQUICKSCALEGRID_P_P_H diff --git a/src/quick/items/qquickscreen_p.h b/src/quick/items/qquickscreen_p.h index 014fc0709b..98f38b7154 100644 --- a/src/quick/items/qquickscreen_p.h +++ b/src/quick/items/qquickscreen_p.h @@ -47,8 +47,6 @@ #include <QSize> #include <private/qqmlglobal_p.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -104,6 +102,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPEINFO(QQuickScreen, QML_HAS_ATTACHED_PROPERTIES) -QT_END_HEADER - #endif diff --git a/src/quick/items/qquickshadereffect_p.h b/src/quick/items/qquickshadereffect_p.h index 6abb41b737..5c3dcf4e41 100644 --- a/src/quick/items/qquickshadereffect_p.h +++ b/src/quick/items/qquickshadereffect_p.h @@ -52,8 +52,6 @@ #include <QtCore/qpointer.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE const char *qtPositionAttributeName(); @@ -193,6 +191,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QQUICKSHADEREFFECT_P_H diff --git a/src/quick/items/qquickshadereffectmesh_p.h b/src/quick/items/qquickshadereffectmesh_p.h index 15f4d02c12..9c19b8e6e6 100644 --- a/src/quick/items/qquickshadereffectmesh_p.h +++ b/src/quick/items/qquickshadereffectmesh_p.h @@ -51,8 +51,6 @@ #ifndef QQUICKSHADEREFFECTMESH_P_H #define QQUICKSHADEREFFECTMESH_P_H -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QSGGeometry; @@ -101,6 +99,4 @@ inline QColor qt_premultiply_color(const QColor &c) QT_END_NAMESPACE -QT_END_HEADER - #endif // QQUICKSHADEREFFECTMESH_P_H diff --git a/src/quick/items/qquickshadereffectnode_p.h b/src/quick/items/qquickshadereffectnode_p.h index db21d06f58..a6854526fa 100644 --- a/src/quick/items/qquickshadereffectnode_p.h +++ b/src/quick/items/qquickshadereffectnode_p.h @@ -51,8 +51,6 @@ #include <QtCore/qsharedpointer.h> #include <QtCore/qpointer.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE struct QQuickShaderEffectMaterialKey { @@ -147,6 +145,4 @@ private Q_SLOTS: QT_END_NAMESPACE -QT_END_HEADER - #endif // QQUICKSHADEREFFECTNODE_P_H diff --git a/src/quick/items/qquickshadereffectsource_p.h b/src/quick/items/qquickshadereffectsource_p.h index 5c9427adde..57aba314aa 100644 --- a/src/quick/items/qquickshadereffectsource_p.h +++ b/src/quick/items/qquickshadereffectsource_p.h @@ -55,8 +55,6 @@ #define QSG_DEBUG_FBO_OVERLAY -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QSGNode; @@ -257,6 +255,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QQUICKSHADEREFFECTSOURCE_P_H diff --git a/src/quick/items/qquicksprite_p.h b/src/quick/items/qquicksprite_p.h index dce28e888b..a85059e8d6 100644 --- a/src/quick/items/qquicksprite_p.h +++ b/src/quick/items/qquicksprite_p.h @@ -50,8 +50,6 @@ #include "qquickspriteengine_p.h" #include <QDebug> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickSprite : public QQuickStochasticState @@ -316,5 +314,4 @@ private: }; QT_END_NAMESPACE -QT_END_HEADER #endif // QQUICKSPRITE_P_H diff --git a/src/quick/items/qquickspriteengine_p.h b/src/quick/items/qquickspriteengine_p.h index 612a2b4c2d..768b5e4a6e 100644 --- a/src/quick/items/qquickspriteengine_p.h +++ b/src/quick/items/qquickspriteengine_p.h @@ -53,8 +53,6 @@ #include <private/qquickpixmapcache_p.h> #include <private/qtquickglobal_p.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickSprite; @@ -323,6 +321,4 @@ inline int spriteCount(QQmlListProperty<QQuickSprite> *p) QT_END_NAMESPACE -QT_END_HEADER - #endif // QQUICKSPRITEENGINE_P_H diff --git a/src/quick/items/qquickspritesequence_p.h b/src/quick/items/qquickspritesequence_p.h index b07d177745..b954a4464f 100644 --- a/src/quick/items/qquickspritesequence_p.h +++ b/src/quick/items/qquickspritesequence_p.h @@ -45,8 +45,6 @@ #include <QtQuick/QQuickItem> #include <QTime> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QSGContext; @@ -145,6 +143,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QQUICKSPRITESEQUENCE_P_H diff --git a/src/quick/items/qquickstateoperations_p.h b/src/quick/items/qquickstateoperations_p.h index d43420f266..9ee0d591da 100644 --- a/src/quick/items/qquickstateoperations_p.h +++ b/src/quick/items/qquickstateoperations_p.h @@ -49,8 +49,6 @@ #include <QtQml/qqmlscriptstring.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickParentChangePrivate; @@ -213,7 +211,5 @@ QML_DECLARE_TYPE(QQuickParentChange) QML_DECLARE_TYPE(QQuickAnchorSet) QML_DECLARE_TYPE(QQuickAnchorChanges) -QT_END_HEADER - #endif // QQUICKSTATEOPERATIONS_P_H diff --git a/src/quick/items/qquicktext_p.h b/src/quick/items/qquicktext_p.h index ba0260c5c7..03b436b3fb 100644 --- a/src/quick/items/qquicktext_p.h +++ b/src/quick/items/qquicktext_p.h @@ -46,8 +46,6 @@ #include <private/qtquickglobal_p.h> #include <QtGui/qtextoption.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickTextPrivate; @@ -295,6 +293,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QQuickText) QML_DECLARE_TYPE(QQuickTextLine) -QT_END_HEADER - #endif // QQUICKTEXT_P_H diff --git a/src/quick/items/qquicktextcontrol_p.h b/src/quick/items/qquicktextcontrol_p.h index 84d6fcce52..94eae81f4e 100644 --- a/src/quick/items/qquicktextcontrol_p.h +++ b/src/quick/items/qquicktextcontrol_p.h @@ -63,8 +63,6 @@ #include <QtGui/qclipboard.h> #include <QtCore/qmimedata.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -196,6 +194,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QQuickTextControl_H diff --git a/src/quick/items/qquicktextedit_p.h b/src/quick/items/qquicktextedit_p.h index e88ca16c0e..0538270cd4 100644 --- a/src/quick/items/qquicktextedit_p.h +++ b/src/quick/items/qquicktextedit_p.h @@ -46,8 +46,6 @@ #include <QtGui/qtextoption.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickTextEditPrivate; @@ -351,6 +349,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QQuickTextEdit) -QT_END_HEADER - #endif // QQUICKTEXTEDIT_P_H diff --git a/src/quick/items/qquicktextinput_p.h b/src/quick/items/qquicktextinput_p.h index 83bc125dee..602e9dc87b 100644 --- a/src/quick/items/qquicktextinput_p.h +++ b/src/quick/items/qquicktextinput_p.h @@ -46,8 +46,6 @@ #include <QtGui/qtextoption.h> #include <QtGui/qvalidator.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickTextInputPrivate; @@ -415,6 +413,4 @@ QML_DECLARE_TYPE(QQuickDoubleValidator) QML_DECLARE_TYPE(QRegExpValidator) #endif -QT_END_HEADER - #endif // QQUICKTEXTINPUT_P_H diff --git a/src/quick/items/qquicktranslate_p.h b/src/quick/items/qquicktranslate_p.h index 8c3438c937..4181f5af79 100644 --- a/src/quick/items/qquicktranslate_p.h +++ b/src/quick/items/qquicktranslate_p.h @@ -46,8 +46,6 @@ #include <QtGui/qmatrix4x4.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickTranslatePrivate; @@ -154,6 +152,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QQuickTranslate) -QT_END_HEADER - #endif diff --git a/src/quick/items/qquickview.h b/src/quick/items/qquickview.h index 10bad4c615..3e8883ddfb 100644 --- a/src/quick/items/qquickview.h +++ b/src/quick/items/qquickview.h @@ -46,8 +46,6 @@ #include <QtCore/qurl.h> #include <QtQml/qqmldebug.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQmlEngine; @@ -115,6 +113,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QQUICKVIEW_H diff --git a/src/quick/items/qquickview_p.h b/src/quick/items/qquickview_p.h index 4b78d8b270..43b17e5bed 100644 --- a/src/quick/items/qquickview_p.h +++ b/src/quick/items/qquickview_p.h @@ -55,8 +55,6 @@ #include "qquickitemchangelistener_p.h" -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQmlContext; @@ -100,6 +98,4 @@ public: QT_END_NAMESPACE -QT_END_HEADER - #endif // QQUICKVIEW_P_H diff --git a/src/quick/items/qquickwindow.h b/src/quick/items/qquickwindow.h index a98f3a695f..959c52b37c 100644 --- a/src/quick/items/qquickwindow.h +++ b/src/quick/items/qquickwindow.h @@ -48,8 +48,6 @@ #include <QtGui/qwindow.h> #include <QtGui/qevent.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickItem; @@ -173,7 +171,5 @@ QT_END_NAMESPACE Q_DECLARE_METATYPE(QQuickWindow *) -QT_END_HEADER - #endif // QQUICKWINDOW_H diff --git a/src/quick/items/qquickwindowmodule_p.h b/src/quick/items/qquickwindowmodule_p.h index 10f0c630b9..4afc45751f 100644 --- a/src/quick/items/qquickwindowmodule_p.h +++ b/src/quick/items/qquickwindowmodule_p.h @@ -44,8 +44,6 @@ #include <private/qtquickglobal_p.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -57,6 +55,4 @@ public: QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/quick/qtquick2_p.h b/src/quick/qtquick2_p.h index ad624e66a8..47f4939820 100644 --- a/src/quick/qtquick2_p.h +++ b/src/quick/qtquick2_p.h @@ -44,8 +44,6 @@ #include <private/qtquickglobal_p.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class Q_QUICK_PRIVATE_EXPORT QQmlQtQuick2Module @@ -56,6 +54,4 @@ public: QT_END_NAMESPACE -QT_END_HEADER - #endif // QTQUICK2_P_H diff --git a/src/quick/qtquickglobal.h b/src/quick/qtquickglobal.h index 7ac75b2682..4cbeb4a00b 100644 --- a/src/quick/qtquickglobal.h +++ b/src/quick/qtquickglobal.h @@ -44,7 +44,6 @@ #include <QtCore/qglobal.h> -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE #ifndef QT_STATIC @@ -58,6 +57,5 @@ QT_BEGIN_NAMESPACE #endif QT_END_NAMESPACE -QT_END_HEADER #endif // QTQUICKGLOBAL_H diff --git a/src/quick/scenegraph/coreapi/qsgdefaultrenderer_p.h b/src/quick/scenegraph/coreapi/qsgdefaultrenderer_p.h index 5bd6eeeb1e..645ba93b80 100644 --- a/src/quick/scenegraph/coreapi/qsgdefaultrenderer_p.h +++ b/src/quick/scenegraph/coreapi/qsgdefaultrenderer_p.h @@ -47,8 +47,6 @@ #include <QtGui/private/qdatabuffer_p.h> #include "qsgrendernode_p.h" -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class Q_QUICK_PRIVATE_EXPORT QSGDefaultRenderer : public QSGRenderer @@ -91,6 +89,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QMLRENDERER_H diff --git a/src/quick/scenegraph/coreapi/qsggeometry.h b/src/quick/scenegraph/coreapi/qsggeometry.h index c9b44e86b0..679b773fc8 100644 --- a/src/quick/scenegraph/coreapi/qsggeometry.h +++ b/src/quick/scenegraph/coreapi/qsggeometry.h @@ -46,8 +46,6 @@ #include <QtGui/qopengl.h> #include <QRectF> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QSGGeometryData; @@ -295,6 +293,4 @@ int QSGGeometry::sizeOfIndex() const QT_END_NAMESPACE -QT_END_HEADER - #endif // QSGGEOMETRY_H diff --git a/src/quick/scenegraph/coreapi/qsgmaterial.h b/src/quick/scenegraph/coreapi/qsgmaterial.h index 062311e2e3..5effdbfda6 100644 --- a/src/quick/scenegraph/coreapi/qsgmaterial.h +++ b/src/quick/scenegraph/coreapi/qsgmaterial.h @@ -45,8 +45,6 @@ #include <QtQuick/qtquickglobal.h> #include <qopenglshaderprogram.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QSGMaterial; @@ -143,6 +141,4 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QSGMaterialShader::RenderState::DirtyStates) QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/quick/scenegraph/coreapi/qsgnode.h b/src/quick/scenegraph/coreapi/qsgnode.h index 82bb66fa77..522546d8e8 100644 --- a/src/quick/scenegraph/coreapi/qsgnode.h +++ b/src/quick/scenegraph/coreapi/qsgnode.h @@ -47,8 +47,6 @@ #include <float.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE //#define QML_RUNTIME_TESTING @@ -335,6 +333,4 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QSGNode::Flags) QT_END_NAMESPACE -QT_END_HEADER - #endif // NODE_H diff --git a/src/quick/scenegraph/coreapi/qsgnodeupdater_p.h b/src/quick/scenegraph/coreapi/qsgnodeupdater_p.h index 88eb814766..7e57bf5bbf 100644 --- a/src/quick/scenegraph/coreapi/qsgnodeupdater_p.h +++ b/src/quick/scenegraph/coreapi/qsgnodeupdater_p.h @@ -45,8 +45,6 @@ #include <private/qtquickglobal_p.h> #include <QtGui/private/qdatabuffer_p.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QSGNode; @@ -96,6 +94,4 @@ protected: QT_END_NAMESPACE -QT_END_HEADER - #endif // NODEUPDATER_P_H diff --git a/src/quick/scenegraph/coreapi/qsgrenderer_p.h b/src/quick/scenegraph/coreapi/qsgrenderer_p.h index 92072e2e3e..5dd53547d1 100644 --- a/src/quick/scenegraph/coreapi/qsgrenderer_p.h +++ b/src/quick/scenegraph/coreapi/qsgrenderer_p.h @@ -55,8 +55,6 @@ #include <QtQuick/private/qsgcontext_p.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QSGMaterialShader; @@ -241,6 +239,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // RENDERER_H diff --git a/src/quick/scenegraph/coreapi/qsgrendernode_p.h b/src/quick/scenegraph/coreapi/qsgrendernode_p.h index 6c3e03b8b3..1f1bc23123 100644 --- a/src/quick/scenegraph/coreapi/qsgrendernode_p.h +++ b/src/quick/scenegraph/coreapi/qsgrendernode_p.h @@ -56,8 +56,6 @@ #include "qsgnode.h" #include <private/qtquickglobal_p.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class Q_QUICK_PRIVATE_EXPORT QSGRenderNode : public QSGNode @@ -110,6 +108,4 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QSGRenderNode::StateFlags) QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/quick/scenegraph/qsgadaptationlayer_p.h b/src/quick/scenegraph/qsgadaptationlayer_p.h index 8b37deb1c1..85c1d2e6ff 100644 --- a/src/quick/scenegraph/qsgadaptationlayer_p.h +++ b/src/quick/scenegraph/qsgadaptationlayer_p.h @@ -59,8 +59,6 @@ // ### remove #include <QtQuick/private/qquicktext_p.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QSGNode; @@ -292,6 +290,4 @@ inline bool QSGDistanceFieldGlyphCache::containsGlyph(glyph_t glyph) QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/quick/scenegraph/qsgcontext_p.h b/src/quick/scenegraph/qsgcontext_p.h index cdc83d1dee..b069c53dd3 100644 --- a/src/quick/scenegraph/qsgcontext_p.h +++ b/src/quick/scenegraph/qsgcontext_p.h @@ -54,8 +54,6 @@ #include <QtQuick/qsgnode.h> #include <QtQuick/private/qsgdepthstencilbuffer_p.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -140,6 +138,4 @@ signals: QT_END_NAMESPACE -QT_END_HEADER - #endif // QSGCONTEXT_H diff --git a/src/quick/scenegraph/qsgcontextplugin_p.h b/src/quick/scenegraph/qsgcontextplugin_p.h index 036bc69c66..be3987d823 100644 --- a/src/quick/scenegraph/qsgcontextplugin_p.h +++ b/src/quick/scenegraph/qsgcontextplugin_p.h @@ -47,8 +47,6 @@ #include <QtCore/qplugin.h> #include <QtCore/qfactoryinterface.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QSGContext; @@ -84,6 +82,4 @@ public: QT_END_NAMESPACE -QT_END_HEADER - #endif // QSGCONTEXTPLUGIN_H diff --git a/src/quick/scenegraph/qsgdefaultglyphnode_p.h b/src/quick/scenegraph/qsgdefaultglyphnode_p.h index 8f764b2d91..a1cd381968 100644 --- a/src/quick/scenegraph/qsgdefaultglyphnode_p.h +++ b/src/quick/scenegraph/qsgdefaultglyphnode_p.h @@ -45,8 +45,6 @@ #include <private/qsgadaptationlayer_p.h> #include <QtQuick/qsgnode.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QGlyphs; @@ -80,6 +78,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // DEFAULT_GLYPHNODE_H diff --git a/src/quick/scenegraph/qsgdefaultimagenode_p.h b/src/quick/scenegraph/qsgdefaultimagenode_p.h index 07cfa2c925..d2b3baae79 100644 --- a/src/quick/scenegraph/qsgdefaultimagenode_p.h +++ b/src/quick/scenegraph/qsgdefaultimagenode_p.h @@ -46,8 +46,6 @@ #include <private/qsgadaptationlayer_p.h> #include <QtQuick/qsgtexturematerial.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class SmoothTextureMaterial : public QSGTextureMaterial @@ -103,6 +101,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/quick/scenegraph/qsgdefaultrectanglenode_p.h b/src/quick/scenegraph/qsgdefaultrectanglenode_p.h index f42a1fa14a..e4560784fd 100644 --- a/src/quick/scenegraph/qsgdefaultrectanglenode_p.h +++ b/src/quick/scenegraph/qsgdefaultrectanglenode_p.h @@ -47,8 +47,6 @@ #include <QtQuick/qsgvertexcolormaterial.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QSGContext; @@ -104,6 +102,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/quick/scenegraph/qsgdistancefieldglyphnode_p.h b/src/quick/scenegraph/qsgdistancefieldglyphnode_p.h index bb423820b4..b75a123d34 100644 --- a/src/quick/scenegraph/qsgdistancefieldglyphnode_p.h +++ b/src/quick/scenegraph/qsgdistancefieldglyphnode_p.h @@ -47,8 +47,6 @@ #include <QtQuick/private/qquicktext_p.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QSGContext; @@ -112,8 +110,6 @@ private: uint m_dirtyMaterial: 1; }; -QT_END_HEADER - QT_END_NAMESPACE #endif // DISTANCEFIELD_GLYPHNODE_H diff --git a/src/quick/scenegraph/qsgflashnode_p.h b/src/quick/scenegraph/qsgflashnode_p.h index 84ea734a25..d8d2ef4a24 100644 --- a/src/quick/scenegraph/qsgflashnode_p.h +++ b/src/quick/scenegraph/qsgflashnode_p.h @@ -44,8 +44,6 @@ #include <QtQuick/QSGSimpleRectNode> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QSGFlashNode : public QSGSimpleRectNode @@ -61,7 +59,5 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QSGFLASHNODE_H diff --git a/src/quick/scenegraph/qsgrenderloop_p.h b/src/quick/scenegraph/qsgrenderloop_p.h index fc705f48e8..2ec6de9411 100644 --- a/src/quick/scenegraph/qsgrenderloop_p.h +++ b/src/quick/scenegraph/qsgrenderloop_p.h @@ -45,8 +45,6 @@ #include <QtGui/QImage> #include <private/qtquickglobal_p.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickWindow; @@ -86,6 +84,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QSGRenderLoop_P_H diff --git a/src/quick/scenegraph/qsgshareddistancefieldglyphcache_p.h b/src/quick/scenegraph/qsgshareddistancefieldglyphcache_p.h index 0286408116..ac613c16f4 100644 --- a/src/quick/scenegraph/qsgshareddistancefieldglyphcache_p.h +++ b/src/quick/scenegraph/qsgshareddistancefieldglyphcache_p.h @@ -46,8 +46,6 @@ #include <private/qsgadaptationlayer_p.h> #include <private/qqmlguard_p.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QPlatformSharedGraphicsCache; @@ -132,6 +130,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QSGSHAREDDISTANCEFIELDGLYPHCACHE_H diff --git a/src/quick/scenegraph/qsgthreadedrenderloop_p.h b/src/quick/scenegraph/qsgthreadedrenderloop_p.h index fd3ab657d3..4c297f500a 100644 --- a/src/quick/scenegraph/qsgthreadedrenderloop_p.h +++ b/src/quick/scenegraph/qsgthreadedrenderloop_p.h @@ -48,8 +48,6 @@ #include "qsgrenderloop_p.h" -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QSGRenderThread; @@ -120,6 +118,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QSGTHREADEDRENDERLOOP_P_H diff --git a/src/quick/scenegraph/util/qsgdepthstencilbuffer_p.h b/src/quick/scenegraph/util/qsgdepthstencilbuffer_p.h index 479c8e2d1f..f3fb92cbc5 100644 --- a/src/quick/scenegraph/util/qsgdepthstencilbuffer_p.h +++ b/src/quick/scenegraph/util/qsgdepthstencilbuffer_p.h @@ -48,8 +48,6 @@ #include <QtCore/qsharedpointer.h> #include <QtCore/qhash.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QSGDepthStencilBufferManager; @@ -137,6 +135,4 @@ extern uint qHash(const QSGDepthStencilBuffer::Format &format); QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/quick/scenegraph/util/qsgflatcolormaterial.h b/src/quick/scenegraph/util/qsgflatcolormaterial.h index 97b8c14a9b..27cf256603 100644 --- a/src/quick/scenegraph/util/qsgflatcolormaterial.h +++ b/src/quick/scenegraph/util/qsgflatcolormaterial.h @@ -45,8 +45,6 @@ #include <QtQuick/qsgmaterial.h> #include <qcolor.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class Q_QUICK_EXPORT QSGFlatColorMaterial : public QSGMaterial @@ -67,6 +65,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // FLATCOLORMATERIAL_H diff --git a/src/quick/scenegraph/util/qsgpainternode_p.h b/src/quick/scenegraph/util/qsgpainternode_p.h index 8c799810e4..387ca9bf88 100644 --- a/src/quick/scenegraph/util/qsgpainternode_p.h +++ b/src/quick/scenegraph/util/qsgpainternode_p.h @@ -50,8 +50,6 @@ #include <QtGui/qcolor.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QOpenGLFramebufferObject; @@ -151,8 +149,6 @@ private: bool m_dirtyTexture; }; -QT_END_HEADER - QT_END_NAMESPACE #endif // QSGPAINTERNODE_P_H diff --git a/src/quick/scenegraph/util/qsgsimplematerial.h b/src/quick/scenegraph/util/qsgsimplematerial.h index 25ac93b2c5..0a733e346a 100644 --- a/src/quick/scenegraph/util/qsgsimplematerial.h +++ b/src/quick/scenegraph/util/qsgsimplematerial.h @@ -44,8 +44,6 @@ #include <QtQuick/qsgmaterial.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE template <typename State> @@ -215,7 +213,5 @@ Q_INLINE_TEMPLATE void QSGSimpleMaterialShader<State>::updateState(const RenderS QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/quick/scenegraph/util/qsgsimplerectnode.h b/src/quick/scenegraph/util/qsgsimplerectnode.h index 2808354089..856e6793bc 100644 --- a/src/quick/scenegraph/util/qsgsimplerectnode.h +++ b/src/quick/scenegraph/util/qsgsimplerectnode.h @@ -45,8 +45,6 @@ #include <QtQuick/qsgnode.h> #include <QtQuick/qsgflatcolormaterial.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class Q_QUICK_EXPORT QSGSimpleRectNode : public QSGGeometryNode @@ -70,6 +68,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // SOLIDRECTNODE_H diff --git a/src/quick/scenegraph/util/qsgsimpletexturenode.h b/src/quick/scenegraph/util/qsgsimpletexturenode.h index a2ce80802a..ffd10210ae 100644 --- a/src/quick/scenegraph/util/qsgsimpletexturenode.h +++ b/src/quick/scenegraph/util/qsgsimpletexturenode.h @@ -46,8 +46,6 @@ #include <QtQuick/qsggeometry.h> #include <QtQuick/qsgtexturematerial.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class Q_QUICK_EXPORT QSGSimpleTextureNode : public QSGGeometryNode @@ -75,6 +73,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QSGSIMPLETEXTURENODE_H diff --git a/src/quick/scenegraph/util/qsgtexture.h b/src/quick/scenegraph/util/qsgtexture.h index 9d91d4e81c..ace29cd9a0 100644 --- a/src/quick/scenegraph/util/qsgtexture.h +++ b/src/quick/scenegraph/util/qsgtexture.h @@ -46,8 +46,6 @@ #include <QObject> #include <QImage> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QSGTexturePrivate; @@ -127,6 +125,4 @@ public: QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/quick/scenegraph/util/qsgtexturematerial.h b/src/quick/scenegraph/util/qsgtexturematerial.h index 7fc06c7927..cbc4f7d51f 100644 --- a/src/quick/scenegraph/util/qsgtexturematerial.h +++ b/src/quick/scenegraph/util/qsgtexturematerial.h @@ -45,8 +45,6 @@ #include <QtQuick/qsgmaterial.h> #include <QtQuick/qsgtexture.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class Q_QUICK_EXPORT QSGOpaqueTextureMaterial : public QSGMaterial @@ -94,6 +92,4 @@ public: QT_END_NAMESPACE -QT_END_HEADER - #endif // TEXTUREMATERIAL_H diff --git a/src/quick/scenegraph/util/qsgtexturematerial_p.h b/src/quick/scenegraph/util/qsgtexturematerial_p.h index 346004be35..a07cb7925e 100644 --- a/src/quick/scenegraph/util/qsgtexturematerial_p.h +++ b/src/quick/scenegraph/util/qsgtexturematerial_p.h @@ -45,8 +45,6 @@ #include "qsgtexturematerial.h" #include <private/qtquickglobal_p.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class Q_QUICK_PRIVATE_EXPORT QSGOpaqueTextureMaterialShader : public QSGMaterialShader @@ -81,6 +79,4 @@ protected: QT_END_NAMESPACE -QT_END_HEADER - #endif // QSGTEXTUREMATERIAL_P_H diff --git a/src/quick/scenegraph/util/qsgtextureprovider.h b/src/quick/scenegraph/util/qsgtextureprovider.h index f4925612f9..608b3c6e0f 100644 --- a/src/quick/scenegraph/util/qsgtextureprovider.h +++ b/src/quick/scenegraph/util/qsgtextureprovider.h @@ -45,8 +45,6 @@ #include <QtQuick/qsgtexture.h> #include <QtCore/qobject.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class Q_QUICK_EXPORT QSGTextureProvider : public QObject @@ -61,6 +59,4 @@ Q_SIGNALS: QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/quick/scenegraph/util/qsgvertexcolormaterial.h b/src/quick/scenegraph/util/qsgvertexcolormaterial.h index 7e1eb43193..a3ffa48c31 100644 --- a/src/quick/scenegraph/util/qsgvertexcolormaterial.h +++ b/src/quick/scenegraph/util/qsgvertexcolormaterial.h @@ -44,8 +44,6 @@ #include <QtQuick/qsgmaterial.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class Q_QUICK_EXPORT QSGVertexColorMaterial : public QSGMaterial @@ -62,6 +60,4 @@ protected: QT_END_NAMESPACE -QT_END_HEADER - #endif // VERTEXCOLORMATERIAL_H diff --git a/src/quick/util/qquickanimation_p.h b/src/quick/util/qquickanimation_p.h index cb0da6112a..82d1ba269e 100644 --- a/src/quick/util/qquickanimation_p.h +++ b/src/quick/util/qquickanimation_p.h @@ -54,8 +54,6 @@ #include "private/qabstractanimationjob_p.h" #include <QtGui/qcolor.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickAbstractAnimationPrivate; @@ -460,6 +458,4 @@ QML_DECLARE_TYPE(QQuickParallelAnimation) QML_DECLARE_TYPE(QQuickVector3dAnimation) QML_DECLARE_TYPE(QQuickRotationAnimation) -QT_END_HEADER - #endif // QQUICKANIMATION_H diff --git a/src/quick/util/qquickanimationcontroller_p.h b/src/quick/util/qquickanimationcontroller_p.h index 0fe3888afb..5286e77534 100644 --- a/src/quick/util/qquickanimationcontroller_p.h +++ b/src/quick/util/qquickanimationcontroller_p.h @@ -45,8 +45,6 @@ #include <qqml.h> #include "qquickanimation_p.h" -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickAnimationControllerPrivate; @@ -89,6 +87,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QQuickAnimationController) -QT_END_HEADER - #endif // QQUICKANIMATIONCONTROLLER_H diff --git a/src/quick/util/qquickapplication_p.h b/src/quick/util/qquickapplication_p.h index aa46a6a7e9..2eef59b608 100644 --- a/src/quick/util/qquickapplication_p.h +++ b/src/quick/util/qquickapplication_p.h @@ -46,8 +46,6 @@ #include <qqml.h> #include <private/qtquickglobal_p.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -81,6 +79,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QQuickApplication) -QT_END_HEADER - #endif // QQUICKAPPLICATION_P_H diff --git a/src/quick/util/qquickbehavior_p.h b/src/quick/util/qquickbehavior_p.h index a93b597a6b..0a49891cc0 100644 --- a/src/quick/util/qquickbehavior_p.h +++ b/src/quick/util/qquickbehavior_p.h @@ -47,8 +47,6 @@ #include <private/qqmlpropertyvalueinterceptor_p.h> #include <qqml.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickAbstractAnimation; @@ -88,6 +86,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QQuickBehavior) -QT_END_HEADER - #endif // QQUICKBEHAVIOR_H diff --git a/src/quick/util/qquickfontloader_p.h b/src/quick/util/qquickfontloader_p.h index 9337f5c2d7..1488ffe734 100644 --- a/src/quick/util/qquickfontloader_p.h +++ b/src/quick/util/qquickfontloader_p.h @@ -47,8 +47,6 @@ #include <QtCore/qobject.h> #include <QtCore/qurl.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickFontLoaderPrivate; @@ -89,7 +87,5 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QQuickFontLoader) -QT_END_HEADER - #endif // QQUICKFONTLOADER_H diff --git a/src/quick/util/qquickimageprovider.h b/src/quick/util/qquickimageprovider.h index 75c2e80a34..2735c9ac78 100644 --- a/src/quick/util/qquickimageprovider.h +++ b/src/quick/util/qquickimageprovider.h @@ -47,8 +47,6 @@ #include <QtGui/qpixmap.h> #include <QtQml/qqmlengine.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -87,6 +85,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QQUICKIMAGEPROVIDER_H diff --git a/src/quick/util/qquickpath_p.h b/src/quick/util/qquickpath_p.h index 545e98556b..71545851e4 100644 --- a/src/quick/util/qquickpath_p.h +++ b/src/quick/util/qquickpath_p.h @@ -50,8 +50,6 @@ #include <QtCore/QObject> #include <QtGui/QPainterPath> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickCurve; @@ -446,6 +444,4 @@ QML_DECLARE_TYPE(QQuickPathSvg) QML_DECLARE_TYPE(QQuickPathPercent) QML_DECLARE_TYPE(QQuickPath) -QT_END_HEADER - #endif // QQUICKPATH_H diff --git a/src/quick/util/qquickpathinterpolator_p.h b/src/quick/util/qquickpathinterpolator_p.h index f5414e028a..b66af408db 100644 --- a/src/quick/util/qquickpathinterpolator_p.h +++ b/src/quick/util/qquickpathinterpolator_p.h @@ -45,8 +45,6 @@ #include <qqml.h> #include <QObject> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickPath; @@ -93,6 +91,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QQuickPathInterpolator) -QT_END_HEADER - #endif // QQUICKPATHINTERPOLATOR_P_H diff --git a/src/quick/util/qquickpixmapcache_p.h b/src/quick/util/qquickpixmapcache_p.h index a6c2a7c1f3..3fefa35c0b 100644 --- a/src/quick/util/qquickpixmapcache_p.h +++ b/src/quick/util/qquickpixmapcache_p.h @@ -51,8 +51,6 @@ #include <private/qintrusivelist_p.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQmlEngine; @@ -139,6 +137,4 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QQuickPixmap::Options) QT_END_NAMESPACE -QT_END_HEADER - #endif // QQUICKPIXMAPCACHE_H diff --git a/src/quick/util/qquickpropertychanges_p.h b/src/quick/util/qquickpropertychanges_p.h index 95320afd6d..674dfa7c4c 100644 --- a/src/quick/util/qquickpropertychanges_p.h +++ b/src/quick/util/qquickpropertychanges_p.h @@ -45,8 +45,6 @@ #include "qquickstatechangescript_p.h" #include <private/qqmlcustomparser_p.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickPropertyChangesPrivate; @@ -105,6 +103,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QQuickPropertyChanges) -QT_END_HEADER - #endif // QQUICKPROPERTYCHANGES_H diff --git a/src/quick/util/qquicksmoothedanimation_p.h b/src/quick/util/qquicksmoothedanimation_p.h index 644ebf2a7b..7bf8b6c063 100644 --- a/src/quick/util/qquicksmoothedanimation_p.h +++ b/src/quick/util/qquicksmoothedanimation_p.h @@ -47,8 +47,6 @@ #include <QtCore/qobject.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQmlProperty; @@ -95,6 +93,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QQuickSmoothedAnimation) -QT_END_HEADER - #endif // QQUICKSMOOTHEDANIMATION_H diff --git a/src/quick/util/qquickspringanimation_p.h b/src/quick/util/qquickspringanimation_p.h index f43d6a4002..14968b770c 100644 --- a/src/quick/util/qquickspringanimation_p.h +++ b/src/quick/util/qquickspringanimation_p.h @@ -47,8 +47,6 @@ #include <QtCore/qobject.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickSpringAnimationPrivate; @@ -102,6 +100,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QQuickSpringAnimation) -QT_END_HEADER - #endif // QQUICKSPRINGANIMATION_H diff --git a/src/quick/util/qquickstate_p.h b/src/quick/util/qquickstate_p.h index e9324f4390..6a7b1b345f 100644 --- a/src/quick/util/qquickstate_p.h +++ b/src/quick/util/qquickstate_p.h @@ -48,8 +48,6 @@ #include <QtCore/qsharedpointer.h> #include <private/qtquickglobal_p.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickActionEvent; @@ -205,6 +203,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QQuickStateOperation) QML_DECLARE_TYPE(QQuickState) -QT_END_HEADER - #endif // QQUICKSTATE_H diff --git a/src/quick/util/qquickstatechangescript_p.h b/src/quick/util/qquickstatechangescript_p.h index 8d3e3804f9..3d8e139fe7 100644 --- a/src/quick/util/qquickstatechangescript_p.h +++ b/src/quick/util/qquickstatechangescript_p.h @@ -45,8 +45,6 @@ #include "qquickstate_p.h" #include <qqmlscriptstring.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickStateChangeScriptPrivate; @@ -80,6 +78,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QQuickStateChangeScript) -QT_END_HEADER - #endif // QQUICKSTATEOPERATIONS_H diff --git a/src/quick/util/qquickstategroup_p.h b/src/quick/util/qquickstategroup_p.h index ccd928aacf..b8e34237b7 100644 --- a/src/quick/util/qquickstategroup_p.h +++ b/src/quick/util/qquickstategroup_p.h @@ -44,8 +44,6 @@ #include "qquickstate_p.h" -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickStateGroupPrivate; @@ -90,6 +88,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QQuickStateGroup) -QT_END_HEADER - #endif // QQUICKSTATEGROUP_H diff --git a/src/quick/util/qquicksystempalette_p.h b/src/quick/util/qquicksystempalette_p.h index c8267b677a..6ff31829e3 100644 --- a/src/quick/util/qquicksystempalette_p.h +++ b/src/quick/util/qquicksystempalette_p.h @@ -47,8 +47,6 @@ #include <QtCore/qobject.h> #include <QPalette> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickSystemPalettePrivate; @@ -115,6 +113,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QQuickSystemPalette) -QT_END_HEADER - #endif // QQUICKSYSTEMPALETTE_H diff --git a/src/quick/util/qquicktransition_p.h b/src/quick/util/qquicktransition_p.h index 6ed2ad63cf..831aec025f 100644 --- a/src/quick/util/qquicktransition_p.h +++ b/src/quick/util/qquicktransition_p.h @@ -48,8 +48,6 @@ #include <QtCore/qobject.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickAbstractAnimation; @@ -127,6 +125,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QQuickTransition) -QT_END_HEADER - #endif // QQUICKTRANSITION_H diff --git a/src/quick/util/qquickutilmodule_p.h b/src/quick/util/qquickutilmodule_p.h index 5a7406b8e7..360480a34a 100644 --- a/src/quick/util/qquickutilmodule_p.h +++ b/src/quick/util/qquickutilmodule_p.h @@ -44,8 +44,6 @@ #include <qqml.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickUtilModule @@ -56,6 +54,4 @@ public: QT_END_NAMESPACE -QT_END_HEADER - #endif // QQUICKUTILMODULE_H diff --git a/src/quick/util/qquickvaluetypes_p.h b/src/quick/util/qquickvaluetypes_p.h index 557cbd4642..2f8756fb01 100644 --- a/src/quick/util/qquickvaluetypes_p.h +++ b/src/quick/util/qquickvaluetypes_p.h @@ -54,8 +54,6 @@ #include <QtGui/QMatrix4x4> #include <QtGui/QFont> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE namespace QQuickValueTypes { @@ -365,6 +363,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QQUICKVALUETYPES_P_H |