diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-07-31 11:44:54 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-07-31 20:31:31 +0000 |
commit | 1c95d379f2d4f53ca8e4d33b27d37b7dab6d7596 (patch) | |
tree | bd593bad43cdda9987bfeadf557d01366b4e98d6 /src/shared | |
parent | b0fd9623651ca32187e4f79ad299ef43ce8347a0 (diff) |
Qt Designer: Fix clang-tidy warnings about class definitions
- Use ' = default' for trivial constructors/destructors
- replace virtual by override or add override where applicable
- Return *this from assignment operators of custom iterators
- Replace trivial constructors by member initialization for simple structs
- Add Q_DISABLE_COPY
Change-Id: I67fb07cb82ccba93a41d58a8a0782628c9c681d9
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Diffstat (limited to 'src/shared')
-rw-r--r-- | src/shared/deviceskin/deviceskin.h | 8 | ||||
-rw-r--r-- | src/shared/findwidget/abstractfindwidget.cpp | 4 | ||||
-rw-r--r-- | src/shared/findwidget/abstractfindwidget.h | 6 | ||||
-rw-r--r-- | src/shared/findwidget/itemviewfindwidget.h | 5 | ||||
-rw-r--r-- | src/shared/findwidget/texteditfindwidget.h | 5 |
5 files changed, 14 insertions, 14 deletions
diff --git a/src/shared/deviceskin/deviceskin.h b/src/shared/deviceskin/deviceskin.h index 52c4848c2..348119d96 100644 --- a/src/shared/deviceskin/deviceskin.h +++ b/src/shared/deviceskin/deviceskin.h @@ -129,10 +129,10 @@ protected slots: void moveParent(); protected: - virtual void paintEvent( QPaintEvent * ); - virtual void mousePressEvent( QMouseEvent *e ); - virtual void mouseMoveEvent( QMouseEvent *e ); - virtual void mouseReleaseEvent( QMouseEvent * ); + void paintEvent(QPaintEvent *) override; + void mousePressEvent(QMouseEvent *e) override; + void mouseMoveEvent(QMouseEvent *e) override; + void mouseReleaseEvent(QMouseEvent *) override; private: void calcRegions(); diff --git a/src/shared/findwidget/abstractfindwidget.cpp b/src/shared/findwidget/abstractfindwidget.cpp index 188ed2c8a..d00a3fd97 100644 --- a/src/shared/findwidget/abstractfindwidget.cpp +++ b/src/shared/findwidget/abstractfindwidget.cpp @@ -192,9 +192,7 @@ AbstractFindWidget::AbstractFindWidget(FindFlags flags, QWidget *parent) /*! Destroys the AbstractFindWidget. */ -AbstractFindWidget::~AbstractFindWidget() -{ -} +AbstractFindWidget::~AbstractFindWidget() = default; /*! Returns the icon set to be used for the action that initiates a search. diff --git a/src/shared/findwidget/abstractfindwidget.h b/src/shared/findwidget/abstractfindwidget.h index 333f8021f..9560c2c5e 100644 --- a/src/shared/findwidget/abstractfindwidget.h +++ b/src/shared/findwidget/abstractfindwidget.h @@ -69,9 +69,9 @@ public: Q_DECLARE_FLAGS(FindFlags, FindFlag) explicit AbstractFindWidget(FindFlags flags = FindFlags(), QWidget *parent = 0); - virtual ~AbstractFindWidget(); + ~AbstractFindWidget() override; - bool eventFilter(QObject *object, QEvent *e); + bool eventFilter(QObject *object, QEvent *e) override; static QIcon findIconSet(); @@ -83,7 +83,7 @@ public slots: void findCurrentText(); protected: - void keyPressEvent(QKeyEvent *event); + void keyPressEvent(QKeyEvent *event) override; private slots: void updateButtons(); diff --git a/src/shared/findwidget/itemviewfindwidget.h b/src/shared/findwidget/itemviewfindwidget.h index 59fdf4bb6..07b45a6de 100644 --- a/src/shared/findwidget/itemviewfindwidget.h +++ b/src/shared/findwidget/itemviewfindwidget.h @@ -61,8 +61,9 @@ public: void setItemView(QAbstractItemView *itemView); protected: - virtual void deactivate(); - virtual void find(const QString &textToFind, bool skipCurrent, bool backward, bool *found, bool *wrapped); + void deactivate() override; + void find(const QString &textToFind, bool skipCurrent, + bool backward, bool *found, bool *wrapped) override; private: QModelIndex findHelper(const QString &textToFind, bool skipCurrent, bool backward, diff --git a/src/shared/findwidget/texteditfindwidget.h b/src/shared/findwidget/texteditfindwidget.h index e4eb2857f..6e676f41d 100644 --- a/src/shared/findwidget/texteditfindwidget.h +++ b/src/shared/findwidget/texteditfindwidget.h @@ -59,8 +59,9 @@ public: void setTextEdit(QTextEdit *textEdit); protected: - virtual void deactivate(); - virtual void find(const QString &textToFind, bool skipCurrent, bool backward, bool *found, bool *wrapped); + void deactivate() override; + void find(const QString &textToFind, bool skipCurrent, + bool backward, bool *found, bool *wrapped) override; private: QTextEdit *m_textEdit; |