Add missing Q_dECL_OVERRIDE

This commit is contained in:
Montel Laurent 2017-01-03 09:13:21 +01:00
parent 8675a31d2a
commit 39adcec588
6 changed files with 10 additions and 10 deletions

View File

@ -30,7 +30,7 @@ class CalendarPlugin : public QQmlExtensionPlugin
Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
public:
void registerTypes(const char *uri);
void registerTypes(const char *uri) Q_DECL_OVERRIDE;
};
#endif

View File

@ -101,7 +101,7 @@ public:
/// @endcond
ColorScope *findParentScope() const;
void itemChange(ItemChange change, const ItemChangeData &value);
void itemChange(ItemChange change, const ItemChangeData &value) Q_DECL_OVERRIDE;
Q_SIGNALS:
void colorGroupChanged();

View File

@ -139,7 +139,7 @@ Q_SIGNALS:
protected:
int roleNameToId(const QString &name); //FIXME TODO KF6: This should have been const.
virtual bool filterAcceptsRow(int source_row, const QModelIndex &source_parent) const;
bool filterAcceptsRow(int source_row, const QModelIndex &source_parent) const Q_DECL_OVERRIDE;
protected Q_SLOTS:
void syncRoleNames();

View File

@ -58,8 +58,8 @@ public:
DataSource(QObject *parent = 0);
void classBegin();
void componentComplete();
void classBegin() Q_DECL_OVERRIDE;
void componentComplete() Q_DECL_OVERRIDE;
/**
* true if the connection to the Plasma DataEngine is valid

View File

@ -34,14 +34,14 @@ class FadingMaterialShader : public QSGSimpleMaterialShader<FadingMaterialState>
{
QSG_DECLARE_SIMPLE_SHADER(FadingMaterialShader, FadingMaterialState)
public:
virtual const char* fragmentShader() const;
virtual const char* vertexShader() const;
const char* fragmentShader() const Q_DECL_OVERRIDE;
const char* vertexShader() const Q_DECL_OVERRIDE;
using QSGSimpleMaterialShader<FadingMaterialState>::updateState;
virtual void updateState(const FadingMaterialState* newState, const FadingMaterialState* oldState) override;
virtual QList<QByteArray> attributes() const;
QList<QByteArray> attributes() const Q_DECL_OVERRIDE;
virtual void initialize();
void initialize() Q_DECL_OVERRIDE;
private:
QOpenGLFunctions *glFuncs = 0;
int m_progressId = 0;

View File

@ -39,7 +39,7 @@ Q_SIGNALS:
void fontChanged();
protected:
bool eventFilter(QObject *watched, QEvent *event);
bool eventFilter(QObject *watched, QEvent *event) Q_DECL_OVERRIDE;
};
/**