Consistently use the override keyword

Clang doesn't like when it's inconsistent.

Change-Id: Ib306f8f647014b399b87ffff13f23eebda07757b
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>

diff --git a/src/quick/items/context2d/qquickcontext2dcommandbuffer.cpp b/src/quick/items/context2d/qquickcontext2dcommandbuffer.cpp
index 782d03f9f9a7286b67daafe69eae907ef91338da..4a2c137aa11fb23ac9f2bf4c6033bd10aba2e46c 100644 (file)
--- a/src/quick/items/context2d/qquickcontext2dcommandbuffer.cpp
+++ b/src/quick/items/context2d/qquickcontext2dcommandbuffer.cpp
@@ -92,7 +92,7 @@ namespace {
         {
         }
 
-        void paint(QPainter *p) const { p->fillRect(m_rect, m_brush); }
+        void paint(QPainter *p) const Q_DECL_OVERRIDE { p->fillRect(m_rect, m_brush); }
         QRectF boundingRect() const Q_DECL_OVERRIDE { return m_rect; }
 
     private:
@@ -109,7 +109,7 @@ namespace {
         {
         }
 
-        void paint(QPainter *p) const { p->fillPath(m_path, m_brush); }
+        void paint(QPainter *p) const Q_DECL_OVERRIDE { p->fillPath(m_path, m_brush); }
         QRectF boundingRect() const Q_DECL_OVERRIDE { return m_path.boundingRect(); }
 
     private:
@@ -126,7 +126,7 @@ namespace {
         {
         }
 
-        void paint(QPainter *p) const { p->strokePath(m_path, m_pen); }
+        void paint(QPainter *p) const Q_DECL_OVERRIDE { p->strokePath(m_path, m_pen); }
 
         QRectF boundingRect() const Q_DECL_OVERRIDE
         {
@@ -148,7 +148,7 @@ namespace {
         {
         }
 
-        void paint(QPainter *p) const { p->drawImage(m_offset, m_image); }
+        void paint(QPainter *p) const Q_DECL_OVERRIDE { p->drawImage(m_offset, m_image); }
 
         QRectF boundingRect() const Q_DECL_OVERRIDE { return QRectF(m_image.rect()).translated(m_offset); }
 

diff --git a/src/quick/items/qquickdrag.cpp b/src/quick/items/qquickdrag.cpp
index 4d464857187681606931e333603c80f75690f77b..2612b855bd54d146269b74e00ccf48ed893e3cff 100644 (file)
--- a/src/quick/items/qquickdrag.cpp
+++ b/src/quick/items/qquickdrag.cpp
@@ -75,7 +75,7 @@ public:
     }
 
     void itemGeometryChanged(QQuickItem *, const QRectF &, const QRectF &) Q_DECL_OVERRIDE;
-    void itemParentChanged(QQuickItem *, QQuickItem *parent);
+    void itemParentChanged(QQuickItem *, QQuickItem *parent) Q_DECL_OVERRIDE;
     void updatePosition();
     void restartDrag();
     void deliverEnterEvent();

diff --git a/src/quick/items/qquickgridview.cpp b/src/quick/items/qquickgridview.cpp
index 3cc0a28b87f96bd88ef03eec5012eaddfcacfe59..99c77488f4639b87f5bed9772542547998f4019f 100644 (file)
--- a/src/quick/items/qquickgridview.cpp
+++ b/src/quick/items/qquickgridview.cpp
@@ -60,19 +60,19 @@ public:
     {
     }
 
-    qreal position() const {
+    qreal position() const Q_DECL_OVERRIDE {
         return rowPos();
     }
 
-    qreal endPosition() const {
+    qreal endPosition() const Q_DECL_OVERRIDE {
         return endRowPos();
     }
 
-    qreal size() const {
+    qreal size() const Q_DECL_OVERRIDE {
         return view->flow() == QQuickGridView::FlowLeftToRight ? view->cellHeight() : view->cellWidth();
     }
 
-    qreal sectionSize() const {
+    qreal sectionSize() const Q_DECL_OVERRIDE {
         return 0.0;
     }
 

diff --git a/src/quick/items/qquickimage_p.h b/src/quick/items/qquickimage_p.h
index 8edf153ca34ca199404ea6f1c9c3d77c97e780e0..be514ae2f5604a396ccd8c60ffb75ec3cd60dcbb 100644 (file)
--- a/src/quick/items/qquickimage_p.h
+++ b/src/quick/items/qquickimage_p.h
@@ -88,7 +88,7 @@ public:
     bool mipmap() const;
     void setMipmap(bool use);
 
-    virtual void emitAutoTransformBaseChanged() { emit autoTransformChanged(); }
+    virtual void emitAutoTransformBaseChanged() Q_DECL_OVERRIDE { emit autoTransformChanged(); }
 
 Q_SIGNALS:
     void fillModeChanged();

diff --git a/src/quick/items/qquickitemview_p_p.h b/src/quick/items/qquickitemview_p_p.h
index 5ac88a758551cdf704099d0de9907f7293532d7f..a8352b229e218b2499bb723d60344a9122a356c3 100644 (file)
--- a/src/quick/items/qquickitemview_p_p.h
+++ b/src/quick/items/qquickitemview_p_p.h
@@ -178,7 +178,7 @@ public:
 
     void regenerate(bool orientationChanged=false);
     void layout();
-    virtual void animationFinished(QAbstractAnimationJob *);
+    virtual void animationFinished(QAbstractAnimationJob *) Q_DECL_OVERRIDE;
     void refill();
     void refill(qreal from, qreal to);
     void mirrorChange() Q_DECL_OVERRIDE;

diff --git a/src/quick/items/qquicklistview.cpp b/src/quick/items/qquicklistview.cpp
index cc500956f5651f001aec025e58273a5a18037a5c..20b6dd5b36ac52b71b4b6919e786c6603bc0bc3d 100644 (file)
--- a/src/quick/items/qquicklistview.cpp
+++ b/src/quick/items/qquicklistview.cpp
@@ -255,7 +255,7 @@ public:
         static_cast<QQuickListViewAttached*>(attached)->m_sectionItem = s;
     }
 
-    qreal position() const {
+    qreal position() const Q_DECL_OVERRIDE {
         if (section()) {
             if (view->orientation() == QQuickListView::Vertical)
                 return (view->verticalLayoutDirection() == QQuickItemView::BottomToTop ? -section()->height()-section()->y() : section()->y());
@@ -271,7 +271,7 @@ public:
         else
             return (view->effectiveLayoutDirection() == Qt::RightToLeft ? -item->width()-itemX() : itemX());
     }
-    qreal size() const {
+    qreal size() const Q_DECL_OVERRIDE {
         if (section())
             return (view->orientation() == QQuickListView::Vertical ? item->height()+section()->height() : item->width()+section()->width());
         else
@@ -280,12 +280,12 @@ public:
     qreal itemSize() const {
         return (view->orientation() == QQuickListView::Vertical ? item->height() : item->width());
     }
-    qreal sectionSize() const {
+    qreal sectionSize() const Q_DECL_OVERRIDE {
         if (section())
             return (view->orientation() == QQuickListView::Vertical ? section()->height() : section()->width());
         return 0.0;
     }
-    qreal endPosition() const {
+    qreal endPosition() const Q_DECL_OVERRIDE {
         if (view->orientation() == QQuickListView::Vertical) {
             return (view->verticalLayoutDirection() == QQuickItemView::BottomToTop
                     ? -itemY()

diff --git a/src/quick/items/qquickwindow.cpp b/src/quick/items/qquickwindow.cpp
index a17d4a43570460c48ac16a1fa6b515e4a14523b0..5958edf29f02cb93d892e229eaaadb9b4fc1c9ad 100644 (file)
--- a/src/quick/items/qquickwindow.cpp
+++ b/src/quick/items/qquickwindow.cpp
@@ -113,7 +113,7 @@ public:
     }
 
 protected:
-    void timerEvent(QTimerEvent *)
+    void timerEvent(QTimerEvent *) Q_DECL_OVERRIDE
     {
         killTimer(m_timer);
         m_timer = 0;

diff --git a/src/quick/util/qquickanimatorjob_p.h b/src/quick/util/qquickanimatorjob_p.h
index 1cffae17db085ef3e8487b908ea6529779461c51..f8f40b4705413ec36a35b850c63bee48d5fd71ee 100644 (file)
--- a/src/quick/util/qquickanimatorjob_p.h
+++ b/src/quick/util/qquickanimatorjob_p.h
@@ -63,7 +63,7 @@ public:
     QQuickAnimatorProxyJob(QAbstractAnimationJob *job, QObject *item);
     ~QQuickAnimatorProxyJob();
 
-    int duration() const { return m_duration; }
+    int duration() const Q_DECL_OVERRIDE { return m_duration; }
 
     QAbstractAnimationJob *job() const { return m_job; }
 
@@ -72,8 +72,8 @@ public:
     void markJobManagedByController() { m_jobManagedByController = true; }
 
 protected:
-    void updateCurrentTime(int);
-    void updateState(QAbstractAnimationJob::State newState, QAbstractAnimationJob::State oldState);
+    void updateCurrentTime(int) Q_DECL_OVERRIDE;
+    void updateState(QAbstractAnimationJob::State newState, QAbstractAnimationJob::State oldState) Q_DECL_OVERRIDE;
     void debugAnimation(QDebug d) const Q_DECL_OVERRIDE;
 
 public Q_SLOTS:
@@ -116,7 +116,7 @@ public:
     qreal to() const { return m_to; }
 
     void setDuration(int duration) { m_duration = duration; }
-    int duration() const { return m_duration; }
+    int duration() const Q_DECL_OVERRIDE { return m_duration; }
 
     QEasingCurve easingCurve() const { return m_easing; }
     void setEasingCurve(const QEasingCurve &curve) { m_easing = curve; }

diff --git a/src/quickwidgets/qquickwidget_p.h b/src/quickwidgets/qquickwidget_p.h
index dd0da96c3d150ecf63d455c6cb49681860e5bdbb..e8d1f714f34a4533223421522aa43e180236cc94 100644 (file)
--- a/src/quickwidgets/qquickwidget_p.h
+++ b/src/quickwidgets/qquickwidget_p.h
@@ -70,7 +70,7 @@ public:
     ~QQuickWidgetPrivate();
 
     void execute();
-    void itemGeometryChanged(QQuickItem *item, const QRectF &newGeometry, const QRectF &oldGeometry);
+    void itemGeometryChanged(QQuickItem *item, const QRectF &newGeometry, const QRectF &oldGeometry) Q_DECL_OVERRIDE;
     void initResize();
     void updateSize();
     void updatePosition();
@@ -82,7 +82,7 @@ public:
     void destroyContext();
     void handleContextCreationFailure(const QSurfaceFormat &format, bool isEs);
 
-    QObject *focusObject();
+    QObject *focusObject() Q_DECL_OVERRIDE;
 
     GLuint textureId() const Q_DECL_OVERRIDE;
     QImage grabFramebuffer() Q_DECL_OVERRIDE;