]> cloud.milkyroute.net Git - dolphin.git/commitdiff
Add missing Q_DECL_OVERRIDE
authorMontel Laurent <montel@kde.org>
Tue, 3 Jan 2017 12:17:54 +0000 (13:17 +0100)
committerMontel Laurent <montel@kde.org>
Tue, 3 Jan 2017 12:18:07 +0000 (13:18 +0100)
src/dolphindockwidget.cpp
src/kitemviews/kitemlistcontainer.cpp
src/kitemviews/private/kfileitemmodeldirlister.h
src/kitemviews/private/kitemlistheaderwidget.h
src/kitemviews/private/kitemlistroleeditor.h
src/kitemviews/private/kitemlistselectiontoggle.h
src/kitemviews/private/kitemlistsmoothscroller.h
src/panels/information/phononwidget.cpp
src/tests/kitemlistselectionmanagertest.cpp

index 82cf9118693d597ac0b63dfc1c37c10948dbc917..ccbecb0d666b48d3b5e310f7d4c1e93174b9d627 100644 (file)
@@ -38,13 +38,13 @@ public:
     DolphinDockTitleBar(QWidget* parent = 0) : QWidget(parent) {}
     virtual ~DolphinDockTitleBar() {}
 
-    virtual QSize minimumSizeHint() const
+    QSize minimumSizeHint() const Q_DECL_OVERRIDE
     {
         const int border = style()->pixelMetric(QStyle::PM_DockWidgetTitleBarButtonMargin);
         return QSize(border, border);
     }
 
-    virtual QSize sizeHint() const
+    QSize sizeHint() const Q_DECL_OVERRIDE
     {
         return minimumSizeHint();
     }
index 6a0c5756c03fe9b23012717c3cdc9f40a355f53f..b4ea62fac354249d66e4977d94807c6d05f515a0 100644 (file)
@@ -48,7 +48,7 @@ class KItemListContainerViewport : public QGraphicsView
 public:
     KItemListContainerViewport(QGraphicsScene* scene, QWidget* parent);
 protected:
-    virtual void wheelEvent(QWheelEvent* event);
+    void wheelEvent(QWheelEvent* event) Q_DECL_OVERRIDE;
 };
 
 KItemListContainerViewport::KItemListContainerViewport(QGraphicsScene* scene, QWidget* parent) :
index c2c621aed1c24ac19921eea851c280f5209b67ae..5aa2b63031cc7ae12d78a74725097ad5674ec87b 100644 (file)
@@ -48,7 +48,7 @@ signals:
     void urlIsFileError(const QUrl& url);
 
 protected:
-    virtual void handleError(KIO::Job* job);
+    void handleError(KIO::Job* job) Q_DECL_OVERRIDE;
 };
 
 #endif
index 2a80c205dd1fa52c082943f6b787b71a268c178d..2342b4907fcc4f08c354dfe82f4a3ae9ef9ae8a5 100644 (file)
@@ -64,7 +64,7 @@ public:
 
     qreal minimumColumnWidth() const;
 
-    virtual void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = 0);
+    void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = 0) Q_DECL_OVERRIDE;
 
 signals:
     /**
@@ -104,13 +104,13 @@ signals:
     void sortRoleChanged(const QByteArray& current, const QByteArray& previous);
 
 protected:
-    virtual void mousePressEvent(QGraphicsSceneMouseEvent* event);
-    virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent* event);
-    virtual void mouseMoveEvent(QGraphicsSceneMouseEvent* event);
-    virtual void mouseDoubleClickEvent(QGraphicsSceneMouseEvent* event);
-    virtual void hoverEnterEvent(QGraphicsSceneHoverEvent* event);
-    virtual void hoverLeaveEvent(QGraphicsSceneHoverEvent* event);
-    virtual void hoverMoveEvent(QGraphicsSceneHoverEvent* event);
+    void mousePressEvent(QGraphicsSceneMouseEvent* event) Q_DECL_OVERRIDE;
+    void mouseReleaseEvent(QGraphicsSceneMouseEvent* event) Q_DECL_OVERRIDE;
+    void mouseMoveEvent(QGraphicsSceneMouseEvent* event) Q_DECL_OVERRIDE;
+    void mouseDoubleClickEvent(QGraphicsSceneMouseEvent* event) Q_DECL_OVERRIDE;
+    void hoverEnterEvent(QGraphicsSceneHoverEvent* event) Q_DECL_OVERRIDE;
+    void hoverLeaveEvent(QGraphicsSceneHoverEvent* event) Q_DECL_OVERRIDE;
+    void hoverMoveEvent(QGraphicsSceneHoverEvent* event) Q_DECL_OVERRIDE;
 
 private slots:
     void slotSortRoleChanged(const QByteArray& current, const QByteArray& previous);
index 3b8f96865838e33ef0945816c62fa20ced70c76c..f889ea4f4ff601275636be1f0a658d02166eaf22 100644 (file)
@@ -44,15 +44,15 @@ public:
     void setRole(const QByteArray& role);
     QByteArray role() const;
 
-    virtual bool eventFilter(QObject* watched, QEvent* event);
+    bool eventFilter(QObject* watched, QEvent* event) Q_DECL_OVERRIDE;
 
 signals:
     void roleEditingFinished(const QByteArray& role, const QVariant& value);
     void roleEditingCanceled(const QByteArray& role, const QVariant& value);
 
 protected:
-    virtual bool event(QEvent* event);
-    virtual void keyPressEvent(QKeyEvent* event);
+    bool event(QEvent* event) Q_DECL_OVERRIDE;
+    void keyPressEvent(QKeyEvent* event) Q_DECL_OVERRIDE;
 
 private slots:
     /**
index d058ee988d5db97e7aa9e982a75ab7c4e3309b19..e3f5bb63c87a06fd6e5bca20a3605885570d5e5b 100644 (file)
@@ -42,10 +42,10 @@ public:
 
     void setHovered(bool hovered);
 
-    virtual void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = 0);
+    void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = 0) Q_DECL_OVERRIDE;
 
 protected:
-    virtual void resizeEvent(QGraphicsSceneResizeEvent* event);
+    void resizeEvent(QGraphicsSceneResizeEvent* event) Q_DECL_OVERRIDE;
 
 private:
     void updatePixmap();
index a3576a3fdddbc0874c6ff65ba6ff1557e48a0b21..7d01a6b62ce269253cb4df0b2e61375c78c8950a 100644 (file)
@@ -83,7 +83,7 @@ public:
     void handleWheelEvent(QWheelEvent* event);
 
 protected:
-    virtual bool eventFilter(QObject* obj, QEvent* event);
+    bool eventFilter(QObject* obj, QEvent* event) Q_DECL_OVERRIDE;
 
 private slots:
     void slotAnimationStateChanged(QAbstractAnimation::State newState,
index e4885ab760acc968cf87a7b503646546aa0e98b9..ac4a32506d179eb3a869b52dab8e5d63cfd94856 100644 (file)
@@ -52,7 +52,7 @@ class EmbeddedVideoPlayer : public Phonon::VideoWidget
             updateGeometry();
         }
 
-        virtual QSize sizeHint() const
+        QSize sizeHint() const Q_DECL_OVERRIDE
         {
             return m_sizeHint.isValid() ? m_sizeHint : Phonon::VideoWidget::sizeHint();
         }
index 5dce57f3c096a98cf3e84724ce0cdea58986d9eb..18a79bd3f3c1c01bf3eb373d061351d641e4c5aa 100644 (file)
@@ -30,8 +30,8 @@ class DummyModel : public KItemModelBase
 public:
     DummyModel();
     void setCount(int count);
-    virtual int count() const;
-    virtual QHash<QByteArray, QVariant> data(int index) const;
+    int count() const Q_DECL_OVERRIDE;
+    QHash<QByteArray, QVariant> data(int index) const Q_DECL_OVERRIDE;
 
 private:
     int m_count;