diff options
Diffstat (limited to 'src/imports/audioengine')
4 files changed, 23 insertions, 23 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 |