diff options
Diffstat (limited to 'tests')
5 files changed, 12 insertions, 12 deletions
diff --git a/tests/auto/unit/mockbackend/mockmediarecorderservice.h b/tests/auto/unit/mockbackend/mockmediarecorderservice.h index 8ef815a09..87f9a7eff 100644 --- a/tests/auto/unit/mockbackend/mockmediarecorderservice.h +++ b/tests/auto/unit/mockbackend/mockmediarecorderservice.h @@ -35,9 +35,9 @@ #include "mockcameraimagecapturecontrol.h" #include "mockcameraexposurecontrol.h" #include "mockcameracontrol.h" -#include <private/qmediaplatformcaptureinterface_p.h> +#include <private/qplatformmediacapture_p.h> -class MockMediaRecorderService : public QMediaPlatformCaptureInterface +class MockMediaRecorderService : public QPlatformMediaCapture { Q_OBJECT public: diff --git a/tests/auto/unit/mockbackend/qmockdevicemanager.cpp b/tests/auto/unit/mockbackend/qmockdevicemanager.cpp index f8b7c5c90..d41987a34 100644 --- a/tests/auto/unit/mockbackend/qmockdevicemanager.cpp +++ b/tests/auto/unit/mockbackend/qmockdevicemanager.cpp @@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE QMockDeviceManager::QMockDeviceManager() - : QMediaPlatformDeviceManager() + : QPlatformMediaDeviceManager() { } diff --git a/tests/auto/unit/mockbackend/qmockdevicemanager_p.h b/tests/auto/unit/mockbackend/qmockdevicemanager_p.h index 1eb6018fb..100fe610f 100644 --- a/tests/auto/unit/mockbackend/qmockdevicemanager_p.h +++ b/tests/auto/unit/mockbackend/qmockdevicemanager_p.h @@ -51,7 +51,7 @@ // We mean it. // -#include <private/qmediaplatformdevicemanager_p.h> +#include <private/qplatformmediadevicemanager_p.h> #include <qelapsedtimer.h> #include <qaudiodeviceinfo.h> #include <qcamerainfo.h> @@ -62,7 +62,7 @@ Q_FORWARD_DECLARE_OBJC_CLASS(AVCaptureDeviceDiscoverySession); class QCameraInfo; -class QMockDeviceManager : public QMediaPlatformDeviceManager +class QMockDeviceManager : public QPlatformMediaDeviceManager { public: QMockDeviceManager(); diff --git a/tests/auto/unit/mockbackend/qmockintegration.cpp b/tests/auto/unit/mockbackend/qmockintegration.cpp index f76ab52c2..565d313ae 100644 --- a/tests/auto/unit/mockbackend/qmockintegration.cpp +++ b/tests/auto/unit/mockbackend/qmockintegration.cpp @@ -56,7 +56,7 @@ QMockIntegration::~QMockIntegration() delete m_manager; } -QMediaPlatformDeviceManager *QMockIntegration::deviceManager() +QPlatformMediaDeviceManager *QMockIntegration::deviceManager() { if (!m_manager) m_manager = new QMockDeviceManager(); @@ -81,7 +81,7 @@ QPlatformMediaPlayer *QMockIntegration::createPlayer() return m_lastPlayer; } -QMediaPlatformCaptureInterface *QMockIntegration::createCaptureInterface(QMediaRecorder::CaptureMode mode) +QPlatformMediaCapture *QMockIntegration::createCaptureInterface(QMediaRecorder::CaptureMode mode) { Q_UNUSED(mode); if (m_flags & NoCaptureInterface) diff --git a/tests/auto/unit/mockbackend/qmockintegration_p.h b/tests/auto/unit/mockbackend/qmockintegration_p.h index e70380404..1c622bbf5 100644 --- a/tests/auto/unit/mockbackend/qmockintegration_p.h +++ b/tests/auto/unit/mockbackend/qmockintegration_p.h @@ -51,7 +51,7 @@ // We mean it. // -#include <private/qmediaplatformintegration_p.h> +#include <private/qplatformmediaintegration_p.h> QT_BEGIN_NAMESPACE @@ -60,18 +60,18 @@ class MockMediaPlayer; class MockAudioDecoderControl; class MockMediaRecorderService; -class QMockIntegration : public QMediaPlatformIntegration +class QMockIntegration : public QPlatformMediaIntegration { public: QMockIntegration(); ~QMockIntegration(); - QMediaPlatformDeviceManager *deviceManager() override; - QMediaPlatformFormatInfo *formatInfo() override { return nullptr; } + QPlatformMediaDeviceManager *deviceManager() override; + QPlatformMediaFormatInfo *formatInfo() override { return nullptr; } QAudioDecoderControl *createAudioDecoder() override; QPlatformMediaPlayer *createPlayer() override; - QMediaPlatformCaptureInterface *createCaptureInterface(QMediaRecorder::CaptureMode mode) override; + QPlatformMediaCapture *createCaptureInterface(QMediaRecorder::CaptureMode mode) override; enum Flag { NoPlayerInterface = 0x1, |