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/plugins/directshow/camera/dscameracontrol.h
View File

@@ -45,8 +45,6 @@
#include <QtCore/qobject.h>
#include <qcameracontrol.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
class DSCameraService;
@@ -87,8 +85,6 @@ private:
QT_END_NAMESPACE
QT_END_HEADER
#endif

4
src/plugins/directshow/camera/dscameraservice.h
View File

@@ -46,8 +46,6 @@
#include <qmediaservice.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
class DSCameraControl;
@@ -85,6 +83,4 @@ private:
QT_END_NAMESPACE
QT_END_HEADER
#endif

4
src/plugins/directshow/camera/dscamerasession.h
View File

@@ -70,8 +70,6 @@
struct ICaptureGraphBuilder2;
struct ISampleGrabber;
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
class DSVideoRenderer;
@@ -202,7 +200,5 @@ protected:
QT_END_NAMESPACE
QT_END_HEADER
#endif

4
src/plugins/directshow/camera/dsimagecapturecontrol.h
View File

@@ -45,8 +45,6 @@
#include <qcameraimagecapturecontrol.h>
#include "dscamerasession.h"
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
class DSImageCaptureControl : public QCameraImageCaptureControl
@@ -75,6 +73,4 @@ private:
QT_END_NAMESPACE
QT_END_HEADER
#endif // DSCAPTURECONTROL_H

4
src/plugins/directshow/camera/dsvideodevicecontrol.h
View File

@@ -45,8 +45,6 @@
#include <qvideodeviceselectorcontrol.h>
#include <QStringList>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
class DSCameraSession;
@@ -80,6 +78,4 @@ private:
QT_END_NAMESPACE
QT_END_HEADER
#endif

4
src/plugins/directshow/camera/dsvideorenderer.h
View File

@@ -47,8 +47,6 @@
class CameraFormatConverter;
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
@@ -72,6 +70,4 @@ private:
QT_END_NAMESPACE
QT_END_HEADER
#endif // DSVIDEORENDERER_H

4
src/plugins/directshow/camera/dsvideowidgetcontrol.h
View File

@@ -51,8 +51,6 @@
#include <qvideowidgetcontrol.h>
#include "dscameracontrol.h"
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
class DSVideoWidgetSurface : public QAbstractVideoSurface
@@ -149,6 +147,4 @@ private: // Data
QT_END_NAMESPACE
QT_END_HEADER
#endif // DSVideoWidgetControl_H