From 3dd96630a2823ff9723a399c84303f565abce455 Mon Sep 17 00:00:00 2001 From: Alexander Volkov Date: Mon, 5 Dec 2016 00:03:04 +0300 Subject: headers: Add missing override and remove redundant virtual Change-Id: Ifa816ebcd79372afca42dbd0dc0ecde006bb688a Reviewed-by: Anton Kudryavtsev Reviewed-by: Simon Hausmann --- tools/qmleasing/mainwindow.h | 6 +++--- tools/qmleasing/splineeditor.h | 10 +++++----- tools/qmlprofiler/qmlprofilerclient.h | 26 +++++++++++++------------- 3 files changed, 21 insertions(+), 21 deletions(-) (limited to 'tools') diff --git a/tools/qmleasing/mainwindow.h b/tools/qmleasing/mainwindow.h index 9af5c8050c..7ca4dbfd5c 100644 --- a/tools/qmleasing/mainwindow.h +++ b/tools/qmleasing/mainwindow.h @@ -51,9 +51,9 @@ public slots: void importData(int result); protected: - virtual void moveEvent(QMoveEvent *event); - virtual void resizeEvent(QResizeEvent *event); - virtual void closeEvent(QCloseEvent *event); + void moveEvent(QMoveEvent *event) override; + void resizeEvent(QResizeEvent *event) override; + void closeEvent(QCloseEvent *event) override; void initQml(); private: diff --git a/tools/qmleasing/splineeditor.h b/tools/qmleasing/splineeditor.h index 243e199cd0..f21713d6a7 100644 --- a/tools/qmleasing/splineeditor.h +++ b/tools/qmleasing/splineeditor.h @@ -75,12 +75,12 @@ public slots: void setEasingCurve(const QString &code); protected: - void paintEvent(QPaintEvent *); - void mousePressEvent(QMouseEvent *); - void mouseMoveEvent(QMouseEvent *); - void mouseReleaseEvent(QMouseEvent *); + void paintEvent(QPaintEvent *) override; + void mousePressEvent(QMouseEvent *) override; + void mouseMoveEvent(QMouseEvent *) override; + void mouseReleaseEvent(QMouseEvent *) override; #ifndef QT_NO_CONTEXTMENU - void contextMenuEvent(QContextMenuEvent *); + void contextMenuEvent(QContextMenuEvent *) override; #endif // QT_NO_CONTEXTMENU void invalidate(); diff --git a/tools/qmlprofiler/qmlprofilerclient.h b/tools/qmlprofiler/qmlprofilerclient.h index 1da04db42a..a04a412bb0 100644 --- a/tools/qmlprofiler/qmlprofilerclient.h +++ b/tools/qmlprofiler/qmlprofilerclient.h @@ -50,24 +50,24 @@ signals: void error(const QString &error); private: - virtual void stateChanged(State state); + void stateChanged(State state) override; - void traceStarted(qint64 time, int engineId); - void traceFinished(qint64 time, int engineId); - void rangeStart(QQmlProfilerDefinitions::RangeType type, qint64 startTime); - void rangeData(QQmlProfilerDefinitions::RangeType type, qint64 time, const QString &data); + void traceStarted(qint64 time, int engineId) override; + void traceFinished(qint64 time, int engineId) override; + void rangeStart(QQmlProfilerDefinitions::RangeType type, qint64 startTime) override; + void rangeData(QQmlProfilerDefinitions::RangeType type, qint64 time, const QString &data) override; void rangeLocation(QQmlProfilerDefinitions::RangeType type, qint64 time, - const QQmlEventLocation &location); - void rangeEnd(QQmlProfilerDefinitions::RangeType type, qint64 endTime); - void animationFrame(qint64 time, int frameRate, int animationCount, int threadId); + const QQmlEventLocation &location) override; + void rangeEnd(QQmlProfilerDefinitions::RangeType type, qint64 endTime) override; + void animationFrame(qint64 time, int frameRate, int animationCount, int threadId) override; void sceneGraphEvent(QQmlProfilerDefinitions::SceneGraphFrameType type, qint64 time, qint64 numericData1, qint64 numericData2, qint64 numericData3, - qint64 numericData4, qint64 numericData5); + qint64 numericData4, qint64 numericData5) override; void pixmapCacheEvent(QQmlProfilerDefinitions::PixmapEventType type, qint64 time, - const QString &url, int numericData1, int numericData2); - void memoryAllocation(QQmlProfilerDefinitions::MemoryType type, qint64 time, qint64 amount); - void inputEvent(QQmlProfilerDefinitions::InputEventType type, qint64 time, int a, int b); - void complete(); + const QString &url, int numericData1, int numericData2) override; + void memoryAllocation(QQmlProfilerDefinitions::MemoryType type, qint64 time, qint64 amount) override; + void inputEvent(QQmlProfilerDefinitions::InputEventType type, qint64 time, int a, int b) override; + void complete() override; }; #endif // QMLPROFILERCLIENT_H -- cgit v1.2.3