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/audio/qaudio.h
View File

@@ -48,8 +48,6 @@
#include <QtCore/qmetatype.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
//QTM_SYNC_HEADER_EXPORT QAudio
@@ -75,6 +73,4 @@ Q_DECLARE_METATYPE(QAudio::Error)
Q_DECLARE_METATYPE(QAudio::State)
Q_DECLARE_METATYPE(QAudio::Mode)
QT_END_HEADER
#endif // QAUDIO_H

4
src/multimedia/audio/qaudio_mac_p.h
View File

@@ -61,8 +61,6 @@
#include <qaudioformat.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
extern QAudioFormat toQAudioFormat(const AudioStreamBasicDescription& streamFormat);
@@ -132,8 +130,6 @@ private:
QT_END_NAMESPACE
QT_END_HEADER
#endif // QAUDIO_MAC_P_H

4
src/multimedia/audio/qaudiobuffer.h
View File

@@ -50,8 +50,6 @@
#include <QtMultimedia/qaudio.h>
#include <QtMultimedia/qaudioformat.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
class QAbstractAudioBuffer;
@@ -152,6 +150,4 @@ QT_END_NAMESPACE
Q_DECLARE_METATYPE(QAudioBuffer)
QT_END_HEADER
#endif // QAUDIOBUFFER_H

4
src/multimedia/audio/qaudiobuffer_p.h
View File

@@ -47,8 +47,6 @@
#include "qaudioformat.h"
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
// Required for QDoc workaround
@@ -86,6 +84,4 @@ public:
QT_END_NAMESPACE
QT_END_HEADER
#endif // QAUDIOBUFFER_P_H

4
src/multimedia/audio/qaudiodecoder.h
View File

@@ -47,8 +47,6 @@
#include <QtMultimedia/qaudiobuffer.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
class QAudioDecoderPrivate;
@@ -142,6 +140,4 @@ Q_DECLARE_METATYPE(QAudioDecoder::Error)
Q_MEDIA_ENUM_DEBUG(QAudioDecoder, State)
Q_MEDIA_ENUM_DEBUG(QAudioDecoder, Error)
QT_END_HEADER
#endif // QAUDIODECODER_H

4
src/multimedia/audio/qaudiodevicefactory_p.h
View File

@@ -61,8 +61,6 @@
#include "qaudiodeviceinfo.h"
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
@@ -92,7 +90,5 @@ public:
QT_END_NAMESPACE
QT_END_HEADER
#endif // QAUDIODEVICEFACTORY_P_H

4
src/multimedia/audio/qaudiodeviceinfo.h
View File

@@ -55,8 +55,6 @@
#include <QtMultimedia/qaudio.h>
#include <QtMultimedia/qaudioformat.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
@@ -110,6 +108,4 @@ QT_END_NAMESPACE
Q_DECLARE_METATYPE(QAudioDeviceInfo)
QT_END_HEADER
#endif // QAUDIODEVICEINFO_H

4
src/multimedia/audio/qaudiodeviceinfo_alsa_p.h
View File

@@ -65,8 +65,6 @@
#include "qaudiodeviceinfo.h"
#include "qaudiosystem.h"
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
@@ -120,8 +118,6 @@ private:
QT_END_NAMESPACE
QT_END_HEADER
#endif

4
src/multimedia/audio/qaudiodeviceinfo_mac_p.h
View File

@@ -58,8 +58,6 @@
#include <qaudiosystem.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
@@ -92,6 +90,4 @@ public:
QT_END_NAMESPACE
QT_END_HEADER
#endif // QDEVICEINFO_MAC_P_H

4
src/multimedia/audio/qaudiodeviceinfo_win32_p.h
View File

@@ -63,8 +63,6 @@
#include <qaudiosystem.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
@@ -112,7 +110,5 @@ private:
QT_END_NAMESPACE
QT_END_HEADER
#endif

4
src/multimedia/audio/qaudioformat.h
View File

@@ -49,8 +49,6 @@
#include <QtMultimedia/qtmultimediadefs.h>
#include <QtMultimedia/qmultimedia.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
class QAudioFormatPrivate;
@@ -117,6 +115,4 @@ Q_DECLARE_METATYPE(QAudioFormat)
Q_DECLARE_METATYPE(QAudioFormat::SampleType)
Q_DECLARE_METATYPE(QAudioFormat::Endian)
QT_END_HEADER
#endif // QAUDIOFORMAT_H

4
src/multimedia/audio/qaudioinput.h
View File

@@ -53,8 +53,6 @@
#include <QtMultimedia/qaudiodeviceinfo.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
@@ -110,6 +108,4 @@ private:
QT_END_NAMESPACE
QT_END_HEADER
#endif // QAUDIOINPUT_H

4
src/multimedia/audio/qaudioinput_alsa_p.h
View File

@@ -67,8 +67,6 @@
#include "qaudiodeviceinfo.h"
#include "qaudiosystem.h"
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
@@ -186,7 +184,5 @@ private:
QT_END_NAMESPACE
QT_END_HEADER
#endif

4
src/multimedia/audio/qaudioinput_mac_p.h
View File

@@ -68,8 +68,6 @@
#include <qaudioformat.h>
#include <qaudiosystem.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
@@ -172,6 +170,4 @@ private:
QT_END_NAMESPACE
QT_END_HEADER
#endif // QAUDIOINPUT_MAC_P_H

4
src/multimedia/audio/qaudioinput_win32_p.h
View File

@@ -69,8 +69,6 @@
#include <qaudiosystem.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
@@ -178,7 +176,5 @@ private:
QT_END_NAMESPACE
QT_END_HEADER
#endif

4
src/multimedia/audio/qaudiooutput.h
View File

@@ -53,8 +53,6 @@
#include <QtMultimedia/qaudiodeviceinfo.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
@@ -113,6 +111,4 @@ private:
QT_END_NAMESPACE
QT_END_HEADER
#endif // QAUDIOOUTPUT_H

4
src/multimedia/audio/qaudiooutput_alsa_p.h
View File

@@ -66,8 +66,6 @@
#include "qaudiodeviceinfo.h"
#include "qaudiosystem.h"
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
@@ -171,7 +169,5 @@ private:
QT_END_NAMESPACE
QT_END_HEADER
#endif

4
src/multimedia/audio/qaudiooutput_mac_p.h
View File

@@ -68,8 +68,6 @@
#include <qaudioformat.h>
#include <qaudiosystem.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
@@ -171,6 +169,4 @@ private:
QT_END_NAMESPACE
QT_END_HEADER
#endif

4
src/multimedia/audio/qaudiooutput_win32_p.h
View File

@@ -76,8 +76,6 @@
# endif
#endif
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
@@ -170,7 +168,5 @@ private:
QT_END_NAMESPACE
QT_END_HEADER
#endif

4
src/multimedia/audio/qaudioprobe.h
View File

@@ -45,8 +45,6 @@
#include <QtCore/qobject.h>
#include <QtMultimedia/qaudiobuffer.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
class QMediaObject;
@@ -75,6 +73,4 @@ private:
QT_END_NAMESPACE
QT_END_HEADER
#endif // QAUDIOPROBE_H

4
src/multimedia/audio/qaudiosystem.h
View File

@@ -49,8 +49,6 @@
#include <QtMultimedia/qaudioformat.h>
#include <QtMultimedia/qaudiodeviceinfo.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
// Required for QDoc workaround
@@ -140,6 +138,4 @@ Q_SIGNALS:
QT_END_NAMESPACE
QT_END_HEADER
#endif // QAUDIOSYSTEM_H

4
src/multimedia/audio/qaudiosystemplugin.h
View File

@@ -53,8 +53,6 @@
#include <QtMultimedia/qaudiodeviceinfo.h>
#include <QtMultimedia/qaudiosystem.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
// Required for QDoc workaround
@@ -92,6 +90,4 @@ public:
QT_END_NAMESPACE
QT_END_HEADER
#endif // QAUDIOSYSTEMPLUGIN_H

4
src/multimedia/audio/qsamplecache_p.h
View File

@@ -62,8 +62,6 @@
#include <qaudioformat.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
class QIODevice;
@@ -165,6 +163,4 @@ private:
QT_END_NAMESPACE
QT_END_HEADER
#endif // QSAMPLECACHE_P_H

4
src/multimedia/audio/qsound.h
View File

@@ -45,8 +45,6 @@
#include <QtMultimedia/qtmultimediadefs.h>
#include <QtCore/qobject.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
class QSoundEffect;
@@ -85,7 +83,5 @@ private:
QT_END_NAMESPACE
QT_END_HEADER
#endif // QSOUND_H

4
src/multimedia/audio/qsoundeffect.h
View File

@@ -48,8 +48,6 @@
#include <QtCore/qstringlist.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
@@ -132,7 +130,5 @@ private:
QT_END_NAMESPACE
QT_END_HEADER
#endif // QSOUNDEFFECT_H

4
src/multimedia/audio/qsoundeffect_pulse_p.h
View File

@@ -62,8 +62,6 @@
#include <pulse/pulseaudio.h>
#include "qsamplecache_p.h"
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
class QSoundEffectRef;
@@ -169,6 +167,4 @@ private:
QT_END_NAMESPACE
QT_END_HEADER
#endif // QSOUNDEFFECT_PULSE_H

4
src/multimedia/audio/qsoundeffect_qaudio_p.h
View File

@@ -59,8 +59,6 @@
#include "qsamplecache_p.h"
#include "qsoundeffect.h"
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
class QSoundEffectPrivate;
@@ -151,6 +149,4 @@ private:
QT_END_NAMESPACE
QT_END_HEADER
#endif // QSOUNDEFFECT_QAUDIO_H

4
src/multimedia/audio/qwavedecoder_p.h
View File

@@ -57,8 +57,6 @@
#include <qaudioformat.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
@@ -134,6 +132,4 @@ private:
QT_END_NAMESPACE
QT_END_HEADER
#endif // WAVEDECODER_H