summaryrefslogtreecommitdiffstats
path: root/src/plugins/directshow/camera
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/directshow/camera')
-rw-r--r--src/plugins/directshow/camera/dscameracontrol.h4
-rw-r--r--src/plugins/directshow/camera/dscameraservice.h4
-rw-r--r--src/plugins/directshow/camera/dscamerasession.h4
-rw-r--r--src/plugins/directshow/camera/dsimagecapturecontrol.h4
-rw-r--r--src/plugins/directshow/camera/dsvideodevicecontrol.h4
-rw-r--r--src/plugins/directshow/camera/dsvideorenderer.h4
-rw-r--r--src/plugins/directshow/camera/dsvideowidgetcontrol.h4
7 files changed, 0 insertions, 28 deletions
diff --git a/src/plugins/directshow/camera/dscameracontrol.h b/src/plugins/directshow/camera/dscameracontrol.h
index d36f70c35..216ac744c 100644
--- a/src/plugins/directshow/camera/dscameracontrol.h
+++ b/src/plugins/directshow/camera/dscameracontrol.h
@@ -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
diff --git a/src/plugins/directshow/camera/dscameraservice.h b/src/plugins/directshow/camera/dscameraservice.h
index f86c34226..31c35c6d1 100644
--- a/src/plugins/directshow/camera/dscameraservice.h
+++ b/src/plugins/directshow/camera/dscameraservice.h
@@ -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
diff --git a/src/plugins/directshow/camera/dscamerasession.h b/src/plugins/directshow/camera/dscamerasession.h
index 592bba3f1..c02a99098 100644
--- a/src/plugins/directshow/camera/dscamerasession.h
+++ b/src/plugins/directshow/camera/dscamerasession.h
@@ -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
diff --git a/src/plugins/directshow/camera/dsimagecapturecontrol.h b/src/plugins/directshow/camera/dsimagecapturecontrol.h
index abde36208..ff8dc9bff 100644
--- a/src/plugins/directshow/camera/dsimagecapturecontrol.h
+++ b/src/plugins/directshow/camera/dsimagecapturecontrol.h
@@ -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
diff --git a/src/plugins/directshow/camera/dsvideodevicecontrol.h b/src/plugins/directshow/camera/dsvideodevicecontrol.h
index f6c9dbbd2..74635ddb2 100644
--- a/src/plugins/directshow/camera/dsvideodevicecontrol.h
+++ b/src/plugins/directshow/camera/dsvideodevicecontrol.h
@@ -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
diff --git a/src/plugins/directshow/camera/dsvideorenderer.h b/src/plugins/directshow/camera/dsvideorenderer.h
index 2fc08a7b0..518384917 100644
--- a/src/plugins/directshow/camera/dsvideorenderer.h
+++ b/src/plugins/directshow/camera/dsvideorenderer.h
@@ -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
diff --git a/src/plugins/directshow/camera/dsvideowidgetcontrol.h b/src/plugins/directshow/camera/dsvideowidgetcontrol.h
index 9249c3178..16207d3f6 100644
--- a/src/plugins/directshow/camera/dsvideowidgetcontrol.h
+++ b/src/plugins/directshow/camera/dsvideowidgetcontrol.h
@@ -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