diff options
| author | Michael Goddard <michael.goddard@nokia.com> | 2012-06-20 16:04:57 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-29 02:47:29 +0200 |
| commit | bba28afe559837321a2083b3ce046ab774a7ef6b (patch) | |
| tree | 8908febff01fa8cfbe889dcde87e425b00fbf0d8 /src/multimedia/camera | |
| parent | b834fe032f6504ec07f80332d1e22de0b4fc64e0 (diff) | |
Rename a few controls.
The encoder controls could be confused with actual encoding, so make
clear they are just settings. Also, the end point selector controls
were not named very well.
Change-Id: I27f8bf9c865c5f295abad97c01ef98752af42613
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Reviewed-by: Ling Hu <ling.hu@nokia.com>
Diffstat (limited to 'src/multimedia/camera')
| -rw-r--r-- | src/multimedia/camera/qcamera.cpp | 6 | ||||
| -rw-r--r-- | src/multimedia/camera/qcamerafocus.cpp | 2 | ||||
| -rw-r--r-- | src/multimedia/camera/qcameraimageprocessing.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/multimedia/camera/qcamera.cpp b/src/multimedia/camera/qcamera.cpp index 3a19119a5..063e28093 100644 --- a/src/multimedia/camera/qcamera.cpp +++ b/src/multimedia/camera/qcamera.cpp @@ -51,7 +51,7 @@ #include <qmediarecordercontrol.h> #include <qcameraimageprocessingcontrol.h> #include <qcameraimagecapturecontrol.h> -#include <qvideodevicecontrol.h> +#include <qvideodeviceselectorcontrol.h> #include <QDebug> @@ -122,7 +122,7 @@ public: QMediaServiceProvider *provider; QCameraControl *control; - QVideoDeviceControl *deviceControl; + QVideoDeviceSelectorControl *deviceControl; QCameraLocksControl *locksControl; QCameraExposure *cameraExposure; @@ -245,7 +245,7 @@ void QCameraPrivate::initControls() if (service) { control = qobject_cast<QCameraControl *>(service->requestControl(QCameraControl_iid)); locksControl = qobject_cast<QCameraLocksControl *>(service->requestControl(QCameraLocksControl_iid)); - deviceControl = qobject_cast<QVideoDeviceControl*>(service->requestControl(QVideoDeviceControl_iid)); + deviceControl = qobject_cast<QVideoDeviceSelectorControl*>(service->requestControl(QVideoDeviceSelectorControl_iid)); if (control) { q->connect(control, SIGNAL(stateChanged(QCamera::State)), q, SLOT(_q_updateState(QCamera::State))); diff --git a/src/multimedia/camera/qcamerafocus.cpp b/src/multimedia/camera/qcamerafocus.cpp index 198794158..d4f096bc9 100644 --- a/src/multimedia/camera/qcamerafocus.cpp +++ b/src/multimedia/camera/qcamerafocus.cpp @@ -49,7 +49,7 @@ #include <qcamerazoomcontrol.h> #include <qmediarecordercontrol.h> #include <qcameraimagecapturecontrol.h> -#include <qvideodevicecontrol.h> +#include <qvideodeviceselectorcontrol.h> #include <QtCore/QDebug> diff --git a/src/multimedia/camera/qcameraimageprocessing.cpp b/src/multimedia/camera/qcameraimageprocessing.cpp index b867f3596..e6a1129d2 100644 --- a/src/multimedia/camera/qcameraimageprocessing.cpp +++ b/src/multimedia/camera/qcameraimageprocessing.cpp @@ -48,7 +48,7 @@ #include <qmediarecordercontrol.h> #include <qcameraimageprocessingcontrol.h> #include <qcameraimagecapturecontrol.h> -#include <qvideodevicecontrol.h> +#include <qvideodeviceselectorcontrol.h> #include <QtCore/QDebug> |