From 1a63f5eb2a7ea31c242ee06405e174fee4aaeba3 Mon Sep 17 00:00:00 2001 From: Montel Laurent Date: Fri, 2 Jun 2017 07:14:46 +0200 Subject: [PATCH] Use Q_DECL_OVERRIDE --- applets/appmenu/lib/appmenuapplet.h | 2 +- applets/appmenu/plugin/appmenumodel.h | 6 +++--- applets/systemtray/tests/statusnotifier/pumpjob.h | 8 ++++---- components/shellprivate/widgetexplorer/widgetexplorer.h | 4 ++-- libtaskmanager/declarative/taskmanagerplugin.h | 2 +- .../qmlhelper/holidayeventshelperplugin.h | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/applets/appmenu/lib/appmenuapplet.h b/applets/appmenu/lib/appmenuapplet.h index d08013f6c..c6a870f6c 100644 --- a/applets/appmenu/lib/appmenuapplet.h +++ b/applets/appmenu/lib/appmenuapplet.h @@ -80,7 +80,7 @@ public slots: void trigger(QQuickItem *ctx, int idx); protected: - bool eventFilter(QObject *watched, QEvent *event); + bool eventFilter(QObject *watched, QEvent *event) Q_DECL_OVERRIDE; private: QMenu *createMenu(int idx) const; diff --git a/applets/appmenu/plugin/appmenumodel.h b/applets/appmenu/plugin/appmenumodel.h index 77ad5e9d1..9b4605db9 100644 --- a/applets/appmenu/plugin/appmenumodel.h +++ b/applets/appmenu/plugin/appmenumodel.h @@ -44,9 +44,9 @@ public: ActionRole }; - QVariant data(const QModelIndex &index, int role) const; - int rowCount(const QModelIndex &parent = QModelIndex()) const; - QHash roleNames() const; + QVariant data(const QModelIndex &index, int role) const Q_DECL_OVERRIDE; + int rowCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; + QHash roleNames() const Q_DECL_OVERRIDE; void updateApplicationMenu(const QString &serviceName, const QString &menuObjectPath); diff --git a/applets/systemtray/tests/statusnotifier/pumpjob.h b/applets/systemtray/tests/statusnotifier/pumpjob.h index cc98536fc..f767952a8 100644 --- a/applets/systemtray/tests/statusnotifier/pumpjob.h +++ b/applets/systemtray/tests/statusnotifier/pumpjob.h @@ -34,10 +34,10 @@ class PumpJob : public KIO::Job PumpJob(int interval = 0); virtual ~PumpJob(); - virtual void start(); - virtual bool doKill(); - virtual bool doSuspend(); - virtual bool doResume(); + void start() Q_DECL_OVERRIDE; + bool doKill() Q_DECL_OVERRIDE; + bool doSuspend() Q_DECL_OVERRIDE; + bool doResume() Q_DECL_OVERRIDE; virtual bool isSuspended() const; diff --git a/components/shellprivate/widgetexplorer/widgetexplorer.h b/components/shellprivate/widgetexplorer/widgetexplorer.h index eb7562396..b58820967 100644 --- a/components/shellprivate/widgetexplorer/widgetexplorer.h +++ b/components/shellprivate/widgetexplorer/widgetexplorer.h @@ -143,8 +143,8 @@ public: */ Q_INVOKABLE void uninstall(const QString &pluginName); - void classBegin(); - void componentComplete(); + void classBegin() Q_DECL_OVERRIDE; + void componentComplete() Q_DECL_OVERRIDE; Q_SIGNALS: void widgetsMenuActionsChanged(); diff --git a/libtaskmanager/declarative/taskmanagerplugin.h b/libtaskmanager/declarative/taskmanagerplugin.h index bb544de95..c6b3e4f27 100644 --- a/libtaskmanager/declarative/taskmanagerplugin.h +++ b/libtaskmanager/declarative/taskmanagerplugin.h @@ -33,7 +33,7 @@ class TaskManagerPlugin : public QQmlExtensionPlugin Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface") public: - virtual void registerTypes(const char *uri); + void registerTypes(const char *uri) Q_DECL_OVERRIDE; }; } diff --git a/plasmacalendarintegration/qmlhelper/holidayeventshelperplugin.h b/plasmacalendarintegration/qmlhelper/holidayeventshelperplugin.h index 32a0e684b..065a28566 100644 --- a/plasmacalendarintegration/qmlhelper/holidayeventshelperplugin.h +++ b/plasmacalendarintegration/qmlhelper/holidayeventshelperplugin.h @@ -27,7 +27,7 @@ class HolidayEventsHelperPlugin : public QQmlExtensionPlugin Q_OBJECT Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface") public: - virtual void registerTypes(const char* uri); + void registerTypes(const char* uri) Q_DECL_OVERRIDE; }; #endif // HOLIDAYEVENTSHELPERPLUGIN_H