Merge QCameraImageProcessing into QCamera

At the same time remove the colorFilter property. Color
filters are at most a post-processing effect and should
not be part of QCamera itself. The support for the filters
was in any case missing pretty much everywhere (except
gst-photography, which is not supported by most cameras today).

Change-Id: I59306cc75470b11490feeb910c26a414d796f9f1
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>

1 files changed, 12 insertions, 21 deletions

diff --git a/examples/multimediawidgets/camera/camera.cpp b/examples/multimediawidgets/camera/camera.cpp
index 2b3091207..864e24eac 100644
--- a/examples/multimediawidgets/camera/camera.cpp
+++ b/examples/multimediawidgets/camera/camera.cpp
@@ -134,27 +134,18 @@ void Camera::setCamera(const QCameraInfo &cameraInfo)
     connect(m_imageCapture, &QCameraImageCapture::errorOccurred, this, &Camera::displayCaptureError);
     readyForCapture(m_imageCapture->isReadyForCapture());
 
-    QCameraImageProcessing *imageProcessing = m_camera->imageProcessing();
-    if (!imageProcessing) {
-        ui->brightnessSlider->setEnabled(false);
-        ui->contrastSlider->setEnabled(false);
-        ui->saturationSlider->setEnabled(false);
-        ui->hueSlider->setEnabled(false);
-    } else {
-        connect(ui->brightnessSlider, &QSlider::valueChanged, [imageProcessing](int value) {
-            imageProcessing->setBrightness(value/100.);
-        });
-        connect(ui->contrastSlider, &QSlider::valueChanged, [imageProcessing](int value) {
-            imageProcessing->setContrast(value/100.);
-        });
-        connect(ui->saturationSlider, &QSlider::valueChanged, [imageProcessing](int value) {
-            imageProcessing->setSaturation(value/100.);
-        });
-        connect(ui->hueSlider, &QSlider::valueChanged, [imageProcessing](int value) {
-            imageProcessing->setHue(value/100.);
-        });
-    }
-
+    connect(ui->brightnessSlider, &QSlider::valueChanged, [this](int value) {
+        m_camera->setBrightness(value/100.);
+    });
+    connect(ui->contrastSlider, &QSlider::valueChanged, [this](int value) {
+        m_camera->setContrast(value/100.);
+    });
+    connect(ui->saturationSlider, &QSlider::valueChanged, [this](int value) {
+        m_camera->setSaturation(value/100.);
+    });
+    connect(ui->hueSlider, &QSlider::valueChanged, [this](int value) {
+        m_camera->setHue(value/100.);
+    });
 
     updateCaptureMode();
     m_camera->start();