diff options
| author | Michael Brasser <mbrasser@ford.com> | 2017-12-22 12:08:52 -0600 |
|---|---|---|
| committer | Brett Stottlemyer <bstottle@ford.com> | 2017-12-23 11:33:37 +0000 |
| commit | 73a49c428150c2772e10cf6d8086bb0eb2608038 (patch) | |
| tree | 5a518cbb55e7c2c1eac2a8183723cc55ef87a22d /tools | |
| parent | b14e5fc60650e99abbe165c26ec42dc574537fb3 (diff) | |
[repc] Don't use override for READONLY PROPs
SimpleSource now inherits Source, but READONLY properties do not get a
virtual setter in Source, so the SimpleSource setter isn't an override.
Original patch by Brett Stottlemyer.
Change-Id: Ibfc10ed0d8cdd517ebab114ca1ea7e127aae91fd
Reviewed-by: Michael Brasser <michael.brasser@live.com>
Reviewed-by: Brett Stottlemyer <bstottle@ford.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/repc/repcodegenerator.cpp | 9 | ||||
| -rw-r--r-- | tools/repc/repcodegenerator.h | 2 |
2 files changed, 7 insertions, 4 deletions
diff --git a/tools/repc/repcodegenerator.cpp b/tools/repc/repcodegenerator.cpp index a236feb..3ef6ab9 100644 --- a/tools/repc/repcodegenerator.cpp +++ b/tools/repc/repcodegenerator.cpp @@ -359,9 +359,12 @@ QString RepCodeGenerator::formatMarshallingOperators(const POD &pod) ; } -void RepCodeGenerator::generateSimpleSetter(QTextStream &out, const ASTProperty &property) +void RepCodeGenerator::generateSimpleSetter(QTextStream &out, const ASTProperty &property, bool generateOverride) { - out << " virtual void set" << cap(property.name) << "(" << property.type << " " << property.name << ") override" << endl; + out << " virtual void set" << cap(property.name) << "(" << property.type << " " << property.name << ")"; + if (generateOverride) + out << " override"; + out << endl; out << " {" << endl; out << " if (" << property.name << " != m_" << property.name << ") {" << endl; out << " m_" << property.name << " = " << property.name << ";" << endl; @@ -955,7 +958,7 @@ void RepCodeGenerator::generateClass(Mode mode, QTextStream &out, const ASTClass out << "protected:" << endl; addProtected = false; } - generateSimpleSetter(out, property); + generateSimpleSetter(out, property, false); } } } diff --git a/tools/repc/repcodegenerator.h b/tools/repc/repcodegenerator.h index f9e8654..18af23c 100644 --- a/tools/repc/repcodegenerator.h +++ b/tools/repc/repcodegenerator.h @@ -66,7 +66,7 @@ private: QString generateMetaTypeRegistrationForEnums(const QVector<QString> &enums); void generateStreamOperatorsForEnums(QTextStream &out, const QVector<QString> &enums); - void generateSimpleSetter(QTextStream &out, const ASTProperty &property); + void generateSimpleSetter(QTextStream &out, const ASTProperty &property, bool generateOverride = true); void generatePOD(QTextStream &out, const POD &pod); void generateENUMs(QTextStream &out, const QVector<ASTEnum> &enums, const QString &className); void generateDeclarationsForEnums(QTextStream &out, const QVector<ASTEnum> &enums, bool generateQENUM=true); |