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/scenegraph/util | |
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/scenegraph/util')
-rw-r--r-- | src/quick/scenegraph/util/qsgdepthstencilbuffer_p.h | 4 | ||||
-rw-r--r-- | src/quick/scenegraph/util/qsgflatcolormaterial.h | 4 | ||||
-rw-r--r-- | src/quick/scenegraph/util/qsgpainternode_p.h | 4 | ||||
-rw-r--r-- | src/quick/scenegraph/util/qsgsimplematerial.h | 4 | ||||
-rw-r--r-- | src/quick/scenegraph/util/qsgsimplerectnode.h | 4 | ||||
-rw-r--r-- | src/quick/scenegraph/util/qsgsimpletexturenode.h | 4 | ||||
-rw-r--r-- | src/quick/scenegraph/util/qsgtexture.h | 4 | ||||
-rw-r--r-- | src/quick/scenegraph/util/qsgtexturematerial.h | 4 | ||||
-rw-r--r-- | src/quick/scenegraph/util/qsgtexturematerial_p.h | 4 | ||||
-rw-r--r-- | src/quick/scenegraph/util/qsgtextureprovider.h | 4 | ||||
-rw-r--r-- | src/quick/scenegraph/util/qsgvertexcolormaterial.h | 4 |
11 files changed, 0 insertions, 44 deletions
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 |