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/imports/multimedia/qdeclarativeaudio_p.h
View File

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

4
src/imports/multimedia/qdeclarativecamera_p.h
View File

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

4
src/imports/multimedia/qdeclarativecameracapture_p.h
View File

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

4
src/imports/multimedia/qdeclarativecameraexposure_p.h
View File

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

4
src/imports/multimedia/qdeclarativecameraflash_p.h
View File

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

4
src/imports/multimedia/qdeclarativecamerafocus_p.h
View File

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

4
src/imports/multimedia/qdeclarativecameraimageprocessing_p.h
View File

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

4
src/imports/multimedia/qdeclarativecamerapreviewprovider_p.h
View File

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

4
src/imports/multimedia/qdeclarativecamerarecorder_p.h
View File

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

4
src/imports/multimedia/qdeclarativemediametadata_p.h
View File

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

4
src/imports/multimedia/qdeclarativeradio_p.h
View File

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

4
src/imports/multimedia/qdeclarativeradiodata_p.h
View File

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

4
src/imports/multimedia/qdeclarativetorch_p.h
View File

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