diff options
| author | Kevin Funk <kevin.funk@kdab.com> | 2017-09-20 20:57:47 +0200 |
|---|---|---|
| committer | Kevin Funk <kevin.funk@kdab.com> | 2017-09-22 07:33:13 +0000 |
| commit | fdf1613fd9d059b5cbfddbf0dd9a76a8d2e23b26 (patch) | |
| tree | c25f693010cc064c768c55313785d4209d09c769 /src/designer/src/components/formeditor/qdesigner_resource.cpp | |
| parent | c2f48cd9e8eeafda8fb52c59840bccc3e9c60de5 (diff) | |
Replace Q_DECL_OVERRIDE with override
Change-Id: I1b8b338a6bc2f3c87af62c20ff1428096b309628
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/designer/src/components/formeditor/qdesigner_resource.cpp')
| -rw-r--r-- | src/designer/src/components/formeditor/qdesigner_resource.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/designer/src/components/formeditor/qdesigner_resource.cpp b/src/designer/src/components/formeditor/qdesigner_resource.cpp index c2a6c250a..4da1e7b4c 100644 --- a/src/designer/src/components/formeditor/qdesigner_resource.cpp +++ b/src/designer/src/components/formeditor/qdesigner_resource.cpp @@ -133,13 +133,13 @@ public: QStringList loadedQrcFiles() const { return m_loadedQrcFiles.keys(); } // needed only for loading old resource attribute of <iconset> tag. #endif - QVariant loadResource(const QDir &workingDirectory, const DomProperty *icon) const Q_DECL_OVERRIDE; + QVariant loadResource(const QDir &workingDirectory, const DomProperty *icon) const override; - QVariant toNativeValue(const QVariant &value) const Q_DECL_OVERRIDE; + QVariant toNativeValue(const QVariant &value) const override; - DomProperty *saveResource(const QDir &workingDirectory, const QVariant &value) const Q_DECL_OVERRIDE; + DomProperty *saveResource(const QDir &workingDirectory, const QVariant &value) const override; - bool isResourceType(const QVariant &value) const Q_DECL_OVERRIDE; + bool isResourceType(const QVariant &value) const override; private: QDesignerFormEditorInterface *m_core; @@ -361,11 +361,11 @@ class QDesignerTextBuilder : public QTextBuilder public: QDesignerTextBuilder() {} - QVariant loadText(const DomProperty *icon) const Q_DECL_OVERRIDE; + QVariant loadText(const DomProperty *icon) const override; - QVariant toNativeValue(const QVariant &value) const Q_DECL_OVERRIDE; + QVariant toNativeValue(const QVariant &value) const override; - DomProperty *saveText(const QVariant &value) const Q_DECL_OVERRIDE; + DomProperty *saveText(const QVariant &value) const override; }; QVariant QDesignerTextBuilder::loadText(const DomProperty *text) const |