diff options
Diffstat (limited to 'tests/auto/unit/mockbackend')
5 files changed, 12 insertions, 12 deletions
diff --git a/tests/auto/unit/mockbackend/qmockimagecapture.cpp b/tests/auto/unit/mockbackend/qmockimagecapture.cpp index 23e9fad60..9e2396113 100644 --- a/tests/auto/unit/mockbackend/qmockimagecapture.cpp +++ b/tests/auto/unit/mockbackend/qmockimagecapture.cpp @@ -29,11 +29,11 @@ #include <qmockimagecapture.h> #include <qmockcamera.h> #include <qmockmediacapturesession.h> -#include <qcameraimagecapture.h> +#include <qimagecapture.h> #include <qcamera.h> -QMockImageCapture::QMockImageCapture(QCameraImageCapture *parent) - : QPlatformCameraImageCapture(parent) +QMockImageCapture::QMockImageCapture(QImageCapture *parent) + : QPlatformImageCapture(parent) { } @@ -51,7 +51,7 @@ int QMockImageCapture::capture(const QString &fileName) QTimer::singleShot(5, this, SLOT(captured())); return m_captureRequest; } else { - emit error(-1, QCameraImageCapture::NotReadyError, + emit error(-1, QImageCapture::NotReadyError, QLatin1String("Could not capture in stopped state")); } diff --git a/tests/auto/unit/mockbackend/qmockimagecapture.h b/tests/auto/unit/mockbackend/qmockimagecapture.h index 139c12474..8d7cea1a4 100644 --- a/tests/auto/unit/mockbackend/qmockimagecapture.h +++ b/tests/auto/unit/mockbackend/qmockimagecapture.h @@ -33,18 +33,18 @@ #include <QTimer> #include <QtMultimedia/qmediametadata.h> -#include "private/qplatformcameraimagecapture_p.h" +#include "private/qplatformimagecapture_p.h" #include "private/qplatformcamera_p.h" QT_BEGIN_NAMESPACE class QMockMediaCaptureSession; -class QMockImageCapture : public QPlatformCameraImageCapture +class QMockImageCapture : public QPlatformImageCapture { Q_OBJECT public: - QMockImageCapture(QCameraImageCapture *parent); + QMockImageCapture(QImageCapture *parent); ~QMockImageCapture() { diff --git a/tests/auto/unit/mockbackend/qmockintegration.cpp b/tests/auto/unit/mockbackend/qmockintegration.cpp index 614542042..16e65a7b8 100644 --- a/tests/auto/unit/mockbackend/qmockintegration.cpp +++ b/tests/auto/unit/mockbackend/qmockintegration.cpp @@ -94,7 +94,7 @@ QPlatformCamera *QMockIntegration::createCamera(QCamera *parent) return m_lastCamera; } -QPlatformCameraImageCapture *QMockIntegration::createImageCapture(QCameraImageCapture *capture) +QPlatformImageCapture *QMockIntegration::createImageCapture(QImageCapture *capture) { return new QMockImageCapture(capture); } diff --git a/tests/auto/unit/mockbackend/qmockintegration_p.h b/tests/auto/unit/mockbackend/qmockintegration_p.h index e46b35713..7c32d7783 100644 --- a/tests/auto/unit/mockbackend/qmockintegration_p.h +++ b/tests/auto/unit/mockbackend/qmockintegration_p.h @@ -75,7 +75,7 @@ public: QPlatformMediaPlayer *createPlayer(QMediaPlayer *) override; QPlatformCamera *createCamera(QCamera *) override; QPlatformMediaEncoder *createEncoder(QMediaRecorder *) override; - QPlatformCameraImageCapture *createImageCapture(QCameraImageCapture *) override; + QPlatformImageCapture *createImageCapture(QImageCapture *) override; QPlatformMediaCaptureSession *createCaptureSession() override; QPlatformVideoSink *createVideoSink(QVideoSink *) override; diff --git a/tests/auto/unit/mockbackend/qmockmediacapturesession.h b/tests/auto/unit/mockbackend/qmockmediacapturesession.h index 8ddbeefcd..1d18c664b 100644 --- a/tests/auto/unit/mockbackend/qmockmediacapturesession.h +++ b/tests/auto/unit/mockbackend/qmockmediacapturesession.h @@ -60,11 +60,11 @@ public: mockCameraControl = control; } - void setImageCapture(QPlatformCameraImageCapture *imageCapture) override + void setImageCapture(QPlatformImageCapture *imageCapture) override { mockImageCapture = imageCapture; } - QPlatformCameraImageCapture *imageCapture() override { return hasControls ? mockImageCapture : nullptr; } + QPlatformImageCapture *imageCapture() override { return hasControls ? mockImageCapture : nullptr; } QPlatformMediaEncoder *mediaEncoder() override { return hasControls ? mockControl : nullptr; } void setMediaEncoder(QPlatformMediaEncoder *encoder) override @@ -88,7 +88,7 @@ public: } QMockCamera *mockCameraControl = nullptr; - QPlatformCameraImageCapture *mockImageCapture = nullptr; + QPlatformImageCapture *mockImageCapture = nullptr; QMockMediaEncoder *mockControl = nullptr; QPlatformAudioInput *m_audioInput = nullptr; bool hasControls; |