diff options
| author | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2015-04-10 10:20:09 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2015-05-13 18:08:27 +0000 |
| commit | 5dbd90b220c946f439a5806006a2665c2860bf31 (patch) | |
| tree | e8a932f4cd25528bd55a1d4b7968c9e86bf3769b /src/designer/src/components/formeditor/qdesigner_resource.cpp | |
| parent | 121c7721972064105d8f1c1ac7ca001b6bff4491 (diff) | |
Qt Designer: Introduce Q_DECL_OVERRIDE.
Replacement done by a script and verified with clang 3.5 to not cause
new warnings.
Change-Id: Ibaa1efe91cd65a6b54591a629b7335aebc0803bf
Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
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 c040d6839..b1e9fdc24 100644 --- a/src/designer/src/components/formeditor/qdesigner_resource.cpp +++ b/src/designer/src/components/formeditor/qdesigner_resource.cpp @@ -135,13 +135,13 @@ public: QStringList loadedQrcFiles() const { return m_loadedQrcFiles.keys(); } // needed only for loading old resource attribute of <iconset> tag. #endif - virtual QVariant loadResource(const QDir &workingDirectory, const DomProperty *icon) const; + QVariant loadResource(const QDir &workingDirectory, const DomProperty *icon) const Q_DECL_OVERRIDE; - virtual QVariant toNativeValue(const QVariant &value) const; + QVariant toNativeValue(const QVariant &value) const Q_DECL_OVERRIDE; - virtual DomProperty *saveResource(const QDir &workingDirectory, const QVariant &value) const; + DomProperty *saveResource(const QDir &workingDirectory, const QVariant &value) const Q_DECL_OVERRIDE; - virtual bool isResourceType(const QVariant &value) const; + bool isResourceType(const QVariant &value) const Q_DECL_OVERRIDE; private: QDesignerFormEditorInterface *m_core; @@ -364,11 +364,11 @@ class QDesignerTextBuilder : public QTextBuilder public: QDesignerTextBuilder() {} - virtual QVariant loadText(const DomProperty *icon) const; + QVariant loadText(const DomProperty *icon) const Q_DECL_OVERRIDE; - virtual QVariant toNativeValue(const QVariant &value) const; + QVariant toNativeValue(const QVariant &value) const Q_DECL_OVERRIDE; - virtual DomProperty *saveText(const QVariant &value) const; + DomProperty *saveText(const QVariant &value) const Q_DECL_OVERRIDE; }; QVariant QDesignerTextBuilder::loadText(const DomProperty *text) const |