From 2454db821c4223fe76f3b66103bc9e7853412c8f Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Fri, 11 Jun 2021 14:38:39 +0200 Subject: Rename QCamera::cameraInfo to cameraDevice And take the opportunity to clean up variable naming as well. Change-Id: I510cc8295b8d35554534a3c2ac9d83bf6f5a9d65 Reviewed-by: Volker Hilsheimer Reviewed-by: Doris Verria --- .../declarative-camera/PhotoCaptureControls.qml | 2 +- .../declarative-camera/VideoCaptureControls.qml | 2 +- examples/multimedia/devices/main.cpp | 18 +++++++++--------- examples/multimediawidgets/camera/camera.cpp | 12 ++++++------ examples/multimediawidgets/camera/camera.h | 2 +- examples/multimediawidgets/camera/imagesettings.cpp | 2 +- examples/multimediawidgets/camera/videosettings.cpp | 2 +- 7 files changed, 20 insertions(+), 20 deletions(-) (limited to 'examples') diff --git a/examples/multimedia/declarative-camera/PhotoCaptureControls.qml b/examples/multimedia/declarative-camera/PhotoCaptureControls.qml index bfe539468..72a502684 100644 --- a/examples/multimedia/declarative-camera/PhotoCaptureControls.qml +++ b/examples/multimedia/declarative-camera/PhotoCaptureControls.qml @@ -137,7 +137,7 @@ FocusScope { CameraListButton { model: MediaDevices.videoInputs - onValueChanged: captureSession.camera.cameraInfo = value + onValueChanged: captureSession.camera.cameraDevice = value } CameraButton { diff --git a/examples/multimedia/declarative-camera/VideoCaptureControls.qml b/examples/multimedia/declarative-camera/VideoCaptureControls.qml index ac3cbe3e0..3fc787d30 100644 --- a/examples/multimedia/declarative-camera/VideoCaptureControls.qml +++ b/examples/multimedia/declarative-camera/VideoCaptureControls.qml @@ -112,7 +112,7 @@ FocusScope { CameraListButton { model: MediaDevices.videoInputs - onValueChanged: captureSession.camera.cameraInfo = value + onValueChanged: captureSession.camera.cameraDevice = value } CameraButton { diff --git a/examples/multimedia/devices/main.cpp b/examples/multimedia/devices/main.cpp index a9d1537d3..a07e7c468 100644 --- a/examples/multimedia/devices/main.cpp +++ b/examples/multimedia/devices/main.cpp @@ -119,18 +119,18 @@ void printAudioDeviceInfo(QTextStream &out, const QAudioDevice &deviceInfo) out << Qt::endl; } -void printVideoDeviceInfo(QTextStream &out, const QCameraDevice &cameraInfo) +void printVideoDeviceInfo(QTextStream &out, const QCameraDevice &cameraDevice) { - const auto isDefault = cameraInfo.isDefault() ? "Yes" : "No"; - const auto position = cameraInfo.position(); - const auto photoResolutions = cameraInfo.photoResolutions(); - const auto videoFormats = cameraInfo.videoFormats(); + const auto isDefault = cameraDevice.isDefault() ? "Yes" : "No"; + const auto position = cameraDevice.position(); + const auto photoResolutions = cameraDevice.photoResolutions(); + const auto videoFormats = cameraDevice.videoFormats(); out.setFieldWidth(30); out.setFieldAlignment(QTextStream::AlignLeft); - out << "Name: " << cameraInfo.description() << qSetFieldWidth(0) << Qt::endl; + out << "Name: " << cameraDevice.description() << qSetFieldWidth(0) << Qt::endl; out.setFieldWidth(30); - out << "Id: " << QString::fromLatin1(cameraInfo.id()) << qSetFieldWidth(0) << Qt::endl; + out << "Id: " << QString::fromLatin1(cameraDevice.id()) << qSetFieldWidth(0) << Qt::endl; out.setFieldWidth(30); out << "Default: " << isDefault << qSetFieldWidth(0) << Qt::endl; out.setFieldWidth(30); @@ -173,8 +173,8 @@ int main() printAudioDeviceInfo(out, deviceInfo); out << Qt::endl << "Video devices detected: " << Qt::endl; - for (auto &cameraInfo: videoInputDevices) - printVideoDeviceInfo(out, cameraInfo); + for (auto &cameraDevice : videoInputDevices) + printVideoDeviceInfo(out, cameraDevice); return 0; } diff --git a/examples/multimediawidgets/camera/camera.cpp b/examples/multimediawidgets/camera/camera.cpp index 552990496..043afeb29 100644 --- a/examples/multimediawidgets/camera/camera.cpp +++ b/examples/multimediawidgets/camera/camera.cpp @@ -93,9 +93,9 @@ Camera::Camera() setCamera(QMediaDevices::defaultVideoInput()); } -void Camera::setCamera(const QCameraDevice &cameraInfo) +void Camera::setCamera(const QCameraDevice &cameraDevice) { - m_camera.reset(new QCamera(cameraInfo)); + m_camera.reset(new QCamera(cameraDevice)); m_captureSession.setCamera(m_camera.data()); connect(m_camera.data(), &QCamera::activeChanged, this, &Camera::updateCameraActive); @@ -358,11 +358,11 @@ void Camera::updateCameras() { ui->menuDevices->clear(); const QList availableCameras = QMediaDevices::videoInputs(); - for (const QCameraDevice &cameraInfo : availableCameras) { - QAction *videoDeviceAction = new QAction(cameraInfo.description(), videoDevicesGroup); + for (const QCameraDevice &cameraDevice : availableCameras) { + QAction *videoDeviceAction = new QAction(cameraDevice.description(), videoDevicesGroup); videoDeviceAction->setCheckable(true); - videoDeviceAction->setData(QVariant::fromValue(cameraInfo)); - if (cameraInfo == QMediaDevices::defaultVideoInput()) + videoDeviceAction->setData(QVariant::fromValue(cameraDevice)); + if (cameraDevice == QMediaDevices::defaultVideoInput()) videoDeviceAction->setChecked(true); ui->menuDevices->addAction(videoDeviceAction); diff --git a/examples/multimediawidgets/camera/camera.h b/examples/multimediawidgets/camera/camera.h index 2b19dae86..c165aa201 100644 --- a/examples/multimediawidgets/camera/camera.h +++ b/examples/multimediawidgets/camera/camera.h @@ -80,7 +80,7 @@ public slots: void saveMetaData(); private slots: - void setCamera(const QCameraDevice &cameraInfo); + void setCamera(const QCameraDevice &cameraDevice); void startCamera(); void stopCamera(); diff --git a/examples/multimediawidgets/camera/imagesettings.cpp b/examples/multimediawidgets/camera/imagesettings.cpp index 8e58fc7d4..fa619638d 100644 --- a/examples/multimediawidgets/camera/imagesettings.cpp +++ b/examples/multimediawidgets/camera/imagesettings.cpp @@ -75,7 +75,7 @@ ImageSettings::ImageSettings(QCameraImageCapture *imageCapture, QWidget *parent) ui->imageQualitySlider->setRange(0, int(QCameraImageCapture::VeryHighQuality)); ui->imageResolutionBox->addItem(tr("Default Resolution")); - const QList supportedResolutions = imagecapture->captureSession()->camera()->cameraInfo().photoResolutions(); + const QList supportedResolutions = imagecapture->captureSession()->camera()->cameraDevice().photoResolutions(); for (const QSize &resolution : supportedResolutions) { ui->imageResolutionBox->addItem(QString("%1x%2").arg(resolution.width()).arg(resolution.height()), QVariant(resolution)); diff --git a/examples/multimediawidgets/camera/videosettings.cpp b/examples/multimediawidgets/camera/videosettings.cpp index 22b82fb60..03c4f74c1 100644 --- a/examples/multimediawidgets/camera/videosettings.cpp +++ b/examples/multimediawidgets/camera/videosettings.cpp @@ -92,7 +92,7 @@ VideoSettings::VideoSettings(QMediaRecorder *mediaRecorder, QWidget *parent) ui->videoResolutionBox->addItem(tr("Default")); - auto supportedResolutions = mediaRecorder->captureSession()->camera()->cameraInfo().photoResolutions(); // ### Should use resolutions from video formats + auto supportedResolutions = mediaRecorder->captureSession()->camera()->cameraDevice().photoResolutions(); // ### Should use resolutions from video formats for (const QSize &resolution : supportedResolutions) { ui->videoResolutionBox->addItem(QString("%1x%2").arg(resolution.width()).arg(resolution.height()), QVariant(resolution)); -- cgit v1.2.3