diff options
| author | Sandro S. Andrade <sandroandrade@kde.org> | 2013-11-26 05:52:45 -0300 |
|---|---|---|
| committer | Sandro S. Andrade <sandroandrade@kde.org> | 2013-11-26 09:48:20 +0100 |
| commit | 0f13b4f396ac21dee5ba1df2cc4cd482b3b41f88 (patch) | |
| tree | ce6707d69337130a755f17449761f88ac7376ac2 /scripts/templates | |
| parent | cb4567f68fde059f014546eff434fa40d164a4e0 (diff) | |
Update metamodel implementation. UML update coming soon ...
Change-Id: Ie5c42361c8fdae602134c9bdd8ce19416b2c7f40
Reviewed-by: Sandro S. Andrade <sandroandrade@kde.org>
Diffstat (limited to 'scripts/templates')
| -rw-r--r-- | scripts/templates/common.tmpl | 2 | ||||
| -rw-r--r-- | scripts/templates/qclass.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/scripts/templates/common.tmpl b/scripts/templates/common.tmpl index 82e8deb4..86f8bf73 100644 --- a/scripts/templates/common.tmpl +++ b/scripts/templates/common.tmpl @@ -535,7 +535,7 @@ void Q${namespace}${originalClassName}Object::unset${qtAttribute.remove("^is").u [%- SET attributeName = attribute.findvalue("@name") -%] [%- SET qtAttribute = QT_ATTRIBUTE(attribute) -%] [%- NEXT IF redefinedProperties.grep("^${className}-${qtAttribute}$").size > 0 -%] - [%- NEXT IF attribute.findvalue("@aggregation") != "composite" -%] + [%- NEXT IF attribute.findvalue("@aggregation") != "composite" && qtType.match('\*') -%] [%- IF qtType.match("QList|QSet") %] foreach (${qtType.remove("QList<").remove("QSet<").remove(">").replace('\* ', '*')}element, ${PLURALFORM(qtAttribute, attribute)}()) [%- IF qtType.match('\*') %] diff --git a/scripts/templates/qclass.cpp b/scripts/templates/qclass.cpp index 687d1805..bc499653 100644 --- a/scripts/templates/qclass.cpp +++ b/scripts/templates/qclass.cpp @@ -144,7 +144,7 @@ Q${namespace}${className}::Q${namespace}${className}([%- IF class.findvalue("@is */ Q${namespace}${className}::~Q${namespace}${className}() { - QUmlElement::deleteQModelingObject(); + QModelingElement::deleteQModelingObject(); } [%- IF documentation != "" %] |