diff options
author | Tobias Hunger <tobias.hunger@qt.io> | 2018-05-07 15:12:32 +0200 |
---|---|---|
committer | Tobias Hunger <tobias.hunger@qt.io> | 2018-05-07 15:45:05 +0000 |
commit | 685f031cc31dc4679881f52696f804b06bd6aeff (patch) | |
tree | 9bb19e5cd955da992a7afd7a4a40085987db8064 /src/libs/qmleditorwidgets | |
parent | 0cb0c0451ddd067df87ceb94e02bfd97bcbe68db (diff) | |
download | qt-creator-685f031cc31dc4679881f52696f804b06bd6aeff.tar.gz |
QmlEditorWidgets: Use override consistently
clang-tidy fixes from modernize-use-override check.
Change-Id: I456fe6e6e10a5e4bf58868c8f3e0ed0eef87524e
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Diffstat (limited to 'src/libs/qmleditorwidgets')
-rw-r--r-- | src/libs/qmleditorwidgets/colorbutton.h | 2 | ||||
-rw-r--r-- | src/libs/qmleditorwidgets/contextpanewidget.h | 14 | ||||
-rw-r--r-- | src/libs/qmleditorwidgets/customcolordialog.h | 4 | ||||
-rw-r--r-- | src/libs/qmleditorwidgets/easingpane/easingcontextpane.h | 2 | ||||
-rw-r--r-- | src/libs/qmleditorwidgets/easingpane/easinggraph.h | 4 | ||||
-rw-r--r-- | src/libs/qmleditorwidgets/filewidget.h | 2 | ||||
-rw-r--r-- | src/libs/qmleditorwidgets/fontsizespinbox.h | 8 | ||||
-rw-r--r-- | src/libs/qmleditorwidgets/gradientline.h | 14 |
8 files changed, 25 insertions, 25 deletions
diff --git a/src/libs/qmleditorwidgets/colorbutton.h b/src/libs/qmleditorwidgets/colorbutton.h index c70fd2b309..8928f65da3 100644 --- a/src/libs/qmleditorwidgets/colorbutton.h +++ b/src/libs/qmleditorwidgets/colorbutton.h @@ -59,7 +59,7 @@ signals: void colorChanged(); protected: - void paintEvent(QPaintEvent *event); + void paintEvent(QPaintEvent *event) override; private: QString m_colorString; bool m_noColor; diff --git a/src/libs/qmleditorwidgets/contextpanewidget.h b/src/libs/qmleditorwidgets/contextpanewidget.h index f1aea114f5..84ebf85b24 100644 --- a/src/libs/qmleditorwidgets/contextpanewidget.h +++ b/src/libs/qmleditorwidgets/contextpanewidget.h @@ -57,12 +57,12 @@ public: protected: QPoint m_pos; - void mousePressEvent(QMouseEvent * event); - void mouseReleaseEvent(QMouseEvent * event); - void mouseMoveEvent(QMouseEvent * event); + void mousePressEvent(QMouseEvent * event) override; + void mouseReleaseEvent(QMouseEvent * event) override; + void mouseMoveEvent(QMouseEvent * event) override; void virtual protectedMoved(); - void leaveEvent(QEvent *); - void enterEvent(QEvent *); + void leaveEvent(QEvent *) override; + void enterEvent(QEvent *) override; private: QGraphicsDropShadowEffect *m_dropShadowEffect; @@ -77,7 +77,7 @@ class QMLEDITORWIDGETS_EXPORT ContextPaneWidget : public DragWidget public: explicit ContextPaneWidget(QWidget *parent = 0); - ~ContextPaneWidget(); + ~ContextPaneWidget() override; void activate(const QPoint &pos, const QPoint &alternative, const QPoint &alternative2, bool pinned); void rePosition(const QPoint &pos, const QPoint &alternative , const QPoint &alternative3, bool pinned); void deactivate(); @@ -109,7 +109,7 @@ private: void onResetPosition(bool toggle); protected: - void protectedMoved(); + void protectedMoved() override; QToolButton *m_toolButton; QWidget *createFontWidget(); diff --git a/src/libs/qmleditorwidgets/customcolordialog.h b/src/libs/qmleditorwidgets/customcolordialog.h index 3b76dc9612..a6df6e692d 100644 --- a/src/libs/qmleditorwidgets/customcolordialog.h +++ b/src/libs/qmleditorwidgets/customcolordialog.h @@ -82,8 +82,8 @@ signals: protected: void setupWidgets(); - void leaveEvent(QEvent *); - void enterEvent(QEvent *); + void leaveEvent(QEvent *) override; + void enterEvent(QEvent *) override; private: QFrame *m_beforeColorWidget; diff --git a/src/libs/qmleditorwidgets/easingpane/easingcontextpane.h b/src/libs/qmleditorwidgets/easingpane/easingcontextpane.h index 8f71a53d22..480860f0c5 100644 --- a/src/libs/qmleditorwidgets/easingpane/easingcontextpane.h +++ b/src/libs/qmleditorwidgets/easingpane/easingcontextpane.h @@ -46,7 +46,7 @@ class EasingContextPane : public QWidget enum GraphDisplayMode { GraphMode, SimulationMode }; public: explicit EasingContextPane(QWidget *parent = 0); - ~EasingContextPane(); + ~EasingContextPane() override; void setProperties(QmlJS::PropertyReader *propertyReader); void setGraphDisplayMode(GraphDisplayMode newMode); diff --git a/src/libs/qmleditorwidgets/easingpane/easinggraph.h b/src/libs/qmleditorwidgets/easingpane/easinggraph.h index 37236caded..a4bfabf0db 100644 --- a/src/libs/qmleditorwidgets/easingpane/easinggraph.h +++ b/src/libs/qmleditorwidgets/easingpane/easinggraph.h @@ -50,7 +50,7 @@ class EasingGraph: public QWidget public: EasingGraph(QWidget *parent=0); - ~EasingGraph(); + ~EasingGraph() override; QEasingCurve::Type easingType() const; QEasingCurve easingCurve() const; @@ -77,7 +77,7 @@ public: QRectF boundingRect() const; //void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget *); - void paintEvent(QPaintEvent *); + void paintEvent(QPaintEvent *) override; signals: void easingShapeChanged(); diff --git a/src/libs/qmleditorwidgets/filewidget.h b/src/libs/qmleditorwidgets/filewidget.h index c8592f9a8e..da5c3c305d 100644 --- a/src/libs/qmleditorwidgets/filewidget.h +++ b/src/libs/qmleditorwidgets/filewidget.h @@ -53,7 +53,7 @@ class QMLEDITORWIDGETS_EXPORT FileWidget : public QWidget public: FileWidget(QWidget *parent = 0); - ~FileWidget(); + ~FileWidget() override; QString fileName() const { return m_fileName.toString(); } diff --git a/src/libs/qmleditorwidgets/fontsizespinbox.h b/src/libs/qmleditorwidgets/fontsizespinbox.h index f3063d03b2..d9ee85092c 100644 --- a/src/libs/qmleditorwidgets/fontsizespinbox.h +++ b/src/libs/qmleditorwidgets/fontsizespinbox.h @@ -44,9 +44,9 @@ public: bool isPixelSize() { return !m_isPointSize; } bool isPointSize() { return m_isPointSize; } - void stepBy(int steps); + void stepBy(int steps) override; - QValidator::State validate (QString &input, int &pos) const; + QValidator::State validate (QString &input, int &pos) const override; int value() const { return m_value; } signals: @@ -75,11 +75,11 @@ public: } - void clear(); + void clear() override; void setValue (int val); protected: - StepEnabled stepEnabled() const; + StepEnabled stepEnabled() const override; private: void onEditingFinished(); diff --git a/src/libs/qmleditorwidgets/gradientline.h b/src/libs/qmleditorwidgets/gradientline.h index 99c101f2a4..0d5cff8a7f 100644 --- a/src/libs/qmleditorwidgets/gradientline.h +++ b/src/libs/qmleditorwidgets/gradientline.h @@ -57,13 +57,13 @@ signals: void gradientChanged(); void openColorDialog(const QPoint &pos); protected: - bool event(QEvent *event); - void keyPressEvent(QKeyEvent * event); - void paintEvent(QPaintEvent *event); - void mousePressEvent(QMouseEvent *event); - void mouseDoubleClickEvent(QMouseEvent *event); - void mouseReleaseEvent(QMouseEvent *); - void mouseMoveEvent(QMouseEvent *); + bool event(QEvent *event) override; + void keyPressEvent(QKeyEvent * event) override; + void paintEvent(QPaintEvent *event) override; + void mousePressEvent(QMouseEvent *event) override; + void mouseDoubleClickEvent(QMouseEvent *event) override; + void mouseReleaseEvent(QMouseEvent *) override; + void mouseMoveEvent(QMouseEvent *) override; private: void setup(); |