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/video | |
| 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/video')
| -rw-r--r-- | src/multimedia/video/qabstractvideobuffer.h | 4 | ||||
| -rw-r--r-- | src/multimedia/video/qabstractvideobuffer_p.h | 4 | ||||
| -rw-r--r-- | src/multimedia/video/qabstractvideosurface.h | 4 | ||||
| -rw-r--r-- | src/multimedia/video/qimagevideobuffer_p.h | 4 | ||||
| -rw-r--r-- | src/multimedia/video/qmemoryvideobuffer_p.h | 8 | ||||
| -rw-r--r-- | src/multimedia/video/qvideoframe.h | 4 | ||||
| -rw-r--r-- | src/multimedia/video/qvideoprobe.h | 4 | ||||
| -rw-r--r-- | src/multimedia/video/qvideosurfaceformat.h | 4 | ||||
| -rw-r--r-- | src/multimedia/video/qvideosurfaceoutput_p.h | 4 |
9 files changed, 0 insertions, 40 deletions
diff --git a/src/multimedia/video/qabstractvideobuffer.h b/src/multimedia/video/qabstractvideobuffer.h index b3b0644f4..ebacb05e3 100644 --- a/src/multimedia/video/qabstractvideobuffer.h +++ b/src/multimedia/video/qabstractvideobuffer.h @@ -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 diff --git a/src/multimedia/video/qabstractvideobuffer_p.h b/src/multimedia/video/qabstractvideobuffer_p.h index 5b355ff1b..6accfbbd8 100644 --- a/src/multimedia/video/qabstractvideobuffer_p.h +++ b/src/multimedia/video/qabstractvideobuffer_p.h @@ -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 diff --git a/src/multimedia/video/qabstractvideosurface.h b/src/multimedia/video/qabstractvideosurface.h index bd634f6d5..ab87b7c70 100644 --- a/src/multimedia/video/qabstractvideosurface.h +++ b/src/multimedia/video/qabstractvideosurface.h @@ -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 diff --git a/src/multimedia/video/qimagevideobuffer_p.h b/src/multimedia/video/qimagevideobuffer_p.h index 99f09b569..0acdd3e42 100644 --- a/src/multimedia/video/qimagevideobuffer_p.h +++ b/src/multimedia/video/qimagevideobuffer_p.h @@ -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 diff --git a/src/multimedia/video/qmemoryvideobuffer_p.h b/src/multimedia/video/qmemoryvideobuffer_p.h index d34be47f3..7b21e767e 100644 --- a/src/multimedia/video/qmemoryvideobuffer_p.h +++ b/src/multimedia/video/qmemoryvideobuffer_p.h @@ -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 diff --git a/src/multimedia/video/qvideoframe.h b/src/multimedia/video/qvideoframe.h index 84a048e22..6bc24db14 100644 --- a/src/multimedia/video/qvideoframe.h +++ b/src/multimedia/video/qvideoframe.h @@ -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 diff --git a/src/multimedia/video/qvideoprobe.h b/src/multimedia/video/qvideoprobe.h index e7718c603..de585d7b2 100644 --- a/src/multimedia/video/qvideoprobe.h +++ b/src/multimedia/video/qvideoprobe.h @@ -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 diff --git a/src/multimedia/video/qvideosurfaceformat.h b/src/multimedia/video/qvideosurfaceformat.h index 617eccaa3..689ed506e 100644 --- a/src/multimedia/video/qvideosurfaceformat.h +++ b/src/multimedia/video/qvideosurfaceformat.h @@ -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 diff --git a/src/multimedia/video/qvideosurfaceoutput_p.h b/src/multimedia/video/qvideosurfaceoutput_p.h index 741f6325b..0b74d5939 100644 --- a/src/multimedia/video/qvideosurfaceoutput_p.h +++ b/src/multimedia/video/qvideosurfaceoutput_p.h @@ -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 |