From 75b6d2cd5230227e168ec9f249cf1c1bfb460248 Mon Sep 17 00:00:00 2001 From: Montel Laurent Date: Thu, 27 Nov 2014 22:16:53 +0100 Subject: [PATCH] Use Q_DECL_OVERRIDE --- searchdialog/kmsearchfilterproxymodel.h | 2 +- searchdialog/kmsearchmessagemodel.h | 6 +++--- searchdialog/searchdescriptionattribute.h | 8 ++++---- searchdialog/searchwindow.h | 4 ++-- widgets/collectionpane.h | 6 +++--- widgets/statusbarlabeltoggledstate.h | 2 +- widgets/vacationscriptindicatorwidget.h | 4 ++-- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/searchdialog/kmsearchfilterproxymodel.h b/searchdialog/kmsearchfilterproxymodel.h index 4bd2273aa..be358d1f4 100644 --- a/searchdialog/kmsearchfilterproxymodel.h +++ b/searchdialog/kmsearchfilterproxymodel.h @@ -41,7 +41,7 @@ public: explicit KMSearchFilterProxyModel(QObject *parent); ~KMSearchFilterProxyModel(); protected: - bool lessThan(const QModelIndex &left, const QModelIndex &right) const; + bool lessThan(const QModelIndex &left, const QModelIndex &right) const Q_DECL_OVERRIDE; }; } diff --git a/searchdialog/kmsearchmessagemodel.h b/searchdialog/kmsearchmessagemodel.h index b4ae067d6..cea81c2aa 100644 --- a/searchdialog/kmsearchmessagemodel.h +++ b/searchdialog/kmsearchmessagemodel.h @@ -48,10 +48,10 @@ public: explicit KMSearchMessageModel(QObject *parent = 0); ~KMSearchMessageModel(); - int columnCount(const QModelIndex &parent = QModelIndex()) const; - QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; + int columnCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; + QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE; - QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const; + QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE; }; diff --git a/searchdialog/searchdescriptionattribute.h b/searchdialog/searchdescriptionattribute.h index fee7c7de3..6a9fb5059 100644 --- a/searchdialog/searchdescriptionattribute.h +++ b/searchdialog/searchdescriptionattribute.h @@ -42,10 +42,10 @@ public: void setListCollection(const QList &col); QList listCollection() const; - QByteArray type() const; - Attribute *clone() const; - QByteArray serialized() const; - void deserialize(const QByteArray &data); + QByteArray type() const Q_DECL_OVERRIDE; + Attribute *clone() const Q_DECL_OVERRIDE; + QByteArray serialized() const Q_DECL_OVERRIDE; + void deserialize(const QByteArray &data) Q_DECL_OVERRIDE; private: QList mListCollection; diff --git a/searchdialog/searchwindow.h b/searchdialog/searchwindow.h index 738e47da7..0a36913cf 100644 --- a/searchdialog/searchwindow.h +++ b/searchdialog/searchwindow.h @@ -111,10 +111,10 @@ public: protected: /** Reimplemented to react to Escape. */ - void keyPressEvent(QKeyEvent *); + void keyPressEvent(QKeyEvent *) Q_DECL_OVERRIDE; /** Reimplemented to stop searching when the window is closed */ - void closeEvent(QCloseEvent *); + void closeEvent(QCloseEvent *) Q_DECL_OVERRIDE; void createSearchModel(); diff --git a/widgets/collectionpane.h b/widgets/collectionpane.h index 9b4a5659b..14e400c76 100644 --- a/widgets/collectionpane.h +++ b/widgets/collectionpane.h @@ -29,8 +29,8 @@ public: explicit CollectionPane(bool restoreSession, QAbstractItemModel *model, QItemSelectionModel *selectionModel, QWidget *parent = 0); ~CollectionPane(); - MessageList::StorageModel *createStorageModel(QAbstractItemModel *model, QItemSelectionModel *selectionModel, QObject *parent); - void writeConfig(bool restoreSession); + MessageList::StorageModel *createStorageModel(QAbstractItemModel *model, QItemSelectionModel *selectionModel, QObject *parent) Q_DECL_OVERRIDE; + void writeConfig(bool restoreSession) Q_DECL_OVERRIDE; }; class CollectionStorageModel : public MessageList::StorageModel @@ -42,7 +42,7 @@ public: */ explicit CollectionStorageModel(QAbstractItemModel *model, QItemSelectionModel *selectionModel, QObject *parent = 0); ~CollectionStorageModel(); - bool isOutBoundFolder(const Akonadi::Collection &c) const; + bool isOutBoundFolder(const Akonadi::Collection &c) const Q_DECL_OVERRIDE; }; #endif /* COLLECTIONPANE_H */ diff --git a/widgets/statusbarlabeltoggledstate.h b/widgets/statusbarlabeltoggledstate.h index 2f936ef98..c19e2c6e8 100644 --- a/widgets/statusbarlabeltoggledstate.h +++ b/widgets/statusbarlabeltoggledstate.h @@ -36,7 +36,7 @@ Q_SIGNALS: void toggleModeChanged(bool state); protected: - void mousePressEvent(QMouseEvent *ev); + void mousePressEvent(QMouseEvent *ev) Q_DECL_OVERRIDE; private: void updateLabel(); diff --git a/widgets/vacationscriptindicatorwidget.h b/widgets/vacationscriptindicatorwidget.h index 6473385cd..c99a53294 100644 --- a/widgets/vacationscriptindicatorwidget.h +++ b/widgets/vacationscriptindicatorwidget.h @@ -35,7 +35,7 @@ Q_SIGNALS: void clicked(const QString &serverName); protected: - void mouseReleaseEvent(QMouseEvent *event); + void mouseReleaseEvent(QMouseEvent *event) Q_DECL_OVERRIDE; private: QString mServerName; @@ -52,7 +52,7 @@ Q_SIGNALS: void clicked(); protected: - void mouseReleaseEvent(QMouseEvent *event); + void mouseReleaseEvent(QMouseEvent *event) Q_DECL_OVERRIDE; }; class VacationScriptIndicatorWidget : public QWidget