Use Q_DECL_OVERRIDE

wilder-5.14
Montel Laurent 9 years ago
parent 90a2f5fda5
commit 1a63f5eb2a
  1. 2
      applets/appmenu/lib/appmenuapplet.h
  2. 6
      applets/appmenu/plugin/appmenumodel.h
  3. 8
      applets/systemtray/tests/statusnotifier/pumpjob.h
  4. 4
      components/shellprivate/widgetexplorer/widgetexplorer.h
  5. 2
      libtaskmanager/declarative/taskmanagerplugin.h
  6. 2
      plasmacalendarintegration/qmlhelper/holidayeventshelperplugin.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;

@ -44,9 +44,9 @@ public:
ActionRole
};
QVariant data(const QModelIndex &index, int role) const;
int rowCount(const QModelIndex &parent = QModelIndex()) const;
QHash<int, QByteArray> roleNames() const;
QVariant data(const QModelIndex &index, int role) const Q_DECL_OVERRIDE;
int rowCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE;
QHash<int, QByteArray> roleNames() const Q_DECL_OVERRIDE;
void updateApplicationMenu(const QString &serviceName, const QString &menuObjectPath);

@ -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;

@ -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();

@ -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;
};
}

@ -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

Loading…
Cancel
Save