From 8dc2956edf08bb9ba627f744e6b3735d9a04409a Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 10 Oct 2018 21:12:58 +0200 Subject: [PATCH] Use override --- aboutdialog/aboutdialog.h | 2 +- enterpassworddialog/enterpassworddialog.h | 6 ++--- models/checklistmodel.h | 18 +++++++------- paletteeditor/colorbutton.h | 14 +++++------ settingsdialog/optioncategory.h | 2 +- settingsdialog/optioncategoryfiltermodel.h | 2 +- settingsdialog/optioncategorymodel.h | 6 ++--- settingsdialog/optionpage.h | 28 +++++++++++----------- settingsdialog/settingsdialog.h | 4 ++-- widgets/clearcombobox.h | 6 ++--- widgets/clearlineedit.h | 6 ++--- widgets/clearplaintextedit.h | 6 ++--- widgets/clearspinbox.h | 10 ++++---- widgets/iconbutton.h | 10 ++++---- widgets/pathselection.h | 2 +- 15 files changed, 61 insertions(+), 61 deletions(-) diff --git a/aboutdialog/aboutdialog.h b/aboutdialog/aboutdialog.h index d247acc..9c9ef7e 100644 --- a/aboutdialog/aboutdialog.h +++ b/aboutdialog/aboutdialog.h @@ -28,7 +28,7 @@ public: const std::vector &dependencyVersions, const QString &website = QString(), const QString &description = QString(), const QImage &image = QImage()); explicit AboutDialog(QWidget *parent, const QString &description = QString(), const QImage &image = QImage()); - ~AboutDialog(); + ~AboutDialog() override; private: std::unique_ptr m_ui; diff --git a/enterpassworddialog/enterpassworddialog.h b/enterpassworddialog/enterpassworddialog.h index 903576e..89c71a7 100644 --- a/enterpassworddialog/enterpassworddialog.h +++ b/enterpassworddialog/enterpassworddialog.h @@ -26,7 +26,7 @@ class QT_UTILITIES_EXPORT EnterPasswordDialog : public QDialog { public: explicit EnterPasswordDialog(QWidget *parent = nullptr); - ~EnterPasswordDialog(); + ~EnterPasswordDialog() override; const QString &userName() const; const QString &password() const; QString description() const; @@ -42,8 +42,8 @@ public: static bool isCapslockPressed(); protected: - bool event(QEvent *event); - bool eventFilter(QObject *sender, QEvent *event); + bool event(QEvent *event) override; + bool eventFilter(QObject *sender, QEvent *event) override; private Q_SLOTS: void updateShowPassword(); diff --git a/models/checklistmodel.h b/models/checklistmodel.h index 27a6da3..737059d 100644 --- a/models/checklistmodel.h +++ b/models/checklistmodel.h @@ -74,18 +74,18 @@ class QT_UTILITIES_EXPORT ChecklistModel : public QAbstractListModel { public: explicit ChecklistModel(QObject *parent = nullptr); - int rowCount(const QModelIndex &parent = QModelIndex()) const; - Qt::ItemFlags flags(const QModelIndex &index) const; - QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; - QMap itemData(const QModelIndex &index) const; - bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::DisplayRole); - bool setItemData(const QModelIndex &index, const QMap &roles); + int rowCount(const QModelIndex &parent = QModelIndex()) const override; + Qt::ItemFlags flags(const QModelIndex &index) const override; + QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; + QMap itemData(const QModelIndex &index) const override; + bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::DisplayRole) override; + bool setItemData(const QModelIndex &index, const QMap &roles) override; bool setChecked(int row, bool checked); bool setChecked(int row, Qt::CheckState checked); virtual QString labelForId(const QVariant &id) const; - Qt::DropActions supportedDropActions() const; - bool insertRows(int row, int count, const QModelIndex &parent); - bool removeRows(int row, int count, const QModelIndex &parent); + Qt::DropActions supportedDropActions() const override; + bool insertRows(int row, int count, const QModelIndex &parent) override; + bool removeRows(int row, int count, const QModelIndex &parent) override; const QList &items() const; void setItems(const QList &items); void restore(QSettings &settings, const QString &name); diff --git a/paletteeditor/colorbutton.h b/paletteeditor/colorbutton.h index 2d6598c..a9a2b1e 100644 --- a/paletteeditor/colorbutton.h +++ b/paletteeditor/colorbutton.h @@ -17,7 +17,7 @@ class QT_UTILITIES_EXPORT ColorButton : public QToolButton { Q_PROPERTY(bool backgroundCheckered READ isBackgroundCheckered WRITE setBackgroundCheckered) public: ColorButton(QWidget *parent = nullptr); - ~ColorButton(); + ~ColorButton() override; bool isBackgroundCheckered() const; void setBackgroundCheckered(bool checkered); @@ -31,13 +31,13 @@ Q_SIGNALS: void colorChanged(const QColor &color); protected: - void paintEvent(QPaintEvent *event); - void mousePressEvent(QMouseEvent *event); - void mouseMoveEvent(QMouseEvent *event); + void paintEvent(QPaintEvent *event) override; + void mousePressEvent(QMouseEvent *event) override; + void mouseMoveEvent(QMouseEvent *event) override; #ifndef QT_NO_DRAGANDDROP - void dragEnterEvent(QDragEnterEvent *event); - void dragLeaveEvent(QDragLeaveEvent *event); - void dropEvent(QDropEvent *event); + void dragEnterEvent(QDragEnterEvent *event) override; + void dragLeaveEvent(QDragLeaveEvent *event) override; + void dropEvent(QDropEvent *event) override; #endif private: diff --git a/settingsdialog/optioncategory.h b/settingsdialog/optioncategory.h index 63ae2f1..7601b34 100644 --- a/settingsdialog/optioncategory.h +++ b/settingsdialog/optioncategory.h @@ -19,7 +19,7 @@ class QT_UTILITIES_EXPORT OptionCategory : public QObject { public: explicit OptionCategory(QObject *parent = nullptr); - ~OptionCategory(); + ~OptionCategory() override; const QString &displayName() const; void setDisplayName(const QString &displayName); diff --git a/settingsdialog/optioncategoryfiltermodel.h b/settingsdialog/optioncategoryfiltermodel.h index c33628d..e510863 100644 --- a/settingsdialog/optioncategoryfiltermodel.h +++ b/settingsdialog/optioncategoryfiltermodel.h @@ -11,7 +11,7 @@ public: explicit OptionCategoryFilterModel(QObject *parent = nullptr); protected: - virtual bool filterAcceptsRow(int source_row, const QModelIndex &sourceParent) const; + virtual bool filterAcceptsRow(int source_row, const QModelIndex &sourceParent) const override; }; } // namespace Dialogs diff --git a/settingsdialog/optioncategorymodel.h b/settingsdialog/optioncategorymodel.h index e009612..c9fd821 100644 --- a/settingsdialog/optioncategorymodel.h +++ b/settingsdialog/optioncategorymodel.h @@ -16,14 +16,14 @@ class QT_UTILITIES_EXPORT OptionCategoryModel : public QAbstractListModel { public: explicit OptionCategoryModel(QObject *parent = nullptr); explicit OptionCategoryModel(const QList &categories, QObject *parent = nullptr); - virtual ~OptionCategoryModel(); + virtual ~OptionCategoryModel() override; const QList &categories() const; OptionCategory *category(const QModelIndex &index) const; OptionCategory *category(int row) const; void setCategories(const QList categories); - int rowCount(const QModelIndex &parent = QModelIndex()) const; - QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; + int rowCount(const QModelIndex &parent = QModelIndex()) const override; + QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; private Q_SLOTS: void categoryChangedName(); diff --git a/settingsdialog/optionpage.h b/settingsdialog/optionpage.h index cf69199..7d5d50e 100644 --- a/settingsdialog/optionpage.h +++ b/settingsdialog/optionpage.h @@ -91,13 +91,13 @@ inline QStringList &OptionPage::errors() template class QT_UTILITIES_EXPORT UiFileBasedOptionPage : public OptionPage { public: explicit UiFileBasedOptionPage(QWidget *parentWindow = nullptr); - ~UiFileBasedOptionPage(); + ~UiFileBasedOptionPage() override; - bool apply() = 0; - void reset() = 0; + bool apply() override = 0; + void reset() override = 0; protected: - QWidget *setupWidget(); + QWidget *setupWidget() override; UiClass *ui(); private: @@ -152,9 +152,9 @@ template inline UiClass *UiFileBasedOptionPage::ui() class QT_UTILITIES_EXPORT SomeClass : public ::Dialogs::OptionPage { \ public: \ explicit SomeClass(QWidget *parentWidget = nullptr); \ - ~SomeClass(); \ - bool apply(); \ - void reset(); \ + ~SomeClass() override; \ + bool apply() override; \ + void reset() override; \ \ private: @@ -167,9 +167,9 @@ template inline UiClass *UiFileBasedOptionPage::ui() typedef ::Dialogs::OptionPage SomeClass##Base; \ class QT_UTILITIES_EXPORT SomeClass : public ::Dialogs::OptionPage { \ public: \ - ~SomeClass(); \ - bool apply(); \ - void reset(); \ + ~SomeClass() override; \ + bool apply() override; \ + void reset() override; \ \ private: @@ -185,9 +185,9 @@ template inline UiClass *UiFileBasedOptionPage::ui() typedef ::Dialogs::UiFileBasedOptionPage SomeClass##Base; \ class QT_UTILITIES_EXPORT SomeClass : public ::Dialogs::UiFileBasedOptionPage { \ public: \ - ~SomeClass(); \ - bool apply(); \ - void reset(); \ + ~SomeClass() override; \ + bool apply() override; \ + void reset() override; \ \ private: @@ -268,7 +268,7 @@ private: */ #define DECLARE_SETUP_WIDGETS \ protected: \ - QWidget *setupWidget(); \ + QWidget *setupWidget() override; \ \ private: diff --git a/settingsdialog/settingsdialog.h b/settingsdialog/settingsdialog.h index bd2faba..e8d3be1 100644 --- a/settingsdialog/settingsdialog.h +++ b/settingsdialog/settingsdialog.h @@ -24,7 +24,7 @@ class QT_UTILITIES_EXPORT SettingsDialog : public QDialog { public: explicit SettingsDialog(QWidget *parent = nullptr); - ~SettingsDialog(); + ~SettingsDialog() override; bool isTabBarAlwaysVisible() const; void setTabBarAlwaysVisible(bool value); OptionCategoryModel *categoryModel(); @@ -38,7 +38,7 @@ Q_SIGNALS: void resetted(); protected: - void showEvent(QShowEvent *event); + void showEvent(QShowEvent *event) override; private Q_SLOTS: void currentCategoryChanged(const QModelIndex &index); diff --git a/widgets/clearcombobox.h b/widgets/clearcombobox.h index 954259e..42e7f7b 100644 --- a/widgets/clearcombobox.h +++ b/widgets/clearcombobox.h @@ -11,12 +11,12 @@ class QT_UTILITIES_EXPORT ClearComboBox : public QComboBox, public ButtonOverlay Q_OBJECT public: explicit ClearComboBox(QWidget *parent = nullptr); - ~ClearComboBox(); - bool isCleared() const; + ~ClearComboBox() override; + bool isCleared() const override; private Q_SLOTS: void handleTextChanged(const QString &text); - void handleClearButtonClicked(); + void handleClearButtonClicked() override; }; } // namespace Widgets diff --git a/widgets/clearlineedit.h b/widgets/clearlineedit.h index 1aaeb4c..f2cc3a2 100644 --- a/widgets/clearlineedit.h +++ b/widgets/clearlineedit.h @@ -15,12 +15,12 @@ class QT_UTILITIES_EXPORT ClearLineEdit : public QLineEdit, public ButtonOverlay Q_OBJECT public: explicit ClearLineEdit(QWidget *parent = nullptr); - ~ClearLineEdit(); - bool isCleared() const; + ~ClearLineEdit() override; + bool isCleared() const override; private Q_SLOTS: void handleTextChanged(const QString &text); - void handleClearButtonClicked(); + void handleClearButtonClicked() override; }; } // namespace Widgets diff --git a/widgets/clearplaintextedit.h b/widgets/clearplaintextedit.h index c2b8670..4fc191e 100644 --- a/widgets/clearplaintextedit.h +++ b/widgets/clearplaintextedit.h @@ -11,12 +11,12 @@ class QT_UTILITIES_EXPORT ClearPlainTextEdit : public QPlainTextEdit, public But Q_OBJECT public: explicit ClearPlainTextEdit(QWidget *parent = nullptr); - ~ClearPlainTextEdit(); - bool isCleared() const; + ~ClearPlainTextEdit() override; + bool isCleared() const override; private Q_SLOTS: void handleTextChanged(); - void handleClearButtonClicked(); + void handleClearButtonClicked() override; void handleScroll(); }; diff --git a/widgets/clearspinbox.h b/widgets/clearspinbox.h index f5e03ce..eac9035 100644 --- a/widgets/clearspinbox.h +++ b/widgets/clearspinbox.h @@ -20,20 +20,20 @@ class QT_UTILITIES_EXPORT ClearSpinBox : public QSpinBox, public ButtonOverlay { public: explicit ClearSpinBox(QWidget *parent = nullptr); - ~ClearSpinBox(); + ~ClearSpinBox() override; bool minimumHidden() const; void setMinimumHidden(bool value); QString placeholderText() const; void setPlaceholderText(const QString &placeholderText); - bool isCleared() const; + bool isCleared() const override; protected: - int valueFromText(const QString &text) const; - QString textFromValue(int val) const; + int valueFromText(const QString &text) const override; + QString textFromValue(int val) const override; private Q_SLOTS: void handleValueChanged(int value); - void handleClearButtonClicked(); + void handleClearButtonClicked() override; private: bool m_minimumHidden; diff --git a/widgets/iconbutton.h b/widgets/iconbutton.h index 80c14d4..9f17339 100644 --- a/widgets/iconbutton.h +++ b/widgets/iconbutton.h @@ -14,16 +14,16 @@ class QT_UTILITIES_EXPORT IconButton : public QAbstractButton { public: explicit IconButton(QWidget *parent = nullptr); - ~IconButton(); + ~IconButton() override; const QPixmap &pixmap() const; void setPixmap(const QPixmap &pixmap); - QSize sizeHint() const; + QSize sizeHint() const override; protected: - void paintEvent(QPaintEvent *event); - void keyPressEvent(QKeyEvent *event); - void keyReleaseEvent(QKeyEvent *event); + void paintEvent(QPaintEvent *event) override; + void keyPressEvent(QKeyEvent *event) override; + void keyReleaseEvent(QKeyEvent *event) override; private: QPixmap m_pixmap; diff --git a/widgets/pathselection.h b/widgets/pathselection.h index b367239..1eca447 100644 --- a/widgets/pathselection.h +++ b/widgets/pathselection.h @@ -23,7 +23,7 @@ public: void provideCustomFileDialog(QFileDialog *customFileDialog); protected: - bool eventFilter(QObject *obj, QEvent *event); + bool eventFilter(QObject *obj, QEvent *event) override; private slots: void showFileDialog();