summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergio Ahumada <sergio.ahumada@digia.com>2013-01-27 09:45:48 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-01-28 19:52:27 +0100
commit7e1803d382fd199bae12c8e13cd710e51e633a09 (patch)
treef534576a0d917822f2a7a2d631f146ebc193e42e
parentd8232635209f0ed34e005384410a63fea018073e (diff)
downloadqtscript-7e1803d382fd199bae12c8e13cd710e51e633a09.tar.gz
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: I7fed9ff47fd84f6cf2b418658a1ee3e7130539ac Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
-rw-r--r--src/script/api/qscriptable.h4
-rw-r--r--src/script/api/qscriptclass.h4
-rw-r--r--src/script/api/qscriptclasspropertyiterator.h4
-rw-r--r--src/script/api/qscriptcontext.h4
-rw-r--r--src/script/api/qscriptcontextinfo.h4
-rw-r--r--src/script/api/qscriptengine.h4
-rw-r--r--src/script/api/qscriptengineagent.h4
-rw-r--r--src/script/api/qscriptextensioninterface.h4
-rw-r--r--src/script/api/qscriptextensionplugin.h4
-rw-r--r--src/script/api/qscriptprogram.h4
-rw-r--r--src/script/api/qscriptstring.h4
-rw-r--r--src/script/api/qscriptvalue.h4
-rw-r--r--src/script/api/qscriptvalueiterator.h4
-rw-r--r--src/script/api/qtscriptglobal.h4
-rw-r--r--src/scripttools/debugging/qscriptenginedebugger.h4
15 files changed, 0 insertions, 60 deletions
diff --git a/src/script/api/qscriptable.h b/src/script/api/qscriptable.h
index 2b92334..4f4fdc2 100644
--- a/src/script/api/qscriptable.h
+++ b/src/script/api/qscriptable.h
@@ -29,8 +29,6 @@
#include <QtCore/qscopedpointer.h>
#include <QtScript/qtscriptglobal.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
@@ -65,6 +63,4 @@ private:
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif // QSCRIPTABLE_H
diff --git a/src/script/api/qscriptclass.h b/src/script/api/qscriptclass.h
index 74ea464..fbc7699 100644
--- a/src/script/api/qscriptclass.h
+++ b/src/script/api/qscriptclass.h
@@ -30,8 +30,6 @@
#include <QtCore/qscopedpointer.h>
#include <QtScript/qscriptvalue.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
@@ -94,6 +92,4 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QScriptClass::QueryFlags)
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/script/api/qscriptclasspropertyiterator.h b/src/script/api/qscriptclasspropertyiterator.h
index e83254f..3a946bd 100644
--- a/src/script/api/qscriptclasspropertyiterator.h
+++ b/src/script/api/qscriptclasspropertyiterator.h
@@ -29,8 +29,6 @@
#include <QtCore/qscopedpointer.h>
#include <QtScript/qscriptvalue.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
@@ -69,6 +67,4 @@ private:
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/script/api/qscriptcontext.h b/src/script/api/qscriptcontext.h
index 7e8f8a5..8cbfad8 100644
--- a/src/script/api/qscriptcontext.h
+++ b/src/script/api/qscriptcontext.h
@@ -28,8 +28,6 @@
#include <QtScript/qscriptvalue.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
@@ -98,6 +96,4 @@ private:
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/script/api/qscriptcontextinfo.h b/src/script/api/qscriptcontextinfo.h
index e03f147..d8000ca 100644
--- a/src/script/api/qscriptcontextinfo.h
+++ b/src/script/api/qscriptcontextinfo.h
@@ -31,8 +31,6 @@
#include <QtCore/qsharedpointer.h>
#include <QtScript/qtscriptglobal.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
@@ -101,6 +99,4 @@ Q_SCRIPT_EXPORT QDataStream &operator>>(QDataStream &, QScriptContextInfo &);
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/script/api/qscriptengine.h b/src/script/api/qscriptengine.h
index 752d318..fcfb4a2 100644
--- a/src/script/api/qscriptengine.h
+++ b/src/script/api/qscriptengine.h
@@ -40,8 +40,6 @@
#include <QtScript/qscriptstring.h>
#include <QtScript/qscriptprogram.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
@@ -445,6 +443,4 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QScriptEngine::QObjectWrapOptions)
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif // QSCRIPTENGINE_H
diff --git a/src/script/api/qscriptengineagent.h b/src/script/api/qscriptengineagent.h
index 8eef03b..289ce52 100644
--- a/src/script/api/qscriptengineagent.h
+++ b/src/script/api/qscriptengineagent.h
@@ -30,8 +30,6 @@
#include <QtCore/qscopedpointer.h>
#include <QtScript/qtscriptglobal.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
@@ -86,6 +84,4 @@ private:
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/script/api/qscriptextensioninterface.h b/src/script/api/qscriptextensioninterface.h
index b158740..ea9af81 100644
--- a/src/script/api/qscriptextensioninterface.h
+++ b/src/script/api/qscriptextensioninterface.h
@@ -29,8 +29,6 @@
#include <QtCore/qobject.h>
#include <QtScript/qtscriptglobal.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
@@ -48,6 +46,4 @@ Q_DECLARE_INTERFACE(QScriptExtensionInterface, QScriptExtensionInterface_iid)
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif // QSCRIPTEXTENSIONINTERFACE_H
diff --git a/src/script/api/qscriptextensionplugin.h b/src/script/api/qscriptextensionplugin.h
index a3b3a15..5fad2e4 100644
--- a/src/script/api/qscriptextensionplugin.h
+++ b/src/script/api/qscriptextensionplugin.h
@@ -28,8 +28,6 @@
#include <QtScript/qscriptextensioninterface.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
@@ -52,6 +50,4 @@ public:
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif // QSCRIPTEXTENSIONPLUGIN_H
diff --git a/src/script/api/qscriptprogram.h b/src/script/api/qscriptprogram.h
index 5bebb71..0d3d413 100644
--- a/src/script/api/qscriptprogram.h
+++ b/src/script/api/qscriptprogram.h
@@ -29,8 +29,6 @@
#include <QtCore/qstring.h>
#include <QtScript/qtscriptglobal.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
@@ -63,6 +61,4 @@ private:
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif // QSCRIPTPROGRAM_H
diff --git a/src/script/api/qscriptstring.h b/src/script/api/qscriptstring.h
index 40ad691..f763de2 100644
--- a/src/script/api/qscriptstring.h
+++ b/src/script/api/qscriptstring.h
@@ -29,8 +29,6 @@
#include <QtCore/qsharedpointer.h>
#include <QtScript/qtscriptglobal.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
@@ -64,6 +62,4 @@ Q_SCRIPT_EXPORT uint qHash(const QScriptString &key);
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif // QSCRIPTSTRING_H
diff --git a/src/script/api/qscriptvalue.h b/src/script/api/qscriptvalue.h
index 823055f..9ea69c1 100644
--- a/src/script/api/qscriptvalue.h
+++ b/src/script/api/qscriptvalue.h
@@ -30,8 +30,6 @@
#include <QtCore/qsharedpointer.h>
#include <QtScript/qtscriptglobal.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
@@ -218,6 +216,4 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QScriptValue::PropertyFlags)
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/script/api/qscriptvalueiterator.h b/src/script/api/qscriptvalueiterator.h
index e54de0b..19019b5 100644
--- a/src/script/api/qscriptvalueiterator.h
+++ b/src/script/api/qscriptvalueiterator.h
@@ -28,8 +28,6 @@
#include <QtCore/qscopedpointer.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
@@ -73,6 +71,4 @@ private:
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif // QSCRIPTVALUEITERATOR_H
diff --git a/src/script/api/qtscriptglobal.h b/src/script/api/qtscriptglobal.h
index 4bc3b31..1b74cf6 100644
--- a/src/script/api/qtscriptglobal.h
+++ b/src/script/api/qtscriptglobal.h
@@ -44,8 +44,6 @@
#include <QtCore/qglobal.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
#ifndef QT_STATIC
@@ -66,6 +64,4 @@ QT_BEGIN_NAMESPACE
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/scripttools/debugging/qscriptenginedebugger.h b/src/scripttools/debugging/qscriptenginedebugger.h
index 3f15bc3..9589f65 100644
--- a/src/scripttools/debugging/qscriptenginedebugger.h
+++ b/src/scripttools/debugging/qscriptenginedebugger.h
@@ -45,8 +45,6 @@
#include <QtCore/qobject.h>
#include <QtScript/qtscriptglobal.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
@@ -132,6 +130,4 @@ private:
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif