diff options
Diffstat (limited to 'src/plugins/winrt')
21 files changed, 126 insertions, 126 deletions
diff --git a/src/plugins/winrt/qwinrtabstractvideorenderercontrol.cpp b/src/plugins/winrt/qwinrtabstractvideorenderercontrol.cpp index 79545f6ee..3544031a7 100644 --- a/src/plugins/winrt/qwinrtabstractvideorenderercontrol.cpp +++ b/src/plugins/winrt/qwinrtabstractvideorenderercontrol.cpp @@ -150,12 +150,12 @@ public: create(); } - MapMode mapMode() const Q_DECL_OVERRIDE + MapMode mapMode() const override { return NotMapped; } - uchar *map(MapMode mode, int *numBytes, int *bytesPerLine) Q_DECL_OVERRIDE + uchar *map(MapMode mode, int *numBytes, int *bytesPerLine) override { Q_UNUSED(mode); Q_UNUSED(numBytes); @@ -163,11 +163,11 @@ public: return 0; } - void unmap() Q_DECL_OVERRIDE + void unmap() override { } - QVariant handle() const Q_DECL_OVERRIDE + QVariant handle() const override { return QVariant::fromValue(textureId()); } diff --git a/src/plugins/winrt/qwinrtabstractvideorenderercontrol.h b/src/plugins/winrt/qwinrtabstractvideorenderercontrol.h index 53dcb6b94..e190c8c4a 100644 --- a/src/plugins/winrt/qwinrtabstractvideorenderercontrol.h +++ b/src/plugins/winrt/qwinrtabstractvideorenderercontrol.h @@ -63,8 +63,8 @@ public: MediaFoundation }; - QAbstractVideoSurface *surface() const Q_DECL_OVERRIDE; - void setSurface(QAbstractVideoSurface *surface) Q_DECL_OVERRIDE; + QAbstractVideoSurface *surface() const override; + void setSurface(QAbstractVideoSurface *surface) override; QSize size() const; void setSize(const QSize &size); diff --git a/src/plugins/winrt/qwinrtcameracontrol.cpp b/src/plugins/winrt/qwinrtcameracontrol.cpp index 527dd6e8f..4c515bc3d 100644 --- a/src/plugins/winrt/qwinrtcameracontrol.cpp +++ b/src/plugins/winrt/qwinrtcameracontrol.cpp @@ -245,12 +245,12 @@ public: { if (m_pendingSamples.load() < 3) { m_pendingSamples.ref(); - return QueueEvent(MEStreamSinkRequestSample, GUID_NULL, S_OK, Q_NULLPTR); + return QueueEvent(MEStreamSinkRequestSample, GUID_NULL, S_OK, nullptr); } return S_OK; } - HRESULT __stdcall GetEvent(DWORD flags, IMFMediaEvent **event) Q_DECL_OVERRIDE + HRESULT __stdcall GetEvent(DWORD flags, IMFMediaEvent **event) override { QMutexLocker locker(&m_mutex); // Create an extra reference to avoid deadlock @@ -260,43 +260,43 @@ public: return eventQueue->GetEvent(flags, event); } - HRESULT __stdcall BeginGetEvent(IMFAsyncCallback *callback, IUnknown *state) Q_DECL_OVERRIDE + HRESULT __stdcall BeginGetEvent(IMFAsyncCallback *callback, IUnknown *state) override { QMutexLocker locker(&m_mutex); HRESULT hr = m_eventQueue->BeginGetEvent(callback, state); return hr; } - HRESULT __stdcall EndGetEvent(IMFAsyncResult *result, IMFMediaEvent **event) Q_DECL_OVERRIDE + HRESULT __stdcall EndGetEvent(IMFAsyncResult *result, IMFMediaEvent **event) override { QMutexLocker locker(&m_mutex); return m_eventQueue->EndGetEvent(result, event); } - HRESULT __stdcall QueueEvent(MediaEventType eventType, const GUID &extendedType, HRESULT status, const PROPVARIANT *value) Q_DECL_OVERRIDE + HRESULT __stdcall QueueEvent(MediaEventType eventType, const GUID &extendedType, HRESULT status, const PROPVARIANT *value) override { QMutexLocker locker(&m_mutex); return m_eventQueue->QueueEventParamVar(eventType, extendedType, status, value); } - HRESULT __stdcall GetMediaSink(IMFMediaSink **mediaSink) Q_DECL_OVERRIDE + HRESULT __stdcall GetMediaSink(IMFMediaSink **mediaSink) override { *mediaSink = m_sink; return S_OK; } - HRESULT __stdcall GetIdentifier(DWORD *identifier) Q_DECL_OVERRIDE + HRESULT __stdcall GetIdentifier(DWORD *identifier) override { *identifier = 0; return S_OK; } - HRESULT __stdcall GetMediaTypeHandler(IMFMediaTypeHandler **handler) Q_DECL_OVERRIDE + HRESULT __stdcall GetMediaTypeHandler(IMFMediaTypeHandler **handler) override { return QueryInterface(IID_PPV_ARGS(handler)); } - HRESULT __stdcall ProcessSample(IMFSample *sample) Q_DECL_OVERRIDE + HRESULT __stdcall ProcessSample(IMFSample *sample) override { ComPtr<IMFMediaBuffer> buffer; HRESULT hr = sample->GetBufferByIndex(0, &buffer); @@ -311,7 +311,7 @@ public: return hr; } - HRESULT __stdcall PlaceMarker(MFSTREAMSINK_MARKER_TYPE type, const PROPVARIANT *value, const PROPVARIANT *context) Q_DECL_OVERRIDE + HRESULT __stdcall PlaceMarker(MFSTREAMSINK_MARKER_TYPE type, const PROPVARIANT *value, const PROPVARIANT *context) override { Q_UNUSED(type); Q_UNUSED(value); @@ -319,14 +319,14 @@ public: return S_OK; } - HRESULT __stdcall Flush() Q_DECL_OVERRIDE + HRESULT __stdcall Flush() override { m_videoRenderer->discardBuffers(); m_pendingSamples.store(0); return S_OK; } - HRESULT __stdcall IsMediaTypeSupported(IMFMediaType *type, IMFMediaType **) Q_DECL_OVERRIDE + HRESULT __stdcall IsMediaTypeSupported(IMFMediaType *type, IMFMediaType **) override { HRESULT hr; GUID majorType; @@ -337,34 +337,34 @@ public: return S_OK; } - HRESULT __stdcall GetMediaTypeCount(DWORD *typeCount) Q_DECL_OVERRIDE + HRESULT __stdcall GetMediaTypeCount(DWORD *typeCount) override { *typeCount = 1; return S_OK; } - HRESULT __stdcall GetMediaTypeByIndex(DWORD index, IMFMediaType **type) Q_DECL_OVERRIDE + HRESULT __stdcall GetMediaTypeByIndex(DWORD index, IMFMediaType **type) override { if (index == 0) return m_type.CopyTo(type); return E_BOUNDS; } - HRESULT __stdcall SetCurrentMediaType(IMFMediaType *type) Q_DECL_OVERRIDE + HRESULT __stdcall SetCurrentMediaType(IMFMediaType *type) override { - if (FAILED(IsMediaTypeSupported(type, Q_NULLPTR))) + if (FAILED(IsMediaTypeSupported(type, nullptr))) return MF_E_INVALIDREQUEST; m_type = type; return S_OK; } - HRESULT __stdcall GetCurrentMediaType(IMFMediaType **type) Q_DECL_OVERRIDE + HRESULT __stdcall GetCurrentMediaType(IMFMediaType **type) override { return m_type.CopyTo(type); } - HRESULT __stdcall GetMajorType(GUID *majorType) Q_DECL_OVERRIDE + HRESULT __stdcall GetMajorType(GUID *majorType) override { return m_type->GetMajorType(majorType); } @@ -405,19 +405,19 @@ public: return m_stream->RequestSample(); } - HRESULT __stdcall SetProperties(Collections::IPropertySet *configuration) Q_DECL_OVERRIDE + HRESULT __stdcall SetProperties(Collections::IPropertySet *configuration) override { Q_UNUSED(configuration); return E_NOTIMPL; } - HRESULT __stdcall GetCharacteristics(DWORD *characteristics) Q_DECL_OVERRIDE + HRESULT __stdcall GetCharacteristics(DWORD *characteristics) override { *characteristics = MEDIASINK_FIXED_STREAMS | MEDIASINK_RATELESS; return S_OK; } - HRESULT __stdcall AddStreamSink(DWORD streamSinkIdentifier, IMFMediaType *mediaType, IMFStreamSink **streamSink) Q_DECL_OVERRIDE + HRESULT __stdcall AddStreamSink(DWORD streamSinkIdentifier, IMFMediaType *mediaType, IMFStreamSink **streamSink) override { Q_UNUSED(streamSinkIdentifier); Q_UNUSED(mediaType); @@ -425,33 +425,33 @@ public: return E_NOTIMPL; } - HRESULT __stdcall RemoveStreamSink(DWORD streamSinkIdentifier) Q_DECL_OVERRIDE + HRESULT __stdcall RemoveStreamSink(DWORD streamSinkIdentifier) override { Q_UNUSED(streamSinkIdentifier); return E_NOTIMPL; } - HRESULT __stdcall GetStreamSinkCount(DWORD *streamSinkCount) Q_DECL_OVERRIDE + HRESULT __stdcall GetStreamSinkCount(DWORD *streamSinkCount) override { *streamSinkCount = 1; return S_OK; } - HRESULT __stdcall GetStreamSinkByIndex(DWORD index, IMFStreamSink **streamSink) Q_DECL_OVERRIDE + HRESULT __stdcall GetStreamSinkByIndex(DWORD index, IMFStreamSink **streamSink) override { if (index == 0) return m_stream.CopyTo(streamSink); return MF_E_INVALIDINDEX; } - HRESULT __stdcall GetStreamSinkById(DWORD streamSinkIdentifier, IMFStreamSink **streamSink) Q_DECL_OVERRIDE + HRESULT __stdcall GetStreamSinkById(DWORD streamSinkIdentifier, IMFStreamSink **streamSink) override { // ID and index are always 0 HRESULT hr = GetStreamSinkByIndex(streamSinkIdentifier, streamSink); return hr == MF_E_INVALIDINDEX ? MF_E_INVALIDSTREAMNUMBER : hr; } - HRESULT __stdcall SetPresentationClock(IMFPresentationClock *presentationClock) Q_DECL_OVERRIDE + HRESULT __stdcall SetPresentationClock(IMFPresentationClock *presentationClock) override { HRESULT hr = S_OK; m_presentationClock = presentationClock; @@ -460,19 +460,19 @@ public: return hr; } - HRESULT __stdcall GetPresentationClock(IMFPresentationClock **presentationClock) Q_DECL_OVERRIDE + HRESULT __stdcall GetPresentationClock(IMFPresentationClock **presentationClock) override { return m_presentationClock.CopyTo(presentationClock); } - HRESULT __stdcall Shutdown() Q_DECL_OVERRIDE + HRESULT __stdcall Shutdown() override { m_stream->Flush(); scheduleSetActive(false); return m_presentationClock ? m_presentationClock->Stop() : S_OK; } - HRESULT __stdcall OnClockStart(MFTIME systemTime, LONGLONG clockStartOffset) Q_DECL_OVERRIDE + HRESULT __stdcall OnClockStart(MFTIME systemTime, LONGLONG clockStartOffset) override { Q_UNUSED(systemTime); Q_UNUSED(clockStartOffset); @@ -482,34 +482,34 @@ public: return S_OK; } - HRESULT __stdcall OnClockStop(MFTIME systemTime) Q_DECL_OVERRIDE + HRESULT __stdcall OnClockStop(MFTIME systemTime) override { Q_UNUSED(systemTime); scheduleSetActive(false); - return m_stream->QueueEvent(MEStreamSinkStopped, GUID_NULL, S_OK, Q_NULLPTR); + return m_stream->QueueEvent(MEStreamSinkStopped, GUID_NULL, S_OK, nullptr); } - HRESULT __stdcall OnClockPause(MFTIME systemTime) Q_DECL_OVERRIDE + HRESULT __stdcall OnClockPause(MFTIME systemTime) override { Q_UNUSED(systemTime); scheduleSetActive(false); - return m_stream->QueueEvent(MEStreamSinkPaused, GUID_NULL, S_OK, Q_NULLPTR); + return m_stream->QueueEvent(MEStreamSinkPaused, GUID_NULL, S_OK, nullptr); } - HRESULT __stdcall OnClockRestart(MFTIME systemTime) Q_DECL_OVERRIDE + HRESULT __stdcall OnClockRestart(MFTIME systemTime) override { Q_UNUSED(systemTime); scheduleSetActive(true); - return m_stream->QueueEvent(MEStreamSinkStarted, GUID_NULL, S_OK, Q_NULLPTR); + return m_stream->QueueEvent(MEStreamSinkStarted, GUID_NULL, S_OK, nullptr); } - HRESULT __stdcall OnClockSetRate(MFTIME systemTime, float rate) Q_DECL_OVERRIDE + HRESULT __stdcall OnClockSetRate(MFTIME systemTime, float rate) override { Q_UNUSED(systemTime); Q_UNUSED(rate); diff --git a/src/plugins/winrt/qwinrtcameracontrol.h b/src/plugins/winrt/qwinrtcameracontrol.h index 7ef67e957..c46921a9c 100644 --- a/src/plugins/winrt/qwinrtcameracontrol.h +++ b/src/plugins/winrt/qwinrtcameracontrol.h @@ -81,16 +81,16 @@ public: explicit QWinRTCameraControl(QObject *parent = 0); ~QWinRTCameraControl(); - QCamera::State state() const Q_DECL_OVERRIDE; - void setState(QCamera::State state) Q_DECL_OVERRIDE; + QCamera::State state() const override; + void setState(QCamera::State state) override; - QCamera::Status status() const Q_DECL_OVERRIDE; + QCamera::Status status() const override; - QCamera::CaptureModes captureMode() const Q_DECL_OVERRIDE; - void setCaptureMode(QCamera::CaptureModes mode) Q_DECL_OVERRIDE; - bool isCaptureModeSupported(QCamera::CaptureModes mode) const Q_DECL_OVERRIDE; + QCamera::CaptureModes captureMode() const override; + void setCaptureMode(QCamera::CaptureModes mode) override; + bool isCaptureModeSupported(QCamera::CaptureModes mode) const override; - bool canChangeProperty(PropertyChangeType changeType, QCamera::Status status) const Q_DECL_OVERRIDE; + bool canChangeProperty(PropertyChangeType changeType, QCamera::Status status) const override; QVideoRendererControl *videoRenderer() const; QVideoDeviceSelectorControl *videoDeviceSelector() const; diff --git a/src/plugins/winrt/qwinrtcameraflashcontrol.h b/src/plugins/winrt/qwinrtcameraflashcontrol.h index 335329037..b9be69230 100644 --- a/src/plugins/winrt/qwinrtcameraflashcontrol.h +++ b/src/plugins/winrt/qwinrtcameraflashcontrol.h @@ -62,11 +62,11 @@ public: void initialize(Microsoft::WRL::ComPtr<ABI::Windows::Media::Devices::IAdvancedVideoCaptureDeviceController2> &controller); - QCameraExposure::FlashModes flashMode() const Q_DECL_OVERRIDE; - void setFlashMode(QCameraExposure::FlashModes mode) Q_DECL_OVERRIDE; - bool isFlashModeSupported(QCameraExposure::FlashModes mode) const Q_DECL_OVERRIDE; + QCameraExposure::FlashModes flashMode() const override; + void setFlashMode(QCameraExposure::FlashModes mode) override; + bool isFlashModeSupported(QCameraExposure::FlashModes mode) const override; - bool isFlashReady() const Q_DECL_OVERRIDE; + bool isFlashReady() const override; private: QScopedPointer<QWinRTCameraFlashControlPrivate> d_ptr; diff --git a/src/plugins/winrt/qwinrtcamerafocuscontrol.h b/src/plugins/winrt/qwinrtcamerafocuscontrol.h index 0a8c0afcf..fcfb84edc 100644 --- a/src/plugins/winrt/qwinrtcamerafocuscontrol.h +++ b/src/plugins/winrt/qwinrtcamerafocuscontrol.h @@ -51,15 +51,15 @@ class QWinRTCameraFocusControl : public QCameraFocusControl public: explicit QWinRTCameraFocusControl(QWinRTCameraControl *parent); - QCameraFocus::FocusModes focusMode() const Q_DECL_OVERRIDE; - void setFocusMode(QCameraFocus::FocusModes mode) Q_DECL_OVERRIDE; - bool isFocusModeSupported(QCameraFocus::FocusModes mode) const Q_DECL_OVERRIDE; - QCameraFocus::FocusPointMode focusPointMode() const Q_DECL_OVERRIDE; - void setFocusPointMode(QCameraFocus::FocusPointMode mode) Q_DECL_OVERRIDE; - bool isFocusPointModeSupported(QCameraFocus::FocusPointMode mode) const Q_DECL_OVERRIDE; - QPointF customFocusPoint() const Q_DECL_OVERRIDE; - void setCustomFocusPoint(const QPointF &point) Q_DECL_OVERRIDE; - QCameraFocusZoneList focusZones() const Q_DECL_OVERRIDE; + QCameraFocus::FocusModes focusMode() const override; + void setFocusMode(QCameraFocus::FocusModes mode) override; + bool isFocusModeSupported(QCameraFocus::FocusModes mode) const override; + QCameraFocus::FocusPointMode focusPointMode() const override; + void setFocusPointMode(QCameraFocus::FocusPointMode mode) override; + bool isFocusPointModeSupported(QCameraFocus::FocusPointMode mode) const override; + QPointF customFocusPoint() const override; + void setCustomFocusPoint(const QPointF &point) override; + QCameraFocusZoneList focusZones() const override; void setSupportedFocusMode(QCameraFocus::FocusModes flag); void setSupportedFocusPointMode(const QSet<QCameraFocus::FocusPointMode> &supportedFocusPointModes); diff --git a/src/plugins/winrt/qwinrtcameraimagecapturecontrol.h b/src/plugins/winrt/qwinrtcameraimagecapturecontrol.h index 3820bfaf1..ce1404e1c 100644 --- a/src/plugins/winrt/qwinrtcameraimagecapturecontrol.h +++ b/src/plugins/winrt/qwinrtcameraimagecapturecontrol.h @@ -64,13 +64,13 @@ class QWinRTCameraImageCaptureControl : public QCameraImageCaptureControl public: explicit QWinRTCameraImageCaptureControl(QWinRTCameraControl *parent); - bool isReadyForCapture() const Q_DECL_OVERRIDE; + bool isReadyForCapture() const override; - QCameraImageCapture::DriveMode driveMode() const Q_DECL_OVERRIDE; - void setDriveMode(QCameraImageCapture::DriveMode mode) Q_DECL_OVERRIDE; + QCameraImageCapture::DriveMode driveMode() const override; + void setDriveMode(QCameraImageCapture::DriveMode mode) override; - int capture(const QString &fileName) Q_DECL_OVERRIDE; - void cancelCapture() Q_DECL_OVERRIDE; + int capture(const QString &fileName) override; + void cancelCapture() override; private slots: void onCameraStateChanged(QCamera::State state); diff --git a/src/plugins/winrt/qwinrtcamerainfocontrol.h b/src/plugins/winrt/qwinrtcamerainfocontrol.h index b97025dcb..031ed2720 100644 --- a/src/plugins/winrt/qwinrtcamerainfocontrol.h +++ b/src/plugins/winrt/qwinrtcamerainfocontrol.h @@ -50,8 +50,8 @@ class QWinRTCameraInfoControl : public QCameraInfoControl public: explicit QWinRTCameraInfoControl(QObject *parent = 0); - QCamera::Position cameraPosition(const QString &deviceName) const Q_DECL_OVERRIDE; - int cameraOrientation(const QString &deviceName) const Q_DECL_OVERRIDE; + QCamera::Position cameraPosition(const QString &deviceName) const override; + int cameraOrientation(const QString &deviceName) const override; }; QT_END_NAMESPACE diff --git a/src/plugins/winrt/qwinrtcameralockscontrol.h b/src/plugins/winrt/qwinrtcameralockscontrol.h index 873c355b0..61015fdaa 100644 --- a/src/plugins/winrt/qwinrtcameralockscontrol.h +++ b/src/plugins/winrt/qwinrtcameralockscontrol.h @@ -51,10 +51,10 @@ class QWinRTCameraLocksControl : public QCameraLocksControl public: explicit QWinRTCameraLocksControl(QObject *parent); - QCamera::LockTypes supportedLocks() const Q_DECL_OVERRIDE; - QCamera::LockStatus lockStatus(QCamera::LockType lock) const Q_DECL_OVERRIDE; - void searchAndLock(QCamera::LockTypes locks) Q_DECL_OVERRIDE; - void unlock(QCamera::LockTypes locks) Q_DECL_OVERRIDE; + QCamera::LockTypes supportedLocks() const override; + QCamera::LockStatus lockStatus(QCamera::LockType lock) const override; + void searchAndLock(QCamera::LockTypes locks) override; + void unlock(QCamera::LockTypes locks) override; void initialize(); private: diff --git a/src/plugins/winrt/qwinrtcameraservice.h b/src/plugins/winrt/qwinrtcameraservice.h index beae2a140..6fa4d5fce 100644 --- a/src/plugins/winrt/qwinrtcameraservice.h +++ b/src/plugins/winrt/qwinrtcameraservice.h @@ -51,8 +51,8 @@ class QWinRTCameraService : public QMediaService public: explicit QWinRTCameraService(QObject *parent = 0); - QMediaControl *requestControl(const char *name) Q_DECL_OVERRIDE; - void releaseControl(QMediaControl *control) Q_DECL_OVERRIDE; + QMediaControl *requestControl(const char *name) override; + void releaseControl(QMediaControl *control) override; private: QScopedPointer<QWinRTCameraServicePrivate> d_ptr; diff --git a/src/plugins/winrt/qwinrtcameravideorenderercontrol.cpp b/src/plugins/winrt/qwinrtcameravideorenderercontrol.cpp index 5f7810060..0a5ae46fa 100644 --- a/src/plugins/winrt/qwinrtcameravideorenderercontrol.cpp +++ b/src/plugins/winrt/qwinrtcameravideorenderercontrol.cpp @@ -89,12 +89,12 @@ public: unmap(); } - MapMode mapMode() const Q_DECL_OVERRIDE + MapMode mapMode() const override { return currentMode; } - uchar *map(MapMode mode, int *numBytes, int *bytesPerLine) Q_DECL_OVERRIDE + uchar *map(MapMode mode, int *numBytes, int *bytesPerLine) override { if (currentMode != NotMapped || mode == NotMapped || control && control->state() != QCamera::ActiveState) return nullptr; @@ -113,7 +113,7 @@ public: return bytes; } - void unmap() Q_DECL_OVERRIDE + void unmap() override { if (currentMode == NotMapped) return; diff --git a/src/plugins/winrt/qwinrtcameravideorenderercontrol.h b/src/plugins/winrt/qwinrtcameravideorenderercontrol.h index ec6e0e0e4..eeda83d52 100644 --- a/src/plugins/winrt/qwinrtcameravideorenderercontrol.h +++ b/src/plugins/winrt/qwinrtcameravideorenderercontrol.h @@ -58,8 +58,8 @@ public: explicit QWinRTCameraVideoRendererControl(const QSize &size, QObject *parent); ~QWinRTCameraVideoRendererControl(); - bool render(ID3D11Texture2D *texture) Q_DECL_OVERRIDE; - bool dequeueFrame(QVideoFrame *frame) Q_DECL_OVERRIDE; + bool render(ID3D11Texture2D *texture) override; + bool dequeueFrame(QVideoFrame *frame) override; void queueBuffer(IMF2DBuffer *buffer); void discardBuffers(); void incrementProbe(); diff --git a/src/plugins/winrt/qwinrtimageencodercontrol.h b/src/plugins/winrt/qwinrtimageencodercontrol.h index 7b0781798..dbeac2384 100644 --- a/src/plugins/winrt/qwinrtimageencodercontrol.h +++ b/src/plugins/winrt/qwinrtimageencodercontrol.h @@ -51,11 +51,11 @@ class QWinRTImageEncoderControl : public QImageEncoderControl public: explicit QWinRTImageEncoderControl(QObject *parent = 0); - QStringList supportedImageCodecs() const Q_DECL_OVERRIDE; - QString imageCodecDescription(const QString &codecName) const Q_DECL_OVERRIDE; - QList<QSize> supportedResolutions(const QImageEncoderSettings &settings, bool *continuous = 0) const Q_DECL_OVERRIDE; - QImageEncoderSettings imageSettings() const Q_DECL_OVERRIDE; - void setImageSettings(const QImageEncoderSettings &settings) Q_DECL_OVERRIDE; + QStringList supportedImageCodecs() const override; + QString imageCodecDescription(const QString &codecName) const override; + QList<QSize> supportedResolutions(const QImageEncoderSettings &settings, bool *continuous = 0) const override; + QImageEncoderSettings imageSettings() const override; + void setImageSettings(const QImageEncoderSettings &settings) override; void setSupportedResolutionsList(const QList<QSize> resolution); void applySettings(); diff --git a/src/plugins/winrt/qwinrtmediaplayercontrol.cpp b/src/plugins/winrt/qwinrtmediaplayercontrol.cpp index 9fd48fd76..de6b3418e 100644 --- a/src/plugins/winrt/qwinrtmediaplayercontrol.cpp +++ b/src/plugins/winrt/qwinrtmediaplayercontrol.cpp @@ -541,7 +541,7 @@ QWinRTMediaPlayerControl::QWinRTMediaPlayerControl(IMFMediaEngineClassFactory *f d->seekable = false; d->hasAudio = false; d->hasVideo = false; - d->videoRenderer = Q_NULLPTR; + d->videoRenderer = nullptr; d->notifier = Make<MediaEngineNotify>(this, d); HRESULT hr; @@ -796,7 +796,7 @@ void QWinRTMediaPlayerControl::setMedia(const QMediaContent &media, QIODevice *s } // Let Windows handle all other URLs - hr = d->engine->SetSource(Q_NULLPTR); // Resets the byte stream + hr = d->engine->SetSource(nullptr); // Resets the byte stream Q_ASSERT_SUCCEEDED(hr); hr = d->engine->Load(); if (FAILED(hr)) diff --git a/src/plugins/winrt/qwinrtmediaplayercontrol.h b/src/plugins/winrt/qwinrtmediaplayercontrol.h index 3d4154093..1e854f5bb 100644 --- a/src/plugins/winrt/qwinrtmediaplayercontrol.h +++ b/src/plugins/winrt/qwinrtmediaplayercontrol.h @@ -56,39 +56,39 @@ public: QWinRTMediaPlayerControl(IMFMediaEngineClassFactory *factory, QObject *parent = 0); ~QWinRTMediaPlayerControl(); - QMediaPlayer::State state() const Q_DECL_OVERRIDE; - QMediaPlayer::MediaStatus mediaStatus() const Q_DECL_OVERRIDE; + QMediaPlayer::State state() const override; + QMediaPlayer::MediaStatus mediaStatus() const override; - qint64 duration() const Q_DECL_OVERRIDE; + qint64 duration() const override; - qint64 position() const Q_DECL_OVERRIDE; - void setPosition(qint64 position) Q_DECL_OVERRIDE; + qint64 position() const override; + void setPosition(qint64 position) override; - int volume() const Q_DECL_OVERRIDE; - void setVolume(int volume) Q_DECL_OVERRIDE; + int volume() const override; + void setVolume(int volume) override; - bool isMuted() const Q_DECL_OVERRIDE; - void setMuted(bool muted) Q_DECL_OVERRIDE; + bool isMuted() const override; + void setMuted(bool muted) override; - int bufferStatus() const Q_DECL_OVERRIDE; + int bufferStatus() const override; - bool isAudioAvailable() const Q_DECL_OVERRIDE; - bool isVideoAvailable() const Q_DECL_OVERRIDE; + bool isAudioAvailable() const override; + bool isVideoAvailable() const override; - bool isSeekable() const Q_DECL_OVERRIDE; + bool isSeekable() const override; - QMediaTimeRange availablePlaybackRanges() const Q_DECL_OVERRIDE; + QMediaTimeRange availablePlaybackRanges() const override; - qreal playbackRate() const Q_DECL_OVERRIDE; - void setPlaybackRate(qreal rate) Q_DECL_OVERRIDE; + qreal playbackRate() const override; + void setPlaybackRate(qreal rate) override; - QMediaContent media() const Q_DECL_OVERRIDE; - const QIODevice *mediaStream() const Q_DECL_OVERRIDE; - void setMedia(const QMediaContent &media, QIODevice *stream) Q_DECL_OVERRIDE; + QMediaContent media() const override; + const QIODevice *mediaStream() const override; + void setMedia(const QMediaContent &media, QIODevice *stream) override; - void play() Q_DECL_OVERRIDE; - void pause() Q_DECL_OVERRIDE; - void stop() Q_DECL_OVERRIDE; + void play() override; + void pause() override; + void stop() override; QVideoRendererControl *videoRendererControl(); diff --git a/src/plugins/winrt/qwinrtmediaplayerservice.cpp b/src/plugins/winrt/qwinrtmediaplayerservice.cpp index 58149fd33..3253ed188 100644 --- a/src/plugins/winrt/qwinrtmediaplayerservice.cpp +++ b/src/plugins/winrt/qwinrtmediaplayerservice.cpp @@ -65,7 +65,7 @@ QWinRTMediaPlayerService::QWinRTMediaPlayerService(QObject *parent) { Q_D(QWinRTMediaPlayerService); - d->player = Q_NULLPTR; + d->player = nullptr; HRESULT hr = MFStartup(MF_VERSION); Q_ASSERT(SUCCEEDED(hr)); @@ -94,11 +94,11 @@ QMediaControl *QWinRTMediaPlayerService::requestControl(const char *name) } if (qstrcmp(name, QVideoRendererControl_iid) == 0) { if (!d->player) - return Q_NULLPTR; + return nullptr; return d->player->videoRendererControl(); } - return Q_NULLPTR; + return nullptr; } void QWinRTMediaPlayerService::releaseControl(QMediaControl *control) diff --git a/src/plugins/winrt/qwinrtplayerrenderercontrol.h b/src/plugins/winrt/qwinrtplayerrenderercontrol.h index fb67d0c8c..70f3c4af2 100644 --- a/src/plugins/winrt/qwinrtplayerrenderercontrol.h +++ b/src/plugins/winrt/qwinrtplayerrenderercontrol.h @@ -58,7 +58,7 @@ public: bool ensureReady(); - bool render(ID3D11Texture2D *texture) Q_DECL_OVERRIDE; + bool render(ID3D11Texture2D *texture) override; private: QScopedPointer<QWinRTPlayerRendererControlPrivate> d_ptr; diff --git a/src/plugins/winrt/qwinrtserviceplugin.cpp b/src/plugins/winrt/qwinrtserviceplugin.cpp index d08a39a5e..286789e4c 100644 --- a/src/plugins/winrt/qwinrtserviceplugin.cpp +++ b/src/plugins/winrt/qwinrtserviceplugin.cpp @@ -55,7 +55,7 @@ QMediaService *QWinRTServicePlugin::create(QString const &key) if (key == QLatin1String(Q_MEDIASERVICE_CAMERA)) return new QWinRTCameraService(this); - return Q_NULLPTR; + return nullptr; } void QWinRTServicePlugin::release(QMediaService *service) diff --git a/src/plugins/winrt/qwinrtserviceplugin.h b/src/plugins/winrt/qwinrtserviceplugin.h index d6600aa54..30a76022d 100644 --- a/src/plugins/winrt/qwinrtserviceplugin.h +++ b/src/plugins/winrt/qwinrtserviceplugin.h @@ -62,13 +62,13 @@ public: QMediaServiceProviderHint::Features supportedFeatures(const QByteArray &service) const; - QCamera::Position cameraPosition(const QByteArray &device) const Q_DECL_OVERRIDE; - int cameraOrientation(const QByteArray &device) const Q_DECL_OVERRIDE; + QCamera::Position cameraPosition(const QByteArray &device) const override; + int cameraOrientation(const QByteArray &device) const override; - QList<QByteArray> devices(const QByteArray &service) const Q_DECL_OVERRIDE; - QString deviceDescription(const QByteArray &service, const QByteArray &device) Q_DECL_OVERRIDE; + QList<QByteArray> devices(const QByteArray &service) const override; + QString deviceDescription(const QByteArray &service, const QByteArray &device) override; - QByteArray defaultDevice(const QByteArray &service) const Q_DECL_OVERRIDE; + QByteArray defaultDevice(const QByteArray &service) const override; }; QT_END_NAMESPACE diff --git a/src/plugins/winrt/qwinrtvideodeviceselectorcontrol.cpp b/src/plugins/winrt/qwinrtvideodeviceselectorcontrol.cpp index abe10f9a4..41d4693cb 100644 --- a/src/plugins/winrt/qwinrtvideodeviceselectorcontrol.cpp +++ b/src/plugins/winrt/qwinrtvideodeviceselectorcontrol.cpp @@ -124,7 +124,7 @@ struct QWinRTVideoDeviceSelectorControlGlobal IDeviceInformation *device; hr = deviceList->GetAt(i, &device); Q_ASSERT_SUCCEEDED(hr); - onDeviceAdded(Q_NULLPTR, device); + onDeviceAdded(nullptr, device); } // If there is no default device provided by the API, choose the first one diff --git a/src/plugins/winrt/qwinrtvideodeviceselectorcontrol.h b/src/plugins/winrt/qwinrtvideodeviceselectorcontrol.h index 36f00656c..3beb9782a 100644 --- a/src/plugins/winrt/qwinrtvideodeviceselectorcontrol.h +++ b/src/plugins/winrt/qwinrtvideodeviceselectorcontrol.h @@ -65,13 +65,13 @@ public: explicit QWinRTVideoDeviceSelectorControl(QObject *parent = 0); ~QWinRTVideoDeviceSelectorControl(); - int deviceCount() const Q_DECL_OVERRIDE; + int deviceCount() const override; - QString deviceName(int index) const Q_DECL_OVERRIDE; - QString deviceDescription(int index) const Q_DECL_OVERRIDE; + QString deviceName(int index) const override; + QString deviceDescription(int index) const override; - int defaultDevice() const Q_DECL_OVERRIDE; - int selectedDevice() const Q_DECL_OVERRIDE; + int defaultDevice() const override; + int selectedDevice() const override; static QCamera::Position cameraPosition(const QString &deviceName); static int cameraOrientation(const QString &deviceName); @@ -80,7 +80,7 @@ public: static QByteArray defaultDeviceName(); public slots: - void setSelectedDevice(int index) Q_DECL_OVERRIDE; + void setSelectedDevice(int index) override; private: QScopedPointer<QWinRTVideoDeviceSelectorControlPrivate> d_ptr; |