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/video/qabstractvideobuffer.h
View File

@@ -48,8 +48,6 @@
#include <QtCore/qmetatype.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
@@ -112,6 +110,4 @@ QT_END_NAMESPACE
Q_DECLARE_METATYPE(QAbstractVideoBuffer::HandleType)
Q_DECLARE_METATYPE(QAbstractVideoBuffer::MapMode)
QT_END_HEADER
#endif

4
src/multimedia/video/qabstractvideobuffer_p.h
View File

@@ -60,8 +60,6 @@
#include <qmultimedia.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
class QAbstractVideoBufferPrivate
@@ -76,7 +74,5 @@ public:
QT_END_NAMESPACE
QT_END_HEADER
#endif

4
src/multimedia/video/qabstractvideosurface.h
View File

@@ -45,8 +45,6 @@
#include <QtCore/qobject.h>
#include <QtMultimedia/qvideoframe.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
class QRectF;
@@ -113,6 +111,4 @@ QT_END_NAMESPACE
Q_DECLARE_METATYPE(QAbstractVideoSurface*)
Q_DECLARE_METATYPE(QAbstractVideoSurface::Error)
QT_END_HEADER
#endif

4
src/multimedia/video/qimagevideobuffer_p.h
View File

@@ -55,8 +55,6 @@
#include <qabstractvideobuffer.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
@@ -79,7 +77,5 @@ public:
QT_END_NAMESPACE
QT_END_HEADER
#endif

8
src/multimedia/video/qmemoryvideobuffer_p.h
View File

@@ -55,10 +55,6 @@
// We mean it.
//
QT_BEGIN_HEADER
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
@@ -79,9 +75,5 @@ public:
QT_END_NAMESPACE
QT_END_HEADER
QT_END_HEADER
#endif

4
src/multimedia/video/qvideoframe.h
View File

@@ -48,8 +48,6 @@
#include <QtMultimedia/qabstractvideobuffer.h>
#include <QtCore/qvariant.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
class QSize;
@@ -177,7 +175,5 @@ Q_DECLARE_METATYPE(QVideoFrame)
Q_DECLARE_METATYPE(QVideoFrame::FieldType)
Q_DECLARE_METATYPE(QVideoFrame::PixelFormat)
QT_END_HEADER
#endif

4
src/multimedia/video/qvideoprobe.h
View File

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

4
src/multimedia/video/qvideosurfaceformat.h
View File

@@ -49,8 +49,6 @@
#include <QtGui/qimage.h>
#include <QtMultimedia/qvideoframe.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
@@ -143,7 +141,5 @@ Q_DECLARE_METATYPE(QVideoSurfaceFormat)
Q_DECLARE_METATYPE(QVideoSurfaceFormat::Direction)
Q_DECLARE_METATYPE(QVideoSurfaceFormat::YCbCrColorSpace)
QT_END_HEADER
#endif

4
src/multimedia/video/qvideosurfaceoutput_p.h
View File

@@ -47,8 +47,6 @@
#include <QtCore/qsharedpointer.h>
#include <QtCore/qpointer.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
@@ -79,7 +77,5 @@ private:
QT_END_NAMESPACE
QT_END_HEADER
#endif