aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/util
diff options
context:
space:
mode:
authorShawn Rutledge <shawn.rutledge@qt.io>2018-02-26 17:34:27 +0100
committerShawn Rutledge <shawn.rutledge@qt.io>2018-02-27 08:27:38 +0000
commite17c89f4ce74e5699ed50dc2187a39d8990316c4 (patch)
treeb1f9b85d5bd1233d8931813dc4e06f7342be2249 /src/quick/util
parente41d067227eb6225b05df88ab724708588fa5304 (diff)
use the override keyword consistently and correctly (clang-tidy)
Change-Id: If9e28d143f8cba3df3c757476b4f2265e2eb8b2a Reviewed-by: Johan Helsing <johan.helsing@qt.io>
Diffstat (limited to 'src/quick/util')
-rw-r--r--src/quick/util/qquickanimation_p.h24
-rw-r--r--src/quick/util/qquickanimation_p_p.h6
-rw-r--r--src/quick/util/qquickimageprovider.h8
-rw-r--r--src/quick/util/qquickpath_p.h2
-rw-r--r--src/quick/util/qquickprofiler_p.h2
-rw-r--r--src/quick/util/qquickstate_p.h2
6 files changed, 22 insertions, 22 deletions
diff --git a/src/quick/util/qquickanimation_p.h b/src/quick/util/qquickanimation_p.h
index d1f460fef7..2293f2597f 100644
--- a/src/quick/util/qquickanimation_p.h
+++ b/src/quick/util/qquickanimation_p.h
@@ -88,7 +88,7 @@ public:
};
QQuickAbstractAnimation(QObject *parent=nullptr);
- virtual ~QQuickAbstractAnimation();
+ ~QQuickAbstractAnimation() override;
enum Loops { Infinite = -2 };
Q_ENUM(Loops)
@@ -167,7 +167,7 @@ class Q_QUICK_PRIVATE_EXPORT QQuickPauseAnimation : public QQuickAbstractAnimati
public:
QQuickPauseAnimation(QObject *parent=nullptr);
- virtual ~QQuickPauseAnimation();
+ ~QQuickPauseAnimation() override;
int duration() const;
void setDuration(int);
@@ -193,7 +193,7 @@ class QQuickScriptAction : public QQuickAbstractAnimation
public:
QQuickScriptAction(QObject *parent=nullptr);
- virtual ~QQuickScriptAction();
+ ~QQuickScriptAction() override;
QQmlScriptString script() const;
void setScript(const QQmlScriptString &);
@@ -223,7 +223,7 @@ class QQuickPropertyAction : public QQuickAbstractAnimation
public:
QQuickPropertyAction(QObject *parent=nullptr);
- virtual ~QQuickPropertyAction();
+ ~QQuickPropertyAction() override;
QObject *target() const;
void setTargetObject(QObject *);
@@ -271,7 +271,7 @@ class Q_QUICK_PRIVATE_EXPORT QQuickPropertyAnimation : public QQuickAbstractAnim
public:
QQuickPropertyAnimation(QObject *parent=nullptr);
- virtual ~QQuickPropertyAnimation();
+ ~QQuickPropertyAnimation() override;
virtual int duration() const;
virtual void setDuration(int);
@@ -326,7 +326,7 @@ class Q_QUICK_PRIVATE_EXPORT QQuickColorAnimation : public QQuickPropertyAnimati
public:
QQuickColorAnimation(QObject *parent=nullptr);
- virtual ~QQuickColorAnimation();
+ ~QQuickColorAnimation() override;
QColor from() const;
void setFrom(const QColor &);
@@ -345,7 +345,7 @@ class Q_QUICK_PRIVATE_EXPORT QQuickNumberAnimation : public QQuickPropertyAnimat
public:
QQuickNumberAnimation(QObject *parent=nullptr);
- virtual ~QQuickNumberAnimation();
+ ~QQuickNumberAnimation() override;
qreal from() const;
void setFrom(qreal);
@@ -370,7 +370,7 @@ class Q_QUICK_PRIVATE_EXPORT QQuickVector3dAnimation : public QQuickPropertyAnim
public:
QQuickVector3dAnimation(QObject *parent=nullptr);
- virtual ~QQuickVector3dAnimation();
+ ~QQuickVector3dAnimation() override;
QVector3D from() const;
void setFrom(QVector3D);
@@ -391,7 +391,7 @@ class Q_QUICK_PRIVATE_EXPORT QQuickRotationAnimation : public QQuickPropertyAnim
public:
QQuickRotationAnimation(QObject *parent=nullptr);
- virtual ~QQuickRotationAnimation();
+ ~QQuickRotationAnimation() override;
qreal from() const;
void setFrom(qreal);
@@ -419,7 +419,7 @@ class Q_QUICK_PRIVATE_EXPORT QQuickAnimationGroup : public QQuickAbstractAnimati
public:
QQuickAnimationGroup(QObject *parent);
- virtual ~QQuickAnimationGroup();
+ ~QQuickAnimationGroup() override;
QQmlListProperty<QQuickAbstractAnimation> animations();
friend class QQuickAbstractAnimation;
@@ -435,7 +435,7 @@ class QQuickSequentialAnimation : public QQuickAnimationGroup
public:
QQuickSequentialAnimation(QObject *parent=nullptr);
- virtual ~QQuickSequentialAnimation();
+ ~QQuickSequentialAnimation() override;
protected:
ThreadingModel threadingModel() const override;
@@ -452,7 +452,7 @@ class Q_QUICK_PRIVATE_EXPORT QQuickParallelAnimation : public QQuickAnimationGro
public:
QQuickParallelAnimation(QObject *parent=nullptr);
- virtual ~QQuickParallelAnimation();
+ ~QQuickParallelAnimation() override;
protected:
ThreadingModel threadingModel() const override;
diff --git a/src/quick/util/qquickanimation_p_p.h b/src/quick/util/qquickanimation_p_p.h
index 304258cde1..c20ec65c24 100644
--- a/src/quick/util/qquickanimation_p_p.h
+++ b/src/quick/util/qquickanimation_p_p.h
@@ -102,7 +102,7 @@ public:
QActionAnimation();
QActionAnimation(QAbstractAnimationAction *action);
- ~QActionAnimation();
+ ~QActionAnimation() override;
int duration() const override;
void setAnimAction(QAbstractAnimationAction *action);
@@ -130,7 +130,7 @@ class Q_AUTOTEST_EXPORT QQuickBulkValueAnimator : public QAbstractAnimationJob
Q_DISABLE_COPY(QQuickBulkValueAnimator)
public:
QQuickBulkValueAnimator();
- ~QQuickBulkValueAnimator();
+ ~QQuickBulkValueAnimator() override;
void setAnimValue(QQuickBulkValueUpdater *value);
QQuickBulkValueUpdater *getAnimValue() const { return animValue; }
@@ -307,7 +307,7 @@ class Q_AUTOTEST_EXPORT QQuickAnimationPropertyUpdater : public QQuickBulkValueU
{
public:
QQuickAnimationPropertyUpdater() : interpolatorType(0), interpolator(nullptr), prevInterpolatorType(0), reverse(false), fromSourced(false), fromDefined(false), wasDeleted(nullptr) {}
- ~QQuickAnimationPropertyUpdater();
+ ~QQuickAnimationPropertyUpdater() override;
void setValue(qreal v) override;
diff --git a/src/quick/util/qquickimageprovider.h b/src/quick/util/qquickimageprovider.h
index 4451105782..4f8193789a 100644
--- a/src/quick/util/qquickimageprovider.h
+++ b/src/quick/util/qquickimageprovider.h
@@ -59,7 +59,7 @@ class Q_QUICK_EXPORT QQuickTextureFactory : public QObject
Q_OBJECT
public:
QQuickTextureFactory();
- virtual ~QQuickTextureFactory();
+ ~QQuickTextureFactory() override;
virtual QSGTexture *createTexture(QQuickWindow *window) const = 0;
virtual QSize textureSize() const = 0;
@@ -74,7 +74,7 @@ class Q_QUICK_EXPORT QQuickImageResponse : public QObject
Q_OBJECT
public:
QQuickImageResponse();
- virtual ~QQuickImageResponse();
+ ~QQuickImageResponse() override;
virtual QQuickTextureFactory *textureFactory() const = 0;
virtual QString errorString() const;
@@ -91,7 +91,7 @@ class Q_QUICK_EXPORT QQuickImageProvider : public QQmlImageProviderBase
friend class QQuickImageProviderWithOptions; // ### Qt 6 Remove
public:
QQuickImageProvider(ImageType type, Flags flags = Flags());
- virtual ~QQuickImageProvider();
+ ~QQuickImageProvider() override;
ImageType imageType() const override;
Flags flags() const override;
@@ -114,7 +114,7 @@ class Q_QUICK_EXPORT QQuickAsyncImageProvider : public QQuickImageProvider
{
public:
QQuickAsyncImageProvider();
- virtual ~QQuickAsyncImageProvider();
+ ~QQuickAsyncImageProvider() override;
#if QT_VERSION >= QT_VERSION_CHECK(6,0,0)
virtual QQuickImageResponse *requestImageResponse(const QString &id, const QSize &requestedSize, const QQuickImageProviderOptions &options) = 0;
diff --git a/src/quick/util/qquickpath_p.h b/src/quick/util/qquickpath_p.h
index f8b67ef945..6b9a40fe6d 100644
--- a/src/quick/util/qquickpath_p.h
+++ b/src/quick/util/qquickpath_p.h
@@ -449,7 +449,7 @@ class Q_QUICK_PRIVATE_EXPORT QQuickPath : public QObject, public QQmlParserStatu
Q_INTERFACES(QQmlParserStatus)
public:
QQuickPath(QObject *parent=nullptr);
- ~QQuickPath();
+ ~QQuickPath() override;
QQmlListProperty<QQuickPathElement> pathElements();
diff --git a/src/quick/util/qquickprofiler_p.h b/src/quick/util/qquickprofiler_p.h
index 38027a6abf..d699ddf371 100644
--- a/src/quick/util/qquickprofiler_p.h
+++ b/src/quick/util/qquickprofiler_p.h
@@ -333,7 +333,7 @@ public:
static void initialize(QObject *parent);
- virtual ~QQuickProfiler();
+ ~QQuickProfiler() override;
signals:
void dataReady(const QVector<QQuickProfilerData> &data);
diff --git a/src/quick/util/qquickstate_p.h b/src/quick/util/qquickstate_p.h
index 89af5882df..79874ee78e 100644
--- a/src/quick/util/qquickstate_p.h
+++ b/src/quick/util/qquickstate_p.h
@@ -160,7 +160,7 @@ class Q_QUICK_PRIVATE_EXPORT QQuickState : public QObject
public:
QQuickState(QObject *parent=nullptr);
- virtual ~QQuickState();
+ ~QQuickState() override;
QString name() const;
void setName(const QString &);