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/multimediawidgets/qcameraviewfinder.h
View File

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

4
src/multimediawidgets/qeglimagetexturesurface_p.h
View File

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

4
src/multimediawidgets/qgraphicsvideoitem.h
View File

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

4
src/multimediawidgets/qpaintervideosurface_mac_p.h
View File

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

4
src/multimediawidgets/qpaintervideosurface_p.h
View File

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

2
src/multimediawidgets/qtmultimediawidgetdefs.h
View File

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

4
src/multimediawidgets/qvideowidget.h
View File

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

4
src/multimediawidgets/qvideowidget_p.h
View File

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

4
src/multimediawidgets/qvideowidgetcontrol.h
View File

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