summaryrefslogtreecommitdiff
path: root/src/multimedia
diff options
context:
space:
mode:
Diffstat (limited to 'src/multimedia')
-rw-r--r--src/multimedia/audio/qaudiobuffer.cpp14
-rw-r--r--src/multimedia/audio/qaudiodecoder.h4
-rw-r--r--src/multimedia/audio/qaudiodevicefactory.cpp94
-rw-r--r--src/multimedia/audio/qaudiosystemplugin.h8
-rw-r--r--src/multimedia/audio/qsoundeffect_qaudio_p.h4
-rw-r--r--src/multimedia/audio/qwavedecoder_p.h10
-rw-r--r--src/multimedia/camera/qcamera.h2
-rw-r--r--src/multimedia/camera/qcamerafocus.cpp32
-rw-r--r--src/multimedia/camera/qcameraimagecapture.h4
-rw-r--r--src/multimedia/camera/qcameraimageprocessing.cpp8
-rw-r--r--src/multimedia/playback/qmedianetworkplaylistprovider_p.h28
-rw-r--r--src/multimedia/playback/qmediaplayer.h6
-rw-r--r--src/multimedia/playback/qmediaplaylist.h4
-rw-r--r--src/multimedia/playback/qmediaplaylist_p.h22
-rw-r--r--src/multimedia/playback/qmediaplaylistioplugin_p.h14
-rw-r--r--src/multimedia/playback/qmediaplaylistnavigator.cpp6
-rw-r--r--src/multimedia/playback/qplaylistfileparser.cpp4
-rw-r--r--src/multimedia/qmediaresourcepolicy_p.cpp12
-rw-r--r--src/multimedia/qmediaserviceprovider.cpp20
-rw-r--r--src/multimedia/qmediaserviceproviderplugin.h4
-rw-r--r--src/multimedia/qtmultimediaquicktools_headers/qdeclarativevideooutput_p.h8
-rw-r--r--src/multimedia/qtmultimediaquicktools_headers/qsgvideonode_p.h4
-rw-r--r--src/multimedia/radio/qradiodata.h4
-rw-r--r--src/multimedia/radio/qradiotuner.h2
-rw-r--r--src/multimedia/recording/qmediarecorder.h4
-rw-r--r--src/multimedia/video/qabstractvideobuffer.h2
-rw-r--r--src/multimedia/video/qabstractvideobuffer_p.h2
-rw-r--r--src/multimedia/video/qimagevideobuffer_p.h6
-rw-r--r--src/multimedia/video/qmemoryvideobuffer_p.h6
-rw-r--r--src/multimedia/video/qvideosurfaceoutput_p.h4
30 files changed, 171 insertions, 171 deletions
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;