slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rename availabilityError to availability.

Browse Source 
It's perhaps clearer in the usual case.

Change-Id: Id3cef82ac83f8c9b538b3315281664ce1c6a2b96
Reviewed-by: Ling Hu <ling.hu@nokia.com>
This commit is contained in:
Michael Goddard
2012-06-25 10:53:26 +10:00
committed by Qt by Nokia
parent bba28afe55
commit b0809c027c
44 changed files with 167 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/imports/multimedia/qdeclarativecamera.cpp
View File

@@ -68,9 +68,9 @@ void QDeclarativeCamera::_q_updateState(QCamera::State state)
emit cameraStateChanged(QDeclarativeCamera::State(state));
}
void QDeclarativeCamera::_q_availabilityChanged(QtMultimedia::AvailabilityError error)
void QDeclarativeCamera::_q_availabilityChanged(QtMultimedia::AvailabilityStatus availability)
{
emit availabilityChanged(Availability(error));
emit availabilityChanged(Availability(availability));
}
/*!
@@ -188,9 +188,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)));
// Note we map availabilityError->availability
connect(m_camera, SIGNAL(availabilityErrorChanged(QtMultimedia::AvailabilityError)), this, SLOT(_q_availabilityChanged(QtMultimedia::AvailabilityError)));
connect(m_camera, SIGNAL(availabilityChanged(QtMultimedia::AvailabilityStatus)), this, SLOT(_q_availabilityChanged(QtMultimedia::AvailabilityStatus)));
connect(m_camera->focus(), SIGNAL(opticalZoomChanged(qreal)), this, SIGNAL(opticalZoomChanged(qreal)));
connect(m_camera->focus(), SIGNAL(digitalZoomChanged(qreal)), this, SIGNAL(digitalZoomChanged(qreal)));
@@ -260,7 +258,7 @@ QString QDeclarativeCamera::errorString() const
*/
QDeclarativeCamera::Availability QDeclarativeCamera::availability() const
{
return Availability(m_camera->availabilityError());
return Availability(m_camera->availability());
}