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: Ic5b55b26967d65b3f11cac6fc3963f33ec6051a4
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
Reviewed-by: Alan Alpert <aalpert@rim.com>

9 files changed, 0 insertions, 36 deletions

diff --git a/src/imports/folderlistmodel/qdeclarativefolderlistmodel.h b/src/imports/folderlistmodel/qdeclarativefolderlistmodel.h
index d50bba9d..68dc25d2 100644
--- a/src/imports/folderlistmodel/qdeclarativefolderlistmodel.h
+++ b/src/imports/folderlistmodel/qdeclarativefolderlistmodel.h
@@ -49,8 +49,6 @@
 
 #ifndef QT_NO_DIRMODEL
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(Declarative)
@@ -153,8 +151,6 @@ QT_END_NAMESPACE
 QML_DECLARE_TYPE(QDeclarativeFolderListModel)
 //![qml decl]
 
-QT_END_HEADER
-
 #endif // QT_NO_DIRMODEL
 
 #endif // QDECLARATIVEFOLDERLISTMODEL_H
diff --git a/src/imports/gestures/qdeclarativegesturearea_p.h b/src/imports/gestures/qdeclarativegesturearea_p.h
index 7a2d39e7..68f42641 100644
--- a/src/imports/gestures/qdeclarativegesturearea_p.h
+++ b/src/imports/gestures/qdeclarativegesturearea_p.h
@@ -52,8 +52,6 @@
 
 #ifndef QT_NO_GESTURES
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(Declarative)
@@ -97,8 +95,6 @@ QT_END_NAMESPACE
 
 QML_DECLARE_TYPE(QDeclarativeGestureArea)
 
-QT_END_HEADER
-
 #endif // QT_NO_GESTURES
 
 #endif
diff --git a/src/imports/particles/qdeclarativeparticles_p.h b/src/imports/particles/qdeclarativeparticles_p.h
index 9031589e..dad3f142 100644
--- a/src/imports/particles/qdeclarativeparticles_p.h
+++ b/src/imports/particles/qdeclarativeparticles_p.h
@@ -44,8 +44,6 @@
 
 #include <QtDeclarative/qdeclarativeitem.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(Declarative)
@@ -253,6 +251,4 @@ QML_DECLARE_TYPE(QDeclarativeParticleMotionGravity)
 QML_DECLARE_TYPE(QDeclarativeParticleMotionWander)
 QML_DECLARE_TYPE(QDeclarativeParticles)
 
-QT_END_HEADER
-
 #endif
diff --git a/src/imports/shaders/scenegraph/qsggeometry.h b/src/imports/shaders/scenegraph/qsggeometry.h
index 2ec3cb9d..eca48c69 100644
--- a/src/imports/shaders/scenegraph/qsggeometry.h
+++ b/src/imports/shaders/scenegraph/qsggeometry.h
@@ -44,8 +44,6 @@
 
 #include <QtOpenGL/qgl.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QSGGeometry
@@ -229,6 +227,4 @@ inline const QSGGeometry::ColoredPoint2D *QSGGeometry::vertexDataAsColoredPoint2
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif // QSGGEOMETRY_H
diff --git a/src/imports/shaders/shadereffect.h b/src/imports/shaders/shadereffect.h
index 1fc45de6..3bc1bd1f 100644
--- a/src/imports/shaders/shadereffect.h
+++ b/src/imports/shaders/shadereffect.h
@@ -44,8 +44,6 @@
 
 #include <QGraphicsEffect>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class ShaderEffectSource;
@@ -74,8 +72,6 @@ public:
     bool m_changed : 1;
 };
 
-QT_END_HEADER
-
 QT_END_NAMESPACE
 
 #endif // SHADEREFFECT_H
diff --git a/src/imports/shaders/shadereffectbuffer.h b/src/imports/shaders/shadereffectbuffer.h
index 8674ff7b..569d1ab2 100644
--- a/src/imports/shaders/shadereffectbuffer.h
+++ b/src/imports/shaders/shadereffectbuffer.h
@@ -44,8 +44,6 @@
 
 #include <QGLFramebufferObject>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class ShaderEffectBuffer : public QGLFramebufferObject
@@ -55,8 +53,6 @@ public:
     ~ShaderEffectBuffer();
 };
 
-QT_END_HEADER
-
 QT_END_NAMESPACE
 
 #endif // SHADEREFFECTBUFFER_H
diff --git a/src/imports/shaders/shadereffectitem.h b/src/imports/shaders/shadereffectitem.h
index 2538773d..7274656d 100644
--- a/src/imports/shaders/shadereffectitem.h
+++ b/src/imports/shaders/shadereffectitem.h
@@ -47,8 +47,6 @@
 #include "shadereffectsource.h"
 #include "scenegraph/qsggeometry.h"
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QGLFramebufferObject;
@@ -148,8 +146,6 @@ private:
     bool m_defaultVertexShader : 1;
 };
 
-QT_END_HEADER
-
 QT_END_NAMESPACE
 
 #endif // SHADEREFFECTITEM_H
diff --git a/src/imports/shaders/shadereffectsource.h b/src/imports/shaders/shadereffectsource.h
index 5c8794e3..7003ff40 100644
--- a/src/imports/shaders/shadereffectsource.h
+++ b/src/imports/shaders/shadereffectsource.h
@@ -46,8 +46,6 @@
 #include <QGLFunctions>
 #include <QPointer>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class ShaderEffectBuffer;
@@ -152,8 +150,6 @@ private:
     bool m_mirrored : 1;
 };
 
-QT_END_HEADER
-
 QT_END_NAMESPACE
 
 
diff --git a/src/imports/webview/qdeclarativewebview_p.h b/src/imports/webview/qdeclarativewebview_p.h
index 4effd00e..f2b5db79 100644
--- a/src/imports/webview/qdeclarativewebview_p.h
+++ b/src/imports/webview/qdeclarativewebview_p.h
@@ -51,8 +51,6 @@
 #include <QWebPage>
 
 
-QT_BEGIN_HEADER
-
 class QWebHistory;
 class QWebSettings;
 
@@ -394,6 +392,4 @@ QML_DECLARE_TYPE(QDeclarativeWebView)
 QML_DECLARE_TYPE(QDeclarativeWebSettings)
 QML_DECLARE_TYPEINFO(QDeclarativeWebView, QML_HAS_ATTACHED_PROPERTIES)
 
-QT_END_HEADER
-
 #endif