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/multimediawidgets | |
| 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/multimediawidgets')
| -rw-r--r-- | src/multimediawidgets/qcameraviewfinder.h | 4 | ||||
| -rw-r--r-- | src/multimediawidgets/qeglimagetexturesurface_p.h | 4 | ||||
| -rw-r--r-- | src/multimediawidgets/qgraphicsvideoitem.h | 4 | ||||
| -rw-r--r-- | src/multimediawidgets/qpaintervideosurface_mac_p.h | 4 | ||||
| -rw-r--r-- | src/multimediawidgets/qpaintervideosurface_p.h | 4 | ||||
| -rw-r--r-- | src/multimediawidgets/qtmultimediawidgetdefs.h | 2 | ||||
| -rw-r--r-- | src/multimediawidgets/qvideowidget.h | 4 | ||||
| -rw-r--r-- | src/multimediawidgets/qvideowidget_p.h | 4 | ||||
| -rw-r--r-- | src/multimediawidgets/qvideowidgetcontrol.h | 4 |
9 files changed, 0 insertions, 34 deletions
diff --git a/src/multimediawidgets/qcameraviewfinder.h b/src/multimediawidgets/qcameraviewfinder.h index 134ec4186..14585b89a 100644 --- a/src/multimediawidgets/qcameraviewfinder.h +++ b/src/multimediawidgets/qcameraviewfinder.h @@ -53,8 +53,6 @@ #include <QtMultimedia/qmediaservice.h> #include <QtMultimediaWidgets/qvideowidget.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -80,7 +78,5 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QCAMERA_H diff --git a/src/multimediawidgets/qeglimagetexturesurface_p.h b/src/multimediawidgets/qeglimagetexturesurface_p.h index 011971f0c..ca06b7984 100644 --- a/src/multimediawidgets/qeglimagetexturesurface_p.h +++ b/src/multimediawidgets/qeglimagetexturesurface_p.h @@ -65,8 +65,6 @@ #include <qvideosurfaceformat.h> #include <qvideoframe.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QGLContext; @@ -142,7 +140,5 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/multimediawidgets/qgraphicsvideoitem.h b/src/multimediawidgets/qgraphicsvideoitem.h index 6137846b7..910925a47 100644 --- a/src/multimediawidgets/qgraphicsvideoitem.h +++ b/src/multimediawidgets/qgraphicsvideoitem.h @@ -47,8 +47,6 @@ #include <QtMultimediaWidgets/qvideowidget.h> #include <QtMultimedia/qmediabindableinterface.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QVideoSurfaceFormat; @@ -107,7 +105,5 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/multimediawidgets/qpaintervideosurface_mac_p.h b/src/multimediawidgets/qpaintervideosurface_mac_p.h index b1d56dcd3..a81ed7fd3 100644 --- a/src/multimediawidgets/qpaintervideosurface_mac_p.h +++ b/src/multimediawidgets/qpaintervideosurface_mac_p.h @@ -57,8 +57,6 @@ #include <qvideosurfaceformat.h> #include <qvideoframe.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -95,6 +93,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/multimediawidgets/qpaintervideosurface_p.h b/src/multimediawidgets/qpaintervideosurface_p.h index 007cad44e..671769bb0 100644 --- a/src/multimediawidgets/qpaintervideosurface_p.h +++ b/src/multimediawidgets/qpaintervideosurface_p.h @@ -61,8 +61,6 @@ #include <qabstractvideosurface.h> #include <qvideoframe.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QGLContext; @@ -181,7 +179,5 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QPainterVideoSurface::ShaderTypes) QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/multimediawidgets/qtmultimediawidgetdefs.h b/src/multimediawidgets/qtmultimediawidgetdefs.h index b5da320ff..83e150fd0 100644 --- a/src/multimediawidgets/qtmultimediawidgetdefs.h +++ b/src/multimediawidgets/qtmultimediawidgetdefs.h @@ -55,7 +55,6 @@ #include <QtCore/qglobal.h> -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE #ifndef QT_STATIC @@ -69,7 +68,6 @@ QT_BEGIN_NAMESPACE #endif QT_END_NAMESPACE -QT_END_HEADER #endif // QMULTIMEDIAWIDGETS_P_H diff --git a/src/multimediawidgets/qvideowidget.h b/src/multimediawidgets/qvideowidget.h index 8ffaffb0f..f9fae32ce 100644 --- a/src/multimediawidgets/qvideowidget.h +++ b/src/multimediawidgets/qvideowidget.h @@ -47,8 +47,6 @@ #include <QtMultimediaWidgets/qtmultimediawidgetdefs.h> #include <QtMultimedia/qmediabindableinterface.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -131,7 +129,5 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/multimediawidgets/qvideowidget_p.h b/src/multimediawidgets/qvideowidget_p.h index 6d968ed86..04a3ca180 100644 --- a/src/multimediawidgets/qvideowidget_p.h +++ b/src/multimediawidgets/qvideowidget_p.h @@ -64,8 +64,6 @@ #include <QtCore/qpointer.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -282,7 +280,5 @@ public: QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/multimediawidgets/qvideowidgetcontrol.h b/src/multimediawidgets/qvideowidgetcontrol.h index 872621094..66736c62b 100644 --- a/src/multimediawidgets/qvideowidgetcontrol.h +++ b/src/multimediawidgets/qvideowidgetcontrol.h @@ -47,8 +47,6 @@ #include <QtWidgets/qwidget.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -97,7 +95,5 @@ Q_MEDIA_DECLARE_CONTROL(QVideoWidgetControl, QVideoWidgetControl_iid) QT_END_NAMESPACE -QT_END_HEADER - #endif |