summaryrefslogtreecommitdiffstats
path: root/src/imports/multimedia
diff options
context:
space:
mode:
Diffstat (limited to 'src/imports/multimedia')
-rw-r--r--src/imports/multimedia/qdeclarativeaudio_p.h4
-rw-r--r--src/imports/multimedia/qdeclarativecamera_p.h4
-rw-r--r--src/imports/multimedia/qdeclarativecameracapture_p.h4
-rw-r--r--src/imports/multimedia/qdeclarativecameraexposure_p.h4
-rw-r--r--src/imports/multimedia/qdeclarativecameraflash_p.h4
-rw-r--r--src/imports/multimedia/qdeclarativecamerafocus_p.h4
-rw-r--r--src/imports/multimedia/qdeclarativecameraimageprocessing_p.h4
-rw-r--r--src/imports/multimedia/qdeclarativecamerapreviewprovider_p.h4
-rw-r--r--src/imports/multimedia/qdeclarativecamerarecorder_p.h4
-rw-r--r--src/imports/multimedia/qdeclarativemediametadata_p.h4
-rw-r--r--src/imports/multimedia/qdeclarativeradio_p.h4
-rw-r--r--src/imports/multimedia/qdeclarativeradiodata_p.h4
-rw-r--r--src/imports/multimedia/qdeclarativetorch_p.h4
13 files changed, 0 insertions, 52 deletions
diff --git a/src/imports/multimedia/qdeclarativeaudio_p.h b/src/imports/multimedia/qdeclarativeaudio_p.h
index 79228d70d..b8a75c659 100644
--- a/src/imports/multimedia/qdeclarativeaudio_p.h
+++ b/src/imports/multimedia/qdeclarativeaudio_p.h
@@ -59,8 +59,6 @@
#include <qmediaplayer.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
class QTimerEvent;
@@ -271,6 +269,4 @@ QT_END_NAMESPACE
QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeAudio))
-QT_END_HEADER
-
#endif
diff --git a/src/imports/multimedia/qdeclarativecamera_p.h b/src/imports/multimedia/qdeclarativecamera_p.h
index c96ba3f98..8638c423d 100644
--- a/src/imports/multimedia/qdeclarativecamera_p.h
+++ b/src/imports/multimedia/qdeclarativecamera_p.h
@@ -65,8 +65,6 @@
#include <QtQml/qqmlparserstatus.h>
#include <QtQml/qqml.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
class QDeclarativeCameraExposure;
@@ -312,6 +310,4 @@ QT_END_NAMESPACE
QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeCamera))
-QT_END_HEADER
-
#endif
diff --git a/src/imports/multimedia/qdeclarativecameracapture_p.h b/src/imports/multimedia/qdeclarativecameracapture_p.h
index 4ab30ee45..8bab446e5 100644
--- a/src/imports/multimedia/qdeclarativecameracapture_p.h
+++ b/src/imports/multimedia/qdeclarativecameracapture_p.h
@@ -59,8 +59,6 @@
#include <QtQml/qqml.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
class QDeclarativeCamera;
@@ -125,6 +123,4 @@ QT_END_NAMESPACE
QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeCameraCapture))
-QT_END_HEADER
-
#endif
diff --git a/src/imports/multimedia/qdeclarativecameraexposure_p.h b/src/imports/multimedia/qdeclarativecameraexposure_p.h
index e8ad8fb7c..6908a965c 100644
--- a/src/imports/multimedia/qdeclarativecameraexposure_p.h
+++ b/src/imports/multimedia/qdeclarativecameraexposure_p.h
@@ -57,8 +57,6 @@
#include <qcamera.h>
#include <qcameraexposure.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
class QDeclarativeCamera;
@@ -142,6 +140,4 @@ QT_END_NAMESPACE
QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeCameraExposure))
-QT_END_HEADER
-
#endif
diff --git a/src/imports/multimedia/qdeclarativecameraflash_p.h b/src/imports/multimedia/qdeclarativecameraflash_p.h
index 6009d90ca..e3919a41c 100644
--- a/src/imports/multimedia/qdeclarativecameraflash_p.h
+++ b/src/imports/multimedia/qdeclarativecameraflash_p.h
@@ -56,8 +56,6 @@
#include <qcamera.h>
#include <qcameraexposure.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
class QDeclarativeCamera;
@@ -91,6 +89,4 @@ QT_END_NAMESPACE
QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeCameraFlash))
-QT_END_HEADER
-
#endif
diff --git a/src/imports/multimedia/qdeclarativecamerafocus_p.h b/src/imports/multimedia/qdeclarativecamerafocus_p.h
index a6060e5b6..3287b9309 100644
--- a/src/imports/multimedia/qdeclarativecamerafocus_p.h
+++ b/src/imports/multimedia/qdeclarativecamerafocus_p.h
@@ -58,8 +58,6 @@
#include <qcamerafocus.h>
#include "qdeclarativecamera_p.h"
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
class FocusZonesModel;
@@ -131,6 +129,4 @@ QT_END_NAMESPACE
QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeCameraFocus))
-QT_END_HEADER
-
#endif
diff --git a/src/imports/multimedia/qdeclarativecameraimageprocessing_p.h b/src/imports/multimedia/qdeclarativecameraimageprocessing_p.h
index 40655d5c4..f5759f927 100644
--- a/src/imports/multimedia/qdeclarativecameraimageprocessing_p.h
+++ b/src/imports/multimedia/qdeclarativecameraimageprocessing_p.h
@@ -56,8 +56,6 @@
#include <qcamera.h>
#include <qcameraimageprocessing.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
class QDeclarativeCamera;
@@ -127,6 +125,4 @@ QT_END_NAMESPACE
QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeCameraImageProcessing))
-QT_END_HEADER
-
#endif
diff --git a/src/imports/multimedia/qdeclarativecamerapreviewprovider_p.h b/src/imports/multimedia/qdeclarativecamerapreviewprovider_p.h
index b0b4d53ce..07a37b2b7 100644
--- a/src/imports/multimedia/qdeclarativecamerapreviewprovider_p.h
+++ b/src/imports/multimedia/qdeclarativecamerapreviewprovider_p.h
@@ -55,8 +55,6 @@
#include <QtQuick/qquickimageprovider.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
class QDeclarativeCameraPreviewProvider : public QQuickImageProvider
@@ -71,6 +69,4 @@ public:
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/imports/multimedia/qdeclarativecamerarecorder_p.h b/src/imports/multimedia/qdeclarativecamerarecorder_p.h
index dce349ad8..3a1bc11b2 100644
--- a/src/imports/multimedia/qdeclarativecamerarecorder_p.h
+++ b/src/imports/multimedia/qdeclarativecamerarecorder_p.h
@@ -57,8 +57,6 @@
#include <qmediarecorder.h>
#include <qmediaencodersettings.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
class QDeclarativeCamera;
@@ -227,6 +225,4 @@ QT_END_NAMESPACE
QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeCameraRecorder))
-QT_END_HEADER
-
#endif
diff --git a/src/imports/multimedia/qdeclarativemediametadata_p.h b/src/imports/multimedia/qdeclarativemediametadata_p.h
index 4fa00c306..5b7c46993 100644
--- a/src/imports/multimedia/qdeclarativemediametadata_p.h
+++ b/src/imports/multimedia/qdeclarativemediametadata_p.h
@@ -56,8 +56,6 @@
#include <QtQml/qqml.h>
#include "qmediaobject.h"
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
class QDeclarativeMediaMetaData : public QObject
@@ -179,6 +177,4 @@ QT_END_NAMESPACE
QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeMediaMetaData))
-QT_END_HEADER
-
#endif
diff --git a/src/imports/multimedia/qdeclarativeradio_p.h b/src/imports/multimedia/qdeclarativeradio_p.h
index 2f747434e..b5d8fab8d 100644
--- a/src/imports/multimedia/qdeclarativeradio_p.h
+++ b/src/imports/multimedia/qdeclarativeradio_p.h
@@ -56,8 +56,6 @@
#include <qradiotuner.h>
#include <QtQml/qqml.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
class QDeclarativeRadioData;
@@ -202,6 +200,4 @@ QT_END_NAMESPACE
QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeRadio))
-QT_END_HEADER
-
#endif // QDECLARATIVERADIO_P_H
diff --git a/src/imports/multimedia/qdeclarativeradiodata_p.h b/src/imports/multimedia/qdeclarativeradiodata_p.h
index 51a986722..e4d3dbfaf 100644
--- a/src/imports/multimedia/qdeclarativeradiodata_p.h
+++ b/src/imports/multimedia/qdeclarativeradiodata_p.h
@@ -57,8 +57,6 @@
#include <qradiotuner.h>
#include <QtQml/qqml.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
class QDeclarativeRadioData : public QObject
@@ -191,6 +189,4 @@ QT_END_NAMESPACE
QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeRadioData))
-QT_END_HEADER
-
#endif // QDECLARATIVERADIODATA_P_H
diff --git a/src/imports/multimedia/qdeclarativetorch_p.h b/src/imports/multimedia/qdeclarativetorch_p.h
index ef9c36108..7866bad8c 100644
--- a/src/imports/multimedia/qdeclarativetorch_p.h
+++ b/src/imports/multimedia/qdeclarativetorch_p.h
@@ -49,8 +49,6 @@
#include <qcameraexposurecontrol.h>
#include <qcameraflashcontrol.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
class QDeclarativeTorch : public QObject
@@ -88,6 +86,4 @@ QT_END_NAMESPACE
QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeTorch))
-QT_END_HEADER
-
#endif // QDECLARATIVETORCH_P_H