summaryrefslogtreecommitdiffstats
path: root/src/multimedia/camera
diff options
context:
space:
mode:
Diffstat (limited to 'src/multimedia/camera')
-rw-r--r--src/multimedia/camera/qcamera.cpp14
-rw-r--r--src/multimedia/camera/qcamera.h1
2 files changed, 2 insertions, 13 deletions
diff --git a/src/multimedia/camera/qcamera.cpp b/src/multimedia/camera/qcamera.cpp
index 730a27fb3..580808c03 100644
--- a/src/multimedia/camera/qcamera.cpp
+++ b/src/multimedia/camera/qcamera.cpp
@@ -409,19 +409,9 @@ QCamera::~QCamera()
}
}
-
/*!
- Return true if the camera service is ready to use.
+ Returns the availability state of the camera service.
*/
-bool QCamera::isAvailable() const
-{
- return availabilityError() == QtMultimedia::NoError;
-}
-
-/*!
- Returns the error state of the camera service.
-*/
-
QtMultimedia::AvailabilityError QCamera::availabilityError() const
{
Q_D(const QCamera);
@@ -434,7 +424,7 @@ QtMultimedia::AvailabilityError QCamera::availabilityError() const
if (d->error != QCamera::NoError)
return QtMultimedia::ResourceError;
- return QtMultimedia::NoError;
+ return QMediaObject::availabilityError();
}
diff --git a/src/multimedia/camera/qcamera.h b/src/multimedia/camera/qcamera.h
index c2a7c4277..a48bbc9b5 100644
--- a/src/multimedia/camera/qcamera.h
+++ b/src/multimedia/camera/qcamera.h
@@ -150,7 +150,6 @@ public:
static QList<QByteArray> availableDevices();
static QString deviceDescription(const QByteArray &device);
- bool isAvailable() const;
QtMultimedia::AvailabilityError availabilityError() const;
State state() const;