diff options
Diffstat (limited to 'src/imports')
-rw-r--r-- | src/imports/multimedia/plugins.qmltypes | 2 | ||||
-rw-r--r-- | src/imports/multimedia/qdeclarativeaudio.cpp | 8 | ||||
-rw-r--r-- | src/imports/multimedia/qdeclarativeaudio_p.h | 10 | ||||
-rw-r--r-- | src/imports/multimedia/qdeclarativecamera.cpp | 4 | ||||
-rw-r--r-- | src/imports/multimedia/qdeclarativecamera_p.h | 10 | ||||
-rw-r--r-- | src/imports/multimedia/qdeclarativecamerarecorder.cpp | 8 | ||||
-rw-r--r-- | src/imports/multimedia/qdeclarativecamerarecorder_p.h | 6 | ||||
-rw-r--r-- | src/imports/multimedia/qdeclarativeradio.cpp | 4 | ||||
-rw-r--r-- | src/imports/multimedia/qdeclarativeradio_p.h | 10 | ||||
-rw-r--r-- | src/imports/multimedia/qdeclarativeradiodata.cpp | 4 | ||||
-rw-r--r-- | src/imports/multimedia/qdeclarativeradiodata_p.h | 10 |
11 files changed, 38 insertions, 38 deletions
diff --git a/src/imports/multimedia/plugins.qmltypes b/src/imports/multimedia/plugins.qmltypes index 7743df429..1fe849962 100644 --- a/src/imports/multimedia/plugins.qmltypes +++ b/src/imports/multimedia/plugins.qmltypes @@ -1436,7 +1436,7 @@ Module { Signal { name: "availabilityChanged" type: "void" - Parameter { name: "error"; type: "QtMultimedia::AvailabilityStatus" } + Parameter { name: "error"; type: "QMultimedia::AvailabilityStatus" } } } Component { diff --git a/src/imports/multimedia/qdeclarativeaudio.cpp b/src/imports/multimedia/qdeclarativeaudio.cpp index 85d65d3f6..fc070bec4 100644 --- a/src/imports/multimedia/qdeclarativeaudio.cpp +++ b/src/imports/multimedia/qdeclarativeaudio.cpp @@ -100,7 +100,7 @@ void QDeclarativeAudio::_q_error(QMediaPlayer::Error errorCode) emit errorChanged(); } -void QDeclarativeAudio::_q_availabilityChanged(QtMultimedia::AvailabilityStatus) +void QDeclarativeAudio::_q_availabilityChanged(QMultimedia::AvailabilityStatus) { emit availabilityChanged(availability()); } @@ -659,10 +659,10 @@ void QDeclarativeAudio::classBegin() connect(m_player, SIGNAL(videoAvailableChanged(bool)), this, SIGNAL(hasVideoChanged())); - m_error = m_player->availability() == QtMultimedia::ServiceMissing ? QMediaPlayer::ServiceMissingError : QMediaPlayer::NoError; + m_error = m_player->availability() == QMultimedia::ServiceMissing ? QMediaPlayer::ServiceMissingError : QMediaPlayer::NoError; - connect(m_player, SIGNAL(availabilityChanged(QtMultimedia::AvailabilityStatus)), - this, SLOT(_q_availabilityChanged(QtMultimedia::AvailabilityStatus))); + connect(m_player, SIGNAL(availabilityChanged(QMultimedia::AvailabilityStatus)), + this, SLOT(_q_availabilityChanged(QMultimedia::AvailabilityStatus))); m_metaData.reset(new QDeclarativeMediaMetaData(m_player)); diff --git a/src/imports/multimedia/qdeclarativeaudio_p.h b/src/imports/multimedia/qdeclarativeaudio_p.h index b3f13d093..f45a1f0a8 100644 --- a/src/imports/multimedia/qdeclarativeaudio_p.h +++ b/src/imports/multimedia/qdeclarativeaudio_p.h @@ -138,10 +138,10 @@ public: }; enum Availability { - Available = QtMultimedia::Available, - Busy = QtMultimedia::Busy, - Unavailable = QtMultimedia::ServiceMissing, - ResourceMissing = QtMultimedia::ResourceError + Available = QMultimedia::Available, + Busy = QMultimedia::Busy, + Unavailable = QMultimedia::ServiceMissing, + ResourceMissing = QMultimedia::ResourceError }; QDeclarativeAudio(QObject *parent = 0); @@ -237,7 +237,7 @@ Q_SIGNALS: private Q_SLOTS: void _q_error(QMediaPlayer::Error); - void _q_availabilityChanged(QtMultimedia::AvailabilityStatus); + void _q_availabilityChanged(QMultimedia::AvailabilityStatus); void _q_statusChanged(); private: diff --git a/src/imports/multimedia/qdeclarativecamera.cpp b/src/imports/multimedia/qdeclarativecamera.cpp index 2a6121877..746e100a2 100644 --- a/src/imports/multimedia/qdeclarativecamera.cpp +++ b/src/imports/multimedia/qdeclarativecamera.cpp @@ -68,7 +68,7 @@ void QDeclarativeCamera::_q_updateState(QCamera::State state) emit cameraStateChanged(QDeclarativeCamera::State(state)); } -void QDeclarativeCamera::_q_availabilityChanged(QtMultimedia::AvailabilityStatus availability) +void QDeclarativeCamera::_q_availabilityChanged(QMultimedia::AvailabilityStatus availability) { emit availabilityChanged(Availability(availability)); } @@ -189,7 +189,7 @@ QDeclarativeCamera::QDeclarativeCamera(QObject *parent) : connect(m_camera, SIGNAL(stateChanged(QCamera::State)), this, SLOT(_q_updateState(QCamera::State))); connect(m_camera, SIGNAL(statusChanged(QCamera::Status)), this, SIGNAL(cameraStatusChanged())); connect(m_camera, SIGNAL(error(QCamera::Error)), this, SLOT(_q_error(QCamera::Error))); - connect(m_camera, SIGNAL(availabilityChanged(QtMultimedia::AvailabilityStatus)), this, SLOT(_q_availabilityChanged(QtMultimedia::AvailabilityStatus))); + connect(m_camera, SIGNAL(availabilityChanged(QMultimedia::AvailabilityStatus)), this, SLOT(_q_availabilityChanged(QMultimedia::AvailabilityStatus))); connect(m_camera->focus(), SIGNAL(opticalZoomChanged(qreal)), this, SIGNAL(opticalZoomChanged(qreal))); connect(m_camera->focus(), SIGNAL(digitalZoomChanged(qreal)), this, SIGNAL(digitalZoomChanged(qreal))); diff --git a/src/imports/multimedia/qdeclarativecamera_p.h b/src/imports/multimedia/qdeclarativecamera_p.h index 2afc0ccac..64c396d99 100644 --- a/src/imports/multimedia/qdeclarativecamera_p.h +++ b/src/imports/multimedia/qdeclarativecamera_p.h @@ -216,10 +216,10 @@ public: }; enum Availability { - Available = QtMultimedia::Available, - Busy = QtMultimedia::Busy, - Unavailable = QtMultimedia::ServiceMissing, - ResourceMissing = QtMultimedia::ResourceError + Available = QMultimedia::Available, + Busy = QMultimedia::Busy, + Unavailable = QMultimedia::ServiceMissing, + ResourceMissing = QMultimedia::ResourceError }; QDeclarativeCamera(QObject *parent = 0); @@ -287,7 +287,7 @@ Q_SIGNALS: private Q_SLOTS: void _q_updateState(QCamera::State); void _q_error(QCamera::Error); - void _q_availabilityChanged(QtMultimedia::AvailabilityStatus); + void _q_availabilityChanged(QMultimedia::AvailabilityStatus); protected: void classBegin(); diff --git a/src/imports/multimedia/qdeclarativecamerarecorder.cpp b/src/imports/multimedia/qdeclarativecamerarecorder.cpp index f3b8719e2..a1ce2388c 100644 --- a/src/imports/multimedia/qdeclarativecamerarecorder.cpp +++ b/src/imports/multimedia/qdeclarativecamerarecorder.cpp @@ -326,8 +326,8 @@ void QDeclarativeCameraRecorder::setAudioSampleRate(int rate) void QDeclarativeCameraRecorder::setAudioEncodingMode(QDeclarativeCameraRecorder::EncodingMode encodingMode) { - if (m_audioSettings.encodingMode() != QtMultimedia::EncodingMode(encodingMode)) { - m_audioSettings.setEncodingMode(QtMultimedia::EncodingMode(encodingMode)); + if (m_audioSettings.encodingMode() != QMultimedia::EncodingMode(encodingMode)) { + m_audioSettings.setEncodingMode(QMultimedia::EncodingMode(encodingMode)); m_recorder->setAudioSettings(m_audioSettings); emit audioEncodingModeChanged(encodingMode); } @@ -335,8 +335,8 @@ void QDeclarativeCameraRecorder::setAudioEncodingMode(QDeclarativeCameraRecorder void QDeclarativeCameraRecorder::setVideoEncodingMode(QDeclarativeCameraRecorder::EncodingMode encodingMode) { - if (m_videoSettings.encodingMode() != QtMultimedia::EncodingMode(encodingMode)) { - m_videoSettings.setEncodingMode(QtMultimedia::EncodingMode(encodingMode)); + if (m_videoSettings.encodingMode() != QMultimedia::EncodingMode(encodingMode)) { + m_videoSettings.setEncodingMode(QMultimedia::EncodingMode(encodingMode)); m_recorder->setVideoSettings(m_videoSettings); emit videoEncodingModeChanged(encodingMode); } diff --git a/src/imports/multimedia/qdeclarativecamerarecorder_p.h b/src/imports/multimedia/qdeclarativecamerarecorder_p.h index aec1ac58d..d1482bcff 100644 --- a/src/imports/multimedia/qdeclarativecamerarecorder_p.h +++ b/src/imports/multimedia/qdeclarativecamerarecorder_p.h @@ -116,9 +116,9 @@ public: enum EncodingMode { - ConstantQualityEncoding = QtMultimedia::ConstantQualityEncoding, - ConstantBitRateEncoding = QtMultimedia::ConstantBitRateEncoding, - AverageBitRateEncoding = QtMultimedia::AverageBitRateEncoding + ConstantQualityEncoding = QMultimedia::ConstantQualityEncoding, + ConstantBitRateEncoding = QMultimedia::ConstantBitRateEncoding, + AverageBitRateEncoding = QMultimedia::AverageBitRateEncoding }; enum Error { diff --git a/src/imports/multimedia/qdeclarativeradio.cpp b/src/imports/multimedia/qdeclarativeradio.cpp index 8d30ff145..7f524b028 100644 --- a/src/imports/multimedia/qdeclarativeradio.cpp +++ b/src/imports/multimedia/qdeclarativeradio.cpp @@ -116,7 +116,7 @@ QDeclarativeRadio::QDeclarativeRadio(QObject *parent) : connect(m_radioTuner, SIGNAL(mutedChanged(bool)), this, SIGNAL(mutedChanged(bool))); connect(m_radioTuner, SIGNAL(stationFound(int, QString)), this, SIGNAL(stationFound(int, QString))); connect(m_radioTuner, SIGNAL(antennaConnectedChanged(bool)), this, SIGNAL(antennaConnectedChanged(bool))); - connect(m_radioTuner, SIGNAL(availabilityChanged(QtMultimedia::AvailabilityStatus)), this, SLOT(_q_availabilityChanged(QtMultimedia::AvailabilityStatus))); + connect(m_radioTuner, SIGNAL(availabilityChanged(QMultimedia::AvailabilityStatus)), this, SLOT(_q_availabilityChanged(QMultimedia::AvailabilityStatus))); connect(m_radioTuner, SIGNAL(error(QRadioTuner::Error)), this, SLOT(_q_error(QRadioTuner::Error))); } @@ -527,7 +527,7 @@ void QDeclarativeRadio::_q_error(QRadioTuner::Error errorCode) emit errorChanged(); } -void QDeclarativeRadio::_q_availabilityChanged(QtMultimedia::AvailabilityStatus availability) +void QDeclarativeRadio::_q_availabilityChanged(QMultimedia::AvailabilityStatus availability) { emit availabilityChanged(Availability(availability)); } diff --git a/src/imports/multimedia/qdeclarativeradio_p.h b/src/imports/multimedia/qdeclarativeradio_p.h index 53bbf3e27..e3abef382 100644 --- a/src/imports/multimedia/qdeclarativeradio_p.h +++ b/src/imports/multimedia/qdeclarativeradio_p.h @@ -120,10 +120,10 @@ public: }; enum Availability { - Available = QtMultimedia::Available, - Busy = QtMultimedia::Busy, - Unavailable = QtMultimedia::ServiceMissing, - ResourceMissing = QtMultimedia::ResourceError + Available = QMultimedia::Available, + Busy = QMultimedia::Busy, + Unavailable = QMultimedia::ServiceMissing, + ResourceMissing = QMultimedia::ResourceError }; QDeclarativeRadio(QObject *parent = 0); @@ -189,7 +189,7 @@ private Q_SLOTS: void _q_stateChanged(QRadioTuner::State state); void _q_bandChanged(QRadioTuner::Band band); void _q_error(QRadioTuner::Error errorCode); - void _q_availabilityChanged(QtMultimedia::AvailabilityStatus); + void _q_availabilityChanged(QMultimedia::AvailabilityStatus); private: Q_DISABLE_COPY(QDeclarativeRadio) diff --git a/src/imports/multimedia/qdeclarativeradiodata.cpp b/src/imports/multimedia/qdeclarativeradiodata.cpp index 21227c2aa..e02b43735 100644 --- a/src/imports/multimedia/qdeclarativeradiodata.cpp +++ b/src/imports/multimedia/qdeclarativeradiodata.cpp @@ -282,7 +282,7 @@ void QDeclarativeRadioData::_q_error(QRadioData::Error errorCode) emit errorChanged(); } -void QDeclarativeRadioData::_q_availabilityChanged(QtMultimedia::AvailabilityStatus availability) +void QDeclarativeRadioData::_q_availabilityChanged(QMultimedia::AvailabilityStatus availability) { emit availabilityChanged(Availability(availability)); } @@ -299,7 +299,7 @@ void QDeclarativeRadioData::connectSignals() connect(m_radioData, SIGNAL(alternativeFrequenciesEnabledChanged(bool)), this, SIGNAL(alternativeFrequenciesEnabledChanged(bool))); // Since the radio data type depends on the service for the tuner, the availability is also dictated from the tuner - connect(m_radioTuner, SIGNAL(availabilityChanged(QtMultimedia::AvailabilityStatus)), this, SLOT(_q_availabilityChanged(QtMultimedia::AvailabilityStatus))); + connect(m_radioTuner, SIGNAL(availabilityChanged(QMultimedia::AvailabilityStatus)), this, SLOT(_q_availabilityChanged(QMultimedia::AvailabilityStatus))); connect(m_radioData, SIGNAL(error(QRadioData::Error)), this, SLOT(_q_error(QRadioData::Error))); } diff --git a/src/imports/multimedia/qdeclarativeradiodata_p.h b/src/imports/multimedia/qdeclarativeradiodata_p.h index 36b20d2be..44790bca2 100644 --- a/src/imports/multimedia/qdeclarativeradiodata_p.h +++ b/src/imports/multimedia/qdeclarativeradiodata_p.h @@ -137,10 +137,10 @@ public: }; enum Availability { - Available = QtMultimedia::Available, - Busy = QtMultimedia::Busy, - Unavailable = QtMultimedia::ServiceMissing, - ResourceMissing = QtMultimedia::ResourceError + Available = QMultimedia::Available, + Busy = QMultimedia::Busy, + Unavailable = QMultimedia::ServiceMissing, + ResourceMissing = QMultimedia::ResourceError }; QDeclarativeRadioData(QObject *parent = 0); @@ -176,7 +176,7 @@ Q_SIGNALS: private Q_SLOTS: void _q_programTypeChanged(QRadioData::ProgramType programType); void _q_error(QRadioData::Error errorCode); - void _q_availabilityChanged(QtMultimedia::AvailabilityStatus); + void _q_availabilityChanged(QMultimedia::AvailabilityStatus); private: void connectSignals(); |