diff options
author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-01-27 09:19:58 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-01-28 23:21:21 +0100 |
commit | 157f4f982bd3b78a3471f0a22652c3d32d89df70 (patch) | |
tree | bffb9b62fd9c5ad70f7bfed0a5c8b80958a0400d /src/multimedia/playback | |
parent | f462bb9177d550f16f2ec768571b9076eb489dfa (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/multimedia/playback')
-rw-r--r-- | src/multimedia/playback/playlistfileparser_p.h | 4 | ||||
-rw-r--r-- | src/multimedia/playback/qmediacontent.h | 4 | ||||
-rw-r--r-- | src/multimedia/playback/qmedianetworkplaylistprovider_p.h | 4 | ||||
-rw-r--r-- | src/multimedia/playback/qmediaplayer.h | 4 | ||||
-rw-r--r-- | src/multimedia/playback/qmediaplaylist.h | 4 | ||||
-rw-r--r-- | src/multimedia/playback/qmediaplaylist_p.h | 4 | ||||
-rw-r--r-- | src/multimedia/playback/qmediaplaylistioplugin_p.h | 4 | ||||
-rw-r--r-- | src/multimedia/playback/qmediaplaylistnavigator_p.h | 4 | ||||
-rw-r--r-- | src/multimedia/playback/qmediaplaylistprovider_p.h | 4 | ||||
-rw-r--r-- | src/multimedia/playback/qmediaresource.h | 4 |
10 files changed, 0 insertions, 40 deletions
diff --git a/src/multimedia/playback/playlistfileparser_p.h b/src/multimedia/playback/playlistfileparser_p.h index d8fca090f..4173970a1 100644 --- a/src/multimedia/playback/playlistfileparser_p.h +++ b/src/multimedia/playback/playlistfileparser_p.h @@ -56,8 +56,6 @@ #include <QtNetwork> #include "qtmultimediadefs.h" -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QPlaylistFileParserPrivate; @@ -108,6 +106,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // PLAYLISTFILEPARSER_P_H diff --git a/src/multimedia/playback/qmediacontent.h b/src/multimedia/playback/qmediacontent.h index 2e7a9417c..f63f5545b 100644 --- a/src/multimedia/playback/qmediacontent.h +++ b/src/multimedia/playback/qmediacontent.h @@ -49,8 +49,6 @@ #include <QtMultimedia/qtmultimediadefs.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QMediaPlaylist; @@ -90,6 +88,4 @@ QT_END_NAMESPACE Q_DECLARE_METATYPE(QMediaContent) -QT_END_HEADER - #endif // QMEDIACONTENT_H diff --git a/src/multimedia/playback/qmedianetworkplaylistprovider_p.h b/src/multimedia/playback/qmedianetworkplaylistprovider_p.h index 825c309a0..12d0b86b1 100644 --- a/src/multimedia/playback/qmedianetworkplaylistprovider_p.h +++ b/src/multimedia/playback/qmedianetworkplaylistprovider_p.h @@ -55,8 +55,6 @@ #include "qmediaplaylistprovider_p.h" -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -95,7 +93,5 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QMEDIANETWORKPAYLISTSOURCE_P_H diff --git a/src/multimedia/playback/qmediaplayer.h b/src/multimedia/playback/qmediaplayer.h index df75d61c2..dd63b9370 100644 --- a/src/multimedia/playback/qmediaplayer.h +++ b/src/multimedia/playback/qmediaplayer.h @@ -48,8 +48,6 @@ #include <QtNetwork/qnetworkconfiguration.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -226,6 +224,4 @@ Q_MEDIA_ENUM_DEBUG(QMediaPlayer, State) Q_MEDIA_ENUM_DEBUG(QMediaPlayer, MediaStatus) Q_MEDIA_ENUM_DEBUG(QMediaPlayer, Error) -QT_END_HEADER - #endif // QMEDIAPLAYER_H diff --git a/src/multimedia/playback/qmediaplaylist.h b/src/multimedia/playback/qmediaplaylist.h index 78bde5c30..b19e293b2 100644 --- a/src/multimedia/playback/qmediaplaylist.h +++ b/src/multimedia/playback/qmediaplaylist.h @@ -50,8 +50,6 @@ #include <QtMultimedia/qmediaenumdebug.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -148,6 +146,4 @@ Q_DECLARE_METATYPE(QMediaPlaylist::Error) Q_MEDIA_ENUM_DEBUG(QMediaPlaylist, PlaybackMode) Q_MEDIA_ENUM_DEBUG(QMediaPlaylist, Error) -QT_END_HEADER - #endif // QMEDIAPLAYLIST_H diff --git a/src/multimedia/playback/qmediaplaylist_p.h b/src/multimedia/playback/qmediaplaylist_p.h index 0b053dd8c..65e34d26e 100644 --- a/src/multimedia/playback/qmediaplaylist_p.h +++ b/src/multimedia/playback/qmediaplaylist_p.h @@ -66,8 +66,6 @@ # pragma Q_MOC_EXPAND_MACROS #endif -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -169,7 +167,5 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QMEDIAPLAYLIST_P_H diff --git a/src/multimedia/playback/qmediaplaylistioplugin_p.h b/src/multimedia/playback/qmediaplaylistioplugin_p.h index 0a385613f..dfa97bbe5 100644 --- a/src/multimedia/playback/qmediaplaylistioplugin_p.h +++ b/src/multimedia/playback/qmediaplaylistioplugin_p.h @@ -60,8 +60,6 @@ #include "qmediacontent.h" -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QString; @@ -126,7 +124,5 @@ public: QT_END_NAMESPACE -QT_END_HEADER - #endif // QMEDIAPLAYLISTIOPLUGIN_P_H diff --git a/src/multimedia/playback/qmediaplaylistnavigator_p.h b/src/multimedia/playback/qmediaplaylistnavigator_p.h index d0f3a371f..4e0a9e235 100644 --- a/src/multimedia/playback/qmediaplaylistnavigator_p.h +++ b/src/multimedia/playback/qmediaplaylistnavigator_p.h @@ -57,8 +57,6 @@ #include "qmediaplaylist.h" #include <QtCore/qobject.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -118,7 +116,5 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QMEDIAPLAYLISTNAVIGATOR_P_H diff --git a/src/multimedia/playback/qmediaplaylistprovider_p.h b/src/multimedia/playback/qmediaplaylistprovider_p.h index 579590394..d33c155f9 100644 --- a/src/multimedia/playback/qmediaplaylistprovider_p.h +++ b/src/multimedia/playback/qmediaplaylistprovider_p.h @@ -56,8 +56,6 @@ #include "qmediacontent.h" #include "qmediaplaylist.h" -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -120,8 +118,6 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QMEDIAPLAYLISTSOURCE_P_H diff --git a/src/multimedia/playback/qmediaresource.h b/src/multimedia/playback/qmediaresource.h index ff29d49fd..6848ca0ab 100644 --- a/src/multimedia/playback/qmediaresource.h +++ b/src/multimedia/playback/qmediaresource.h @@ -48,8 +48,6 @@ #include <QtMultimedia/qtmultimediadefs.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE // Class forward declaration required for QDoc bug @@ -128,6 +126,4 @@ QT_END_NAMESPACE Q_DECLARE_METATYPE(QMediaResource) Q_DECLARE_METATYPE(QMediaResourceList) -QT_END_HEADER - #endif |