QT_BEGIN_NAMESPACE
-void QDeclarativeCamera::_q_error(int errorCode, const QString &errorString)
+void QDeclarativeCamera::_q_error(QCamera::Error errorCode)
{
- emit error(Error(errorCode), errorString);
+ emit error(Error(errorCode), errorString());
emit errorChanged();
}
connect(m_camera, SIGNAL(captureModeChanged(QCamera::CaptureModes)), this, SIGNAL(captureModeChanged()));
connect(m_camera, SIGNAL(lockStatusChanged(QCamera::LockStatus,QCamera::LockChangeReason)), this, SIGNAL(lockStatusChanged()));
connect(m_camera, SIGNAL(stateChanged(QCamera::State)), this, SLOT(_q_updateState(QCamera::State)));
+ 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)));
Returns any camera error.
\sa QDeclarativeCameraError::Error
*/
-QDeclarativeCamera::Error QDeclarativeCamera::error() const
+QDeclarativeCamera::Error QDeclarativeCamera::errorCode() const
{
return QDeclarativeCamera::Error(m_camera->error());
}
*/
/*!
- \qmlsignal QtMultimedia5::Camera::onError(error, errorString)
+ \qmlproperty enumeration QtMultimedia5::Camera::errorCode
- This handler is called when an error occurs. The enumeration value \a error is one of the
+ Error state of the camera.
+
+ \sa QtMultimedia5::Camera::onError
+*/
+
+/*!
+ \qmlproperty string QtMultimedia5::Camera::errorString
+
+ A string describing a camera's error state.
+
+ \sa QtMultimedia5::Camera::onError
+*/
+
+
+/*!
+ \qmlsignal QtMultimedia5::Camera::onError(errorCode, errorString)
+
+ This handler is called when an error occurs. The enumeration value \a errorCode is one of the
values defined below, and a descriptive string value is available in \a errorString.
\table
Q_PROPERTY(CaptureMode captureMode READ captureMode WRITE setCaptureMode NOTIFY captureModeChanged)
Q_PROPERTY(State cameraState READ cameraState WRITE setCameraState NOTIFY cameraStateChanged)
Q_PROPERTY(LockStatus lockStatus READ lockStatus NOTIFY lockStatusChanged)
+ Q_PROPERTY(Error errorCode READ errorCode NOTIFY errorChanged)
Q_PROPERTY(QString errorString READ errorString NOTIFY errorChanged)
Q_PROPERTY(Availability availability READ availability NOTIFY availabilityChanged)
CaptureMode captureMode() const;
State cameraState() const;
- Error error() const;
+ Error errorCode() const;
QString errorString() const;
LockStatus lockStatus() const;
Q_SIGNALS:
void errorChanged();
- void error(QDeclarativeCamera::Error error, const QString &errorString);
+ void error(QDeclarativeCamera::Error errorCode, const QString &errorString);
void captureModeChanged();
void cameraStateChanged(QDeclarativeCamera::State);
private Q_SLOTS:
void _q_updateState(QCamera::State);
- void _q_error(int, const QString &);
+ void _q_error(QCamera::Error);
void _q_availabilityChanged(QtMultimedia::AvailabilityError);
protected: