slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove QT_{BEGIN,END}_HEADER macro usage

Browse Source 
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>
This commit is contained in:
Sergio Ahumada
2013-01-27 09:19:58 +01:00
committed by The Qt Project
parent f462bb9177
commit 157f4f982b
156 changed files with 0 additions and 623 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/multimedia/playback/playlistfileparser_p.h
View File

@@ -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

4
src/multimedia/playback/qmediacontent.h
View File

@@ -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

4
src/multimedia/playback/qmedianetworkplaylistprovider_p.h
View File

@@ -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

4
src/multimedia/playback/qmediaplayer.h
View File

@@ -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

4
src/multimedia/playback/qmediaplaylist.h
View File

@@ -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

4
src/multimedia/playback/qmediaplaylist_p.h
View File

@@ -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

4
src/multimedia/playback/qmediaplaylistioplugin_p.h
View File

@@ -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

4
src/multimedia/playback/qmediaplaylistnavigator_p.h
View File

@@ -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

4
src/multimedia/playback/qmediaplaylistprovider_p.h
View File

@@ -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

4
src/multimedia/playback/qmediaresource.h
View File

@@ -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