summaryrefslogtreecommitdiffstats
path: root/src/imports/audioengine
diff options
context:
space:
mode:
authorSergio Ahumada <sergio.ahumada@digia.com>2013-01-27 09:19:58 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-01-28 23:21:21 +0100
commit157f4f982bd3b78a3471f0a22652c3d32d89df70 (patch)
treebffb9b62fd9c5ad70f7bfed0a5c8b80958a0400d /src/imports/audioengine
parentf462bb9177d550f16f2ec768571b9076eb489dfa (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: Id95d10f5d9c146d9eb496119af6a8b8501ffcb17 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
Diffstat (limited to 'src/imports/audioengine')
-rw-r--r--src/imports/audioengine/qaudioengine_openal_p.h4
-rw-r--r--src/imports/audioengine/qaudioengine_p.h4
-rw-r--r--src/imports/audioengine/qdeclarative_attenuationmodel_p.h4
-rw-r--r--src/imports/audioengine/qdeclarative_audiocategory_p.h4
-rw-r--r--src/imports/audioengine/qdeclarative_audioengine_p.h4
-rw-r--r--src/imports/audioengine/qdeclarative_audiolistener_p.h4
-rw-r--r--src/imports/audioengine/qdeclarative_audiosample_p.h4
-rw-r--r--src/imports/audioengine/qdeclarative_playvariation_p.h4
-rw-r--r--src/imports/audioengine/qdeclarative_sound_p.h4
-rw-r--r--src/imports/audioengine/qdeclarative_soundinstance_p.h4
-rw-r--r--src/imports/audioengine/qsoundbuffer_p.h4
-rw-r--r--src/imports/audioengine/qsoundinstance_p.h4
-rw-r--r--src/imports/audioengine/qsoundsource_p.h4
13 files changed, 0 insertions, 52 deletions
diff --git a/src/imports/audioengine/qaudioengine_openal_p.h b/src/imports/audioengine/qaudioengine_openal_p.h
index 95ea38889..da0032f83 100644
--- a/src/imports/audioengine/qaudioengine_openal_p.h
+++ b/src/imports/audioengine/qaudioengine_openal_p.h
@@ -58,8 +58,6 @@
#include "qsoundsource_p.h"
#include "qsoundbuffer_p.h"
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
class QSoundBufferPrivateAL : public QSoundBuffer
@@ -168,6 +166,4 @@ private:
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/imports/audioengine/qaudioengine_p.h b/src/imports/audioengine/qaudioengine_p.h
index 8c8b664f0..81983009d 100644
--- a/src/imports/audioengine/qaudioengine_p.h
+++ b/src/imports/audioengine/qaudioengine_p.h
@@ -47,8 +47,6 @@
#include <QtCore/QUrl>
#include <QtGui/qvector3d.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
class QSoundSource;
@@ -105,6 +103,4 @@ private:
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/imports/audioengine/qdeclarative_attenuationmodel_p.h b/src/imports/audioengine/qdeclarative_attenuationmodel_p.h
index 8ce38cb4a..7d883c54d 100644
--- a/src/imports/audioengine/qdeclarative_attenuationmodel_p.h
+++ b/src/imports/audioengine/qdeclarative_attenuationmodel_p.h
@@ -46,8 +46,6 @@
#include <QtQml/qqmlcomponent.h>
#include <QVector3D>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
class QDeclarativeAttenuationModel : public QObject, public QQmlParserStatus
@@ -133,6 +131,4 @@ private:
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/imports/audioengine/qdeclarative_audiocategory_p.h b/src/imports/audioengine/qdeclarative_audiocategory_p.h
index 4e192bd8b..8513709a8 100644
--- a/src/imports/audioengine/qdeclarative_audiocategory_p.h
+++ b/src/imports/audioengine/qdeclarative_audiocategory_p.h
@@ -45,8 +45,6 @@
#include <QtQml/qqml.h>
#include <QtQml/qqmlcomponent.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
class QDeclarativeAudioCategory : public QObject, public QQmlParserStatus
@@ -89,6 +87,4 @@ private:
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/imports/audioengine/qdeclarative_audioengine_p.h b/src/imports/audioengine/qdeclarative_audioengine_p.h
index 4c82c7229..ea0221d1d 100644
--- a/src/imports/audioengine/qdeclarative_audioengine_p.h
+++ b/src/imports/audioengine/qdeclarative_audioengine_p.h
@@ -50,8 +50,6 @@
#include <QTimer>
#include "qaudioengine_p.h"
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
class QDeclarativeSoundInstance;
@@ -163,6 +161,4 @@ private:
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/imports/audioengine/qdeclarative_audiolistener_p.h b/src/imports/audioengine/qdeclarative_audiolistener_p.h
index ec45deeb0..278aeaddf 100644
--- a/src/imports/audioengine/qdeclarative_audiolistener_p.h
+++ b/src/imports/audioengine/qdeclarative_audiolistener_p.h
@@ -45,8 +45,6 @@
#include <QtCore/QObject>
#include <QtGui/qvector3d.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
class QDeclarativeAudioEngine;
@@ -97,6 +95,4 @@ private:
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/imports/audioengine/qdeclarative_audiosample_p.h b/src/imports/audioengine/qdeclarative_audiosample_p.h
index 6bd8d1e1d..0cf11e476 100644
--- a/src/imports/audioengine/qdeclarative_audiosample_p.h
+++ b/src/imports/audioengine/qdeclarative_audiosample_p.h
@@ -45,8 +45,6 @@
#include <QtQml/qqml.h>
#include <QtQml/qqmlcomponent.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
class QSoundBuffer;
@@ -106,6 +104,4 @@ private:
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/imports/audioengine/qdeclarative_playvariation_p.h b/src/imports/audioengine/qdeclarative_playvariation_p.h
index 450e9e92f..4ca9ebe71 100644
--- a/src/imports/audioengine/qdeclarative_playvariation_p.h
+++ b/src/imports/audioengine/qdeclarative_playvariation_p.h
@@ -45,8 +45,6 @@
#include <QtQml/qqml.h>
#include <QtQml/qqmlcomponent.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
class QDeclarativeAudioSample;
@@ -106,6 +104,4 @@ private:
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/imports/audioengine/qdeclarative_sound_p.h b/src/imports/audioengine/qdeclarative_sound_p.h
index 68ba6bee7..5d9080061 100644
--- a/src/imports/audioengine/qdeclarative_sound_p.h
+++ b/src/imports/audioengine/qdeclarative_sound_p.h
@@ -47,8 +47,6 @@
#include <QtCore/qlist.h>
#include "qdeclarative_playvariation_p.h"
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
class QDeclarativeAudioCategory;
@@ -171,6 +169,4 @@ private:
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/imports/audioengine/qdeclarative_soundinstance_p.h b/src/imports/audioengine/qdeclarative_soundinstance_p.h
index 6c35e1119..bf6d87d16 100644
--- a/src/imports/audioengine/qdeclarative_soundinstance_p.h
+++ b/src/imports/audioengine/qdeclarative_soundinstance_p.h
@@ -46,8 +46,6 @@
#include <QtGui/qvector3d.h>
#include "qsoundinstance_p.h"
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
class QDeclarativeSound;
@@ -150,6 +148,4 @@ private Q_SLOTS:
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/imports/audioengine/qsoundbuffer_p.h b/src/imports/audioengine/qsoundbuffer_p.h
index 1228d4b11..c4322f204 100644
--- a/src/imports/audioengine/qsoundbuffer_p.h
+++ b/src/imports/audioengine/qsoundbuffer_p.h
@@ -44,8 +44,6 @@
#include <QObject>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
class QSoundBuffer : public QObject
@@ -65,6 +63,4 @@ protected:
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif // QSOUNDBUFFER_P_H
diff --git a/src/imports/audioengine/qsoundinstance_p.h b/src/imports/audioengine/qsoundinstance_p.h
index dbdb95d63..92cf05f70 100644
--- a/src/imports/audioengine/qsoundinstance_p.h
+++ b/src/imports/audioengine/qsoundinstance_p.h
@@ -46,8 +46,6 @@
#include <QObject>
#include "qsoundsource_p.h"
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
class QDeclarativeSound;
@@ -134,6 +132,4 @@ private:
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif // QSOUNDINSTANCE_P_H
diff --git a/src/imports/audioengine/qsoundsource_p.h b/src/imports/audioengine/qsoundsource_p.h
index 5c3b90b68..5a623cb9b 100644
--- a/src/imports/audioengine/qsoundsource_p.h
+++ b/src/imports/audioengine/qsoundsource_p.h
@@ -45,8 +45,6 @@
#include <QVector3D>
#include <QObject>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
class QSoundBuffer;
@@ -93,6 +91,4 @@ protected:
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif