diff options
Diffstat (limited to 'src')
53 files changed, 323 insertions, 323 deletions
diff --git a/src/imports/audioengine/audioengine.cpp b/src/imports/audioengine/audioengine.cpp index a132af49a..f97928f9d 100644 --- a/src/imports/audioengine/audioengine.cpp +++ b/src/imports/audioengine/audioengine.cpp @@ -67,7 +67,7 @@ class QAudioEngineDeclarativeModule : public QQmlExtensionPlugin public: QAudioEngineDeclarativeModule(QObject *parent = 0) : QQmlExtensionPlugin(parent) { initResources(); } - virtual void registerTypes(const char *uri) + void registerTypes(const char *uri) override { Q_ASSERT(QLatin1String(uri) == QLatin1String("QtAudioEngine")); diff --git a/src/imports/audioengine/qaudioengine_openal_p.h b/src/imports/audioengine/qaudioengine_openal_p.h index 088cb3f22..c1dbf6aa2 100644 --- a/src/imports/audioengine/qaudioengine_openal_p.h +++ b/src/imports/audioengine/qaudioengine_openal_p.h @@ -123,28 +123,28 @@ public: QSoundSourcePrivate(QObject *parent); ~QSoundSourcePrivate(); - void play(); - void pause(); - void stop(); + void play() override; + void pause() override; + void stop() override; - QSoundSource::State state() const; + QSoundSource::State state() const override; bool isLooping() const; - void setLooping(bool looping); - void setPosition(const QVector3D& position); - void setDirection(const QVector3D& direction); - void setVelocity(const QVector3D& velocity); + void setLooping(bool looping) override; + void setPosition(const QVector3D& position) override; + void setDirection(const QVector3D& direction) override; + void setVelocity(const QVector3D& velocity) override; - QVector3D velocity() const; - QVector3D position() const; - QVector3D direction() const; + QVector3D velocity() const override; + QVector3D position() const override; + QVector3D direction() const override; - void setGain(qreal gain); - void setPitch(qreal pitch); - void setCone(qreal innerAngle, qreal outerAngle, qreal outerGain); + void setGain(qreal gain) override; + void setPitch(qreal pitch) override; + void setCone(qreal innerAngle, qreal outerAngle, qreal outerGain) override; - void bindBuffer(QSoundBuffer*); - void unbindBuffer(); + void bindBuffer(QSoundBuffer*) override; + void unbindBuffer() override; void checkState(); diff --git a/src/imports/audioengine/qdeclarative_attenuationmodel_p.h b/src/imports/audioengine/qdeclarative_attenuationmodel_p.h index b50ed2ff5..1cec3f4ab 100644 --- a/src/imports/audioengine/qdeclarative_attenuationmodel_p.h +++ b/src/imports/audioengine/qdeclarative_attenuationmodel_p.h @@ -97,9 +97,9 @@ public: qreal endDistance() const; void setEndDistance(qreal endDist); - qreal calculateGain(const QVector3D &listenerPosition, const QVector3D &sourcePosition) const; + qreal calculateGain(const QVector3D &listenerPosition, const QVector3D &sourcePosition) const override; - void setEngine(QDeclarativeAudioEngine *engine); + void setEngine(QDeclarativeAudioEngine *engine) override; private: Q_DISABLE_COPY(QDeclarativeAttenuationModelLinear); @@ -126,9 +126,9 @@ public: qreal rolloffFactor() const; void setRolloffFactor(qreal rolloffFactor); - qreal calculateGain(const QVector3D &listenerPosition, const QVector3D &sourcePosition) const; + qreal calculateGain(const QVector3D &listenerPosition, const QVector3D &sourcePosition) const override; - void setEngine(QDeclarativeAudioEngine *engine); + void setEngine(QDeclarativeAudioEngine *engine) override; private: Q_DISABLE_COPY(QDeclarativeAttenuationModelInverse); diff --git a/src/imports/audioengine/qdeclarative_audioengine_p.h b/src/imports/audioengine/qdeclarative_audioengine_p.h index abb379894..fd049e629 100644 --- a/src/imports/audioengine/qdeclarative_audioengine_p.h +++ b/src/imports/audioengine/qdeclarative_audioengine_p.h @@ -90,8 +90,8 @@ public: QDeclarativeAudioEngine(QObject *parent = 0); ~QDeclarativeAudioEngine(); - void classBegin(); - void componentComplete(); + void classBegin() override; + void componentComplete() override; //This is used for tracking all objects declared inside AudioEngine //see appendFunction diff --git a/src/imports/multimedia/multimedia.cpp b/src/imports/multimedia/multimedia.cpp index 1b8c87cc0..6a316a298 100644 --- a/src/imports/multimedia/multimedia.cpp +++ b/src/imports/multimedia/multimedia.cpp @@ -85,7 +85,7 @@ class QMultimediaDeclarativeModule : public QQmlExtensionPlugin public: QMultimediaDeclarativeModule(QObject *parent = 0) : QQmlExtensionPlugin(parent) { initResources(); } - virtual void registerTypes(const char *uri) + void registerTypes(const char *uri) override { Q_ASSERT(QLatin1String(uri) == QLatin1String("QtMultimedia")); @@ -155,7 +155,7 @@ public: qmlRegisterType<QAbstractVideoFilter>(); } - void initializeEngine(QQmlEngine *engine, const char *uri) + void initializeEngine(QQmlEngine *engine, const char *uri) override { Q_UNUSED(uri); engine->addImageProvider("camera", new QDeclarativeCameraPreviewProvider); diff --git a/src/imports/multimedia/qdeclarativeaudio_p.h b/src/imports/multimedia/qdeclarativeaudio_p.h index ad30fa729..4e2b94300 100644 --- a/src/imports/multimedia/qdeclarativeaudio_p.h +++ b/src/imports/multimedia/qdeclarativeaudio_p.h @@ -170,8 +170,8 @@ public: PlaybackState playbackState() const; void setPlaybackState(QMediaPlayer::State playbackState); - void classBegin(); - void componentComplete(); + void classBegin() override; + void componentComplete() override; QObject *mediaObject() { return m_player; } diff --git a/src/imports/multimedia/qdeclarativecamera_p.h b/src/imports/multimedia/qdeclarativecamera_p.h index 964d30117..97afa5b53 100644 --- a/src/imports/multimedia/qdeclarativecamera_p.h +++ b/src/imports/multimedia/qdeclarativecamera_p.h @@ -336,8 +336,8 @@ private Q_SLOTS: void _q_availabilityChanged(QMultimedia::AvailabilityStatus); protected: - void classBegin(); - void componentComplete(); + void classBegin() override; + void componentComplete() override; private: Q_DISABLE_COPY(QDeclarativeCamera) diff --git a/src/imports/multimedia/qdeclarativecamerafocus_p.h b/src/imports/multimedia/qdeclarativecamerafocus_p.h index 707102bff..16a48de53 100644 --- a/src/imports/multimedia/qdeclarativecamerafocus_p.h +++ b/src/imports/multimedia/qdeclarativecamerafocus_p.h @@ -131,8 +131,8 @@ public: FocusZonesModel(QObject *parent = 0); - int rowCount(const QModelIndex &parent = QModelIndex()) const; - QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; + int rowCount(const QModelIndex &parent = QModelIndex()) const override; + QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; public slots: void setFocusZones(const QCameraFocusZoneList &zones); diff --git a/src/imports/multimedia/qdeclarativecamerapreviewprovider_p.h b/src/imports/multimedia/qdeclarativecamerapreviewprovider_p.h index b9ac29b1e..cf5f0644c 100644 --- a/src/imports/multimedia/qdeclarativecamerapreviewprovider_p.h +++ b/src/imports/multimedia/qdeclarativecamerapreviewprovider_p.h @@ -61,7 +61,7 @@ public: QDeclarativeCameraPreviewProvider(); ~QDeclarativeCameraPreviewProvider(); - virtual QImage requestImage(const QString &id, QSize *size, const QSize& requestedSize); + QImage requestImage(const QString &id, QSize *size, const QSize& requestedSize) override; static void registerPreview(const QString &id, const QImage &preview); }; diff --git a/src/imports/multimedia/qdeclarativeplaylist_p.h b/src/imports/multimedia/qdeclarativeplaylist_p.h index 22c853605..fa221a05b 100644 --- a/src/imports/multimedia/qdeclarativeplaylist_p.h +++ b/src/imports/multimedia/qdeclarativeplaylist_p.h @@ -126,12 +126,12 @@ public: QString errorString() const; QMediaPlaylist *mediaPlaylist() const { return m_playlist; } - int rowCount(const QModelIndex &parent = QModelIndex()) const; - QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; - QHash<int, QByteArray> roleNames() const; + int rowCount(const QModelIndex &parent = QModelIndex()) const override; + QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; + QHash<int, QByteArray> roleNames() const override; - void classBegin(); - void componentComplete(); + void classBegin() override; + void componentComplete() override; QQmlListProperty<QDeclarativePlaylistItem> items() { return QQmlListProperty<QDeclarativePlaylistItem>( diff --git a/src/multimedia/audio/qaudiobuffer.cpp b/src/multimedia/audio/qaudiobuffer.cpp index 3768fd196..e4918edf2 100644 --- a/src/multimedia/audio/qaudiobuffer.cpp +++ b/src/multimedia/audio/qaudiobuffer.cpp @@ -140,15 +140,15 @@ public: free(mBuffer); } - void release() {delete this;} - QAudioFormat format() const {return mFormat;} - qint64 startTime() const {return mStartTime;} - int frameCount() const {return mFrameCount;} + void release() override {delete this;} + QAudioFormat format() const override {return mFormat;} + qint64 startTime() const override {return mStartTime;} + int frameCount() const override {return mFrameCount;} - void *constData() const {return mBuffer;} + void *constData() const override {return mBuffer;} - void *writableData() {return mBuffer;} - QAbstractAudioBuffer *clone() const + void *writableData() override {return mBuffer;} + QAbstractAudioBuffer *clone() const override { return new QMemoryAudioBufferProvider(mBuffer, mFrameCount, mFormat, mStartTime); } diff --git a/src/multimedia/audio/qaudiodecoder.h b/src/multimedia/audio/qaudiodecoder.h index a63a6836f..85e0b75f7 100644 --- a/src/multimedia/audio/qaudiodecoder.h +++ b/src/multimedia/audio/qaudiodecoder.h @@ -120,8 +120,8 @@ Q_SIGNALS: void durationChanged(qint64 duration); public: - virtual bool bind(QObject *); - virtual void unbind(QObject *); + bool bind(QObject *) override; + void unbind(QObject *) override; private: Q_DISABLE_COPY(QAudioDecoder) diff --git a/src/multimedia/audio/qaudiodevicefactory.cpp b/src/multimedia/audio/qaudiodevicefactory.cpp index c3e4929b3..b1788f28a 100644 --- a/src/multimedia/audio/qaudiodevicefactory.cpp +++ b/src/multimedia/audio/qaudiodevicefactory.cpp @@ -61,64 +61,64 @@ Q_GLOBAL_STATIC_WITH_ARGS(QMediaPluginLoader, audioLoader, class QNullDeviceInfo : public QAbstractAudioDeviceInfo { public: - QAudioFormat preferredFormat() const { qWarning()<<"using null deviceinfo, none available"; return QAudioFormat(); } - bool isFormatSupported(const QAudioFormat& ) const { return false; } + QAudioFormat preferredFormat() const override { qWarning()<<"using null deviceinfo, none available"; return QAudioFormat(); } + bool isFormatSupported(const QAudioFormat& ) const override { return false; } QAudioFormat nearestFormat(const QAudioFormat& ) const { return QAudioFormat(); } - QString deviceName() const { return QString(); } - QStringList supportedCodecs() { return QStringList(); } - QList<int> supportedSampleRates() { return QList<int>(); } - QList<int> supportedChannelCounts() { return QList<int>(); } - QList<int> supportedSampleSizes() { return QList<int>(); } - QList<QAudioFormat::Endian> supportedByteOrders() { return QList<QAudioFormat::Endian>(); } - QList<QAudioFormat::SampleType> supportedSampleTypes() { return QList<QAudioFormat::SampleType>(); } + QString deviceName() const override { return QString(); } + QStringList supportedCodecs() override { return QStringList(); } + QList<int> supportedSampleRates() override { return QList<int>(); } + QList<int> supportedChannelCounts() override { return QList<int>(); } + QList<int> supportedSampleSizes() override { return QList<int>(); } + QList<QAudioFormat::Endian> supportedByteOrders() override { return QList<QAudioFormat::Endian>(); } + QList<QAudioFormat::SampleType> supportedSampleTypes() override { return QList<QAudioFormat::SampleType>(); } }; class QNullInputDevice : public QAbstractAudioInput { public: - void start(QIODevice*) { qWarning()<<"using null input device, none available";} - QIODevice* start() { qWarning()<<"using null input device, none available"; return 0; } - void stop() {} - void reset() {} - void suspend() {} - void resume() {} - int bytesReady() const { return 0; } - int periodSize() const { return 0; } - void setBufferSize(int ) {} - int bufferSize() const { return 0; } - void setNotifyInterval(int ) {} - int notifyInterval() const { return 0; } - qint64 processedUSecs() const { return 0; } - qint64 elapsedUSecs() const { return 0; } - QAudio::Error error() const { return QAudio::OpenError; } - QAudio::State state() const { return QAudio::StoppedState; } - void setFormat(const QAudioFormat&) {} - QAudioFormat format() const { return QAudioFormat(); } - void setVolume(qreal) {} - qreal volume() const {return 1.0f;} + void start(QIODevice*) override { qWarning()<<"using null input device, none available";} + QIODevice* start() override { qWarning()<<"using null input device, none available"; return 0; } + void stop() override {} + void reset() override {} + void suspend() override {} + void resume() override {} + int bytesReady() const override { return 0; } + int periodSize() const override { return 0; } + void setBufferSize(int ) override {} + int bufferSize() const override { return 0; } + void setNotifyInterval(int ) override {} + int notifyInterval() const override { return 0; } + qint64 processedUSecs() const override { return 0; } + qint64 elapsedUSecs() const override { return 0; } + QAudio::Error error() const override { return QAudio::OpenError; } + QAudio::State state() const override { return QAudio::StoppedState; } + void setFormat(const QAudioFormat&) override {} + QAudioFormat format() const override { return QAudioFormat(); } + void setVolume(qreal) override {} + qreal volume() const override {return 1.0f;} }; class QNullOutputDevice : public QAbstractAudioOutput { public: - void start(QIODevice*) {qWarning()<<"using null output device, none available";} - QIODevice* start() { qWarning()<<"using null output device, none available"; return 0; } - void stop() {} - void reset() {} - void suspend() {} - void resume() {} - int bytesFree() const { return 0; } - int periodSize() const { return 0; } - void setBufferSize(int ) {} - int bufferSize() const { return 0; } - void setNotifyInterval(int ) {} - int notifyInterval() const { return 0; } - qint64 processedUSecs() const { return 0; } - qint64 elapsedUSecs() const { return 0; } - QAudio::Error error() const { return QAudio::OpenError; } - QAudio::State state() const { return QAudio::StoppedState; } - void setFormat(const QAudioFormat&) {} - QAudioFormat format() const { return QAudioFormat(); } + void start(QIODevice*) override {qWarning()<<"using null output device, none available";} + QIODevice* start() override { qWarning()<<"using null output device, none available"; return 0; } + void stop() override {} + void reset() override {} + void suspend() override {} + void resume() override {} + int bytesFree() const override { return 0; } + int periodSize() const override { return 0; } + void setBufferSize(int ) override {} + int bufferSize() const override { return 0; } + void setNotifyInterval(int ) override {} + int notifyInterval() const override { return 0; } + qint64 processedUSecs() const override { return 0; } + qint64 elapsedUSecs() const override { return 0; } + QAudio::Error error() const override { return QAudio::OpenError; } + QAudio::State state() const override { return QAudio::StoppedState; } + void setFormat(const QAudioFormat&) override {} + QAudioFormat format() const override { return QAudioFormat(); } }; QList<QAudioDeviceInfo> QAudioDeviceFactory::availableDevices(QAudio::Mode mode) diff --git a/src/multimedia/audio/qaudiosystemplugin.h b/src/multimedia/audio/qaudiosystemplugin.h index 3368c9b98..e304f1c46 100644 --- a/src/multimedia/audio/qaudiosystemplugin.h +++ b/src/multimedia/audio/qaudiosystemplugin.h @@ -81,10 +81,10 @@ public: explicit QAudioSystemPlugin(QObject *parent = Q_NULLPTR); ~QAudioSystemPlugin(); - virtual QList<QByteArray> availableDevices(QAudio::Mode) const = 0; - virtual QAbstractAudioInput* createInput(const QByteArray& device) = 0; - virtual QAbstractAudioOutput* createOutput(const QByteArray& device) = 0; - virtual QAbstractAudioDeviceInfo* createDeviceInfo(const QByteArray& device, QAudio::Mode mode) = 0; + QList<QByteArray> availableDevices(QAudio::Mode) const override = 0; + QAbstractAudioInput* createInput(const QByteArray& device) override = 0; + QAbstractAudioOutput* createOutput(const QByteArray& device) override = 0; + QAbstractAudioDeviceInfo* createDeviceInfo(const QByteArray& device, QAudio::Mode mode) override = 0; }; QT_END_NAMESPACE diff --git a/src/multimedia/audio/qsoundeffect_qaudio_p.h b/src/multimedia/audio/qsoundeffect_qaudio_p.h index d8c416fdb..6fc3ae8d5 100644 --- a/src/multimedia/audio/qsoundeffect_qaudio_p.h +++ b/src/multimedia/audio/qsoundeffect_qaudio_p.h @@ -69,8 +69,8 @@ public: PrivateSoundSource(QSoundEffectPrivate* s); ~PrivateSoundSource() {} - qint64 readData( char* data, qint64 len); - qint64 writeData(const char* data, qint64 len); + qint64 readData( char* data, qint64 len) override; + qint64 writeData(const char* data, qint64 len) override; private Q_SLOTS: void sampleReady(); diff --git a/src/multimedia/audio/qwavedecoder_p.h b/src/multimedia/audio/qwavedecoder_p.h index 1cd20e07f..0f1cef599 100644 --- a/src/multimedia/audio/qwavedecoder_p.h +++ b/src/multimedia/audio/qwavedecoder_p.h @@ -70,9 +70,9 @@ public: QAudioFormat audioFormat() const; int duration() const; - qint64 size() const; - bool isSequential() const; - qint64 bytesAvailable() const; + qint64 size() const override; + bool isSequential() const override; + qint64 bytesAvailable() const override; Q_SIGNALS: void formatKnown(); @@ -82,8 +82,8 @@ private Q_SLOTS: void handleData(); private: - qint64 readData(char *data, qint64 maxlen); - qint64 writeData(const char *data, qint64 len); + qint64 readData(char *data, qint64 maxlen) override; + qint64 writeData(const char *data, qint64 len) override; bool enoughDataAvailable(); bool findChunk(const char *chunkId); diff --git a/src/multimedia/camera/qcamera.h b/src/multimedia/camera/qcamera.h index 7d7063650..9d3d26b0e 100644 --- a/src/multimedia/camera/qcamera.h +++ b/src/multimedia/camera/qcamera.h @@ -176,7 +176,7 @@ public: QT_DEPRECATED static QString deviceDescription(const QByteArray &device); #endif - QMultimedia::AvailabilityStatus availability() const; + QMultimedia::AvailabilityStatus availability() const override; State state() const; Status status() const; diff --git a/src/multimedia/camera/qcamerafocus.cpp b/src/multimedia/camera/qcamerafocus.cpp index 9da48e257..848b33df8 100644 --- a/src/multimedia/camera/qcamerafocus.cpp +++ b/src/multimedia/camera/qcamerafocus.cpp @@ -68,15 +68,15 @@ public: QCameraFocusFakeZoomControl(QObject *parent) : QCameraZoomControl(parent) {} - qreal maximumOpticalZoom() const { return 1.0; } - qreal maximumDigitalZoom() const { return 1.0; } + qreal maximumOpticalZoom() const override { return 1.0; } + qreal maximumDigitalZoom() const override { return 1.0; } - qreal requestedOpticalZoom() const { return 1.0; } - qreal requestedDigitalZoom() const { return 1.0; } - qreal currentOpticalZoom() const { return 1.0; } - qreal currentDigitalZoom() const { return 1.0; } + qreal requestedOpticalZoom() const override { return 1.0; } + qreal requestedDigitalZoom() const override { return 1.0; } + qreal currentOpticalZoom() const override { return 1.0; } + qreal currentDigitalZoom() const override { return 1.0; } - void zoomTo(qreal, qreal) { qWarning("The camera doesn't support zooming."); } + void zoomTo(qreal, qreal) override { qWarning("The camera doesn't support zooming."); } }; class QCameraFocusFakeFocusControl : public QCameraFocusControl @@ -85,17 +85,17 @@ public: QCameraFocusFakeFocusControl(QObject *parent) : QCameraFocusControl(parent) {} - QCameraFocus::FocusModes focusMode() const { return QCameraFocus::AutoFocus; } - void setFocusMode(QCameraFocus::FocusModes) { qWarning("Focus mode selection is not supported"); } - bool isFocusModeSupported(QCameraFocus::FocusModes) const { return false; } + QCameraFocus::FocusModes focusMode() const override { return QCameraFocus::AutoFocus; } + void setFocusMode(QCameraFocus::FocusModes) override { qWarning("Focus mode selection is not supported"); } + bool isFocusModeSupported(QCameraFocus::FocusModes) const override { return false; } - QCameraFocus::FocusPointMode focusPointMode() const { return QCameraFocus::FocusPointAuto; } - void setFocusPointMode(QCameraFocus::FocusPointMode) { qWarning("Focus points mode selection is not supported"); } - bool isFocusPointModeSupported(QCameraFocus::FocusPointMode) const { return false; } - QPointF customFocusPoint() const { return QPointF(0.5,0.5); } - void setCustomFocusPoint(const QPointF &) { qWarning("Focus points selection is not supported"); } + QCameraFocus::FocusPointMode focusPointMode() const override { return QCameraFocus::FocusPointAuto; } + void setFocusPointMode(QCameraFocus::FocusPointMode) override { qWarning("Focus points mode selection is not supported"); } + bool isFocusPointModeSupported(QCameraFocus::FocusPointMode) const override { return false; } + QPointF customFocusPoint() const override { return QPointF(0.5,0.5); } + void setCustomFocusPoint(const QPointF &) override { qWarning("Focus points selection is not supported"); } - QCameraFocusZoneList focusZones() const { return QCameraFocusZoneList(); } + QCameraFocusZoneList focusZones() const override { return QCameraFocusZoneList(); } }; diff --git a/src/multimedia/camera/qcameraimagecapture.h b/src/multimedia/camera/qcameraimagecapture.h index 3f3c6bd26..12feb9eec 100644 --- a/src/multimedia/camera/qcameraimagecapture.h +++ b/src/multimedia/camera/qcameraimagecapture.h @@ -93,7 +93,7 @@ public: bool isAvailable() const; QMultimedia::AvailabilityStatus availability() const; - QMediaObject *mediaObject() const; + QMediaObject *mediaObject() const override; Error error() const; QString errorString() const; @@ -135,7 +135,7 @@ Q_SIGNALS: void imageSaved(int id, const QString &fileName); protected: - bool setMediaObject(QMediaObject *); + bool setMediaObject(QMediaObject *) override; QCameraImageCapturePrivate *d_ptr; private: diff --git a/src/multimedia/camera/qcameraimageprocessing.cpp b/src/multimedia/camera/qcameraimageprocessing.cpp index 431e3202d..91ba1d566 100644 --- a/src/multimedia/camera/qcameraimageprocessing.cpp +++ b/src/multimedia/camera/qcameraimageprocessing.cpp @@ -101,10 +101,10 @@ public: QCameraImageProcessingControl(parent) {} - bool isParameterSupported(ProcessingParameter) const { return false; } - bool isParameterValueSupported(ProcessingParameter, const QVariant &) const { return false; } - QVariant parameter(ProcessingParameter) const { return QVariant(); } - void setParameter(ProcessingParameter, const QVariant &) {} + bool isParameterSupported(ProcessingParameter) const override { return false; } + bool isParameterValueSupported(ProcessingParameter, const QVariant &) const override { return false; } + QVariant parameter(ProcessingParameter) const override { return QVariant(); } + void setParameter(ProcessingParameter, const QVariant &) override {} }; diff --git a/src/multimedia/playback/qmedianetworkplaylistprovider_p.h b/src/multimedia/playback/qmedianetworkplaylistprovider_p.h index 94595751b..3d1ffe66a 100644 --- a/src/multimedia/playback/qmedianetworkplaylistprovider_p.h +++ b/src/multimedia/playback/qmedianetworkplaylistprovider_p.h @@ -62,26 +62,26 @@ class Q_MULTIMEDIA_EXPORT QMediaNetworkPlaylistProvider : public QMediaPlaylistP Q_OBJECT public: QMediaNetworkPlaylistProvider(QObject *parent=0); - virtual ~QMediaNetworkPlaylistProvider(); + ~QMediaNetworkPlaylistProvider(); - virtual bool load(const QNetworkRequest &request, const char *format = 0); + bool load(const QNetworkRequest &request, const char *format = 0) override; - virtual int mediaCount() const; - virtual QMediaContent media(int pos) const; + int mediaCount() const override; + QMediaContent media(int pos) const override; - virtual bool isReadOnly() const; + bool isReadOnly() const override; - virtual bool addMedia(const QMediaContent &content); - virtual bool addMedia(const QList<QMediaContent> &items); - virtual bool insertMedia(int pos, const QMediaContent &content); - virtual bool insertMedia(int pos, const QList<QMediaContent> &items); - virtual bool moveMedia(int from, int to); - virtual bool removeMedia(int pos); - virtual bool removeMedia(int start, int end); - virtual bool clear(); + bool addMedia(const QMediaContent &content) override; + bool addMedia(const QList<QMediaContent> &items) override; + bool insertMedia(int pos, const QMediaContent &content) override; + bool insertMedia(int pos, const QList<QMediaContent> &items) override; + bool moveMedia(int from, int to) override; + bool removeMedia(int pos) override; + bool removeMedia(int start, int end) override; + bool clear() override; public Q_SLOTS: - virtual void shuffle(); + void shuffle() override; private: Q_DISABLE_COPY(QMediaNetworkPlaylistProvider) diff --git a/src/multimedia/playback/qmediaplayer.h b/src/multimedia/playback/qmediaplayer.h index f8d91b999..f23a94104 100644 --- a/src/multimedia/playback/qmediaplayer.h +++ b/src/multimedia/playback/qmediaplayer.h @@ -157,7 +157,7 @@ public: QNetworkConfiguration currentNetworkConfiguration() const; - QMultimedia::AvailabilityStatus availability() const; + QMultimedia::AvailabilityStatus availability() const override; QAudio::Role audioRole() const; void setAudioRole(QAudio::Role audioRole); @@ -205,8 +205,8 @@ Q_SIGNALS: void networkConfigurationChanged(const QNetworkConfiguration &configuration); public: - virtual bool bind(QObject *); - virtual void unbind(QObject *); + bool bind(QObject *) override; + void unbind(QObject *) override; private: Q_DISABLE_COPY(QMediaPlayer) diff --git a/src/multimedia/playback/qmediaplaylist.h b/src/multimedia/playback/qmediaplaylist.h index 05ab8f42e..b16e734f8 100644 --- a/src/multimedia/playback/qmediaplaylist.h +++ b/src/multimedia/playback/qmediaplaylist.h @@ -70,7 +70,7 @@ public: explicit QMediaPlaylist(QObject *parent = Q_NULLPTR); virtual ~QMediaPlaylist(); - QMediaObject *mediaObject() const; + QMediaObject *mediaObject() const override; PlaybackMode playbackMode() const; void setPlaybackMode(PlaybackMode mode); @@ -129,7 +129,7 @@ Q_SIGNALS: void loadFailed(); protected: - bool setMediaObject(QMediaObject *object); + bool setMediaObject(QMediaObject *object) override; QMediaPlaylistPrivate *d_ptr; private: diff --git a/src/multimedia/playback/qmediaplaylist_p.h b/src/multimedia/playback/qmediaplaylist_p.h index 0c3375ba7..8e081dd67 100644 --- a/src/multimedia/playback/qmediaplaylist_p.h +++ b/src/multimedia/playback/qmediaplaylist_p.h @@ -141,26 +141,26 @@ public: connect(m_navigator, SIGNAL(playbackModeChanged(QMediaPlaylist::PlaybackMode)), SIGNAL(playbackModeChanged(QMediaPlaylist::PlaybackMode))); } - virtual ~QMediaNetworkPlaylistControl() {}; + ~QMediaNetworkPlaylistControl() {} - QMediaPlaylistProvider* playlistProvider() const { return m_navigator->playlist(); } - bool setPlaylistProvider(QMediaPlaylistProvider *mediaPlaylist) + QMediaPlaylistProvider* playlistProvider() const override { return m_navigator->playlist(); } + bool setPlaylistProvider(QMediaPlaylistProvider *mediaPlaylist) override { m_navigator->setPlaylist(mediaPlaylist); emit playlistProviderChanged(); return true; } - int currentIndex() const { return m_navigator->currentIndex(); } - void setCurrentIndex(int position) { m_navigator->jump(position); } - int nextIndex(int steps) const { return m_navigator->nextIndex(steps); } - int previousIndex(int steps) const { return m_navigator->previousIndex(steps); } + int currentIndex() const override { return m_navigator->currentIndex(); } + void setCurrentIndex(int position) override { m_navigator->jump(position); } + int nextIndex(int steps) const override { return m_navigator->nextIndex(steps); } + int previousIndex(int steps) const override { return m_navigator->previousIndex(steps); } - void next() { m_navigator->next(); } - void previous() { m_navigator->previous(); } + void next() override { m_navigator->next(); } + void previous() override { m_navigator->previous(); } - QMediaPlaylist::PlaybackMode playbackMode() const { return m_navigator->playbackMode(); } - void setPlaybackMode(QMediaPlaylist::PlaybackMode mode) { m_navigator->setPlaybackMode(mode); } + QMediaPlaylist::PlaybackMode playbackMode() const override { return m_navigator->playbackMode(); } + void setPlaybackMode(QMediaPlaylist::PlaybackMode mode) override { m_navigator->setPlaybackMode(mode); } private: QMediaPlaylistNavigator *m_navigator; diff --git a/src/multimedia/playback/qmediaplaylistioplugin_p.h b/src/multimedia/playback/qmediaplaylistioplugin_p.h index 73281b2bf..1e157d135 100644 --- a/src/multimedia/playback/qmediaplaylistioplugin_p.h +++ b/src/multimedia/playback/qmediaplaylistioplugin_p.h @@ -107,17 +107,17 @@ Q_OBJECT Q_INTERFACES(QMediaPlaylistIOInterface) public: explicit QMediaPlaylistIOPlugin(QObject *parent = 0); - virtual ~QMediaPlaylistIOPlugin(); + ~QMediaPlaylistIOPlugin(); - virtual bool canRead(QIODevice *device, const QByteArray &format = QByteArray() ) const = 0; - virtual bool canRead(const QUrl& location, const QByteArray &format = QByteArray()) const = 0; + bool canRead(QIODevice *device, const QByteArray &format = QByteArray() ) const override = 0; + bool canRead(const QUrl& location, const QByteArray &format = QByteArray()) const override = 0; - virtual bool canWrite(QIODevice *device, const QByteArray &format) const = 0; + bool canWrite(QIODevice *device, const QByteArray &format) const override = 0; - virtual QMediaPlaylistReader *createReader(QIODevice *device, const QByteArray &format = QByteArray()) = 0; - virtual QMediaPlaylistReader *createReader(const QUrl& location, const QByteArray &format = QByteArray()) = 0; + QMediaPlaylistReader *createReader(QIODevice *device, const QByteArray &format = QByteArray()) override = 0; + QMediaPlaylistReader *createReader(const QUrl& location, const QByteArray &format = QByteArray()) override = 0; - virtual QMediaPlaylistWriter *createWriter(QIODevice *device, const QByteArray &format) = 0; + QMediaPlaylistWriter *createWriter(QIODevice *device, const QByteArray &format) override = 0; }; QT_END_NAMESPACE diff --git a/src/multimedia/playback/qmediaplaylistnavigator.cpp b/src/multimedia/playback/qmediaplaylistnavigator.cpp index 1da7329ec..192fd463c 100644 --- a/src/multimedia/playback/qmediaplaylistnavigator.cpp +++ b/src/multimedia/playback/qmediaplaylistnavigator.cpp @@ -50,9 +50,9 @@ class QMediaPlaylistNullProvider : public QMediaPlaylistProvider { public: QMediaPlaylistNullProvider() :QMediaPlaylistProvider() {} - virtual ~QMediaPlaylistNullProvider() {} - virtual int mediaCount() const {return 0;} - virtual QMediaContent media(int) const { return QMediaContent(); } + ~QMediaPlaylistNullProvider() {} + int mediaCount() const override {return 0;} + QMediaContent media(int) const override { return QMediaContent(); } }; Q_GLOBAL_STATIC(QMediaPlaylistNullProvider, _q_nullMediaPlaylist) diff --git a/src/multimedia/playback/qplaylistfileparser.cpp b/src/multimedia/playback/qplaylistfileparser.cpp index 424e54d34..d0617d2cf 100644 --- a/src/multimedia/playback/qplaylistfileparser.cpp +++ b/src/multimedia/playback/qplaylistfileparser.cpp @@ -134,7 +134,7 @@ public: C:\Documents and Settings\I\My Music\Greatest Hits\Example.ogg */ - bool parseLineImpl(int lineIndex, const QString& line, const QUrl& root) + bool parseLineImpl(int lineIndex, const QString& line, const QUrl& root) override { if (line[0] == '#' ) { if (m_extendedFormat) { @@ -241,7 +241,7 @@ NumberOfEntries=2 Version=2 */ - bool parseLineImpl(int, const QString &line, const QUrl &root) + bool parseLineImpl(int, const QString &line, const QUrl &root) override { // We ignore everything but 'File' entries, since that's the only thing we care about. if (!line.startsWith(QLatin1String("File"))) diff --git a/src/multimedia/qmediaresourcepolicy_p.cpp b/src/multimedia/qmediaresourcepolicy_p.cpp index 8c9ea8264..1577f11af 100644 --- a/src/multimedia/qmediaresourcepolicy_p.cpp +++ b/src/multimedia/qmediaresourcepolicy_p.cpp @@ -51,24 +51,24 @@ namespace { { } - bool isVideoEnabled() const + bool isVideoEnabled() const override { return true; } - bool isGranted() const + bool isGranted() const override { return true; } - bool isAvailable() const + bool isAvailable() const override { return true; } - void acquire() {} - void release() {} - void setVideoEnabled(bool) {} + void acquire() override {} + void release() override {} + void setVideoEnabled(bool) override {} }; } diff --git a/src/multimedia/qmediaserviceprovider.cpp b/src/multimedia/qmediaserviceprovider.cpp index 5d470d6bd..b0783fba6 100644 --- a/src/multimedia/qmediaserviceprovider.cpp +++ b/src/multimedia/qmediaserviceprovider.cpp @@ -315,7 +315,7 @@ class QPluginServiceProvider : public QMediaServiceProvider QMap<const QMediaService*, MediaServiceData> mediaServiceData; public: - QMediaService* requestService(const QByteArray &type, const QMediaServiceProviderHint &hint) + QMediaService* requestService(const QByteArray &type, const QMediaServiceProviderHint &hint) override { QString key(QLatin1String(type.constData())); @@ -440,7 +440,7 @@ public: return 0; } - void releaseService(QMediaService *service) + void releaseService(QMediaService *service) override { if (service != 0) { MediaServiceData d = mediaServiceData.take(service); @@ -450,7 +450,7 @@ public: } } - QMediaServiceProviderHint::Features supportedFeatures(const QMediaService *service) const + QMediaServiceProviderHint::Features supportedFeatures(const QMediaService *service) const override { if (service) { MediaServiceData d = mediaServiceData.value(service); @@ -470,7 +470,7 @@ public: QMultimedia::SupportEstimate hasSupport(const QByteArray &serviceType, const QString &mimeType, const QStringList& codecs, - int flags) const + int flags) const override { const QList<QObject*> instances = loader()->instances(QLatin1String(serviceType)); @@ -522,7 +522,7 @@ public: return supportEstimate; } - QStringList supportedMimeTypes(const QByteArray &serviceType, int flags) const + QStringList supportedMimeTypes(const QByteArray &serviceType, int flags) const override { const QList<QObject*> instances = loader()->instances(QLatin1String(serviceType)); @@ -569,7 +569,7 @@ public: return supportedTypes; } - QByteArray defaultDevice(const QByteArray &serviceType) const + QByteArray defaultDevice(const QByteArray &serviceType) const override { const auto instances = loader()->instances(QLatin1String(serviceType)); for (QObject *obj : instances) { @@ -589,7 +589,7 @@ public: return QByteArray(); } - QList<QByteArray> devices(const QByteArray &serviceType) const + QList<QByteArray> devices(const QByteArray &serviceType) const override { QList<QByteArray> res; @@ -606,7 +606,7 @@ public: return res; } - QString deviceDescription(const QByteArray &serviceType, const QByteArray &device) + QString deviceDescription(const QByteArray &serviceType, const QByteArray &device) override { const auto instances = loader()->instances(QLatin1String(serviceType)); for (QObject *obj : instances) { @@ -622,7 +622,7 @@ public: return QString(); } - QCamera::Position cameraPosition(const QByteArray &device) const + QCamera::Position cameraPosition(const QByteArray &device) const override { const QByteArray serviceType(Q_MEDIASERVICE_CAMERA); const auto instances = loader()->instances(QString::fromLatin1(serviceType)); @@ -642,7 +642,7 @@ public: return QCamera::UnspecifiedPosition; } - int cameraOrientation(const QByteArray &device) const + int cameraOrientation(const QByteArray &device) const override { const QByteArray serviceType(Q_MEDIASERVICE_CAMERA); const auto instances = loader()->instances(QString::fromLatin1(serviceType)); diff --git a/src/multimedia/qmediaserviceproviderplugin.h b/src/multimedia/qmediaserviceproviderplugin.h index 43fe55d43..6447e319a 100644 --- a/src/multimedia/qmediaserviceproviderplugin.h +++ b/src/multimedia/qmediaserviceproviderplugin.h @@ -195,8 +195,8 @@ class Q_MULTIMEDIA_EXPORT QMediaServiceProviderPlugin : public QObject, public Q Q_INTERFACES(QMediaServiceProviderFactoryInterface) public: - virtual QMediaService* create(const QString& key) = 0; - virtual void release(QMediaService *service) = 0; + QMediaService* create(const QString& key) override = 0; + void release(QMediaService *service) override = 0; }; /*! diff --git a/src/multimedia/qtmultimediaquicktools_headers/qdeclarativevideooutput_p.h b/src/multimedia/qtmultimediaquicktools_headers/qdeclarativevideooutput_p.h index 54282cad4..465821cb1 100644 --- a/src/multimedia/qtmultimediaquicktools_headers/qdeclarativevideooutput_p.h +++ b/src/multimedia/qtmultimediaquicktools_headers/qdeclarativevideooutput_p.h @@ -134,10 +134,10 @@ Q_SIGNALS: void contentRectChanged(); protected: - QSGNode *updatePaintNode(QSGNode *, UpdatePaintNodeData *); - void itemChange(ItemChange change, const ItemChangeData &changeData); - void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry); - void releaseResources(); + QSGNode *updatePaintNode(QSGNode *, UpdatePaintNodeData *) override; + void itemChange(ItemChange change, const ItemChangeData &changeData) override; + void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) override; + void releaseResources() override; private Q_SLOTS: void _q_updateMediaObject(); diff --git a/src/multimedia/qtmultimediaquicktools_headers/qsgvideonode_p.h b/src/multimedia/qtmultimediaquicktools_headers/qsgvideonode_p.h index ab7c5aa23..c094bed1f 100644 --- a/src/multimedia/qtmultimediaquicktools_headers/qsgvideonode_p.h +++ b/src/multimedia/qtmultimediaquicktools_headers/qsgvideonode_p.h @@ -101,8 +101,8 @@ class Q_MULTIMEDIAQUICK_EXPORT QSGVideoNodeFactoryPlugin : public QObject, publi Q_OBJECT Q_INTERFACES(QSGVideoNodeFactoryInterface) public: - virtual QList<QVideoFrame::PixelFormat> supportedPixelFormats(QAbstractVideoBuffer::HandleType handleType) const = 0; - virtual QSGVideoNode *createNode(const QVideoSurfaceFormat &format) = 0; + QList<QVideoFrame::PixelFormat> supportedPixelFormats(QAbstractVideoBuffer::HandleType handleType) const override = 0; + QSGVideoNode *createNode(const QVideoSurfaceFormat &format) override = 0; }; QT_END_NAMESPACE diff --git a/src/multimedia/radio/qradiodata.h b/src/multimedia/radio/qradiodata.h index a5cc09900..826c652ff 100644 --- a/src/multimedia/radio/qradiodata.h +++ b/src/multimedia/radio/qradiodata.h @@ -87,7 +87,7 @@ public: QMultimedia::AvailabilityStatus availability() const; - QMediaObject *mediaObject() const; + QMediaObject *mediaObject() const override; QString stationId() const; ProgramType programType() const; @@ -113,7 +113,7 @@ Q_SIGNALS: void error(QRadioData::Error error); protected: - bool setMediaObject(QMediaObject *); + bool setMediaObject(QMediaObject *) override; QRadioDataPrivate *d_ptr; private: diff --git a/src/multimedia/radio/qradiotuner.h b/src/multimedia/radio/qradiotuner.h index a9de6416d..7952a2e6c 100644 --- a/src/multimedia/radio/qradiotuner.h +++ b/src/multimedia/radio/qradiotuner.h @@ -81,7 +81,7 @@ public: explicit QRadioTuner(QObject *parent = Q_NULLPTR); ~QRadioTuner(); - QMultimedia::AvailabilityStatus availability() const; + QMultimedia::AvailabilityStatus availability() const override; State state() const; diff --git a/src/multimedia/recording/qmediarecorder.h b/src/multimedia/recording/qmediarecorder.h index 3ac25129b..a12bcd632 100644 --- a/src/multimedia/recording/qmediarecorder.h +++ b/src/multimedia/recording/qmediarecorder.h @@ -109,7 +109,7 @@ public: explicit QMediaRecorder(QMediaObject *mediaObject, QObject *parent = Q_NULLPTR); ~QMediaRecorder(); - QMediaObject *mediaObject() const; + QMediaObject *mediaObject() const override; bool isAvailable() const; QMultimedia::AvailabilityStatus availability() const; @@ -194,7 +194,7 @@ Q_SIGNALS: protected: QMediaRecorder(QMediaRecorderPrivate &dd, QMediaObject *mediaObject, QObject *parent = Q_NULLPTR); - bool setMediaObject(QMediaObject *object); + bool setMediaObject(QMediaObject *object) override; QMediaRecorderPrivate *d_ptr; private: diff --git a/src/multimedia/video/qabstractvideobuffer.h b/src/multimedia/video/qabstractvideobuffer.h index dcefdf7bc..2352c0f3d 100644 --- a/src/multimedia/video/qabstractvideobuffer.h +++ b/src/multimedia/video/qabstractvideobuffer.h @@ -107,7 +107,7 @@ public: QAbstractPlanarVideoBuffer(HandleType type); virtual ~QAbstractPlanarVideoBuffer(); - uchar *map(MapMode mode, int *numBytes, int *bytesPerLine); + uchar *map(MapMode mode, int *numBytes, int *bytesPerLine) override; virtual int map(MapMode mode, int *numBytes, int bytesPerLine[4], uchar *data[4]) = 0; protected: diff --git a/src/multimedia/video/qabstractvideobuffer_p.h b/src/multimedia/video/qabstractvideobuffer_p.h index 6fbd75a30..9e3ced9b5 100644 --- a/src/multimedia/video/qabstractvideobuffer_p.h +++ b/src/multimedia/video/qabstractvideobuffer_p.h @@ -85,7 +85,7 @@ public: QAbstractPlanarVideoBufferPrivate() {} - int map(QAbstractVideoBuffer::MapMode mode, int *numBytes, int bytesPerLine[4], uchar *data[4]); + int map(QAbstractVideoBuffer::MapMode mode, int *numBytes, int bytesPerLine[4], uchar *data[4]) override; private: Q_DECLARE_PUBLIC(QAbstractPlanarVideoBuffer) diff --git a/src/multimedia/video/qimagevideobuffer_p.h b/src/multimedia/video/qimagevideobuffer_p.h index 6fa742c88..f2b88dd9b 100644 --- a/src/multimedia/video/qimagevideobuffer_p.h +++ b/src/multimedia/video/qimagevideobuffer_p.h @@ -67,10 +67,10 @@ public: QImageVideoBuffer(const QImage &image); ~QImageVideoBuffer(); - MapMode mapMode() const; + MapMode mapMode() const override; - uchar *map(MapMode mode, int *numBytes, int *bytesPerLine); - void unmap(); + uchar *map(MapMode mode, int *numBytes, int *bytesPerLine) override; + void unmap() override; }; QT_END_NAMESPACE diff --git a/src/multimedia/video/qmemoryvideobuffer_p.h b/src/multimedia/video/qmemoryvideobuffer_p.h index 132f9367c..e1b1f83a9 100644 --- a/src/multimedia/video/qmemoryvideobuffer_p.h +++ b/src/multimedia/video/qmemoryvideobuffer_p.h @@ -65,10 +65,10 @@ public: QMemoryVideoBuffer(const QByteArray &data, int bytesPerLine); ~QMemoryVideoBuffer(); - MapMode mapMode() const; + MapMode mapMode() const override; - uchar *map(MapMode mode, int *numBytes, int *bytesPerLine); - void unmap(); + uchar *map(MapMode mode, int *numBytes, int *bytesPerLine) override; + void unmap() override; }; QT_END_NAMESPACE diff --git a/src/multimedia/video/qvideosurfaceoutput_p.h b/src/multimedia/video/qvideosurfaceoutput_p.h index bca288191..a1b24abbf 100644 --- a/src/multimedia/video/qvideosurfaceoutput_p.h +++ b/src/multimedia/video/qvideosurfaceoutput_p.h @@ -70,12 +70,12 @@ public: QVideoSurfaceOutput(QObject*parent = 0); ~QVideoSurfaceOutput(); - QMediaObject *mediaObject() const; + QMediaObject *mediaObject() const override; void setVideoSurface(QAbstractVideoSurface *surface); protected: - bool setMediaObject(QMediaObject *object); + bool setMediaObject(QMediaObject *object) override; private: QPointer<QAbstractVideoSurface> m_surface; diff --git a/src/multimediawidgets/qcameraviewfinder.h b/src/multimediawidgets/qcameraviewfinder.h index 2bd49fe83..57f20809a 100644 --- a/src/multimediawidgets/qcameraviewfinder.h +++ b/src/multimediawidgets/qcameraviewfinder.h @@ -64,10 +64,10 @@ public: explicit QCameraViewfinder(QWidget *parent = Q_NULLPTR); ~QCameraViewfinder(); - QMediaObject *mediaObject() const; + QMediaObject *mediaObject() const override; protected: - bool setMediaObject(QMediaObject *object); + bool setMediaObject(QMediaObject *object) override; private: Q_DISABLE_COPY(QCameraViewfinder) diff --git a/src/multimediawidgets/qgraphicsvideoitem.h b/src/multimediawidgets/qgraphicsvideoitem.h index 89de3397a..204993e7f 100644 --- a/src/multimediawidgets/qgraphicsvideoitem.h +++ b/src/multimediawidgets/qgraphicsvideoitem.h @@ -66,7 +66,7 @@ public: explicit QGraphicsVideoItem(QGraphicsItem *parent = Q_NULLPTR); ~QGraphicsVideoItem(); - QMediaObject *mediaObject() const; + QMediaObject *mediaObject() const override; Qt::AspectRatioMode aspectRatioMode() const; void setAspectRatioMode(Qt::AspectRatioMode mode); @@ -79,18 +79,18 @@ public: QSizeF nativeSize() const; - QRectF boundingRect() const; + QRectF boundingRect() const override; - void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = Q_NULLPTR); + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = Q_NULLPTR) override; Q_SIGNALS: void nativeSizeChanged(const QSizeF &size); protected: - void timerEvent(QTimerEvent *event); - QVariant itemChange(GraphicsItemChange change, const QVariant &value); + void timerEvent(QTimerEvent *event) override; + QVariant itemChange(GraphicsItemChange change, const QVariant &value) override; - bool setMediaObject(QMediaObject *object); + bool setMediaObject(QMediaObject *object) override; QGraphicsVideoItemPrivate *d_ptr; diff --git a/src/multimediawidgets/qpaintervideosurface.cpp b/src/multimediawidgets/qpaintervideosurface.cpp index 9a6ad11ed..214e5ec7e 100644 --- a/src/multimediawidgets/qpaintervideosurface.cpp +++ b/src/multimediawidgets/qpaintervideosurface.cpp @@ -72,19 +72,19 @@ public: QVideoSurfaceGenericPainter(); QList<QVideoFrame::PixelFormat> supportedPixelFormats( - QAbstractVideoBuffer::HandleType handleType) const; + QAbstractVideoBuffer::HandleType handleType) const override; - bool isFormatSupported(const QVideoSurfaceFormat &format) const; + bool isFormatSupported(const QVideoSurfaceFormat &format) const override; - QAbstractVideoSurface::Error start(const QVideoSurfaceFormat &format); - void stop(); + QAbstractVideoSurface::Error start(const QVideoSurfaceFormat &format) override; + void stop() override; - QAbstractVideoSurface::Error setCurrentFrame(const QVideoFrame &frame); + QAbstractVideoSurface::Error setCurrentFrame(const QVideoFrame &frame) override; QAbstractVideoSurface::Error paint( - const QRectF &target, QPainter *painter, const QRectF &source); + const QRectF &target, QPainter *painter, const QRectF &source) override; - void updateColors(int brightness, int contrast, int hue, int saturation); + void updateColors(int brightness, int contrast, int hue, int saturation) override; private: QList<QVideoFrame::PixelFormat> m_imagePixelFormats; @@ -252,19 +252,19 @@ public: QVideoSurfaceGLPainter(QGLContext *context); ~QVideoSurfaceGLPainter(); QList<QVideoFrame::PixelFormat> supportedPixelFormats( - QAbstractVideoBuffer::HandleType handleType) const; + QAbstractVideoBuffer::HandleType handleType) const override; - bool isFormatSupported(const QVideoSurfaceFormat &format) const; + bool isFormatSupported(const QVideoSurfaceFormat &format) const override; - void stop(); + void stop() override; - QAbstractVideoSurface::Error setCurrentFrame(const QVideoFrame &frame); + QAbstractVideoSurface::Error setCurrentFrame(const QVideoFrame &frame) override; QAbstractVideoSurface::Error paint( - const QRectF &target, QPainter *painter, const QRectF &source); + const QRectF &target, QPainter *painter, const QRectF &source) override; - void updateColors(int brightness, int contrast, int hue, int saturation); - void viewportDestroyed(); + void updateColors(int brightness, int contrast, int hue, int saturation) override; + void viewportDestroyed() override; protected: void initRgbTextureInfo(GLenum internalFormat, GLuint format, GLenum type, const QSize &size); @@ -667,11 +667,11 @@ class QVideoSurfaceArbFpPainter : public QVideoSurfaceGLPainter public: QVideoSurfaceArbFpPainter(QGLContext *context); - QAbstractVideoSurface::Error start(const QVideoSurfaceFormat &format); - void stop(); + QAbstractVideoSurface::Error start(const QVideoSurfaceFormat &format) override; + void stop() override; QAbstractVideoSurface::Error paint( - const QRectF &target, QPainter *painter, const QRectF &source); + const QRectF &target, QPainter *painter, const QRectF &source) override; private: typedef void (APIENTRY *_glProgramStringARB) (GLenum, GLenum, GLsizei, const GLvoid *); @@ -1066,11 +1066,11 @@ class QVideoSurfaceGlslPainter : public QVideoSurfaceGLPainter public: QVideoSurfaceGlslPainter(QGLContext *context); - QAbstractVideoSurface::Error start(const QVideoSurfaceFormat &format); - void stop(); + QAbstractVideoSurface::Error start(const QVideoSurfaceFormat &format) override; + void stop() override; QAbstractVideoSurface::Error paint( - const QRectF &target, QPainter *painter, const QRectF &source); + const QRectF &target, QPainter *painter, const QRectF &source) override; private: QGLShaderProgram m_program; diff --git a/src/multimediawidgets/qpaintervideosurface_p.h b/src/multimediawidgets/qpaintervideosurface_p.h index 2e89393e9..bf0a0ac5c 100644 --- a/src/multimediawidgets/qpaintervideosurface_p.h +++ b/src/multimediawidgets/qpaintervideosurface_p.h @@ -99,14 +99,14 @@ public: ~QPainterVideoSurface(); QList<QVideoFrame::PixelFormat> supportedPixelFormats( - QAbstractVideoBuffer::HandleType handleType = QAbstractVideoBuffer::NoHandle) const; + QAbstractVideoBuffer::HandleType handleType = QAbstractVideoBuffer::NoHandle) const override; - bool isFormatSupported(const QVideoSurfaceFormat &format) const; + bool isFormatSupported(const QVideoSurfaceFormat &format) const override; - bool start(const QVideoSurfaceFormat &format); - void stop(); + bool start(const QVideoSurfaceFormat &format) override; + void stop() override; - bool present(const QVideoFrame &frame); + bool present(const QVideoFrame &frame) override; int brightness() const; void setBrightness(int brightness); diff --git a/src/multimediawidgets/qvideowidget.h b/src/multimediawidgets/qvideowidget.h index 9aca9d3a4..c8474288b 100644 --- a/src/multimediawidgets/qvideowidget.h +++ b/src/multimediawidgets/qvideowidget.h @@ -67,7 +67,7 @@ public: explicit QVideoWidget(QWidget *parent = Q_NULLPTR); ~QVideoWidget(); - QMediaObject *mediaObject() const; + QMediaObject *mediaObject() const override; #ifdef Q_QDOC bool isFullScreen() const; @@ -80,7 +80,7 @@ public: int hue() const; int saturation() const; - QSize sizeHint() const; + QSize sizeHint() const override; public Q_SLOTS: void setFullScreen(bool fullScreen); @@ -98,14 +98,14 @@ Q_SIGNALS: void saturationChanged(int saturation); protected: - bool event(QEvent *event); - void showEvent(QShowEvent *event); - void hideEvent(QHideEvent *event); - void resizeEvent(QResizeEvent *event); - void moveEvent(QMoveEvent *event); - void paintEvent(QPaintEvent *event); - - bool setMediaObject(QMediaObject *object); + bool event(QEvent *event) override; + void showEvent(QShowEvent *event) override; + void hideEvent(QHideEvent *event) override; + void resizeEvent(QResizeEvent *event) override; + void moveEvent(QMoveEvent *event) override; + void paintEvent(QPaintEvent *event) override; + + bool setMediaObject(QMediaObject *object) override; #if defined(Q_WS_WIN) bool winEvent(MSG *message, long *result); diff --git a/src/multimediawidgets/qvideowidget_p.h b/src/multimediawidgets/qvideowidget_p.h index 15aaa5a60..6ef4c3645 100644 --- a/src/multimediawidgets/qvideowidget_p.h +++ b/src/multimediawidgets/qvideowidget_p.h @@ -106,15 +106,15 @@ public: void releaseControl(); - void setBrightness(int brightness); - void setContrast(int contrast); - void setHue(int hue); - void setSaturation(int saturation); + void setBrightness(int brightness) override; + void setContrast(int contrast) override; + void setHue(int hue) override; + void setSaturation(int saturation) override; - void setFullScreen(bool fullScreen); + void setFullScreen(bool fullScreen) override; - Qt::AspectRatioMode aspectRatioMode() const; - void setAspectRatioMode(Qt::AspectRatioMode mode); + Qt::AspectRatioMode aspectRatioMode() const override; + void setAspectRatioMode(Qt::AspectRatioMode mode) override; private: QMediaService *m_service; @@ -134,23 +134,23 @@ public: void releaseControl(); void clearSurface(); - void setBrightness(int brightness); - void setContrast(int contrast); - void setHue(int hue); - void setSaturation(int saturation); + void setBrightness(int brightness) override; + void setContrast(int contrast) override; + void setHue(int hue) override; + void setSaturation(int saturation) override; - void setFullScreen(bool fullScreen); + void setFullScreen(bool fullScreen) override; - Qt::AspectRatioMode aspectRatioMode() const; - void setAspectRatioMode(Qt::AspectRatioMode mode); + Qt::AspectRatioMode aspectRatioMode() const override; + void setAspectRatioMode(Qt::AspectRatioMode mode) override; - QSize sizeHint() const; + QSize sizeHint() const override; - void showEvent(); - void hideEvent(QHideEvent *event); - void resizeEvent(QResizeEvent *event); - void moveEvent(QMoveEvent *event); - void paintEvent(QPaintEvent *event); + void showEvent() override; + void hideEvent(QHideEvent *event) override; + void resizeEvent(QResizeEvent *event) override; + void moveEvent(QMoveEvent *event) override; + void paintEvent(QPaintEvent *event) override; Q_SIGNALS: void fullScreenChanged(bool fullScreen); @@ -188,23 +188,23 @@ public: void releaseControl(); - void setBrightness(int brightness); - void setContrast(int contrast); - void setHue(int hue); - void setSaturation(int saturation); + void setBrightness(int brightness) override; + void setContrast(int contrast) override; + void setHue(int hue) override; + void setSaturation(int saturation) override; - void setFullScreen(bool fullScreen); + void setFullScreen(bool fullScreen) override; - Qt::AspectRatioMode aspectRatioMode() const; - void setAspectRatioMode(Qt::AspectRatioMode mode); + Qt::AspectRatioMode aspectRatioMode() const override; + void setAspectRatioMode(Qt::AspectRatioMode mode) override; - QSize sizeHint() const; + QSize sizeHint() const override; - void showEvent(); - void hideEvent(QHideEvent *event); - void resizeEvent(QResizeEvent *event); - void moveEvent(QMoveEvent *event); - void paintEvent(QPaintEvent *event); + void showEvent() override; + void hideEvent(QHideEvent *event) override; + void resizeEvent(QResizeEvent *event) override; + void moveEvent(QMoveEvent *event) override; + void paintEvent(QPaintEvent *event) override; #if defined(Q_WS_WIN) bool winEvent(MSG *message, long *result); diff --git a/src/qtmultimediaquicktools/qdeclarativevideooutput_render_p.h b/src/qtmultimediaquicktools/qdeclarativevideooutput_render_p.h index 666a7cbd3..c84612960 100644 --- a/src/qtmultimediaquicktools/qdeclarativevideooutput_render_p.h +++ b/src/qtmultimediaquicktools/qdeclarativevideooutput_render_p.h @@ -125,10 +125,10 @@ class QSGVideoItemSurface : public QAbstractVideoSurface public: explicit QSGVideoItemSurface(QDeclarativeVideoRendererBackend *backend, QObject *parent = 0); ~QSGVideoItemSurface(); - QList<QVideoFrame::PixelFormat> supportedPixelFormats(QAbstractVideoBuffer::HandleType handleType) const; - bool start(const QVideoSurfaceFormat &format); - void stop(); - bool present(const QVideoFrame &frame); + QList<QVideoFrame::PixelFormat> supportedPixelFormats(QAbstractVideoBuffer::HandleType handleType) const override; + bool start(const QVideoSurfaceFormat &format) override; + void stop() override; + bool present(const QVideoFrame &frame) override; void scheduleOpenGLContextUpdate(); private slots: diff --git a/src/qtmultimediaquicktools/qsgvideonode_rgb.cpp b/src/qtmultimediaquicktools/qsgvideonode_rgb.cpp index 2126f0cbd..0dfa11ab9 100644 --- a/src/qtmultimediaquicktools/qsgvideonode_rgb.cpp +++ b/src/qtmultimediaquicktools/qsgvideonode_rgb.cpp @@ -85,9 +85,9 @@ public: setShaderSourceFile(QOpenGLShader::Fragment, QStringLiteral(":/qtmultimediaquicktools/shaders/rgbvideo.frag")); } - void updateState(const RenderState &state, QSGMaterial *newMaterial, QSGMaterial *oldMaterial); + void updateState(const RenderState &state, QSGMaterial *newMaterial, QSGMaterial *oldMaterial) override; - virtual char const *const *attributeNames() const { + char const *const *attributeNames() const override { static const char *names[] = { "qt_VertexPosition", "qt_VertexTexCoord", @@ -97,7 +97,7 @@ public: } protected: - virtual void initialize() { + void initialize() override { m_id_matrix = program()->uniformLocation("qt_Matrix"); m_id_width = program()->uniformLocation("width"); m_id_rgbTexture = program()->uniformLocation("rgbTexture"); @@ -139,17 +139,17 @@ public: QOpenGLContext::currentContext()->functions()->glDeleteTextures(1, &m_textureId); } - virtual QSGMaterialType *type() const { + QSGMaterialType *type() const override { static QSGMaterialType normalType, swizzleType; return needsSwizzling() ? &swizzleType : &normalType; } - virtual QSGMaterialShader *createShader() const { + QSGMaterialShader *createShader() const override { return needsSwizzling() ? new QSGVideoMaterialShader_RGB_swizzle : new QSGVideoMaterialShader_RGB; } - virtual int compare(const QSGMaterial *other) const { + int compare(const QSGMaterial *other) const override { const QSGVideoMaterial_RGB *m = static_cast<const QSGVideoMaterial_RGB *>(other); if (!m_textureId) diff --git a/src/qtmultimediaquicktools/qsgvideonode_rgb_p.h b/src/qtmultimediaquicktools/qsgvideonode_rgb_p.h index 71b28557d..95b74be0b 100644 --- a/src/qtmultimediaquicktools/qsgvideonode_rgb_p.h +++ b/src/qtmultimediaquicktools/qsgvideonode_rgb_p.h @@ -64,13 +64,13 @@ public: QSGVideoNode_RGB(const QVideoSurfaceFormat &format); ~QSGVideoNode_RGB(); - virtual QVideoFrame::PixelFormat pixelFormat() const { + QVideoFrame::PixelFormat pixelFormat() const override { return m_format.pixelFormat(); } - QAbstractVideoBuffer::HandleType handleType() const { + QAbstractVideoBuffer::HandleType handleType() const override { return QAbstractVideoBuffer::NoHandle; } - void setCurrentFrame(const QVideoFrame &frame, FrameFlags flags); + void setCurrentFrame(const QVideoFrame &frame, FrameFlags flags) override; private: QVideoSurfaceFormat m_format; @@ -80,8 +80,8 @@ private: class QSGVideoNodeFactory_RGB : public QSGVideoNodeFactoryInterface { public: - QList<QVideoFrame::PixelFormat> supportedPixelFormats(QAbstractVideoBuffer::HandleType handleType) const; - QSGVideoNode *createNode(const QVideoSurfaceFormat &format); + QList<QVideoFrame::PixelFormat> supportedPixelFormats(QAbstractVideoBuffer::HandleType handleType) const override; + QSGVideoNode *createNode(const QVideoSurfaceFormat &format) override; }; QT_END_NAMESPACE diff --git a/src/qtmultimediaquicktools/qsgvideonode_texture.cpp b/src/qtmultimediaquicktools/qsgvideonode_texture.cpp index 8080f3ec2..a26d59532 100644 --- a/src/qtmultimediaquicktools/qsgvideonode_texture.cpp +++ b/src/qtmultimediaquicktools/qsgvideonode_texture.cpp @@ -82,9 +82,9 @@ public: setShaderSourceFile(QOpenGLShader::Fragment, QStringLiteral(":/qtmultimediaquicktools/shaders/rgbvideo.frag")); } - void updateState(const RenderState &state, QSGMaterial *newMaterial, QSGMaterial *oldMaterial); + void updateState(const RenderState &state, QSGMaterial *newMaterial, QSGMaterial *oldMaterial) override; - virtual char const *const *attributeNames() const { + char const *const *attributeNames() const override { static const char *names[] = { "qt_VertexPosition", "qt_VertexTexCoord", @@ -94,7 +94,7 @@ public: } protected: - virtual void initialize() { + void initialize() override { m_id_matrix = program()->uniformLocation("qt_Matrix"); m_id_Texture = program()->uniformLocation("rgbTexture"); m_id_opacity = program()->uniformLocation("opacity"); @@ -132,17 +132,17 @@ public: m_frame = QVideoFrame(); } - virtual QSGMaterialType *type() const { + QSGMaterialType *type() const override { static QSGMaterialType normalType, swizzleType; return needsSwizzling() ? &swizzleType : &normalType; } - virtual QSGMaterialShader *createShader() const { + QSGMaterialShader *createShader() const override { return needsSwizzling() ? new QSGVideoMaterialShader_Texture_swizzle : new QSGVideoMaterialShader_Texture; } - virtual int compare(const QSGMaterial *other) const { + int compare(const QSGMaterial *other) const override { const QSGVideoMaterial_Texture *m = static_cast<const QSGVideoMaterial_Texture *>(other); if (!m_textureId) diff --git a/src/qtmultimediaquicktools/qsgvideonode_texture_p.h b/src/qtmultimediaquicktools/qsgvideonode_texture_p.h index e3b288d6e..12685dd24 100644 --- a/src/qtmultimediaquicktools/qsgvideonode_texture_p.h +++ b/src/qtmultimediaquicktools/qsgvideonode_texture_p.h @@ -64,13 +64,13 @@ public: QSGVideoNode_Texture(const QVideoSurfaceFormat &format); ~QSGVideoNode_Texture(); - virtual QVideoFrame::PixelFormat pixelFormat() const { + QVideoFrame::PixelFormat pixelFormat() const override { return m_format.pixelFormat(); } - QAbstractVideoBuffer::HandleType handleType() const { + QAbstractVideoBuffer::HandleType handleType() const override { return QAbstractVideoBuffer::GLTextureHandle; } - void setCurrentFrame(const QVideoFrame &frame, FrameFlags flags); + void setCurrentFrame(const QVideoFrame &frame, FrameFlags flags) override; private: QVideoSurfaceFormat m_format; @@ -80,8 +80,8 @@ private: class QSGVideoNodeFactory_Texture : public QSGVideoNodeFactoryInterface { public: - QList<QVideoFrame::PixelFormat> supportedPixelFormats(QAbstractVideoBuffer::HandleType handleType) const; - QSGVideoNode *createNode(const QVideoSurfaceFormat &format); + QList<QVideoFrame::PixelFormat> supportedPixelFormats(QAbstractVideoBuffer::HandleType handleType) const override; + QSGVideoNode *createNode(const QVideoSurfaceFormat &format) override; }; QT_END_NAMESPACE diff --git a/src/qtmultimediaquicktools/qsgvideonode_yuv.cpp b/src/qtmultimediaquicktools/qsgvideonode_yuv.cpp index 68e6b456b..38b5af943 100644 --- a/src/qtmultimediaquicktools/qsgvideonode_yuv.cpp +++ b/src/qtmultimediaquicktools/qsgvideonode_yuv.cpp @@ -79,9 +79,9 @@ public: setShaderSourceFile(QOpenGLShader::Fragment, QStringLiteral(":/qtmultimediaquicktools/shaders/biplanaryuvvideo.frag")); } - virtual void updateState(const RenderState &state, QSGMaterial *newMaterial, QSGMaterial *oldMaterial); + void updateState(const RenderState &state, QSGMaterial *newMaterial, QSGMaterial *oldMaterial) override; - virtual char const *const *attributeNames() const { + char const *const *attributeNames() const override { static const char *names[] = { "qt_VertexPosition", "qt_VertexTexCoord", @@ -91,7 +91,7 @@ public: } protected: - virtual void initialize() { + void initialize() override { m_id_matrix = program()->uniformLocation("qt_Matrix"); m_id_plane1Width = program()->uniformLocation("plane1Width"); m_id_plane2Width = program()->uniformLocation("plane2Width"); @@ -181,10 +181,10 @@ public: setShaderSourceFile(QOpenGLShader::Fragment, QStringLiteral(":/qtmultimediaquicktools/shaders/triplanaryuvvideo.frag")); } - virtual void updateState(const RenderState &state, QSGMaterial *newMaterial, QSGMaterial *oldMaterial); + void updateState(const RenderState &state, QSGMaterial *newMaterial, QSGMaterial *oldMaterial) override; protected: - virtual void initialize() { + void initialize() override { m_id_plane3Width = program()->uniformLocation("plane3Width"); m_id_plane3Texture = program()->uniformLocation("plane3Texture"); QSGVideoMaterialShader_YUV_BiPlanar::initialize(); @@ -201,7 +201,7 @@ public: QSGVideoMaterial_YUV(const QVideoSurfaceFormat &format); ~QSGVideoMaterial_YUV(); - virtual QSGMaterialType *type() const { + QSGMaterialType *type() const override { static QSGMaterialType biPlanarType, biPlanarSwizzleType, triPlanarType, uyvyType, yuyvType; switch (m_format.pixelFormat()) { @@ -218,7 +218,7 @@ public: } } - virtual QSGMaterialShader *createShader() const { + QSGMaterialShader *createShader() const override { switch (m_format.pixelFormat()) { case QVideoFrame::Format_NV12: return new QSGVideoMaterialShader_YUV_BiPlanar; @@ -233,7 +233,7 @@ public: } } - virtual int compare(const QSGMaterial *other) const { + int compare(const QSGMaterial *other) const override { const QSGVideoMaterial_YUV *m = static_cast<const QSGVideoMaterial_YUV *>(other); if (!m_textureIds[0]) return 1; diff --git a/src/qtmultimediaquicktools/qsgvideonode_yuv_p.h b/src/qtmultimediaquicktools/qsgvideonode_yuv_p.h index 2b7e62277..643f40c71 100644 --- a/src/qtmultimediaquicktools/qsgvideonode_yuv_p.h +++ b/src/qtmultimediaquicktools/qsgvideonode_yuv_p.h @@ -63,13 +63,13 @@ public: QSGVideoNode_YUV(const QVideoSurfaceFormat &format); ~QSGVideoNode_YUV(); - virtual QVideoFrame::PixelFormat pixelFormat() const { + QVideoFrame::PixelFormat pixelFormat() const override { return m_format.pixelFormat(); } - QAbstractVideoBuffer::HandleType handleType() const { + QAbstractVideoBuffer::HandleType handleType() const override { return QAbstractVideoBuffer::NoHandle; } - void setCurrentFrame(const QVideoFrame &frame, FrameFlags flags); + void setCurrentFrame(const QVideoFrame &frame, FrameFlags flags) override; private: void bindTexture(int id, int unit, int w, int h, const uchar *bits); @@ -80,8 +80,8 @@ private: class QSGVideoNodeFactory_YUV : public QSGVideoNodeFactoryInterface { public: - QList<QVideoFrame::PixelFormat> supportedPixelFormats(QAbstractVideoBuffer::HandleType handleType) const; - QSGVideoNode *createNode(const QVideoSurfaceFormat &format); + QList<QVideoFrame::PixelFormat> supportedPixelFormats(QAbstractVideoBuffer::HandleType handleType) const override; + QSGVideoNode *createNode(const QVideoSurfaceFormat &format) override; }; QT_END_NAMESPACE |