From 8e82f57c6ac2db6754bfcd6828accb2fcfb77891 Mon Sep 17 00:00:00 2001 From: Jonas Rabbe Date: Wed, 14 Mar 2012 08:39:43 +1000 Subject: Updated declarative components to use the QML module Change-Id: I4b49466ba5248683c2285f98ce17bc2c24bba515 Reviewed-by: Jonas Rabbe --- src/imports/audioengine/audioengine.cpp | 10 +++++----- src/imports/audioengine/audioengine.pro | 2 +- src/imports/audioengine/qdeclarative_attenuationmodel_p.h | 8 ++++---- src/imports/audioengine/qdeclarative_audiocategory_p.h | 8 ++++---- src/imports/audioengine/qdeclarative_audioengine_p.cpp | 2 +- src/imports/audioengine/qdeclarative_audioengine_p.h | 12 ++++++------ src/imports/audioengine/qdeclarative_audiosample_p.h | 8 ++++---- src/imports/audioengine/qdeclarative_playvariation_p.h | 8 ++++---- src/imports/audioengine/qdeclarative_sound_p.h | 4 ++-- src/imports/multimedia/multimedia.cpp | 10 +++++----- src/imports/multimedia/multimedia.pro | 2 +- src/imports/multimedia/qdeclarativeaudio_p.h | 8 ++++---- src/imports/multimedia/qdeclarativeaudio_p_4.h | 8 ++++---- src/imports/multimedia/qdeclarativecamera.cpp | 2 +- src/imports/multimedia/qdeclarativecamera_p.h | 8 ++++---- src/imports/multimedia/qdeclarativecameracapture_p.h | 2 +- src/imports/multimedia/qdeclarativecamerapreviewprovider_p.h | 4 ++-- src/imports/multimedia/qdeclarativemediabase.cpp | 2 +- src/imports/multimedia/qdeclarativemediabase_4.cpp | 2 +- src/imports/multimedia/qdeclarativemediametadata_p.h | 2 +- src/imports/multimedia/qdeclarativeradio.cpp | 1 + src/imports/multimedia/qdeclarativeradio_p.h | 5 +++-- src/imports/multimedia/qdeclarativeradiodata_p.h | 2 +- src/imports/multimedia/qdeclarativetorch_p.h | 4 ++-- 24 files changed, 63 insertions(+), 61 deletions(-) (limited to 'src/imports') diff --git a/src/imports/audioengine/audioengine.cpp b/src/imports/audioengine/audioengine.cpp index 495a11a42..0536847ad 100644 --- a/src/imports/audioengine/audioengine.cpp +++ b/src/imports/audioengine/audioengine.cpp @@ -39,10 +39,10 @@ ** ****************************************************************************/ -#include -#include -#include -#include +#include +#include +#include +#include #include "qdeclarative_audioengine_p.h" #include "qdeclarative_soundinstance_p.h" @@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE -class QAudioEngineDeclarativeModule : public QDeclarativeExtensionPlugin +class QAudioEngineDeclarativeModule : public QQmlExtensionPlugin { Q_OBJECT public: diff --git a/src/imports/audioengine/audioengine.pro b/src/imports/audioengine/audioengine.pro index d3cc2bafc..72c7ae845 100644 --- a/src/imports/audioengine/audioengine.pro +++ b/src/imports/audioengine/audioengine.pro @@ -2,7 +2,7 @@ TARGET = declarative_audioengine TARGETPATH = QtAudioEngine include(../qimportbase.pri) -QT += declarative quick multimedia-private +QT += quick qml multimedia-private win32 { LIBS += -lOpenAL32 diff --git a/src/imports/audioengine/qdeclarative_attenuationmodel_p.h b/src/imports/audioengine/qdeclarative_attenuationmodel_p.h index 57b96fec7..ad6ae0b0b 100644 --- a/src/imports/audioengine/qdeclarative_attenuationmodel_p.h +++ b/src/imports/audioengine/qdeclarative_attenuationmodel_p.h @@ -42,18 +42,18 @@ #ifndef QDECLARATIVEATTENUATIONMODEL_P_H #define QDECLARATIVEATTENUATIONMODEL_P_H -#include -#include +#include +#include #include QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -class QDeclarativeAttenuationModel : public QObject, public QDeclarativeParserStatus +class QDeclarativeAttenuationModel : public QObject, public QQmlParserStatus { Q_OBJECT - Q_INTERFACES(QDeclarativeParserStatus) + Q_INTERFACES(QQmlParserStatus) Q_PROPERTY(QString name READ name WRITE setName) public: diff --git a/src/imports/audioengine/qdeclarative_audiocategory_p.h b/src/imports/audioengine/qdeclarative_audiocategory_p.h index fa8eb5140..48ae7c5b8 100644 --- a/src/imports/audioengine/qdeclarative_audiocategory_p.h +++ b/src/imports/audioengine/qdeclarative_audiocategory_p.h @@ -42,17 +42,17 @@ #ifndef QDECLARATIVEAUDIOCATEGORY_P_H #define QDECLARATIVEAUDIOCATEGORY_P_H -#include -#include +#include +#include QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -class QDeclarativeAudioCategory : public QObject, public QDeclarativeParserStatus +class QDeclarativeAudioCategory : public QObject, public QQmlParserStatus { Q_OBJECT - Q_INTERFACES(QDeclarativeParserStatus) + Q_INTERFACES(QQmlParserStatus) Q_PROPERTY(qreal volume READ volume WRITE setVolume NOTIFY volumeChanged) Q_PROPERTY(QString name READ name WRITE setName) diff --git a/src/imports/audioengine/qdeclarative_audioengine_p.cpp b/src/imports/audioengine/qdeclarative_audioengine_p.cpp index 7c025a554..659cf655c 100644 --- a/src/imports/audioengine/qdeclarative_audioengine_p.cpp +++ b/src/imports/audioengine/qdeclarative_audioengine_p.cpp @@ -48,7 +48,7 @@ #include "qdeclarative_attenuationmodel_p.h" #include "qdeclarative_soundinstance_p.h" #include "qsoundinstance_p.h" -#include +#include #include "qdebug.h" #define DEBUG_AUDIOENGINE diff --git a/src/imports/audioengine/qdeclarative_audioengine_p.h b/src/imports/audioengine/qdeclarative_audioengine_p.h index 4b1364d82..527426a7e 100644 --- a/src/imports/audioengine/qdeclarative_audioengine_p.h +++ b/src/imports/audioengine/qdeclarative_audioengine_p.h @@ -42,9 +42,9 @@ #ifndef QDECLARATIVEAUDIOENGINE_P_H #define QDECLARATIVEAUDIOENGINE_P_H -#include -#include -#include +#include +#include +#include #include #include #include @@ -64,11 +64,11 @@ class QAudioCategory; class QDeclarativeAttenuationModel; class QSoundInstance; -class QDeclarativeAudioEngine : public QObject, public QDeclarativeParserStatus +class QDeclarativeAudioEngine : public QObject, public QQmlParserStatus { Q_OBJECT - Q_INTERFACES(QDeclarativeParserStatus) - Q_PROPERTY(QDeclarativeListProperty bank READ bank CONSTANT) + Q_INTERFACES(QQmlParserStatus) + Q_PROPERTY(QQmlListProperty bank READ bank CONSTANT) Q_PROPERTY(QObject* categories READ categories CONSTANT) Q_PROPERTY(QObject* samples READ samples CONSTANT) Q_PROPERTY(QObject* sounds READ sounds CONSTANT) diff --git a/src/imports/audioengine/qdeclarative_audiosample_p.h b/src/imports/audioengine/qdeclarative_audiosample_p.h index d854efd34..91fbec002 100644 --- a/src/imports/audioengine/qdeclarative_audiosample_p.h +++ b/src/imports/audioengine/qdeclarative_audiosample_p.h @@ -42,8 +42,8 @@ #ifndef QDECLARATIVEAUDIOSAMPLE_P_H #define QDECLARATIVEAUDIOSAMPLE_P_H -#include -#include +#include +#include QT_BEGIN_HEADER @@ -51,10 +51,10 @@ QT_BEGIN_NAMESPACE class QSoundBuffer; -class QDeclarativeAudioSample : public QObject, public QDeclarativeParserStatus +class QDeclarativeAudioSample : public QObject, public QQmlParserStatus { Q_OBJECT - Q_INTERFACES(QDeclarativeParserStatus) + Q_INTERFACES(QQmlParserStatus) Q_PROPERTY(QString name READ name WRITE setName) Q_PROPERTY(QUrl source READ source WRITE setSource) Q_PROPERTY(bool preloaded READ isPreloaded WRITE setPreloaded) diff --git a/src/imports/audioengine/qdeclarative_playvariation_p.h b/src/imports/audioengine/qdeclarative_playvariation_p.h index 1438aa5b5..cd38e88b3 100644 --- a/src/imports/audioengine/qdeclarative_playvariation_p.h +++ b/src/imports/audioengine/qdeclarative_playvariation_p.h @@ -42,8 +42,8 @@ #ifndef QDECLARATIVEPLAYVARIATION_P_H #define QDECLARATIVEPLAYVARIATION_P_H -#include -#include +#include +#include QT_BEGIN_HEADER @@ -52,10 +52,10 @@ QT_BEGIN_NAMESPACE class QDeclarativeAudioSample; class QSoundInstance; -class QDeclarativePlayVariation : public QObject, public QDeclarativeParserStatus +class QDeclarativePlayVariation : public QObject, public QQmlParserStatus { Q_OBJECT - Q_INTERFACES(QDeclarativeParserStatus) + Q_INTERFACES(QQmlParserStatus) Q_PROPERTY(QString sample READ sample WRITE setSample) Q_PROPERTY(bool looping READ isLooping WRITE setLooping) Q_PROPERTY(qreal maxGain READ maxGain WRITE setMaxGain) diff --git a/src/imports/audioengine/qdeclarative_sound_p.h b/src/imports/audioengine/qdeclarative_sound_p.h index 9784b04f8..7184af97b 100644 --- a/src/imports/audioengine/qdeclarative_sound_p.h +++ b/src/imports/audioengine/qdeclarative_sound_p.h @@ -42,8 +42,8 @@ #ifndef QDECLARATIVESOUND_P_H #define QDECLARATIVESOUND_P_H -#include -#include +#include +#include #include #include "qdeclarative_playvariation_p.h" diff --git a/src/imports/multimedia/multimedia.cpp b/src/imports/multimedia/multimedia.cpp index 0c940d18d..62eb1d43c 100644 --- a/src/imports/multimedia/multimedia.cpp +++ b/src/imports/multimedia/multimedia.cpp @@ -39,10 +39,10 @@ ** ****************************************************************************/ -#include -#include -#include -#include +#include +#include +#include +#include #include "qsoundeffect.h" #include "qdeclarativemediametadata_p.h" @@ -63,7 +63,7 @@ QML_DECLARE_TYPE(QSoundEffect) QT_BEGIN_NAMESPACE -class QMultimediaDeclarativeModule : public QDeclarativeExtensionPlugin +class QMultimediaDeclarativeModule : public QQmlExtensionPlugin { Q_OBJECT public: diff --git a/src/imports/multimedia/multimedia.pro b/src/imports/multimedia/multimedia.pro index 34386cc7a..59c985326 100644 --- a/src/imports/multimedia/multimedia.pro +++ b/src/imports/multimedia/multimedia.pro @@ -3,7 +3,7 @@ TARGETPATH = QtMultimedia include(../qimportbase.pri) -QT += declarative quick network multimedia-private +QT += qml quick network multimedia-private DESTDIR = $$QT.multimedia.imports/$$TARGETPATH target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH diff --git a/src/imports/multimedia/qdeclarativeaudio_p.h b/src/imports/multimedia/qdeclarativeaudio_p.h index 6d2497fac..fdbadbc4d 100644 --- a/src/imports/multimedia/qdeclarativeaudio_p.h +++ b/src/imports/multimedia/qdeclarativeaudio_p.h @@ -54,8 +54,8 @@ // #include -#include -#include +#include +#include #include "qdeclarativemediabase_p.h" @@ -65,7 +65,7 @@ QT_BEGIN_NAMESPACE class QTimerEvent; -class QDeclarativeAudio : public QObject, public QDeclarativeMediaBase, public QDeclarativeParserStatus +class QDeclarativeAudio : public QObject, public QDeclarativeMediaBase, public QQmlParserStatus { Q_OBJECT Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged) @@ -93,7 +93,7 @@ class QDeclarativeAudio : public QObject, public QDeclarativeMediaBase, public Q Q_ENUMS(Loop) Q_ENUMS(PlaybackState) Q_ENUMS(Availability) - Q_INTERFACES(QDeclarativeParserStatus) + Q_INTERFACES(QQmlParserStatus) public: enum Status { diff --git a/src/imports/multimedia/qdeclarativeaudio_p_4.h b/src/imports/multimedia/qdeclarativeaudio_p_4.h index 02c873df0..e79a5733e 100644 --- a/src/imports/multimedia/qdeclarativeaudio_p_4.h +++ b/src/imports/multimedia/qdeclarativeaudio_p_4.h @@ -54,8 +54,8 @@ // #include -#include -#include +#include +#include #include "qdeclarativemediabase_p_4.h" @@ -65,7 +65,7 @@ QT_BEGIN_NAMESPACE class QTimerEvent; -class QDeclarativeAudio_4 : public QObject, public QDeclarativeMediaBase_4, public QDeclarativeParserStatus +class QDeclarativeAudio_4 : public QObject, public QDeclarativeMediaBase_4, public QQmlParserStatus { Q_OBJECT Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged) @@ -90,7 +90,7 @@ class QDeclarativeAudio_4 : public QObject, public QDeclarativeMediaBase_4, publ Q_ENUMS(Status) Q_ENUMS(Error) Q_ENUMS(Loop) - Q_INTERFACES(QDeclarativeParserStatus) + Q_INTERFACES(QQmlParserStatus) public: enum Status { diff --git a/src/imports/multimedia/qdeclarativecamera.cpp b/src/imports/multimedia/qdeclarativecamera.cpp index 60aae9145..03bfede0b 100644 --- a/src/imports/multimedia/qdeclarativecamera.cpp +++ b/src/imports/multimedia/qdeclarativecamera.cpp @@ -50,7 +50,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/imports/multimedia/qdeclarativecamera_p.h b/src/imports/multimedia/qdeclarativecamera_p.h index 8ac99574b..396ce80e0 100644 --- a/src/imports/multimedia/qdeclarativecamera_p.h +++ b/src/imports/multimedia/qdeclarativecamera_p.h @@ -62,8 +62,8 @@ #include #include -#include -#include +#include +#include QT_BEGIN_HEADER @@ -74,10 +74,10 @@ class QDeclarativeCameraFocus; class QDeclarativeCameraFlash; class QDeclarativeCameraImageProcessing; -class QDeclarativeCamera : public QObject, public QDeclarativeParserStatus +class QDeclarativeCamera : public QObject, public QQmlParserStatus { Q_OBJECT - Q_INTERFACES(QDeclarativeParserStatus) + Q_INTERFACES(QQmlParserStatus) Q_PROPERTY(CaptureMode captureMode READ captureMode WRITE setCaptureMode NOTIFY captureModeChanged) Q_PROPERTY(State cameraState READ cameraState WRITE setCameraState NOTIFY cameraStateChanged) diff --git a/src/imports/multimedia/qdeclarativecameracapture_p.h b/src/imports/multimedia/qdeclarativecameracapture_p.h index 3d80965e9..93bf5d2c1 100644 --- a/src/imports/multimedia/qdeclarativecameracapture_p.h +++ b/src/imports/multimedia/qdeclarativecameracapture_p.h @@ -57,7 +57,7 @@ #include #include -#include +#include QT_BEGIN_HEADER diff --git a/src/imports/multimedia/qdeclarativecamerapreviewprovider_p.h b/src/imports/multimedia/qdeclarativecamerapreviewprovider_p.h index 912b9d711..40f4a634d 100644 --- a/src/imports/multimedia/qdeclarativecamerapreviewprovider_p.h +++ b/src/imports/multimedia/qdeclarativecamerapreviewprovider_p.h @@ -53,13 +53,13 @@ // We mean it. // -#include +#include QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -class QDeclarativeCameraPreviewProvider : public QDeclarativeImageProvider +class QDeclarativeCameraPreviewProvider : public QQmlImageProvider { public: QDeclarativeCameraPreviewProvider(); diff --git a/src/imports/multimedia/qdeclarativemediabase.cpp b/src/imports/multimedia/qdeclarativemediabase.cpp index 934464c22..2ec9cc1af 100644 --- a/src/imports/multimedia/qdeclarativemediabase.cpp +++ b/src/imports/multimedia/qdeclarativemediabase.cpp @@ -43,7 +43,7 @@ #include #include -#include +#include #include #include diff --git a/src/imports/multimedia/qdeclarativemediabase_4.cpp b/src/imports/multimedia/qdeclarativemediabase_4.cpp index dee5c0c45..9466f6724 100644 --- a/src/imports/multimedia/qdeclarativemediabase_4.cpp +++ b/src/imports/multimedia/qdeclarativemediabase_4.cpp @@ -43,7 +43,7 @@ #include #include -#include +#include #include #include diff --git a/src/imports/multimedia/qdeclarativemediametadata_p.h b/src/imports/multimedia/qdeclarativemediametadata_p.h index d84eeca61..77e076f3b 100644 --- a/src/imports/multimedia/qdeclarativemediametadata_p.h +++ b/src/imports/multimedia/qdeclarativemediametadata_p.h @@ -55,7 +55,7 @@ #include -#include +#include QT_BEGIN_HEADER diff --git a/src/imports/multimedia/qdeclarativeradio.cpp b/src/imports/multimedia/qdeclarativeradio.cpp index ff4bbb3fb..aed3d40a8 100644 --- a/src/imports/multimedia/qdeclarativeradio.cpp +++ b/src/imports/multimedia/qdeclarativeradio.cpp @@ -40,6 +40,7 @@ ****************************************************************************/ #include "qdeclarativeradio_p.h" +#include "qdeclarativeradiodata_p.h" QT_BEGIN_NAMESPACE diff --git a/src/imports/multimedia/qdeclarativeradio_p.h b/src/imports/multimedia/qdeclarativeradio_p.h index 5424b162d..3829c84e2 100644 --- a/src/imports/multimedia/qdeclarativeradio_p.h +++ b/src/imports/multimedia/qdeclarativeradio_p.h @@ -53,14 +53,15 @@ // We mean it. // -#include #include -#include "qdeclarativeradiodata_p.h" +#include QT_BEGIN_HEADER QT_BEGIN_NAMESPACE +class QDeclarativeRadioData; + class QDeclarativeRadio : public QObject { Q_OBJECT diff --git a/src/imports/multimedia/qdeclarativeradiodata_p.h b/src/imports/multimedia/qdeclarativeradiodata_p.h index b9fb553cb..ce157e7b0 100644 --- a/src/imports/multimedia/qdeclarativeradiodata_p.h +++ b/src/imports/multimedia/qdeclarativeradiodata_p.h @@ -53,9 +53,9 @@ // We mean it. // -#include #include #include +#include QT_BEGIN_HEADER diff --git a/src/imports/multimedia/qdeclarativetorch_p.h b/src/imports/multimedia/qdeclarativetorch_p.h index 5dd21f7e9..05a637e3a 100644 --- a/src/imports/multimedia/qdeclarativetorch_p.h +++ b/src/imports/multimedia/qdeclarativetorch_p.h @@ -43,8 +43,8 @@ #ifndef QDECLARATIVETORCH_P_H #define QDECLARATIVETORCH_P_H -#include -#include +#include +#include #include #include #include -- cgit v1.2.3