Fix return value for QList/QSet properties

Add initialization of QObject properties from XMI-declared default values Change-Id: I1a5c097463aa492b121991cf6e569b38222cfdda Reviewed-by: Sandro S. Andrade <sandroandrade@kde.org>
author: Sandro S. Andrade <sandroandrade@kde.org> 2013-08-27 12:01:42 -0300
committer: Sandro S. Andrade <sandroandrade@kde.org> 2013-08-27 17:12:52 +0200
commit: 53b5fa7c58cc496b34679f51e6fcedfaa5f5d448 (patch)
tree: a131696409baa9a6a14294c5d22e4c9cb7eab7cd
parent: bc5342512ed3605bbd1953eaf395fe137ca239f0 (diff)
219 files changed, 537 insertions, 533 deletions
diff --git a/scripts/templates/class.cpp b/scripts/templates/class.cpp
index 496f61df..e1609a13 100644
--- a/scripts/templates/class.cpp
+++ b/scripts/templates/class.cpp
@@ -110,6 +110,8 @@ Q${namespace}${className}::Q${namespace}${className}()
 [%- END %]
 {
 [%- FOREACH attribute = class.findnodes("ownedAttribute") -%]
+    [%- SET defaultValue = attribute.findvalue("defaultValue/@value") -%]
+    [%- SET defaultInstance = attribute.findvalue("defaultValue/@instance") -%]
     [%- SET type = QT_TYPE(namespace, attribute) -%]
     [%- SET derived = attribute.findvalue("@isDerived") -%]
     [%- SET derivedUnion = attribute.findvalue("@isDerivedUnion") %]
@@ -117,10 +119,10 @@ Q${namespace}${className}::Q${namespace}${className}()
 [%- IF type.match("QList|QSet") -%][% IF derived == "true" && (derivedUnion == "" || derivedUnion == "false") %]${type.trim}()[% ELSE %]&_[% QT_ATTRIBUTE(attribute) %][% END %]
 [%- ELSIF type.match('\*$') -%](${type})(0)
 [%- ELSIF type == "QString " -%]QString()
-[%- ELSIF type.match("::") -%]${type.trim}None
-[%- ELSIF type.match("int") -%](int)(0)
+[%- ELSIF type.match("::") -%][% IF defaultInstance != "" %]Qt${namespace}::${defaultInstance.split("-").0}${defaultInstance.split("-").1.ucfirst}[% ELSE %]${type.trim}None[% END -%]
+[%- ELSIF type.match("int") -%](int)([% IF defaultValue != "" %]${defaultValue}[% ELSE %]0[% END %])
 [%- ELSIF type.match("double") -%](double)(0.0)
-[%- ELSIF type.match("bool") -%]false
+[%- ELSIF type.match("bool") -%][% IF defaultValue != "" %]${defaultValue}[% ELSE %]false[% END -%]
 [%- END -%]
 ));
 [%- END %]
@@ -136,13 +138,14 @@ Q${namespace}${className}::Q${namespace}${className}()
 /*!
     ${documentation}
  */
-[%- END %]
-[% QT_TYPE(namespace, attribute) -%]
+[%- END -%]
 [%- SET qtAttribute = QT_ATTRIBUTE(attribute) -%]
+[%- SET qtType = QT_TYPE(namespace, attribute) -%]
 [%- SET readOnly = attribute.findvalue("@isReadOnly") -%]
 [%- SET derived = attribute.findvalue("@isDerived") -%]
 [%- SET derivedUnion = attribute.findvalue("@isDerivedUnion") -%]
-[%- SET association = attribute.findvalue("@association") -%]
+[%- SET association = attribute.findvalue("@association") %]
+[% IF qtType.match("QList|QSet") %]const [% END %][% QT_TYPE(namespace, attribute) -%]
 Q${namespace}${className}::${qtAttribute}() const
 {
     // This is a [% IF readOnly == "" || readOnly == "false" %]read-write[% ELSE %]read-only[% END %][% IF derived == "true" %] derived[% END %][% IF derivedUnion == "true" %] union[% END %] [% IF association != "" %]association end[% ELSE %]property[% END %]
@@ -150,10 +153,10 @@ Q${namespace}${className}::${qtAttribute}() const
     [%- IF derived == "true" && (derivedUnion == "false" || derivedUnion == "") %]
     qWarning("Q${namespace}${className}::${qtAttribute}(): to be implemented (this is a derived [% IF association != "" %]association end[% ELSE %]property[% END %])");
 
-    [%- IF QT_TYPE(namespace, attribute).match('\*$') %]
+    [%- IF qtType.match('\*$') %]
     return 0;
     [%- ELSE %]
-    return ${QT_TYPE(namespace, attribute).trim}();
+    return ${qtType.trim}();
     [%- END %]
     [%- ELSE %]
     return _${qtAttribute};
diff --git a/scripts/templates/class.h b/scripts/templates/class.h
index a8a1cc7c..e692d35b 100644
--- a/scripts/templates/class.h
+++ b/scripts/templates/class.h
@@ -95,15 +95,16 @@ public:
     [%- IF loop.first %]
 
     // Owned attributes
-    [%- END %]
-    [% QT_TYPE(namespace, attribute) -%]
-    [%- QT_ATTRIBUTE(attribute) -%]() const;
+    [%- END -%]
+    [%- SET qtAttribute = QT_ATTRIBUTE(attribute) -%]
+    [%- SET qtType = QT_TYPE(namespace, attribute) %]
+    [% IF qtType.match("QList|QSet") %]const [% END %]${qtType}${qtAttribute}() const;
     [%- SET attributeName = attribute.findvalue("@name").ucfirst -%]
     [%- IF attribute.findnodes("upperValue").findvalue("@value") == "*" %]
-    [% IF attribute.findvalue("@isReadOnly") == "true" -%]Q_DECL_HIDDEN [% END %]void add${attributeName}([% QT_TYPE(namespace, attribute).remove("QSet<").remove("QList<").replace("> ", " ").replace('\* $', '*') %][% QT_ATTRIBUTE(attribute) %]);
-    [% IF attribute.findvalue("@isReadOnly") == "true" -%]Q_DECL_HIDDEN [% END %]void remove${attributeName}([% QT_TYPE(namespace, attribute).remove("QSet<").remove("QList<").replace("> ", " ").replace('\* $', '*') %][% QT_ATTRIBUTE(attribute) %]);
+    [% IF attribute.findvalue("@isReadOnly") == "true" -%]Q_DECL_HIDDEN [% END %]void add${attributeName}([% qtType.remove("QSet<").remove("QList<").replace("> ", " ").replace('\* $', '*') %]${qtAttribute});
+    [% IF attribute.findvalue("@isReadOnly") == "true" -%]Q_DECL_HIDDEN [% END %]void remove${attributeName}([% qtType.remove("QSet<").remove("QList<").replace("> ", " ").replace('\* $', '*') %]${qtAttribute});
     [%- ELSE %]
-    [% IF attribute.findvalue("@isReadOnly") == "true" -%]Q_DECL_HIDDEN [% END %]void set${attributeName.remove("^Is")}([% QT_TYPE(namespace, attribute) %][% QT_ATTRIBUTE(attribute) %]);
+    [% IF attribute.findvalue("@isReadOnly") == "true" -%]Q_DECL_HIDDEN [% END %]void set${attributeName.remove("^Is")}(${qtType}${qtAttribute});
     [%- END %]
     [%- IF loop.last %]
     [%- END %]
diff --git a/src/uml/qumlaccepteventaction.cpp b/src/uml/qumlaccepteventaction.cpp
index b890be85..13953957 100644
--- a/src/uml/qumlaccepteventaction.cpp
+++ b/src/uml/qumlaccepteventaction.cpp
@@ -86,7 +86,7 @@ void QUmlAcceptEventAction::setUnmarshall(bool isUnmarshall)
 /*!
     Pins holding the received event objects or their attributes. Event objects may be copied in transmission, so identity might not be preserved.
  */
-QSet<QUmlOutputPin *> QUmlAcceptEventAction::result() const
+const QSet<QUmlOutputPin *> QUmlAcceptEventAction::result() const
 {
     // This is a read-write association end
 
@@ -120,7 +120,7 @@ void QUmlAcceptEventAction::removeResult(QUmlOutputPin *result)
 /*!
     The type of events accepted by the action, as specified by triggers. For triggers with signal events, a signal of the specified type or any subtype of the specified signal type is accepted.
  */
-QSet<QUmlTrigger *> QUmlAcceptEventAction::trigger() const
+const QSet<QUmlTrigger *> QUmlAcceptEventAction::trigger() const
 {
     // This is a read-write association end
 
diff --git a/src/uml/qumlaccepteventaction.h b/src/uml/qumlaccepteventaction.h
index c503c804..988b33a3 100644
--- a/src/uml/qumlaccepteventaction.h
+++ b/src/uml/qumlaccepteventaction.h
@@ -62,10 +62,10 @@ public:
     // Owned attributes
     bool isUnmarshall() const;
     void setUnmarshall(bool isUnmarshall);
-    QSet<QUmlOutputPin *> result() const;
+    const QSet<QUmlOutputPin *> result() const;
     void addResult(QUmlOutputPin *result);
     void removeResult(QUmlOutputPin *result);
-    QSet<QUmlTrigger *> trigger() const;
+    const QSet<QUmlTrigger *> trigger() const;
     void addTrigger(QUmlTrigger *trigger);
     void removeTrigger(QUmlTrigger *trigger);
 
diff --git a/src/uml/qumlaction.cpp b/src/uml/qumlaction.cpp
index d5cabd3d..0d3aaf91 100644
--- a/src/uml/qumlaction.cpp
+++ b/src/uml/qumlaction.cpp
@@ -96,7 +96,7 @@ void QUmlAction::setContext(QUmlClassifier *context)
 /*!
     The ordered set of input pins connected to the Action. These are among the total set of inputs.
  */
-QList<QUmlInputPin *> QUmlAction::input() const
+const QList<QUmlInputPin *> QUmlAction::input() const
 {
     // This is a read-only derived union association end
 
@@ -149,7 +149,7 @@ void QUmlAction::setLocallyReentrant(bool isLocallyReentrant)
 /*!
     Constraint that must be satisfied when executed is completed.
  */
-QSet<QUmlConstraint *> QUmlAction::localPostcondition() const
+const QSet<QUmlConstraint *> QUmlAction::localPostcondition() const
 {
     // This is a read-write association end
 
@@ -183,7 +183,7 @@ void QUmlAction::removeLocalPostcondition(QUmlConstraint *localPostcondition)
 /*!
     Constraint that must be satisfied when execution is started.
  */
-QSet<QUmlConstraint *> QUmlAction::localPrecondition() const
+const QSet<QUmlConstraint *> QUmlAction::localPrecondition() const
 {
     // This is a read-write association end
 
@@ -217,7 +217,7 @@ void QUmlAction::removeLocalPrecondition(QUmlConstraint *localPrecondition)
 /*!
     The ordered set of output pins connected to the Action. The action places its results onto pins in this set.
  */
-QList<QUmlOutputPin *> QUmlAction::output() const
+const QList<QUmlOutputPin *> QUmlAction::output() const
 {
     // This is a read-only derived union association end
 
diff --git a/src/uml/qumlaction.h b/src/uml/qumlaction.h
index b3c4e8dd..095b43da 100644
--- a/src/uml/qumlaction.h
+++ b/src/uml/qumlaction.h
@@ -64,18 +64,18 @@ public:
     // Owned attributes
     QUmlClassifier *context() const;
     Q_DECL_HIDDEN void setContext(QUmlClassifier *context);
-    QList<QUmlInputPin *> input() const;
+    const QList<QUmlInputPin *> input() const;
     Q_DECL_HIDDEN void addInput(QUmlInputPin *input);
     Q_DECL_HIDDEN void removeInput(QUmlInputPin *input);
     bool isLocallyReentrant() const;
     void setLocallyReentrant(bool isLocallyReentrant);
-    QSet<QUmlConstraint *> localPostcondition() const;
+    const QSet<QUmlConstraint *> localPostcondition() const;
     void addLocalPostcondition(QUmlConstraint *localPostcondition);
     void removeLocalPostcondition(QUmlConstraint *localPostcondition);
-    QSet<QUmlConstraint *> localPrecondition() const;
+    const QSet<QUmlConstraint *> localPrecondition() const;
     void addLocalPrecondition(QUmlConstraint *localPrecondition);
     void removeLocalPrecondition(QUmlConstraint *localPrecondition);
-    QList<QUmlOutputPin *> output() const;
+    const QList<QUmlOutputPin *> output() const;
     Q_DECL_HIDDEN void addOutput(QUmlOutputPin *output);
     Q_DECL_HIDDEN void removeOutput(QUmlOutputPin *output);
 
diff --git a/src/uml/qumlactivity.cpp b/src/uml/qumlactivity.cpp
index 7dfefebc..a6f6c39c 100644
--- a/src/uml/qumlactivity.cpp
+++ b/src/uml/qumlactivity.cpp
@@ -77,7 +77,7 @@ QUmlActivity::QUmlActivity() :
 /*!
     Edges expressing flow between nodes of the activity.
  */
-QSet<QUmlActivityEdge *> QUmlActivity::edge() const
+const QSet<QUmlActivityEdge *> QUmlActivity::edge() const
 {
     // This is a read-write association end
 
@@ -121,7 +121,7 @@ void QUmlActivity::removeEdge(QUmlActivityEdge *edge)
 /*!
     Top-level groups in the activity.
  */
-QSet<QUmlActivityGroup *> QUmlActivity::group() const
+const QSet<QUmlActivityGroup *> QUmlActivity::group() const
 {
     // This is a read-write association end
 
@@ -203,7 +203,7 @@ void QUmlActivity::setSingleExecution(bool isSingleExecution)
 /*!
     Nodes coordinated by the activity.
  */
-QSet<QUmlActivityNode *> QUmlActivity::node() const
+const QSet<QUmlActivityNode *> QUmlActivity::node() const
 {
     // This is a read-write association end
 
@@ -247,7 +247,7 @@ void QUmlActivity::removeNode(QUmlActivityNode *node)
 /*!
     Top-level partitions in the activity.
  */
-QSet<QUmlActivityPartition *> QUmlActivity::partition() const
+const QSet<QUmlActivityPartition *> QUmlActivity::partition() const
 {
     // This is a read-write association end
 
@@ -281,7 +281,7 @@ void QUmlActivity::removePartition(QUmlActivityPartition *partition)
 /*!
     Top-level structured nodes in the activity.
  */
-QSet<QUmlStructuredActivityNode *> QUmlActivity::structuredNode() const
+const QSet<QUmlStructuredActivityNode *> QUmlActivity::structuredNode() const
 {
     // This is a read-write association end
 
@@ -327,7 +327,7 @@ void QUmlActivity::removeStructuredNode(QUmlStructuredActivityNode *structuredNo
 /*!
     Top-level variables in the activity.
  */
-QSet<QUmlVariable *> QUmlActivity::variable() const
+const QSet<QUmlVariable *> QUmlActivity::variable() const
 {
     // This is a read-write association end
 
diff --git a/src/uml/qumlactivity.h b/src/uml/qumlactivity.h
index 23cbcdda..61e2978f 100644
--- a/src/uml/qumlactivity.h
+++ b/src/uml/qumlactivity.h
@@ -64,26 +64,26 @@ public:
     QUmlActivity();
 
     // Owned attributes
-    QSet<QUmlActivityEdge *> edge() const;
+    const QSet<QUmlActivityEdge *> edge() const;
     void addEdge(QUmlActivityEdge *edge);
     void removeEdge(QUmlActivityEdge *edge);
-    QSet<QUmlActivityGroup *> group() const;
+    const QSet<QUmlActivityGroup *> group() const;
     void addGroup(QUmlActivityGroup *group);
     void removeGroup(QUmlActivityGroup *group);
     bool isReadOnly() const;
     void setReadOnly(bool isReadOnly);
     bool isSingleExecution() const;
     void setSingleExecution(bool isSingleExecution);
-    QSet<QUmlActivityNode *> node() const;
+    const QSet<QUmlActivityNode *> node() const;
     void addNode(QUmlActivityNode *node);
     void removeNode(QUmlActivityNode *node);
-    QSet<QUmlActivityPartition *> partition() const;
+    const QSet<QUmlActivityPartition *> partition() const;
     void addPartition(QUmlActivityPartition *partition);
     void removePartition(QUmlActivityPartition *partition);
-    QSet<QUmlStructuredActivityNode *> structuredNode() const;
+    const QSet<QUmlStructuredActivityNode *> structuredNode() const;
     void addStructuredNode(QUmlStructuredActivityNode *structuredNode);
     void removeStructuredNode(QUmlStructuredActivityNode *structuredNode);
-    QSet<QUmlVariable *> variable() const;
+    const QSet<QUmlVariable *> variable() const;
     void addVariable(QUmlVariable *variable);
     void removeVariable(QUmlVariable *variable);
 
diff --git a/src/uml/qumlactivityedge.cpp b/src/uml/qumlactivityedge.cpp
index 6b7c96ac..8d1da98f 100644
--- a/src/uml/qumlactivityedge.cpp
+++ b/src/uml/qumlactivityedge.cpp
@@ -136,7 +136,7 @@ void QUmlActivityEdge::setGuard(QUmlValueSpecification *guard)
 /*!
     Groups containing the edge.
  */
-QSet<QUmlActivityGroup *> QUmlActivityEdge::inGroup() const
+const QSet<QUmlActivityGroup *> QUmlActivityEdge::inGroup() const
 {
     // This is a read-only derived union association end
 
@@ -174,7 +174,7 @@ void QUmlActivityEdge::removeInGroup(QUmlActivityGroup *inGroup)
 /*!
     Partitions containing the edge.
  */
-QSet<QUmlActivityPartition *> QUmlActivityEdge::inPartition() const
+const QSet<QUmlActivityPartition *> QUmlActivityEdge::inPartition() const
 {
     // This is a read-write association end
 
@@ -265,7 +265,7 @@ void QUmlActivityEdge::setInterrupts(QUmlInterruptibleActivityRegion *interrupts
 /*!
     Inherited edges replaced by this edge in a specialization of the activity.
  */
-QSet<QUmlActivityEdge *> QUmlActivityEdge::redefinedEdge() const
+const QSet<QUmlActivityEdge *> QUmlActivityEdge::redefinedEdge() const
 {
     // This is a read-write association end
 
diff --git a/src/uml/qumlactivityedge.h b/src/uml/qumlactivityedge.h
index ec7fccd2..67757682 100644
--- a/src/uml/qumlactivityedge.h
+++ b/src/uml/qumlactivityedge.h
@@ -69,17 +69,17 @@ public:
     void setActivity(QUmlActivity *activity);
     QUmlValueSpecification *guard() const;
     void setGuard(QUmlValueSpecification *guard);
-    QSet<QUmlActivityGroup *> inGroup() const;
+    const QSet<QUmlActivityGroup *> inGroup() const;
     Q_DECL_HIDDEN void addInGroup(QUmlActivityGroup *inGroup);
     Q_DECL_HIDDEN void removeInGroup(QUmlActivityGroup *inGroup);
-    QSet<QUmlActivityPartition *> inPartition() const;
+    const QSet<QUmlActivityPartition *> inPartition() const;
     void addInPartition(QUmlActivityPartition *inPartition);
     void removeInPartition(QUmlActivityPartition *inPartition);
     QUmlStructuredActivityNode *inStructuredNode() const;
     void setInStructuredNode(QUmlStructuredActivityNode *inStructuredNode);
     QUmlInterruptibleActivityRegion *interrupts() const;
     void setInterrupts(QUmlInterruptibleActivityRegion *interrupts);
-    QSet<QUmlActivityEdge *> redefinedEdge() const;
+    const QSet<QUmlActivityEdge *> redefinedEdge() const;
     void addRedefinedEdge(QUmlActivityEdge *redefinedEdge);
     void removeRedefinedEdge(QUmlActivityEdge *redefinedEdge);
     QUmlActivityNode *source() const;
diff --git a/src/uml/qumlactivitygroup.cpp b/src/uml/qumlactivitygroup.cpp
index 2b56444b..4f9be83a 100644
--- a/src/uml/qumlactivitygroup.cpp
+++ b/src/uml/qumlactivitygroup.cpp
@@ -71,7 +71,7 @@ QUmlActivityGroup::QUmlActivityGroup() :
 /*!
     Edges immediately contained in the group.
  */
-QSet<QUmlActivityEdge *> QUmlActivityGroup::containedEdge() const
+const QSet<QUmlActivityEdge *> QUmlActivityGroup::containedEdge() const
 {
     // This is a read-only derived union association end
 
@@ -109,7 +109,7 @@ void QUmlActivityGroup::removeContainedEdge(QUmlActivityEdge *containedEdge)
 /*!
     Nodes immediately contained in the group.
  */
-QSet<QUmlActivityNode *> QUmlActivityGroup::containedNode() const
+const QSet<QUmlActivityNode *> QUmlActivityGroup::containedNode() const
 {
     // This is a read-only derived union association end
 
@@ -171,7 +171,7 @@ void QUmlActivityGroup::setInActivity(QUmlActivity *inActivity)
 /*!
     Groups immediately contained in the group.
  */
-QSet<QUmlActivityGroup *> QUmlActivityGroup::subgroup() const
+const QSet<QUmlActivityGroup *> QUmlActivityGroup::subgroup() const
 {
     // This is a read-only derived union association end
 
diff --git a/src/uml/qumlactivitygroup.h b/src/uml/qumlactivitygroup.h
index f87da36d..e9c16722 100644
--- a/src/uml/qumlactivitygroup.h
+++ b/src/uml/qumlactivitygroup.h
@@ -61,15 +61,15 @@ public:
     Q_DECL_HIDDEN QUmlActivityGroup();
 
     // Owned attributes
-    QSet<QUmlActivityEdge *> containedEdge() const;
+    const QSet<QUmlActivityEdge *> containedEdge() const;
     Q_DECL_HIDDEN void addContainedEdge(QUmlActivityEdge *containedEdge);
     Q_DECL_HIDDEN void removeContainedEdge(QUmlActivityEdge *containedEdge);
-    QSet<QUmlActivityNode *> containedNode() const;
+    const QSet<QUmlActivityNode *> containedNode() const;
     Q_DECL_HIDDEN void addContainedNode(QUmlActivityNode *containedNode);
     Q_DECL_HIDDEN void removeContainedNode(QUmlActivityNode *containedNode);
     QUmlActivity *inActivity() const;
     void setInActivity(QUmlActivity *inActivity);
-    QSet<QUmlActivityGroup *> subgroup() const;
+    const QSet<QUmlActivityGroup *> subgroup() const;
     Q_DECL_HIDDEN void addSubgroup(QUmlActivityGroup *subgroup);
     Q_DECL_HIDDEN void removeSubgroup(QUmlActivityGroup *subgroup);
     QUmlActivityGroup *superGroup() const;
diff --git a/src/uml/qumlactivitynode.cpp b/src/uml/qumlactivitynode.cpp
index 6fc4e13f..87d32740 100644
--- a/src/uml/qumlactivitynode.cpp
+++ b/src/uml/qumlactivitynode.cpp
@@ -101,7 +101,7 @@ void QUmlActivityNode::setActivity(QUmlActivity *activity)
 /*!
     Groups containing the node.
  */
-QSet<QUmlActivityGroup *> QUmlActivityNode::inGroup() const
+const QSet<QUmlActivityGroup *> QUmlActivityNode::inGroup() const
 {
     // This is a read-only derived union association end
 
@@ -139,7 +139,7 @@ void QUmlActivityNode::removeInGroup(QUmlActivityGroup *inGroup)
 /*!
     Interruptible regions containing the node.
  */
-QSet<QUmlInterruptibleActivityRegion *> QUmlActivityNode::inInterruptibleRegion() const
+const QSet<QUmlInterruptibleActivityRegion *> QUmlActivityNode::inInterruptibleRegion() const
 {
     // This is a read-write association end
 
@@ -183,7 +183,7 @@ void QUmlActivityNode::removeInInterruptibleRegion(QUmlInterruptibleActivityRegi
 /*!
     Partitions containing the node.
  */
-QSet<QUmlActivityPartition *> QUmlActivityNode::inPartition() const
+const QSet<QUmlActivityPartition *> QUmlActivityNode::inPartition() const
 {
     // This is a read-write association end
 
@@ -255,7 +255,7 @@ void QUmlActivityNode::setInStructuredNode(QUmlStructuredActivityNode *inStructu
 /*!
     Edges that have the node as target.
  */
-QSet<QUmlActivityEdge *> QUmlActivityNode::incoming() const
+const QSet<QUmlActivityEdge *> QUmlActivityNode::incoming() const
 {
     // This is a read-write association end
 
@@ -293,7 +293,7 @@ void QUmlActivityNode::removeIncoming(QUmlActivityEdge *incoming)
 /*!
     Edges that have the node as source.
  */
-QSet<QUmlActivityEdge *> QUmlActivityNode::outgoing() const
+const QSet<QUmlActivityEdge *> QUmlActivityNode::outgoing() const
 {
     // This is a read-write association end
 
@@ -331,7 +331,7 @@ void QUmlActivityNode::removeOutgoing(QUmlActivityEdge *outgoing)
 /*!
     Inherited nodes replaced by this node in a specialization of the activity.
  */
-QSet<QUmlActivityNode *> QUmlActivityNode::redefinedNode() const
+const QSet<QUmlActivityNode *> QUmlActivityNode::redefinedNode() const
 {
     // This is a read-write association end
 
diff --git a/src/uml/qumlactivitynode.h b/src/uml/qumlactivitynode.h
index 4d711dfa..6fb16ca6 100644
--- a/src/uml/qumlactivitynode.h
+++ b/src/uml/qumlactivitynode.h
@@ -66,24 +66,24 @@ public:
     // Owned attributes
     QUmlActivity *activity() const;
     void setActivity(QUmlActivity *activity);
-    QSet<QUmlActivityGroup *> inGroup() const;
+    const QSet<QUmlActivityGroup *> inGroup() const;
     Q_DECL_HIDDEN void addInGroup(QUmlActivityGroup *inGroup);
     Q_DECL_HIDDEN void removeInGroup(QUmlActivityGroup *inGroup);
-    QSet<QUmlInterruptibleActivityRegion *> inInterruptibleRegion() const;
+    const QSet<QUmlInterruptibleActivityRegion *> inInterruptibleRegion() const;
     void addInInterruptibleRegion(QUmlInterruptibleActivityRegion *inInterruptibleRegion);
     void removeInInterruptibleRegion(QUmlInterruptibleActivityRegion *inInterruptibleRegion);
-    QSet<QUmlActivityPartition *> inPartition() const;
+    const QSet<QUmlActivityPartition *> inPartition() const;
     void addInPartition(QUmlActivityPartition *inPartition);
     void removeInPartition(QUmlActivityPartition *inPartition);
     QUmlStructuredActivityNode *inStructuredNode() const;
     void setInStructuredNode(QUmlStructuredActivityNode *inStructuredNode);
-    QSet<QUmlActivityEdge *> incoming() const;
+    const QSet<QUmlActivityEdge *> incoming() const;
     void addIncoming(QUmlActivityEdge *incoming);
     void removeIncoming(QUmlActivityEdge *incoming);
-    QSet<QUmlActivityEdge *> outgoing() const;
+    const QSet<QUmlActivityEdge *> outgoing() const;
     void addOutgoing(QUmlActivityEdge *outgoing);
     void removeOutgoing(QUmlActivityEdge *outgoing);
-    QSet<QUmlActivityNode *> redefinedNode() const;
+    const QSet<QUmlActivityNode *> redefinedNode() const;
     void addRedefinedNode(QUmlActivityNode *redefinedNode);
     void removeRedefinedNode(QUmlActivityNode *redefinedNode);
 
diff --git a/src/uml/qumlactivitypartition.cpp b/src/uml/qumlactivitypartition.cpp
index 20e23e8c..f81718cb 100644
--- a/src/uml/qumlactivitypartition.cpp
+++ b/src/uml/qumlactivitypartition.cpp
@@ -75,7 +75,7 @@ QUmlActivityPartition::QUmlActivityPartition() :
 /*!
     Edges immediately contained in the group.
  */
-QSet<QUmlActivityEdge *> QUmlActivityPartition::edge() const
+const QSet<QUmlActivityEdge *> QUmlActivityPartition::edge() const
 {
     // This is a read-write association end
 
@@ -157,7 +157,7 @@ void QUmlActivityPartition::setExternal(bool isExternal)
 /*!
     Nodes immediately contained in the group.
  */
-QSet<QUmlActivityNode *> QUmlActivityPartition::node() const
+const QSet<QUmlActivityNode *> QUmlActivityPartition::node() const
 {
     // This is a read-write association end
 
@@ -220,7 +220,7 @@ void QUmlActivityPartition::setRepresents(QUmlElement *represents)
 /*!
     Partitions immediately contained in the partition.
  */
-QSet<QUmlActivityPartition *> QUmlActivityPartition::subpartition() const
+const QSet<QUmlActivityPartition *> QUmlActivityPartition::subpartition() const
 {
     // This is a read-write association end
 
diff --git a/src/uml/qumlactivitypartition.h b/src/uml/qumlactivitypartition.h
index 8c058dc0..c4b5b6a3 100644
--- a/src/uml/qumlactivitypartition.h
+++ b/src/uml/qumlactivitypartition.h
@@ -61,19 +61,19 @@ public:
     QUmlActivityPartition();
 
     // Owned attributes
-    QSet<QUmlActivityEdge *> edge() const;
+    const QSet<QUmlActivityEdge *> edge() const;
     void addEdge(QUmlActivityEdge *edge);
     void removeEdge(QUmlActivityEdge *edge);
     bool isDimension() const;
     void setDimension(bool isDimension);
     bool isExternal() const;
     void setExternal(bool isExternal);
-    QSet<QUmlActivityNode *> node() const;
+    const QSet<QUmlActivityNode *> node() const;
     void addNode(QUmlActivityNode *node);
     void removeNode(QUmlActivityNode *node);
     QUmlElement *represents() const;
     void setRepresents(QUmlElement *represents);
-    QSet<QUmlActivityPartition *> subpartition() const;
+    const QSet<QUmlActivityPartition *> subpartition() const;
     void addSubpartition(QUmlActivityPartition *subpartition);
     void removeSubpartition(QUmlActivityPartition *subpartition);
     QUmlActivityPartition *superPartition() const;
diff --git a/src/uml/qumlartifact.cpp b/src/uml/qumlartifact.cpp
index 8376cf40..81bbf5b7 100644
--- a/src/uml/qumlartifact.cpp
+++ b/src/uml/qumlartifact.cpp
@@ -88,7 +88,7 @@ void QUmlArtifact::setFileName(QString fileName)
 /*!
     The set of model elements that are manifested in the Artifact. That is, these model elements are utilized in the construction (or generation) of the artifact.
  */
-QSet<QUmlManifestation *> QUmlArtifact::manifestation() const
+const QSet<QUmlManifestation *> QUmlArtifact::manifestation() const
 {
     // This is a read-write association end
 
@@ -124,7 +124,7 @@ void QUmlArtifact::removeManifestation(QUmlManifestation *manifestation)
 /*!
     The Artifacts that are defined (nested) within the Artifact. The association is a specialization of the ownedMember association from Namespace to NamedElement.
  */
-QSet<QUmlArtifact *> QUmlArtifact::nestedArtifact() const
+const QSet<QUmlArtifact *> QUmlArtifact::nestedArtifact() const
 {
     // This is a read-write association end
 
@@ -158,7 +158,7 @@ void QUmlArtifact::removeNestedArtifact(QUmlArtifact *nestedArtifact)
 /*!
     The attributes or association ends defined for the Artifact. The association is a specialization of the ownedMember association.
  */
-QList<QUmlProperty *> QUmlArtifact::ownedAttribute() const
+const QList<QUmlProperty *> QUmlArtifact::ownedAttribute() const
 {
     // This is a read-write association end
 
@@ -194,7 +194,7 @@ void QUmlArtifact::removeOwnedAttribute(QUmlProperty *ownedAttribute)
 /*!
     The Operations defined for the Artifact. The association is a specialization of the ownedMember association.
  */
-QList<QUmlOperation *> QUmlArtifact::ownedOperation() const
+const QList<QUmlOperation *> QUmlArtifact::ownedOperation() const
 {
     // This is a read-write association end
 
diff --git a/src/uml/qumlartifact.h b/src/uml/qumlartifact.h
index 4f1d9387..7a305c4f 100644
--- a/src/uml/qumlartifact.h
+++ b/src/uml/qumlartifact.h
@@ -64,16 +64,16 @@ public:
     // Owned attributes
     QString fileName() const;
     void setFileName(QString fileName);
-    QSet<QUmlManifestation *> manifestation() const;
+    const QSet<QUmlManifestation *> manifestation() const;
     void addManifestation(QUmlManifestation *manifestation);
     void removeManifestation(QUmlManifestation *manifestation);
-    QSet<QUmlArtifact *> nestedArtifact() const;
+    const QSet<QUmlArtifact *> nestedArtifact() const;
     void addNestedArtifact(QUmlArtifact *nestedArtifact);
     void removeNestedArtifact(QUmlArtifact *nestedArtifact);
-    QList<QUmlProperty *> ownedAttribute() const;
+    const QList<QUmlProperty *> ownedAttribute() const;
     void addOwnedAttribute(QUmlProperty *ownedAttribute);
     void removeOwnedAttribute(QUmlProperty *ownedAttribute);
-    QList<QUmlOperation *> ownedOperation() const;
+    const QList<QUmlOperation *> ownedOperation() const;
     void addOwnedOperation(QUmlOperation *ownedOperation);
     void removeOwnedOperation(QUmlOperation *ownedOperation);
 
diff --git a/src/uml/qumlassociation.cpp b/src/uml/qumlassociation.cpp
index d5ccc091..4e2a87af 100644
--- a/src/uml/qumlassociation.cpp
+++ b/src/uml/qumlassociation.cpp
@@ -69,7 +69,7 @@ QUmlAssociation::QUmlAssociation() :
 /*!
     References the classifiers that are used as types of the ends of the association.
  */
-QList<QUmlType *> QUmlAssociation::endType() const
+const QList<QUmlType *> QUmlAssociation::endType() const
 {
     // This is a read-only derived association end
 
@@ -130,7 +130,7 @@ void QUmlAssociation::setDerived(bool isDerived)
 /*!
     Each end represents participation of instances of the classifier connected to the end in links of the association.
  */
-QList<QUmlProperty *> QUmlAssociation::memberEnd() const
+const QList<QUmlProperty *> QUmlAssociation::memberEnd() const
 {
     // This is a read-write association end
 
@@ -174,7 +174,7 @@ void QUmlAssociation::removeMemberEnd(QUmlProperty *memberEnd)
 /*!
     The navigable ends that are owned by the association itself.
  */
-QSet<QUmlProperty *> QUmlAssociation::navigableOwnedEnd() const
+const QSet<QUmlProperty *> QUmlAssociation::navigableOwnedEnd() const
 {
     // This is a read-write association end
 
@@ -208,7 +208,7 @@ void QUmlAssociation::removeNavigableOwnedEnd(QUmlProperty *navigableOwnedEnd)
 /*!
     The ends that are owned by the association itself.
  */
-QList<QUmlProperty *> QUmlAssociation::ownedEnd() const
+const QList<QUmlProperty *> QUmlAssociation::ownedEnd() const
 {
     // This is a read-write association end
 
diff --git a/src/uml/qumlassociation.h b/src/uml/qumlassociation.h
index 88e79041..496cd0ac 100644
--- a/src/uml/qumlassociation.h
+++ b/src/uml/qumlassociation.h
@@ -61,18 +61,18 @@ public:
     QUmlAssociation();
 
     // Owned attributes
-    QList<QUmlType *> endType() const;
+    const QList<QUmlType *> endType() const;
     Q_DECL_HIDDEN void addEndType(QUmlType *endType);
     Q_DECL_HIDDEN void removeEndType(QUmlType *endType);
     bool isDerived() const;
     void setDerived(bool isDerived);
-    QList<QUmlProperty *> memberEnd() const;
+    const QList<QUmlProperty *> memberEnd() const;
     void addMemberEnd(QUmlProperty *memberEnd);
     void removeMemberEnd(QUmlProperty *memberEnd);
-    QSet<QUmlProperty *> navigableOwnedEnd() const;
+    const QSet<QUmlProperty *> navigableOwnedEnd() const;
     void addNavigableOwnedEnd(QUmlProperty *navigableOwnedEnd);
     void removeNavigableOwnedEnd(QUmlProperty *navigableOwnedEnd);
-    QList<QUmlProperty *> ownedEnd() const;
+    const QList<QUmlProperty *> ownedEnd() const;
     void addOwnedEnd(QUmlProperty *ownedEnd);
     void removeOwnedEnd(QUmlProperty *ownedEnd);
 
diff --git a/src/uml/qumlbehavior.cpp b/src/uml/qumlbehavior.cpp
index 2be6633c..d7941493 100644
--- a/src/uml/qumlbehavior.cpp
+++ b/src/uml/qumlbehavior.cpp
@@ -62,7 +62,7 @@ QUmlBehavior::QUmlBehavior() :
     _specification(0)
 {
     d_ptr->object.setProperty("context", QVariant::fromValue((QUmlBehavioredClassifier *)(0)));
-    d_ptr->object.setProperty("isReentrant", QVariant::fromValue(false));
+    d_ptr->object.setProperty("isReentrant", QVariant::fromValue(true));
     d_ptr->object.setProperty("ownedParameter", QVariant::fromValue(&_ownedParameter));
     d_ptr->object.setProperty("ownedParameterSet", QVariant::fromValue(&_ownedParameterSet));
     d_ptr->object.setProperty("postcondition", QVariant::fromValue(&_postcondition));
@@ -127,7 +127,7 @@ void QUmlBehavior::setReentrant(bool isReentrant)
 /*!
     References a list of parameters to the behavior which describes the order and type of arguments that can be given when the behavior is invoked and of the values which will be returned when the behavior completes its execution.
  */
-QList<QUmlParameter *> QUmlBehavior::ownedParameter() const
+const QList<QUmlParameter *> QUmlBehavior::ownedParameter() const
 {
     // This is a read-write association end
 
@@ -161,7 +161,7 @@ void QUmlBehavior::removeOwnedParameter(QUmlParameter *ownedParameter)
 /*!
     The ParameterSets owned by this Behavior.
  */
-QSet<QUmlParameterSet *> QUmlBehavior::ownedParameterSet() const
+const QSet<QUmlParameterSet *> QUmlBehavior::ownedParameterSet() const
 {
     // This is a read-write association end
 
@@ -195,7 +195,7 @@ void QUmlBehavior::removeOwnedParameterSet(QUmlParameterSet *ownedParameterSet)
 /*!
     An optional set of Constraints specifying what is fulfilled after the execution of the behavior is completed, if its precondition was fulfilled before its invocation.
  */
-QSet<QUmlConstraint *> QUmlBehavior::postcondition() const
+const QSet<QUmlConstraint *> QUmlBehavior::postcondition() const
 {
     // This is a read-write association end
 
@@ -229,7 +229,7 @@ void QUmlBehavior::removePostcondition(QUmlConstraint *postcondition)
 /*!
     An optional set of Constraints specifying what must be fulfilled when the behavior is invoked.
  */
-QSet<QUmlConstraint *> QUmlBehavior::precondition() const
+const QSet<QUmlConstraint *> QUmlBehavior::precondition() const
 {
     // This is a read-write association end
 
@@ -263,7 +263,7 @@ void QUmlBehavior::removePrecondition(QUmlConstraint *precondition)
 /*!
     References a behavior that this behavior redefines. A subtype of Behavior may redefine any other subtype of Behavior. If the behavior implements a behavioral feature, it replaces the redefined behavior. If the behavior is a classifier behavior, it extends the redefined behavior.
  */
-QSet<QUmlBehavior *> QUmlBehavior::redefinedBehavior() const
+const QSet<QUmlBehavior *> QUmlBehavior::redefinedBehavior() const
 {
     // This is a read-write association end
 
diff --git a/src/uml/qumlbehavior.h b/src/uml/qumlbehavior.h
index c849f8e7..96982f11 100644
--- a/src/uml/qumlbehavior.h
+++ b/src/uml/qumlbehavior.h
@@ -67,19 +67,19 @@ public:
     Q_DECL_HIDDEN void setContext(QUmlBehavioredClassifier *context);
     bool isReentrant() const;
     void setReentrant(bool isReentrant);
-    QList<QUmlParameter *> ownedParameter() const;
+    const QList<QUmlParameter *> ownedParameter() const;
     void addOwnedParameter(QUmlParameter *ownedParameter);
     void removeOwnedParameter(QUmlParameter *ownedParameter);
-    QSet<QUmlParameterSet *> ownedParameterSet() const;
+    const QSet<QUmlParameterSet *> ownedParameterSet() const;
     void addOwnedParameterSet(QUmlParameterSet *ownedParameterSet);
     void removeOwnedParameterSet(QUmlParameterSet *ownedParameterSet);
-    QSet<QUmlConstraint *> postcondition() const;
+    const QSet<QUmlConstraint *> postcondition() const;
     void addPostcondition(QUmlConstraint *postcondition);
     void removePostcondition(QUmlConstraint *postcondition);
-    QSet<QUmlConstraint *> precondition() const;
+    const QSet<QUmlConstraint *> precondition() const;
     void addPrecondition(QUmlConstraint *precondition);
     void removePrecondition(QUmlConstraint *precondition);
-    QSet<QUmlBehavior *> redefinedBehavior() const;
+    const QSet<QUmlBehavior *> redefinedBehavior() const;
     void addRedefinedBehavior(QUmlBehavior *redefinedBehavior);
     void removeRedefinedBehavior(QUmlBehavior *redefinedBehavior);
     QUmlBehavioralFeature *specification() const;
diff --git a/src/uml/qumlbehavioralfeature.cpp b/src/uml/qumlbehavioralfeature.cpp
index 72d6828b..8c6500fa 100644
--- a/src/uml/qumlbehavioralfeature.cpp
+++ b/src/uml/qumlbehavioralfeature.cpp
@@ -61,7 +61,7 @@ QUmlBehavioralFeature::QUmlBehavioralFeature() :
     _concurrency(QtUml::CallConcurrencyKindSequential),
     _isAbstract(false)
 {
-    d_ptr->object.setProperty("concurrency", QVariant::fromValue(QtUml::CallConcurrencyKindNone));
+    d_ptr->object.setProperty("concurrency", QVariant::fromValue(QtUml::CallConcurrencyKindSequential));
     d_ptr->object.setProperty("isAbstract", QVariant::fromValue(false));
     d_ptr->object.setProperty("method", QVariant::fromValue(&_method));
     d_ptr->object.setProperty("ownedParameter", QVariant::fromValue(&_ownedParameter));
@@ -112,7 +112,7 @@ void QUmlBehavioralFeature::setAbstract(bool isAbstract)
 /*!
     A behavioral description that implements the behavioral feature. There may be at most one behavior for a particular pairing of a classifier (as owner of the behavior) and a behavioral feature (as specification of the behavior).
  */
-QSet<QUmlBehavior *> QUmlBehavioralFeature::method() const
+const QSet<QUmlBehavior *> QUmlBehavioralFeature::method() const
 {
     // This is a read-write association end
 
@@ -150,7 +150,7 @@ void QUmlBehavioralFeature::removeMethod(QUmlBehavior *method)
 /*!
     Specifies the ordered set of formal parameters of this BehavioralFeature.
  */
-QList<QUmlParameter *> QUmlBehavioralFeature::ownedParameter() const
+const QList<QUmlParameter *> QUmlBehavioralFeature::ownedParameter() const
 {
     // This is a read-write association end
 
@@ -184,7 +184,7 @@ void QUmlBehavioralFeature::removeOwnedParameter(QUmlParameter *ownedParameter)
 /*!
     The ParameterSets owned by this BehavioralFeature.
  */
-QSet<QUmlParameterSet *> QUmlBehavioralFeature::ownedParameterSet() const
+const QSet<QUmlParameterSet *> QUmlBehavioralFeature::ownedParameterSet() const
 {
     // This is a read-write association end
 
@@ -218,7 +218,7 @@ void QUmlBehavioralFeature::removeOwnedParameterSet(QUmlParameterSet *ownedParam
 /*!
     References the Types representing exceptions that may be raised during an invocation of this feature.
  */
-QSet<QUmlType *> QUmlBehavioralFeature::raisedException() const
+const QSet<QUmlType *> QUmlBehavioralFeature::raisedException() const
 {
     // This is a read-write association end
 
diff --git a/src/uml/qumlbehavioralfeature.h b/src/uml/qumlbehavioralfeature.h
index 20f7e71c..0f0747a5 100644
--- a/src/uml/qumlbehavioralfeature.h
+++ b/src/uml/qumlbehavioralfeature.h
@@ -69,16 +69,16 @@ public:
     void setConcurrency(QtUml::CallConcurrencyKind concurrency);
     bool isAbstract() const;
     void setAbstract(bool isAbstract);
-    QSet<QUmlBehavior *> method() const;
+    const QSet<QUmlBehavior *> method() const;
     void addMethod(QUmlBehavior *method);
     void removeMethod(QUmlBehavior *method);
-    QList<QUmlParameter *> ownedParameter() const;
+    const QList<QUmlParameter *> ownedParameter() const;
     void addOwnedParameter(QUmlParameter *ownedParameter);
     void removeOwnedParameter(QUmlParameter *ownedParameter);
-    QSet<QUmlParameterSet *> ownedParameterSet() const;
+    const QSet<QUmlParameterSet *> ownedParameterSet() const;
     void addOwnedParameterSet(QUmlParameterSet *ownedParameterSet);
     void removeOwnedParameterSet(QUmlParameterSet *ownedParameterSet);
-    QSet<QUmlType *> raisedException() const;
+    const QSet<QUmlType *> raisedException() const;
     void addRaisedException(QUmlType *raisedException);
     void removeRaisedException(QUmlType *raisedException);
 
diff --git a/src/uml/qumlbehavioredclassifier.cpp b/src/uml/qumlbehavioredclassifier.cpp
index b2d79545..7e3c8beb 100644
--- a/src/uml/qumlbehavioredclassifier.cpp
+++ b/src/uml/qumlbehavioredclassifier.cpp
@@ -94,7 +94,7 @@ void QUmlBehavioredClassifier::setClassifierBehavior(QUmlBehavior *classifierBeh
 /*!
     The set of InterfaceRealizations owned by the BehavioredClassifier. Interface realizations reference the Interfaces of which the BehavioredClassifier is an implementation.
  */
-QSet<QUmlInterfaceRealization *> QUmlBehavioredClassifier::interfaceRealization() const
+const QSet<QUmlInterfaceRealization *> QUmlBehavioredClassifier::interfaceRealization() const
 {
     // This is a read-write association end
 
@@ -140,7 +140,7 @@ void QUmlBehavioredClassifier::removeInterfaceRealization(QUmlInterfaceRealizati
 /*!
     References behavior specifications owned by a classifier.
  */
-QSet<QUmlBehavior *> QUmlBehavioredClassifier::ownedBehavior() const
+const QSet<QUmlBehavior *> QUmlBehavioredClassifier::ownedBehavior() const
 {
     // This is a read-write association end
 
diff --git a/src/uml/qumlbehavioredclassifier.h b/src/uml/qumlbehavioredclassifier.h
index d864466d..b7807d4c 100644
--- a/src/uml/qumlbehavioredclassifier.h
+++ b/src/uml/qumlbehavioredclassifier.h
@@ -62,10 +62,10 @@ public:
     // Owned attributes
     QUmlBehavior *classifierBehavior() const;
     void setClassifierBehavior(QUmlBehavior *classifierBehavior);
-    QSet<QUmlInterfaceRealization *> interfaceRealization() const;
+    const QSet<QUmlInterfaceRealization *> interfaceRealization() const;
     void addInterfaceRealization(QUmlInterfaceRealization *interfaceRealization);
     void removeInterfaceRealization(QUmlInterfaceRealization *interfaceRealization);
-    QSet<QUmlBehavior *> ownedBehavior() const;
+    const QSet<QUmlBehavior *> ownedBehavior() const;
     void addOwnedBehavior(QUmlBehavior *ownedBehavior);
     void removeOwnedBehavior(QUmlBehavior *ownedBehavior);
 
diff --git a/src/uml/qumlcallaction.cpp b/src/uml/qumlcallaction.cpp
index cff52b5f..36e3ce4d 100644
--- a/src/uml/qumlcallaction.cpp
+++ b/src/uml/qumlcallaction.cpp
@@ -56,7 +56,7 @@ QT_BEGIN_NAMESPACE
 QUmlCallAction::QUmlCallAction() :
     _isSynchronous(true)
 {
-    d_ptr->object.setProperty("isSynchronous", QVariant::fromValue(false));
+    d_ptr->object.setProperty("isSynchronous", QVariant::fromValue(true));
     d_ptr->object.setProperty("result", QVariant::fromValue(&_result));
 }
 
@@ -84,7 +84,7 @@ void QUmlCallAction::setSynchronous(bool isSynchronous)
 /*!
     A list of output pins where the results of performing the invocation are placed.
  */
-QList<QUmlOutputPin *> QUmlCallAction::result() const
+const QList<QUmlOutputPin *> QUmlCallAction::result() const
 {
     // This is a read-write association end
 
diff --git a/src/uml/qumlcallaction.h b/src/uml/qumlcallaction.h
index 4d90e3d5..3a01f758 100644
--- a/src/uml/qumlcallaction.h
+++ b/src/uml/qumlcallaction.h
@@ -61,7 +61,7 @@ public:
     // Owned attributes
     bool isSynchronous() const;
     void setSynchronous(bool isSynchronous);
-    QList<QUmlOutputPin *> result() const;
+    const QList<QUmlOutputPin *> result() const;
     void addResult(QUmlOutputPin *result);
     void removeResult(QUmlOutputPin *result);
 
diff --git a/src/uml/qumlclass.cpp b/src/uml/qumlclass.cpp
index 861d78bd..939c81e7 100644
--- a/src/uml/qumlclass.cpp
+++ b/src/uml/qumlclass.cpp
@@ -77,7 +77,7 @@ QUmlClass::QUmlClass() :
 /*!
     References the Extensions that specify additional properties of the metaclass. The property is derived from the extensions whose memberEnds are typed by the Class.
  */
-QSet<QUmlExtension *> QUmlClass::extension() const
+const QSet<QUmlExtension *> QUmlClass::extension() const
 {
     // This is a read-only derived association end
 
@@ -161,7 +161,7 @@ void QUmlClass::setActive(bool isActive)
 /*!
     References all the Classifiers that are defined (nested) within the Class.
  */
-QList<QUmlClassifier *> QUmlClass::nestedClassifier() const
+const QList<QUmlClassifier *> QUmlClass::nestedClassifier() const
 {
     // This is a read-write association end
 
@@ -195,7 +195,7 @@ void QUmlClass::removeNestedClassifier(QUmlClassifier *nestedClassifier)
 /*!
     The attributes (i.e. the properties) owned by the class.
  */
-QList<QUmlProperty *> QUmlClass::ownedAttribute() const
+const QList<QUmlProperty *> QUmlClass::ownedAttribute() const
 {
     // This is a read-write association end
 
@@ -241,7 +241,7 @@ void QUmlClass::removeOwnedAttribute(QUmlProperty *ownedAttribute)
 /*!
     The operations owned by the class.
  */
-QList<QUmlOperation *> QUmlClass::ownedOperation() const
+const QList<QUmlOperation *> QUmlClass::ownedOperation() const
 {
     // This is a read-write association end
 
@@ -287,7 +287,7 @@ void QUmlClass::removeOwnedOperation(QUmlOperation *ownedOperation)
 /*!
     Receptions that objects of this class are willing to accept.
  */
-QSet<QUmlReception *> QUmlClass::ownedReception() const
+const QSet<QUmlReception *> QUmlClass::ownedReception() const
 {
     // This is a read-write association end
 
@@ -323,7 +323,7 @@ void QUmlClass::removeOwnedReception(QUmlReception *ownedReception)
 /*!
     This gives the superclasses of a class.
  */
-QSet<QUmlClass *> QUmlClass::superClass() const
+const QSet<QUmlClass *> QUmlClass::superClass() const
 {
     // This is a read-write derived association end
 
diff --git a/src/uml/qumlclass.h b/src/uml/qumlclass.h
index 34d6d378..5208d86c 100644
--- a/src/uml/qumlclass.h
+++ b/src/uml/qumlclass.h
@@ -65,26 +65,26 @@ public:
     QUmlClass();
 
     // Owned attributes
-    QSet<QUmlExtension *> extension() const;
+    const QSet<QUmlExtension *> extension() const;
     Q_DECL_HIDDEN void addExtension(QUmlExtension *extension);
     Q_DECL_HIDDEN void removeExtension(QUmlExtension *extension);
     bool isAbstract() const;
     void setAbstract(bool isAbstract);
     bool isActive() const;
     void setActive(bool isActive);
-    QList<QUmlClassifier *> nestedClassifier() const;
+    const QList<QUmlClassifier *> nestedClassifier() const;
     void addNestedClassifier(QUmlClassifier *nestedClassifier);
     void removeNestedClassifier(QUmlClassifier *nestedClassifier);
-    QList<QUmlProperty *> ownedAttribute() const;
+    const QList<QUmlProperty *> ownedAttribute() const;
     void addOwnedAttribute(QUmlProperty *ownedAttribute);
     void removeOwnedAttribute(QUmlProperty *ownedAttribute);
-    QList<QUmlOperation *> ownedOperation() const;
+    const QList<QUmlOperation *> ownedOperation() const;
     void addOwnedOperation(QUmlOperation *ownedOperation);
     void removeOwnedOperation(QUmlOperation *ownedOperation);
-    QSet<QUmlReception *> ownedReception() const;
+    const QSet<QUmlReception *> ownedReception() const;
     void addOwnedReception(QUmlReception *ownedReception);
     void removeOwnedReception(QUmlReception *ownedReception);
-    QSet<QUmlClass *> superClass() const;
+    const QSet<QUmlClass *> superClass() const;
     void addSuperClass(QUmlClass *superClass);
     void removeSuperClass(QUmlClass *superClass);
 
diff --git a/src/uml/qumlclassifier.cpp b/src/uml/qumlclassifier.cpp
index 0ba69130..2d6162e3 100644
--- a/src/uml/qumlclassifier.cpp
+++ b/src/uml/qumlclassifier.cpp
@@ -92,7 +92,7 @@ QUmlClassifier::QUmlClassifier() :
 /*!
     Refers to all of the Properties that are direct (i.e. not inherited or imported) attributes of the classifier.
  */
-QSet<QUmlProperty *> QUmlClassifier::attribute() const
+const QSet<QUmlProperty *> QUmlClassifier::attribute() const
 {
     // This is a read-only derived union association end
 
@@ -126,7 +126,7 @@ void QUmlClassifier::removeAttribute(QUmlProperty *attribute)
 /*!
     References the collaboration uses owned by the classifier.
  */
-QSet<QUmlCollaborationUse *> QUmlClassifier::collaborationUse() const
+const QSet<QUmlCollaborationUse *> QUmlClassifier::collaborationUse() const
 {
     // This is a read-write association end
 
@@ -160,7 +160,7 @@ void QUmlClassifier::removeCollaborationUse(QUmlCollaborationUse *collaborationU
 /*!
     Specifies each feature defined in the classifier.Note that there may be members of the Classifier that are of the type Feature but are not included in this association, e.g. inherited features.
  */
-QSet<QUmlFeature *> QUmlClassifier::feature() const
+const QSet<QUmlFeature *> QUmlClassifier::feature() const
 {
     // This is a read-only derived union association end
 
@@ -204,7 +204,7 @@ void QUmlClassifier::removeFeature(QUmlFeature *feature)
 /*!
     Specifies the general Classifiers for this Classifier.References the general classifier in the Generalization relationship.
  */
-QSet<QUmlClassifier *> QUmlClassifier::general() const
+const QSet<QUmlClassifier *> QUmlClassifier::general() const
 {
     // This is a read-write derived association end
 
@@ -240,7 +240,7 @@ void QUmlClassifier::removeGeneral(QUmlClassifier *general)
 /*!
     Specifies the Generalization relationships for this Classifier. These Generalizations navigaten to more general classifiers in the generalization hierarchy.
  */
-QSet<QUmlGeneralization *> QUmlClassifier::generalization() const
+const QSet<QUmlGeneralization *> QUmlClassifier::generalization() const
 {
     // This is a read-write association end
 
@@ -284,7 +284,7 @@ void QUmlClassifier::removeGeneralization(QUmlGeneralization *generalization)
 /*!
     Specifies all elements inherited by this classifier from the general classifiers.
  */
-QSet<QUmlNamedElement *> QUmlClassifier::inheritedMember() const
+const QSet<QUmlNamedElement *> QUmlClassifier::inheritedMember() const
 {
     // This is a read-only derived association end
 
@@ -383,7 +383,7 @@ void QUmlClassifier::setOwnedTemplateSignature(QUmlRedefinableTemplateSignature
 /*!
     References the use cases owned by this classifier.
  */
-QSet<QUmlUseCase *> QUmlClassifier::ownedUseCase() const
+const QSet<QUmlUseCase *> QUmlClassifier::ownedUseCase() const
 {
     // This is a read-write association end
 
@@ -417,7 +417,7 @@ void QUmlClassifier::removeOwnedUseCase(QUmlUseCase *ownedUseCase)
 /*!
     Designates the GeneralizationSet of which the associated Classifier is a power type.
  */
-QSet<QUmlGeneralizationSet *> QUmlClassifier::powertypeExtent() const
+const QSet<QUmlGeneralizationSet *> QUmlClassifier::powertypeExtent() const
 {
     // This is a read-write association end
 
@@ -455,7 +455,7 @@ void QUmlClassifier::removePowertypeExtent(QUmlGeneralizationSet *powertypeExten
 /*!
     References the Classifiers that are redefined by this Classifier.
  */
-QSet<QUmlClassifier *> QUmlClassifier::redefinedClassifier() const
+const QSet<QUmlClassifier *> QUmlClassifier::redefinedClassifier() const
 {
     // This is a read-write association end
 
@@ -516,7 +516,7 @@ void QUmlClassifier::setRepresentation(QUmlCollaborationUse *representation)
 /*!
     References the substitutions that are owned by this Classifier.
  */
-QSet<QUmlSubstitution *> QUmlClassifier::substitution() const
+const QSet<QUmlSubstitution *> QUmlClassifier::substitution() const
 {
     // This is a read-write association end
 
@@ -581,7 +581,7 @@ void QUmlClassifier::setTemplateParameter(QUmlClassifierTemplateParameter *templ
 /*!
     The set of use cases for which this Classifier is the subject.
  */
-QSet<QUmlUseCase *> QUmlClassifier::useCase() const
+const QSet<QUmlUseCase *> QUmlClassifier::useCase() const
 {
     // This is a read-write association end
 
diff --git a/src/uml/qumlclassifier.h b/src/uml/qumlclassifier.h
index 6a7b5544..0a712f4e 100644
--- a/src/uml/qumlclassifier.h
+++ b/src/uml/qumlclassifier.h
@@ -71,22 +71,22 @@ public:
     Q_DECL_HIDDEN QUmlClassifier();
 
     // Owned attributes
-    QSet<QUmlProperty *> attribute() const;
+    const QSet<QUmlProperty *> attribute() const;
     Q_DECL_HIDDEN void addAttribute(QUmlProperty *attribute);
     Q_DECL_HIDDEN void removeAttribute(QUmlProperty *attribute);
-    QSet<QUmlCollaborationUse *> collaborationUse() const;
+    const QSet<QUmlCollaborationUse *> collaborationUse() const;
     void addCollaborationUse(QUmlCollaborationUse *collaborationUse);
     void removeCollaborationUse(QUmlCollaborationUse *collaborationUse);
-    QSet<QUmlFeature *> feature() const;
+    const QSet<QUmlFeature *> feature() const;
     Q_DECL_HIDDEN void addFeature(QUmlFeature *feature);
     Q_DECL_HIDDEN void removeFeature(QUmlFeature *feature);
-    QSet<QUmlClassifier *> general() const;
+    const QSet<QUmlClassifier *> general() const;
     void addGeneral(QUmlClassifier *general);
     void removeGeneral(QUmlClassifier *general);
-    QSet<QUmlGeneralization *> generalization() const;
+    const QSet<QUmlGeneralization *> generalization() const;
     void addGeneralization(QUmlGeneralization *generalization);
     void removeGeneralization(QUmlGeneralization *generalization);
-    QSet<QUmlNamedElement *> inheritedMember() const;
+    const QSet<QUmlNamedElement *> inheritedMember() const;
     Q_DECL_HIDDEN void addInheritedMember(QUmlNamedElement *inheritedMember);
     Q_DECL_HIDDEN void removeInheritedMember(QUmlNamedElement *inheritedMember);
     bool isAbstract() const;
@@ -95,23 +95,23 @@ public:
     void setFinalSpecialization(bool isFinalSpecialization);
     QUmlRedefinableTemplateSignature *ownedTemplateSignature() const;
     void setOwnedTemplateSignature(QUmlRedefinableTemplateSignature *ownedTemplateSignature);
-    QSet<QUmlUseCase *> ownedUseCase() const;
+    const QSet<QUmlUseCase *> ownedUseCase() const;
     void addOwnedUseCase(QUmlUseCase *ownedUseCase);
     void removeOwnedUseCase(QUmlUseCase *ownedUseCase);
-    QSet<QUmlGeneralizationSet *> powertypeExtent() const;
+    const QSet<QUmlGeneralizationSet *> powertypeExtent() const;
     void addPowertypeExtent(QUmlGeneralizationSet *powertypeExtent);
     void removePowertypeExtent(QUmlGeneralizationSet *powertypeExtent);
-    QSet<QUmlClassifier *> redefinedClassifier() const;
+    const QSet<QUmlClassifier *> redefinedClassifier() const;
     void addRedefinedClassifier(QUmlClassifier *redefinedClassifier);
     void removeRedefinedClassifier(QUmlClassifier *redefinedClassifier);
     QUmlCollaborationUse *representation() const;
     void setRepresentation(QUmlCollaborationUse *representation);
-    QSet<QUmlSubstitution *> substitution() const;
+    const QSet<QUmlSubstitution *> substitution() const;
     void addSubstitution(QUmlSubstitution *substitution);
     void removeSubstitution(QUmlSubstitution *substitution);
     QUmlClassifierTemplateParameter *templateParameter() const;
     void setTemplateParameter(QUmlClassifierTemplateParameter *templateParameter);
-    QSet<QUmlUseCase *> useCase() const;
+    const QSet<QUmlUseCase *> useCase() const;
     void addUseCase(QUmlUseCase *useCase);
     void removeUseCase(QUmlUseCase *useCase);
 
diff --git a/src/uml/qumlclassifiertemplateparameter.cpp b/src/uml/qumlclassifiertemplateparameter.cpp
index e569a863..8016305c 100644
--- a/src/uml/qumlclassifiertemplateparameter.cpp
+++ b/src/uml/qumlclassifiertemplateparameter.cpp
@@ -57,7 +57,7 @@ QUmlClassifierTemplateParameter::QUmlClassifierTemplateParameter() :
     _allowSubstitutable(true),
     _parameteredElement(0)
 {
-    d_ptr->object.setProperty("allowSubstitutable", QVariant::fromValue(false));
+    d_ptr->object.setProperty("allowSubstitutable", QVariant::fromValue(true));
     d_ptr->object.setProperty("constrainingClassifier", QVariant::fromValue(&_constrainingClassifier));
     d_ptr->object.setProperty("parameteredElement", QVariant::fromValue((QUmlClassifier *)(0)));
 }
@@ -86,7 +86,7 @@ void QUmlClassifierTemplateParameter::setAllowSubstitutable(bool allowSubstituta
 /*!
     The classifiers that constrain the argument that can be used for the parameter. If the allowSubstitutable attribute is true, then any classifier that is compatible with this constraining classifier can be substituted; otherwise, it must be either this classifier or one of its subclasses. If this property is empty, there are no constraints on the classifier that can be used as an argument.
  */
-QSet<QUmlClassifier *> QUmlClassifierTemplateParameter::constrainingClassifier() const
+const QSet<QUmlClassifier *> QUmlClassifierTemplateParameter::constrainingClassifier() const
 {
     // This is a read-write association end
 
diff --git a/src/uml/qumlclassifiertemplateparameter.h b/src/uml/qumlclassifiertemplateparameter.h
index 13ea959d..d146faf9 100644
--- a/src/uml/qumlclassifiertemplateparameter.h
+++ b/src/uml/qumlclassifiertemplateparameter.h
@@ -61,7 +61,7 @@ public:
     // Owned attributes
     bool allowSubstitutable() const;
     void setAllowSubstitutable(bool allowSubstitutable);
-    QSet<QUmlClassifier *> constrainingClassifier() const;
+    const QSet<QUmlClassifier *> constrainingClassifier() const;
     void addConstrainingClassifier(QUmlClassifier *constrainingClassifier);
     void removeConstrainingClassifier(QUmlClassifier *constrainingClassifier);
     QUmlClassifier *parameteredElement() const;
diff --git a/src/uml/qumlclause.cpp b/src/uml/qumlclause.cpp
index eb0faa0d..4d4b2668 100644
--- a/src/uml/qumlclause.cpp
+++ b/src/uml/qumlclause.cpp
@@ -70,7 +70,7 @@ QUmlClause::QUmlClause() :
 /*!
     A nested activity fragment that is executed if the test evaluates to true and the clause is chosen over any concurrent clauses that also evaluate to true.
  */
-QSet<QUmlExecutableNode *> QUmlClause::body() const
+const QSet<QUmlExecutableNode *> QUmlClause::body() const
 {
     // This is a read-write association end
 
@@ -98,7 +98,7 @@ void QUmlClause::removeBody(QUmlExecutableNode *body)
 /*!
     A list of output pins within the body fragment whose values are moved to the result pins of the containing conditional node after execution of the clause body.
  */
-QList<QUmlOutputPin *> QUmlClause::bodyOutput() const
+const QList<QUmlOutputPin *> QUmlClause::bodyOutput() const
 {
     // This is a read-write association end
 
@@ -145,7 +145,7 @@ void QUmlClause::setDecider(QUmlOutputPin *decider)
 /*!
     A set of clauses whose tests must all evaluate false before the current clause can be tested.
  */
-QSet<QUmlClause *> QUmlClause::predecessorClause() const
+const QSet<QUmlClause *> QUmlClause::predecessorClause() const
 {
     // This is a read-write association end
 
@@ -173,7 +173,7 @@ void QUmlClause::removePredecessorClause(QUmlClause *predecessorClause)
 /*!
     A set of clauses which may not be tested unless the current clause tests false.
  */
-QSet<QUmlClause *> QUmlClause::successorClause() const
+const QSet<QUmlClause *> QUmlClause::successorClause() const
 {
     // This is a read-write association end
 
@@ -201,7 +201,7 @@ void QUmlClause::removeSuccessorClause(QUmlClause *successorClause)
 /*!
     A nested activity fragment with a designated output pin that specifies the result of the test.
  */
-QSet<QUmlExecutableNode *> QUmlClause::test() const
+const QSet<QUmlExecutableNode *> QUmlClause::test() const
 {
     // This is a read-write association end
 
diff --git a/src/uml/qumlclause.h b/src/uml/qumlclause.h
index 372ec61e..7733e49e 100644
--- a/src/uml/qumlclause.h
+++ b/src/uml/qumlclause.h
@@ -60,21 +60,21 @@ public:
     QUmlClause();
 
     // Owned attributes
-    QSet<QUmlExecutableNode *> body() const;
+    const QSet<QUmlExecutableNode *> body() const;
     void addBody(QUmlExecutableNode *body);
     void removeBody(QUmlExecutableNode *body);
-    QList<QUmlOutputPin *> bodyOutput() const;
+    const QList<QUmlOutputPin *> bodyOutput() const;
     void addBodyOutput(QUmlOutputPin *bodyOutput);
     void removeBodyOutput(QUmlOutputPin *bodyOutput);
     QUmlOutputPin *decider() const;
     void setDecider(QUmlOutputPin *decider);
-    QSet<QUmlClause *> predecessorClause() const;
+    const QSet<QUmlClause *> predecessorClause() const;
     void addPredecessorClause(QUmlClause *predecessorClause);
     void removePredecessorClause(QUmlClause *predecessorClause);
-    QSet<QUmlClause *> successorClause() const;
+    const QSet<QUmlClause *> successorClause() const;
     void addSuccessorClause(QUmlClause *successorClause);
     void removeSuccessorClause(QUmlClause *successorClause);
-    QSet<QUmlExecutableNode *> test() const;
+    const QSet<QUmlExecutableNode *> test() const;
     void addTest(QUmlExecutableNode *test);
     void removeTest(QUmlExecutableNode *test);
 
diff --git a/src/uml/qumlcollaboration.cpp b/src/uml/qumlcollaboration.cpp
index 7c6258fb..18a6d793 100644
--- a/src/uml/qumlcollaboration.cpp
+++ b/src/uml/qumlcollaboration.cpp
@@ -63,7 +63,7 @@ QUmlCollaboration::QUmlCollaboration()
 /*!
     References connectable elements (possibly owned by other classifiers) which represent roles that instances may play in this collaboration.
  */
-QSet<QUmlConnectableElement *> QUmlCollaboration::collaborationRole() const
+const QSet<QUmlConnectableElement *> QUmlCollaboration::collaborationRole() const
 {
     // This is a read-write association end
 
diff --git a/src/uml/qumlcollaboration.h b/src/uml/qumlcollaboration.h
index aeeb40d0..3cee968c 100644
--- a/src/uml/qumlcollaboration.h
+++ b/src/uml/qumlcollaboration.h
@@ -60,7 +60,7 @@ public:
     QUmlCollaboration();
 
     // Owned attributes
-    QSet<QUmlConnectableElement *> collaborationRole() const;
+    const QSet<QUmlConnectableElement *> collaborationRole() const;
     void addCollaborationRole(QUmlConnectableElement *collaborationRole);
     void removeCollaborationRole(QUmlConnectableElement *collaborationRole);
 
diff --git a/src/uml/qumlcollaborationuse.cpp b/src/uml/qumlcollaborationuse.cpp
index b406acd8..1a3e24d8 100644
--- a/src/uml/qumlcollaborationuse.cpp
+++ b/src/uml/qumlcollaborationuse.cpp
@@ -66,7 +66,7 @@ QUmlCollaborationUse::QUmlCollaborationUse() :
 /*!
     A mapping between features of the collaboration type and features of the owning classifier. This mapping indicates which connectable element of the classifier plays which role(s) in the collaboration. A connectable element may be bound to multiple roles in the same collaboration use (that is, it may play multiple roles).
  */
-QSet<QUmlDependency *> QUmlCollaborationUse::roleBinding() const
+const QSet<QUmlDependency *> QUmlCollaborationUse::roleBinding() const
 {
     // This is a read-write association end
 
diff --git a/src/uml/qumlcollaborationuse.h b/src/uml/qumlcollaborationuse.h
index 828660fe..d870984c 100644
--- a/src/uml/qumlcollaborationuse.h
+++ b/src/uml/qumlcollaborationuse.h
@@ -60,7 +60,7 @@ public:
     QUmlCollaborationUse();
 
     // Owned attributes
-    QSet<QUmlDependency *> roleBinding() const;
+    const QSet<QUmlDependency *> roleBinding() const;
     void addRoleBinding(QUmlDependency *roleBinding);
     void removeRoleBinding(QUmlDependency *roleBinding);
     QUmlCollaboration *type() const;
diff --git a/src/uml/qumlcombinedfragment.cpp b/src/uml/qumlcombinedfragment.cpp
index b066496f..3a622564 100644
--- a/src/uml/qumlcombinedfragment.cpp
+++ b/src/uml/qumlcombinedfragment.cpp
@@ -58,7 +58,7 @@ QUmlCombinedFragment::QUmlCombinedFragment() :
     _interactionOperator(QtUml::InteractionOperatorKindSeq)
 {
     d_ptr->object.setProperty("cfragmentGate", QVariant::fromValue(&_cfragmentGate));
-    d_ptr->object.setProperty("interactionOperator", QVariant::fromValue(QtUml::InteractionOperatorKindNone));
+    d_ptr->object.setProperty("interactionOperator", QVariant::fromValue(QtUml::InteractionOperatorKindSeq));
     d_ptr->object.setProperty("operand", QVariant::fromValue(&_operand));
 }
 
@@ -67,7 +67,7 @@ QUmlCombinedFragment::QUmlCombinedFragment() :
 /*!
     Specifies the gates that form the interface between this CombinedFragment and its surroundings
  */
-QSet<QUmlGate *> QUmlCombinedFragment::cfragmentGate() const
+const QSet<QUmlGate *> QUmlCombinedFragment::cfragmentGate() const
 {
     // This is a read-write association end
 
@@ -120,7 +120,7 @@ void QUmlCombinedFragment::setInteractionOperator(QtUml::InteractionOperatorKind
 /*!
     The set of operands of the combined fragment.
  */
-QList<QUmlInteractionOperand *> QUmlCombinedFragment::operand() const
+const QList<QUmlInteractionOperand *> QUmlCombinedFragment::operand() const
 {
     // This is a read-write association end
 
diff --git a/src/uml/qumlcombinedfragment.h b/src/uml/qumlcombinedfragment.h
index e18c1ae5..5812f668 100644
--- a/src/uml/qumlcombinedfragment.h
+++ b/src/uml/qumlcombinedfragment.h
@@ -61,12 +61,12 @@ public:
     QUmlCombinedFragment();
 
     // Owned attributes
-    QSet<QUmlGate *> cfragmentGate() const;
+    const QSet<QUmlGate *> cfragmentGate() const;
     void addCfragmentGate(QUmlGate *cfragmentGate);
     void removeCfragmentGate(QUmlGate *cfragmentGate);
     QtUml::InteractionOperatorKind interactionOperator() const;
     void setInteractionOperator(QtUml::InteractionOperatorKind interactionOperator);
-    QList<QUmlInteractionOperand *> operand() const;
+    const QList<QUmlInteractionOperand *> operand() const;
     void addOperand(QUmlInteractionOperand *operand);
     void removeOperand(QUmlInteractionOperand *operand);
 
diff --git a/src/uml/qumlcomment.cpp b/src/uml/qumlcomment.cpp
index fb16e1e5..04bc6632 100644
--- a/src/uml/qumlcomment.cpp
+++ b/src/uml/qumlcomment.cpp
@@ -62,7 +62,7 @@ QUmlComment::QUmlComment()
 /*!
     References the Element(s) being commented.
  */
-QSet<QUmlElement *> QUmlComment::annotatedElement() const
+const QSet<QUmlElement *> QUmlComment::annotatedElement() const
 {
     // This is a read-write association end
 
diff --git a/src/uml/qumlcomment.h b/src/uml/qumlcomment.h
index f0adc3ca..281c1947 100644
--- a/src/uml/qumlcomment.h
+++ b/src/uml/qumlcomment.h
@@ -57,7 +57,7 @@ public:
     QUmlComment();
 
     // Owned attributes
-    QSet<QUmlElement *> annotatedElement() const;
+    const QSet<QUmlElement *> annotatedElement() const;
     void addAnnotatedElement(QUmlElement *annotatedElement);
     void removeAnnotatedElement(QUmlElement *annotatedElement);
     QString body() const;
diff --git a/src/uml/qumlcomponent.cpp b/src/uml/qumlcomponent.cpp
index d74a1818..3f6d385f 100644
--- a/src/uml/qumlcomponent.cpp
+++ b/src/uml/qumlcomponent.cpp
@@ -59,7 +59,7 @@ QT_BEGIN_NAMESPACE
 QUmlComponent::QUmlComponent() :
     _isIndirectlyInstantiated(true)
 {
-    d_ptr->object.setProperty("isIndirectlyInstantiated", QVariant::fromValue(false));
+    d_ptr->object.setProperty("isIndirectlyInstantiated", QVariant::fromValue(true));
     d_ptr->object.setProperty("packagedElement", QVariant::fromValue(&_packagedElement));
     d_ptr->object.setProperty("provided", QVariant::fromValue(QSet<QUmlInterface *>()));
     d_ptr->object.setProperty("realization", QVariant::fromValue(&_realization));
@@ -90,7 +90,7 @@ void QUmlComponent::setIndirectlyInstantiated(bool isIndirectlyInstantiated)
 /*!
     The set of PackageableElements that a Component owns. In the namespace of a component, all model elements that are involved in or related to its definition may be owned or imported explicitly. These may include e.g. Classes, Interfaces, Components, Packages, Use cases, Dependencies (e.g. mappings), and Artifacts.
  */
-QSet<QUmlPackageableElement *> QUmlComponent::packagedElement() const
+const QSet<QUmlPackageableElement *> QUmlComponent::packagedElement() const
 {
     // This is a read-write association end
 
@@ -124,7 +124,7 @@ void QUmlComponent::removePackagedElement(QUmlPackageableElement *packagedElemen
 /*!
     The interfaces that the component exposes to its environment. These interfaces may be Realized by the Component or any of its realizingClassifiers, or they may be the Interfaces that are provided by its public Ports.
  */
-QSet<QUmlInterface *> QUmlComponent::provided() const
+const QSet<QUmlInterface *> QUmlComponent::provided() const
 {
     // This is a read-only derived association end
 
@@ -160,7 +160,7 @@ void QUmlComponent::removeProvided(QUmlInterface *provided)
 /*!
     The set of Realizations owned by the Component. Realizations reference the Classifiers of which the Component is an abstraction; i.e., that realize its behavior.
  */
-QSet<QUmlComponentRealization *> QUmlComponent::realization() const
+const QSet<QUmlComponentRealization *> QUmlComponent::realization() const
 {
     // This is a read-write association end
 
@@ -204,7 +204,7 @@ void QUmlComponent::removeRealization(QUmlComponentRealization *realization)
 /*!
     The interfaces that the component requires from other components in its environment in order to be able to offer its full set of provided functionality. These interfaces may be used by the Component or any of its realizingClassifiers, or they may be the Interfaces that are required by its public Ports.
  */
-QSet<QUmlInterface *> QUmlComponent::required() const
+const QSet<QUmlInterface *> QUmlComponent::required() const
 {
     // This is a read-only derived association end
 
diff --git a/src/uml/qumlcomponent.h b/src/uml/qumlcomponent.h
index 08fc65f3..1f051756 100644
--- a/src/uml/qumlcomponent.h
+++ b/src/uml/qumlcomponent.h
@@ -64,16 +64,16 @@ public:
     // Owned attributes
     bool isIndirectlyInstantiated() const;
     void setIndirectlyInstantiated(bool isIndirectlyInstantiated);
-    QSet<QUmlPackageableElement *> packagedElement() const;
+    const QSet<QUmlPackageableElement *> packagedElement() const;
     void addPackagedElement(QUmlPackageableElement *packagedElement);
     void removePackagedElement(QUmlPackageableElement *packagedElement);
-    QSet<QUmlInterface *> provided() const;
+    const QSet<QUmlInterface *> provided() const;
     Q_DECL_HIDDEN void addProvided(QUmlInterface *provided);
     Q_DECL_HIDDEN void removeProvided(QUmlInterface *provided);
-    QSet<QUmlComponentRealization *> realization() const;
+    const QSet<QUmlComponentRealization *> realization() const;
     void addRealization(QUmlComponentRealization *realization);
     void removeRealization(QUmlComponentRealization *realization);
-    QSet<QUmlInterface *> required() const;
+    const QSet<QUmlInterface *> required() const;
     Q_DECL_HIDDEN void addRequired(QUmlInterface *required);
     Q_DECL_HIDDEN void removeRequired(QUmlInterface *required);
 
diff --git a/src/uml/qumlcomponentrealization.cpp b/src/uml/qumlcomponentrealization.cpp
index 0963e6cc..957fbc23 100644
--- a/src/uml/qumlcomponentrealization.cpp
+++ b/src/uml/qumlcomponentrealization.cpp
@@ -94,7 +94,7 @@ void QUmlComponentRealization::setAbstraction(QUmlComponent *abstraction)
 /*!
     The classifiers that are involved in the implementation of the Component that owns this Realization.
  */
-QSet<QUmlClassifier *> QUmlComponentRealization::realizingClassifier() const
+const QSet<QUmlClassifier *> QUmlComponentRealization::realizingClassifier() const
 {
     // This is a read-write association end
 
diff --git a/src/uml/qumlcomponentrealization.h b/src/uml/qumlcomponentrealization.h
index 824ac4f2..09de9b15 100644
--- a/src/uml/qumlcomponentrealization.h
+++ b/src/uml/qumlcomponentrealization.h
@@ -62,7 +62,7 @@ public:
     // Owned attributes
     QUmlComponent *abstraction() const;
     void setAbstraction(QUmlComponent *abstraction);
-    QSet<QUmlClassifier *> realizingClassifier() const;
+    const QSet<QUmlClassifier *> realizingClassifier() const;
     void addRealizingClassifier(QUmlClassifier *realizingClassifier);
     void removeRealizingClassifier(QUmlClassifier *realizingClassifier);
 
diff --git a/src/uml/qumlconditionalnode.cpp b/src/uml/qumlconditionalnode.cpp
index bf94d75a..0b809ed8 100644
--- a/src/uml/qumlconditionalnode.cpp
+++ b/src/uml/qumlconditionalnode.cpp
@@ -69,7 +69,7 @@ QUmlConditionalNode::QUmlConditionalNode() :
 /*!
     Set of clauses composing the conditional.
  */
-QSet<QUmlClause *> QUmlConditionalNode::clause() const
+const QSet<QUmlClause *> QUmlConditionalNode::clause() const
 {
     // This is a read-write association end
 
@@ -141,7 +141,7 @@ void QUmlConditionalNode::setDeterminate(bool isDeterminate)
 /*!
     A list of output pins that constitute the data flow outputs of the conditional.
  */
-QList<QUmlOutputPin *> QUmlConditionalNode::result() const
+const QList<QUmlOutputPin *> QUmlConditionalNode::result() const
 {
     // This is a read-write association end
 
diff --git a/src/uml/qumlconditionalnode.h b/src/uml/qumlconditionalnode.h
index cb6d1b83..6ddaec33 100644
--- a/src/uml/qumlconditionalnode.h
+++ b/src/uml/qumlconditionalnode.h
@@ -60,14 +60,14 @@ public:
     QUmlConditionalNode();
 
     // Owned attributes
-    QSet<QUmlClause *> clause() const;
+    const QSet<QUmlClause *> clause() const;
     void addClause(QUmlClause *clause);
     void removeClause(QUmlClause *clause);
     bool isAssured() const;
     void setAssured(bool isAssured);
     bool isDeterminate() const;
     void setDeterminate(bool isDeterminate);
-    QList<QUmlOutputPin *> result() const;
+    const QList<QUmlOutputPin *> result() const;
     void addResult(QUmlOutputPin *result);
     void removeResult(QUmlOutputPin *result);
 
diff --git a/src/uml/qumlconnectableelement.cpp b/src/uml/qumlconnectableelement.cpp
index d15900e9..9b178da8 100644
--- a/src/uml/qumlconnectableelement.cpp
+++ b/src/uml/qumlconnectableelement.cpp
@@ -66,7 +66,7 @@ QUmlConnectableElement::QUmlConnectableElement() :
 /*!
     Denotes a set of connector ends that attaches to this connectable element.
  */
-QList<QUmlConnectorEnd *> QUmlConnectableElement::end() const
+const QList<QUmlConnectorEnd *> QUmlConnectableElement::end() const
 {
     // This is a read-only derived association end
 
diff --git a/src/uml/qumlconnectableelement.h b/src/uml/qumlconnectableelement.h
index 3395a3b7..a11576d9 100644
--- a/src/uml/qumlconnectableelement.h
+++ b/src/uml/qumlconnectableelement.h
@@ -61,7 +61,7 @@ public:
     Q_DECL_HIDDEN QUmlConnectableElement();
 
     // Owned attributes
-    QList<QUmlConnectorEnd *> end() const;
+    const QList<QUmlConnectorEnd *> end() const;
     Q_DECL_HIDDEN void addEnd(QUmlConnectorEnd *end);
     Q_DECL_HIDDEN void removeEnd(QUmlConnectorEnd *end);
     QUmlConnectableElementTemplateParameter *templateParameter() const;
diff --git a/src/uml/qumlconnectionpointreference.cpp b/src/uml/qumlconnectionpointreference.cpp
index db8663f9..e616a51b 100644
--- a/src/uml/qumlconnectionpointreference.cpp
+++ b/src/uml/qumlconnectionpointreference.cpp
@@ -67,7 +67,7 @@ QUmlConnectionPointReference::QUmlConnectionPointReference() :
 /*!
     The entryPoint kind pseudo states corresponding to this connection point.
  */
-QSet<QUmlPseudostate *> QUmlConnectionPointReference::entry() const
+const QSet<QUmlPseudostate *> QUmlConnectionPointReference::entry() const
 {
     // This is a read-write association end
 
@@ -95,7 +95,7 @@ void QUmlConnectionPointReference::removeEntry(QUmlPseudostate *entry)
 /*!
     The exitPoints kind pseudo states corresponding to this connection point.
  */
-QSet<QUmlPseudostate *> QUmlConnectionPointReference::exit() const
+const QSet<QUmlPseudostate *> QUmlConnectionPointReference::exit() const
 {
     // This is a read-write association end
 
diff --git a/src/uml/qumlconnectionpointreference.h b/src/uml/qumlconnectionpointreference.h
index 05656f2d..8cb07dec 100644
--- a/src/uml/qumlconnectionpointreference.h
+++ b/src/uml/qumlconnectionpointreference.h
@@ -60,10 +60,10 @@ public:
     QUmlConnectionPointReference();
 
     // Owned attributes
-    QSet<QUmlPseudostate *> entry() const;
+    const QSet<QUmlPseudostate *> entry() const;
     void addEntry(QUmlPseudostate *entry);
     void removeEntry(QUmlPseudostate *entry);
-    QSet<QUmlPseudostate *> exit() const;
+    const QSet<QUmlPseudostate *> exit() const;
     void addExit(QUmlPseudostate *exit);
     void removeExit(QUmlPseudostate *exit);
     QUmlState *state() const;
diff --git a/src/uml/qumlconnector.cpp b/src/uml/qumlconnector.cpp
index 68ea8972..012a573c 100644
--- a/src/uml/qumlconnector.cpp
+++ b/src/uml/qumlconnector.cpp
@@ -70,7 +70,7 @@ QUmlConnector::QUmlConnector() :
 /*!
     The set of Behaviors that specify the valid interaction patterns across the connector.
  */
-QSet<QUmlBehavior *> QUmlConnector::contract() const
+const QSet<QUmlBehavior *> QUmlConnector::contract() const
 {
     // This is a read-write association end
 
@@ -98,7 +98,7 @@ void QUmlConnector::removeContract(QUmlBehavior *contract)
 /*!
     A connector consists of at least two connector ends, each representing the participation of instances of the classifiers typing the connectable elements attached to this end. The set of connector ends is ordered.
  */
-QList<QUmlConnectorEnd *> QUmlConnector::end() const
+const QList<QUmlConnectorEnd *> QUmlConnector::end() const
 {
     // This is a read-write association end
 
@@ -156,7 +156,7 @@ void QUmlConnector::setKind(QtUml::ConnectorKind kind)
 /*!
     A connector may be redefined when its containing classifier is specialized. The redefining connector may have a type that specializes the type of the redefined connector. The types of the connector ends of the redefining connector may specialize the types of the connector ends of the redefined connector. The properties of the connector ends of the redefining connector may be replaced.
  */
-QSet<QUmlConnector *> QUmlConnector::redefinedConnector() const
+const QSet<QUmlConnector *> QUmlConnector::redefinedConnector() const
 {
     // This is a read-write association end
 
diff --git a/src/uml/qumlconnector.h b/src/uml/qumlconnector.h
index a4419feb..c0e2ebab 100644
--- a/src/uml/qumlconnector.h
+++ b/src/uml/qumlconnector.h
@@ -62,15 +62,15 @@ public:
     QUmlConnector();
 
     // Owned attributes
-    QSet<QUmlBehavior *> contract() const;
+    const QSet<QUmlBehavior *> contract() const;
     void addContract(QUmlBehavior *contract);
     void removeContract(QUmlBehavior *contract);
-    QList<QUmlConnectorEnd *> end() const;
+    const QList<QUmlConnectorEnd *> end() const;
     void addEnd(QUmlConnectorEnd *end);
     void removeEnd(QUmlConnectorEnd *end);
     QtUml::ConnectorKind kind() const;
     Q_DECL_HIDDEN void setKind(QtUml::ConnectorKind kind);
-    QSet<QUmlConnector *> redefinedConnector() const;
+    const QSet<QUmlConnector *> redefinedConnector() const;
     void addRedefinedConnector(QUmlConnector *redefinedConnector);
     void removeRedefinedConnector(QUmlConnector *redefinedConnector);
     QUmlAssociation *type() const;
diff --git a/src/uml/qumlconsiderignorefragment.cpp b/src/uml/qumlconsiderignorefragment.cpp
index 8ae13266..0606d803 100644
--- a/src/uml/qumlconsiderignorefragment.cpp
+++ b/src/uml/qumlconsiderignorefragment.cpp
@@ -63,7 +63,7 @@ QUmlConsiderIgnoreFragment::QUmlConsiderIgnoreFragment()
 /*!
     The set of messages that apply to this fragment
  */
-QSet<QUmlNamedElement *> QUmlConsiderIgnoreFragment::message() const
+const QSet<QUmlNamedElement *> QUmlConsiderIgnoreFragment::message() const
 {
     // This is a read-write association end
 
diff --git a/src/uml/qumlconsiderignorefragment.h b/src/uml/qumlconsiderignorefragment.h
index d7ec7706..b24c8910 100644
--- a/src/uml/qumlconsiderignorefragment.h
+++ b/src/uml/qumlconsiderignorefragment.h
@@ -59,7 +59,7 @@ public:
     QUmlConsiderIgnoreFragment();
 
     // Owned attributes
-    QSet<QUmlNamedElement *> message() const;
+    const QSet<QUmlNamedElement *> message() const;
     void addMessage(QUmlNamedElement *message);
     void removeMessage(QUmlNamedElement *message);
 
diff --git a/src/uml/qumlconstraint.cpp b/src/uml/qumlconstraint.cpp
index 173be4bc..6440e503 100644
--- a/src/uml/qumlconstraint.cpp
+++ b/src/uml/qumlconstraint.cpp
@@ -69,7 +69,7 @@ QUmlConstraint::QUmlConstraint() :
 /*!
     The ordered set of Elements referenced by this Constraint.
  */
-QList<QUmlElement *> QUmlConstraint::constrainedElement() const
+const QList<QUmlElement *> QUmlConstraint::constrainedElement() const
 {
     // This is a read-write association end
 
diff --git a/src/uml/qumlconstraint.h b/src/uml/qumlconstraint.h
index dde91867..b82db3dd 100644
--- a/src/uml/qumlconstraint.h
+++ b/src/uml/qumlconstraint.h
@@ -61,7 +61,7 @@ public:
     QUmlConstraint();
 
     // Owned attributes
-    QList<QUmlElement *> constrainedElement() const;
+    const QList<QUmlElement *> constrainedElement() const;
     void addConstrainedElement(QUmlElement *constrainedElement);
     void removeConstrainedElement(QUmlElement *constrainedElement);
     QUmlNamespace *context() const;
diff --git a/src/uml/qumlcontinuation.cpp b/src/uml/qumlcontinuation.cpp
index dbe12ff3..d04c22dd 100644
--- a/src/uml/qumlcontinuation.cpp
+++ b/src/uml/qumlcontinuation.cpp
@@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE
 QUmlContinuation::QUmlContinuation() :
     _setting(true)
 {
-    d_ptr->object.setProperty("setting", QVariant::fromValue(false));
+    d_ptr->object.setProperty("setting", QVariant::fromValue(true));
 }
 
 // OWNED ATTRIBUTES
diff --git a/src/uml/qumlcreatelinkaction.cpp b/src/uml/qumlcreatelinkaction.cpp
index c89968da..09349dd8 100644
--- a/src/uml/qumlcreatelinkaction.cpp
+++ b/src/uml/qumlcreatelinkaction.cpp
@@ -63,7 +63,7 @@ QUmlCreateLinkAction::QUmlCreateLinkAction()
 /*!
     Specifies ends of association and inputs.
  */
-QSet<QUmlLinkEndCreationData *> QUmlCreateLinkAction::endData() const
+const QSet<QUmlLinkEndCreationData *> QUmlCreateLinkAction::endData() const
 {
     // This is a read-write association end
 
diff --git a/src/uml/qumlcreatelinkaction.h b/src/uml/qumlcreatelinkaction.h
index 754c07a0..4256ada3 100644
--- a/src/uml/qumlcreatelinkaction.h
+++ b/src/uml/qumlcreatelinkaction.h
@@ -59,7 +59,7 @@ public:
     QUmlCreateLinkAction();
 
     // Owned attributes
-    QSet<QUmlLinkEndCreationData *> endData() const;
+    const QSet<QUmlLinkEndCreationData *> endData() const;
     void addEndData(QUmlLinkEndCreationData *endData);
     void removeEndData(QUmlLinkEndCreationData *endData);
 
diff --git a/src/uml/qumldatatype.cpp b/src/uml/qumldatatype.cpp
index a30fd6df..da1216e2 100644
--- a/src/uml/qumldatatype.cpp
+++ b/src/uml/qumldatatype.cpp
@@ -66,7 +66,7 @@ QUmlDataType::QUmlDataType()
 /*!
     The Attributes owned by the DataType.
  */
-QList<QUmlProperty *> QUmlDataType::ownedAttribute() const
+const QList<QUmlProperty *> QUmlDataType::ownedAttribute() const
 {
     // This is a read-write association end
 
@@ -112,7 +112,7 @@ void QUmlDataType::removeOwnedAttribute(QUmlProperty *ownedAttribute)
 /*!
     The Operations owned by the DataType.
  */
-QList<QUmlOperation *> QUmlDataType::ownedOperation() const
+const QList<QUmlOperation *> QUmlDataType::ownedOperation() const
 {
     // This is a read-write association end
 
diff --git a/src/uml/qumldatatype.h b/src/uml/qumldatatype.h
index 88d76b15..323e24d7 100644
--- a/src/uml/qumldatatype.h
+++ b/src/uml/qumldatatype.h
@@ -61,10 +61,10 @@ public:
     QUmlDataType();
 
     // Owned attributes
-    QList<QUmlProperty *> ownedAttribute() const;
+    const QList<QUmlProperty *> ownedAttribute() const;
     void addOwnedAttribute(QUmlProperty *ownedAttribute);
     void removeOwnedAttribute(QUmlProperty *ownedAttribute);
-    QList<QUmlOperation *> ownedOperation() const;
+    const QList<QUmlOperation *> ownedOperation() const;
     void addOwnedOperation(QUmlOperation *ownedOperation);
     void removeOwnedOperation(QUmlOperation *ownedOperation);
 
diff --git a/src/uml/qumldependency.cpp b/src/uml/qumldependency.cpp
index 8049495c..e36f64a9 100644
--- a/src/uml/qumldependency.cpp
+++ b/src/uml/qumldependency.cpp
@@ -64,7 +64,7 @@ QUmlDependency::QUmlDependency()
 /*!
     The element(s) dependent on the supplier element(s). In some cases (such as a Trace Abstraction) the assignment of direction (that is, the designation of the client element) is at the discretion of the modeler, and is a stipulation.
  */
-QSet<QUmlNamedElement *> QUmlDependency::client() const
+const QSet<QUmlNamedElement *> QUmlDependency::client() const
 {
     // This is a read-write association end
 
@@ -108,7 +108,7 @@ void QUmlDependency::removeClient(QUmlNamedElement *client)
 /*!
     The element(s) independent of the client element(s), in the same respect and the same dependency relationship. In some directed dependency relationships (such as Refinement Abstractions), a common convention in the domain of class-based OO software is to put the more abstract element in this role. Despite this convention, users of UML may stipulate a sense of dependency suitable for their domain, which makes a more abstract element dependent on that which is more specific.
  */
-QSet<QUmlNamedElement *> QUmlDependency::supplier() const
+const QSet<QUmlNamedElement *> QUmlDependency::supplier() const
 {
     // This is a read-write association end
 
diff --git a/src/uml/qumldependency.h b/src/uml/qumldependency.h
index 5491733f..ef896fc2 100644
--- a/src/uml/qumldependency.h
+++ b/src/uml/qumldependency.h
@@ -60,10 +60,10 @@ public:
     QUmlDependency();
 
     // Owned attributes
-    QSet<QUmlNamedElement *> client() const;
+    const QSet<QUmlNamedElement *> client() const;
     void addClient(QUmlNamedElement *client);
     void removeClient(QUmlNamedElement *client);
-    QSet<QUmlNamedElement *> supplier() const;
+    const QSet<QUmlNamedElement *> supplier() const;
     void addSupplier(QUmlNamedElement *supplier);
     void removeSupplier(QUmlNamedElement *supplier);
 
diff --git a/src/uml/qumldeployment.cpp b/src/uml/qumldeployment.cpp
index 9260be13..d9e17d34 100644
--- a/src/uml/qumldeployment.cpp
+++ b/src/uml/qumldeployment.cpp
@@ -68,7 +68,7 @@ QUmlDeployment::QUmlDeployment() :
 /*!
     The specification of properties that parameterize the deployment and execution of one or more Artifacts.
  */
-QSet<QUmlDeploymentSpecification *> QUmlDeployment::configuration() const
+const QSet<QUmlDeploymentSpecification *> QUmlDeployment::configuration() const
 {
     // This is a read-write association end
 
@@ -112,7 +112,7 @@ void QUmlDeployment::removeConfiguration(QUmlDeploymentSpecification *configurat
 /*!
     The Artifacts that are deployed onto a Node. This association specializes the supplier association.
  */
-QSet<QUmlDeployedArtifact *> QUmlDeployment::deployedArtifact() const
+const QSet<QUmlDeployedArtifact *> QUmlDeployment::deployedArtifact() const
 {
     // This is a read-write association end
 
diff --git a/src/uml/qumldeployment.h b/src/uml/qumldeployment.h
index 94968d66..b1e2d64f 100644
--- a/src/uml/qumldeployment.h
+++ b/src/uml/qumldeployment.h
@@ -61,10 +61,10 @@ public:
     QUmlDeployment();
 
     // Owned attributes
-    QSet<QUmlDeploymentSpecification *> configuration() const;
+    const QSet<QUmlDeploymentSpecification *> configuration() const;
     void addConfiguration(QUmlDeploymentSpecification *configuration);
     void removeConfiguration(QUmlDeploymentSpecification *configuration);
-    QSet<QUmlDeployedArtifact *> deployedArtifact() const;
+    const QSet<QUmlDeployedArtifact *> deployedArtifact() const;
     void addDeployedArtifact(QUmlDeployedArtifact *deployedArtifact);
     void removeDeployedArtifact(QUmlDeployedArtifact *deployedArtifact);
     QUmlDeploymentTarget *location() const;
diff --git a/src/uml/qumldeploymenttarget.cpp b/src/uml/qumldeploymenttarget.cpp
index d7d4cb11..7c12012d 100644
--- a/src/uml/qumldeploymenttarget.cpp
+++ b/src/uml/qumldeploymenttarget.cpp
@@ -65,7 +65,7 @@ QUmlDeploymentTarget::QUmlDeploymentTarget()
 /*!
     The set of elements that are manifested in an Artifact that is involved in Deployment to a DeploymentTarget.
  */
-QSet<QUmlPackageableElement *> QUmlDeploymentTarget::deployedElement() const
+const QSet<QUmlPackageableElement *> QUmlDeploymentTarget::deployedElement() const
 {
     // This is a read-only derived association end
 
@@ -101,7 +101,7 @@ void QUmlDeploymentTarget::removeDeployedElement(QUmlPackageableElement *deploye
 /*!
     The set of Deployments for a DeploymentTarget.
  */
-QSet<QUmlDeployment *> QUmlDeploymentTarget::deployment() const
+const QSet<QUmlDeployment *> QUmlDeploymentTarget::deployment() const
 {
     // This is a read-write association end
 
diff --git a/src/uml/qumldeploymenttarget.h b/src/uml/qumldeploymenttarget.h
index 9ce2d0a7..767eee78 100644
--- a/src/uml/qumldeploymenttarget.h
+++ b/src/uml/qumldeploymenttarget.h
@@ -60,10 +60,10 @@ public:
     Q_DECL_HIDDEN QUmlDeploymentTarget();
 
     // Owned attributes
-    QSet<QUmlPackageableElement *> deployedElement() const;
+    const QSet<QUmlPackageableElement *> deployedElement() const;
     Q_DECL_HIDDEN void addDeployedElement(QUmlPackageableElement *deployedElement);
     Q_DECL_HIDDEN void removeDeployedElement(QUmlPackageableElement *deployedElement);
-    QSet<QUmlDeployment *> deployment() const;
+    const QSet<QUmlDeployment *> deployment() const;
     void addDeployment(QUmlDeployment *deployment);
     void removeDeployment(QUmlDeployment *deployment);
 
diff --git a/src/uml/qumldestroylinkaction.cpp b/src/uml/qumldestroylinkaction.cpp
index 68ce0f16..e1283ea9 100644
--- a/src/uml/qumldestroylinkaction.cpp
+++ b/src/uml/qumldestroylinkaction.cpp
@@ -63,7 +63,7 @@ QUmlDestroyLinkAction::QUmlDestroyLinkAction()
 /*!
     Specifies ends of association and inputs.
  */
-QSet<QUmlLinkEndDestructionData *> QUmlDestroyLinkAction::endData() const
+const QSet<QUmlLinkEndDestructionData *> QUmlDestroyLinkAction::endData() const
 {
     // This is a read-write association end
 
diff --git a/src/uml/qumldestroylinkaction.h b/src/uml/qumldestroylinkaction.h
index d7659cc3..7d137429 100644
--- a/src/uml/qumldestroylinkaction.h
+++ b/src/uml/qumldestroylinkaction.h
@@ -59,7 +59,7 @@ public:
     QUmlDestroyLinkAction();
 
     // Owned attributes
-    QSet<QUmlLinkEndDestructionData *> endData() const;
+    const QSet<QUmlLinkEndDestructionData *> endData() const;
     void addEndData(QUmlLinkEndDestructionData *endData);
     void removeEndData(QUmlLinkEndDestructionData *endData);
 
diff --git a/src/uml/qumldirectedrelationship.cpp b/src/uml/qumldirectedrelationship.cpp
index b1f8bf83..c10549e7 100644
--- a/src/uml/qumldirectedrelationship.cpp
+++ b/src/uml/qumldirectedrelationship.cpp
@@ -64,7 +64,7 @@ QUmlDirectedRelationship::QUmlDirectedRelationship()
 /*!
     Specifies the sources of the DirectedRelationship.
  */
-QSet<QUmlElement *> QUmlDirectedRelationship::source() const
+const QSet<QUmlElement *> QUmlDirectedRelationship::source() const
 {
     // This is a read-only derived union association end
 
@@ -98,7 +98,7 @@ void QUmlDirectedRelationship::removeSource(QUmlElement *source)
 /*!
     Specifies the targets of the DirectedRelationship.
  */
-QSet<QUmlElement *> QUmlDirectedRelationship::target() const
+const QSet<QUmlElement *> QUmlDirectedRelationship::target() const
 {
     // This is a read-only derived union association end
 
diff --git a/src/uml/qumldirectedrelationship.h b/src/uml/qumldirectedrelationship.h
index 9b72c86e..252307ff 100644
--- a/src/uml/qumldirectedrelationship.h
+++ b/src/uml/qumldirectedrelationship.h
@@ -59,10 +59,10 @@ public:
     Q_DECL_HIDDEN QUmlDirectedRelationship();
 
     // Owned attributes
-    QSet<QUmlElement *> source() const;
+    const QSet<QUmlElement *> source() const;
     Q_DECL_HIDDEN void addSource(QUmlElement *source);
     Q_DECL_HIDDEN void removeSource(QUmlElement *source);
-    QSet<QUmlElement *> target() const;
+    const QSet<QUmlElement *> target() const;
     Q_DECL_HIDDEN void addTarget(QUmlElement *target);
     Q_DECL_HIDDEN void removeTarget(QUmlElement *target);
 
diff --git a/src/uml/qumlduration.cpp b/src/uml/qumlduration.cpp
index c48c3002..98e87745 100644
--- a/src/uml/qumlduration.cpp
+++ b/src/uml/qumlduration.cpp
@@ -92,7 +92,7 @@ void QUmlDuration::setExpr(QUmlValueSpecification *expr)
 /*!
     Refers to the time and duration observations that are involved in expr.
  */
-QSet<QUmlObservation *> QUmlDuration::observation() const
+const QSet<QUmlObservation *> QUmlDuration::observation() const
 {
     // This is a read-write association end
 
diff --git a/src/uml/qumlduration.h b/src/uml/qumlduration.h
index 246bbc44..a9ac38cc 100644
--- a/src/uml/qumlduration.h
+++ b/src/uml/qumlduration.h
@@ -61,7 +61,7 @@ public:
     // Owned attributes
     QUmlValueSpecification *expr() const;
     void setExpr(QUmlValueSpecification *expr);
-    QSet<QUmlObservation *> observation() const;
+    const QSet<QUmlObservation *> observation() const;
     void addObservation(QUmlObservation *observation);
     void removeObservation(QUmlObservation *observation);
 
diff --git a/src/uml/qumlelement.cpp b/src/uml/qumlelement.cpp
index 59603108..e12a127f 100644
--- a/src/uml/qumlelement.cpp
+++ b/src/uml/qumlelement.cpp
@@ -66,7 +66,7 @@ QUmlElement::QUmlElement() :
 /*!
     The Comments owned by this element.
  */
-QSet<QUmlComment *> QUmlElement::ownedComment() const
+const QSet<QUmlComment *> QUmlElement::ownedComment() const
 {
     // This is a read-write association end
 
@@ -100,7 +100,7 @@ void QUmlElement::removeOwnedComment(QUmlComment *ownedComment)
 /*!
     The Elements owned by this element.
  */
-QSet<QUmlElement *> QUmlElement::ownedElement() const
+const QSet<QUmlElement *> QUmlElement::ownedElement() const
 {
     // This is a read-only derived union association end
 
diff --git a/src/uml/qumlelement.h b/src/uml/qumlelement.h
index bd6bac99..513da490 100644
--- a/src/uml/qumlelement.h
+++ b/src/uml/qumlelement.h
@@ -58,10 +58,10 @@ public:
     Q_DECL_HIDDEN QUmlElement();
 
     // Owned attributes
-    QSet<QUmlComment *> ownedComment() const;
+    const QSet<QUmlComment *> ownedComment() const;
     void addOwnedComment(QUmlComment *ownedComment);
     void removeOwnedComment(QUmlComment *ownedComment);
-    QSet<QUmlElement *> ownedElement() const;
+    const QSet<QUmlElement *> ownedElement() const;
     Q_DECL_HIDDEN void addOwnedElement(QUmlElement *ownedElement);
     Q_DECL_HIDDEN void removeOwnedElement(QUmlElement *ownedElement);
     QUmlElement *owner() const;
diff --git a/src/uml/qumlelementimport.cpp b/src/uml/qumlelementimport.cpp
index 25a68b74..c2df0c60 100644
--- a/src/uml/qumlelementimport.cpp
+++ b/src/uml/qumlelementimport.cpp
@@ -62,7 +62,7 @@ QUmlElementImport::QUmlElementImport() :
     d_ptr->object.setProperty("alias", QVariant::fromValue(QString()));
     d_ptr->object.setProperty("importedElement", QVariant::fromValue((QUmlPackageableElement *)(0)));
     d_ptr->object.setProperty("importingNamespace", QVariant::fromValue((QUmlNamespace *)(0)));
-    d_ptr->object.setProperty("visibility", QVariant::fromValue(QtUml::VisibilityKindNone));
+    d_ptr->object.setProperty("visibility", QVariant::fromValue(QtUml::VisibilityKindPublic));
 }
 
 // OWNED ATTRIBUTES
diff --git a/src/uml/qumlencapsulatedclassifier.cpp b/src/uml/qumlencapsulatedclassifier.cpp
index 97286a7b..a0d616d5 100644
--- a/src/uml/qumlencapsulatedclassifier.cpp
+++ b/src/uml/qumlencapsulatedclassifier.cpp
@@ -63,7 +63,7 @@ QUmlEncapsulatedClassifier::QUmlEncapsulatedClassifier()
 /*!
     References a set of ports that an encapsulated classifier owns.
  */
-QSet<QUmlPort *> QUmlEncapsulatedClassifier::ownedPort() const
+const QSet<QUmlPort *> QUmlEncapsulatedClassifier::ownedPort() const
 {
     // This is a read-only derived association end
 
diff --git a/src/uml/qumlencapsulatedclassifier.h b/src/uml/qumlencapsulatedclassifier.h
index aa31fbab..469da298 100644
--- a/src/uml/qumlencapsulatedclassifier.h
+++ b/src/uml/qumlencapsulatedclassifier.h
@@ -59,7 +59,7 @@ public:
     Q_DECL_HIDDEN QUmlEncapsulatedClassifier();
 
     // Owned attributes
-    QSet<QUmlPort *> ownedPort() const;
+    const QSet<QUmlPort *> ownedPort() const;
     Q_DECL_HIDDEN void addOwnedPort(QUmlPort *ownedPort);
     Q_DECL_HIDDEN void removeOwnedPort(QUmlPort *ownedPort);
 
diff --git a/src/uml/qumlenumeration.cpp b/src/uml/qumlenumeration.cpp
index 8e37bf74..ec743fc6 100644
--- a/src/uml/qumlenumeration.cpp
+++ b/src/uml/qumlenumeration.cpp
@@ -63,7 +63,7 @@ QUmlEnumeration::QUmlEnumeration()
 /*!
     The ordered set of literals for this Enumeration.
  */
-QList<QUmlEnumerationLiteral *> QUmlEnumeration::ownedLiteral() const
+const QList<QUmlEnumerationLiteral *> QUmlEnumeration::ownedLiteral() const
 {
     // This is a read-write association end
 
diff --git a/src/uml/qumlenumeration.h b/src/uml/qumlenumeration.h
index 2388e79e..c581a2a6 100644
--- a/src/uml/qumlenumeration.h
+++ b/src/uml/qumlenumeration.h
@@ -59,7 +59,7 @@ public:
     QUmlEnumeration();
 
     // Owned attributes
-    QList<QUmlEnumerationLiteral *> ownedLiteral() const;
+    const QList<QUmlEnumerationLiteral *> ownedLiteral() const;
     void addOwnedLiteral(QUmlEnumerationLiteral *ownedLiteral);
     void removeOwnedLiteral(QUmlEnumerationLiteral *ownedLiteral);
 
diff --git a/src/uml/qumlexceptionhandler.cpp b/src/uml/qumlexceptionhandler.cpp
index 12c5c2ff..9b35dab1 100644
--- a/src/uml/qumlexceptionhandler.cpp
+++ b/src/uml/qumlexceptionhandler.cpp
@@ -90,7 +90,7 @@ void QUmlExceptionHandler::setExceptionInput(QUmlObjectNode *exceptionInput)
 /*!
     The kind of instances that the handler catches. If an exception occurs whose type is any of the classifiers in the set, the handler catches the exception and executes its body.
  */
-QSet<QUmlClassifier *> QUmlExceptionHandler::exceptionType() const
+const QSet<QUmlClassifier *> QUmlExceptionHandler::exceptionType() const
 {
     // This is a read-write association end
 
diff --git a/src/uml/qumlexceptionhandler.h b/src/uml/qumlexceptionhandler.h
index fdc43333..39365737 100644
--- a/src/uml/qumlexceptionhandler.h
+++ b/src/uml/qumlexceptionhandler.h
@@ -63,7 +63,7 @@ public:
     // Owned attributes
     QUmlObjectNode *exceptionInput() const;
     void setExceptionInput(QUmlObjectNode *exceptionInput);
-    QSet<QUmlClassifier *> exceptionType() const;
+    const QSet<QUmlClassifier *> exceptionType() const;
     void addExceptionType(QUmlClassifier *exceptionType);
     void removeExceptionType(QUmlClassifier *exceptionType);
     QUmlExecutableNode *handlerBody() const;
diff --git a/src/uml/qumlexecutablenode.cpp b/src/uml/qumlexecutablenode.cpp
index 60d5d7f8..2b9861fd 100644
--- a/src/uml/qumlexecutablenode.cpp
+++ b/src/uml/qumlexecutablenode.cpp
@@ -63,7 +63,7 @@ QUmlExecutableNode::QUmlExecutableNode()
 /*!
     A set of exception handlers that are examined if an uncaught exception propagates to the outer level of the executable node.
  */
-QSet<QUmlExceptionHandler *> QUmlExecutableNode::handler() const
+const QSet<QUmlExceptionHandler *> QUmlExecutableNode::handler() const
 {
     // This is a read-write association end
 
diff --git a/src/uml/qumlexecutablenode.h b/src/uml/qumlexecutablenode.h
index c21dd4ac..3b3ac90d 100644
--- a/src/uml/qumlexecutablenode.h
+++ b/src/uml/qumlexecutablenode.h
@@ -59,7 +59,7 @@ public:
     Q_DECL_HIDDEN QUmlExecutableNode();
 
     // Owned attributes
-    QSet<QUmlExceptionHandler *> handler() const;
+    const QSet<QUmlExceptionHandler *> handler() const;
     void addHandler(QUmlExceptionHandler *handler);
     void removeHandler(QUmlExceptionHandler *handler);
 
diff --git a/src/uml/qumlexpansionregion.cpp b/src/uml/qumlexpansionregion.cpp
index 75cd7aec..ffad4056 100644
--- a/src/uml/qumlexpansionregion.cpp
+++ b/src/uml/qumlexpansionregion.cpp
@@ -57,7 +57,7 @@ QUmlExpansionRegion::QUmlExpansionRegion() :
     _mode(QtUml::ExpansionKindIterative)
 {
     d_ptr->object.setProperty("inputElement", QVariant::fromValue(&_inputElement));
-    d_ptr->object.setProperty("mode", QVariant::fromValue(QtUml::ExpansionKindNone));
+    d_ptr->object.setProperty("mode", QVariant::fromValue(QtUml::ExpansionKindIterative));
     d_ptr->object.setProperty("outputElement", QVariant::fromValue(&_outputElement));
 }
 
@@ -66,7 +66,7 @@ QUmlExpansionRegion::QUmlExpansionRegion() :
 /*!
     An object node that holds a separate element of the input collection during each of the multiple executions of the region.
  */
-QSet<QUmlExpansionNode *> QUmlExpansionRegion::inputElement() const
+const QSet<QUmlExpansionNode *> QUmlExpansionRegion::inputElement() const
 {
     // This is a read-write association end
 
@@ -123,7 +123,7 @@ void QUmlExpansionRegion::setMode(QtUml::ExpansionKind mode)
 /*!
     An object node that accepts a separate element of the output collection during each of the multiple executions of the region. The values are formed into a collection that is available when the execution of the region is complete.
  */
-QSet<QUmlExpansionNode *> QUmlExpansionRegion::outputElement() const
+const QSet<QUmlExpansionNode *> QUmlExpansionRegion::outputElement() const
 {
     // This is a read-write association end
 
diff --git a/src/uml/qumlexpansionregion.h b/src/uml/qumlexpansionregion.h
index f0901b81..c4216dec 100644
--- a/src/uml/qumlexpansionregion.h
+++ b/src/uml/qumlexpansionregion.h
@@ -60,12 +60,12 @@ public:
     QUmlExpansionRegion();
 
     // Owned attributes
-    QSet<QUmlExpansionNode *> inputElement() const;
+    const QSet<QUmlExpansionNode *> inputElement() const;
     void addInputElement(QUmlExpansionNode *inputElement);
     void removeInputElement(QUmlExpansionNode *inputElement);
     QtUml::ExpansionKind mode() const;
     void setMode(QtUml::ExpansionKind mode);
-    QSet<QUmlExpansionNode *> outputElement() const;
+    const QSet<QUmlExpansionNode *> outputElement() const;
     void addOutputElement(QUmlExpansionNode *outputElement);
     void removeOutputElement(QUmlExpansionNode *outputElement);
 
diff --git a/src/uml/qumlexpression.cpp b/src/uml/qumlexpression.cpp
index 093fde95..a63445ad 100644
--- a/src/uml/qumlexpression.cpp
+++ b/src/uml/qumlexpression.cpp
@@ -62,7 +62,7 @@ QUmlExpression::QUmlExpression()
 /*!
     Specifies a sequence of operands.
  */
-QList<QUmlValueSpecification *> QUmlExpression::operand() const
+const QList<QUmlValueSpecification *> QUmlExpression::operand() const
 {
     // This is a read-write association end
 
diff --git a/src/uml/qumlexpression.h b/src/uml/qumlexpression.h
index 04722f63..6de89ec5 100644
--- a/src/uml/qumlexpression.h
+++ b/src/uml/qumlexpression.h
@@ -57,7 +57,7 @@ public:
     QUmlExpression();
 
     // Owned attributes
-    QList<QUmlValueSpecification *> operand() const;
+    const QList<QUmlValueSpecification *> operand() const;
     void addOperand(QUmlValueSpecification *operand);
     void removeOperand(QUmlValueSpecification *operand);
     QString symbol() const;
diff --git a/src/uml/qumlextend.cpp b/src/uml/qumlextend.cpp
index 0de79755..4f41801a 100644
--- a/src/uml/qumlextend.cpp
+++ b/src/uml/qumlextend.cpp
@@ -153,7 +153,7 @@ void QUmlExtend::setExtension(QUmlUseCase *extension)
 /*!
     An ordered list of extension points belonging to the extended use case, specifying where the respective behavioral fragments of the extending use case are to be inserted. The first fragment in the extending use case is associated with the first extension point in the list, the second fragment with the second point, and so on. (Note that, in most practical cases, the extending use case has just a single behavior fragment, so that the list of extension points is trivial.)
  */
-QList<QUmlExtensionPoint *> QUmlExtend::extensionLocation() const
+const QList<QUmlExtensionPoint *> QUmlExtend::extensionLocation() const
 {
     // This is a read-write association end
 
diff --git a/src/uml/qumlextend.h b/src/uml/qumlextend.h
index 07153b18..12e32aae 100644
--- a/src/uml/qumlextend.h
+++ b/src/uml/qumlextend.h
@@ -68,7 +68,7 @@ public:
     void setExtendedCase(QUmlUseCase *extendedCase);
     QUmlUseCase *extension() const;
     void setExtension(QUmlUseCase *extension);
-    QList<QUmlExtensionPoint *> extensionLocation() const;
+    const QList<QUmlExtensionPoint *> extensionLocation() const;
     void addExtensionLocation(QUmlExtensionPoint *extensionLocation);
     void removeExtensionLocation(QUmlExtensionPoint *extensionLocation);
 
diff --git a/src/uml/qumlfeature.cpp b/src/uml/qumlfeature.cpp
index 0b7ba28e..731c507a 100644
--- a/src/uml/qumlfeature.cpp
+++ b/src/uml/qumlfeature.cpp
@@ -65,7 +65,7 @@ QUmlFeature::QUmlFeature() :
 /*!
     The Classifiers that have this Feature as a feature.
  */
-QSet<QUmlClassifier *> QUmlFeature::featuringClassifier() const
+const QSet<QUmlClassifier *> QUmlFeature::featuringClassifier() const
 {
     // This is a read-only derived union association end
 
diff --git a/src/uml/qumlfeature.h b/src/uml/qumlfeature.h
index 1a7364f3..b58a85c3 100644
--- a/src/uml/qumlfeature.h
+++ b/src/uml/qumlfeature.h
@@ -59,7 +59,7 @@ public:
     Q_DECL_HIDDEN QUmlFeature();
 
     // Owned attributes
-    QSet<QUmlClassifier *> featuringClassifier() const;
+    const QSet<QUmlClassifier *> featuringClassifier() const;
     Q_DECL_HIDDEN void addFeaturingClassifier(QUmlClassifier *featuringClassifier);
     Q_DECL_HIDDEN void removeFeaturingClassifier(QUmlClassifier *featuringClassifier);
     bool isStatic() const;
diff --git a/src/uml/qumlgeneralization.cpp b/src/uml/qumlgeneralization.cpp
index 89e75820..dd5ef535 100644
--- a/src/uml/qumlgeneralization.cpp
+++ b/src/uml/qumlgeneralization.cpp
@@ -61,7 +61,7 @@ QUmlGeneralization::QUmlGeneralization() :
 {
     d_ptr->object.setProperty("general", QVariant::fromValue((QUmlClassifier *)(0)));
     d_ptr->object.setProperty("generalizationSet", QVariant::fromValue(&_generalizationSet));
-    d_ptr->object.setProperty("isSubstitutable", QVariant::fromValue(false));
+    d_ptr->object.setProperty("isSubstitutable", QVariant::fromValue(true));
     d_ptr->object.setProperty("specific", QVariant::fromValue((QUmlClassifier *)(0)));
 }
 
@@ -97,7 +97,7 @@ void QUmlGeneralization::setGeneral(QUmlClassifier *general)
 /*!
     Designates a set in which instances of Generalization is considered members.
  */
-QSet<QUmlGeneralizationSet *> QUmlGeneralization::generalizationSet() const
+const QSet<QUmlGeneralizationSet *> QUmlGeneralization::generalizationSet() const
 {
     // This is a read-write association end
 
diff --git a/src/uml/qumlgeneralization.h b/src/uml/qumlgeneralization.h
index 2549fbf9..868783b2 100644
--- a/src/uml/qumlgeneralization.h
+++ b/src/uml/qumlgeneralization.h
@@ -62,7 +62,7 @@ public:
     // Owned attributes
     QUmlClassifier *general() const;
     void setGeneral(QUmlClassifier *general);
-    QSet<QUmlGeneralizationSet *> generalizationSet() const;
+    const QSet<QUmlGeneralizationSet *> generalizationSet() const;
     void addGeneralizationSet(QUmlGeneralizationSet *generalizationSet);
     void removeGeneralizationSet(QUmlGeneralizationSet *generalizationSet);
     bool isSubstitutable() const;
diff --git a/src/uml/qumlgeneralizationset.cpp b/src/uml/qumlgeneralizationset.cpp
index bdecbdd7..90f86682 100644
--- a/src/uml/qumlgeneralizationset.cpp
+++ b/src/uml/qumlgeneralizationset.cpp
@@ -70,7 +70,7 @@ QUmlGeneralizationSet::QUmlGeneralizationSet() :
 /*!
     Designates the instances of Generalization which are members of a given GeneralizationSet.
  */
-QSet<QUmlGeneralization *> QUmlGeneralizationSet::generalization() const
+const QSet<QUmlGeneralization *> QUmlGeneralizationSet::generalization() const
 {
     // This is a read-write association end
 
diff --git a/src/uml/qumlgeneralizationset.h b/src/uml/qumlgeneralizationset.h
index 88878fe5..7a677b24 100644
--- a/src/uml/qumlgeneralizationset.h
+++ b/src/uml/qumlgeneralizationset.h
@@ -60,7 +60,7 @@ public:
     QUmlGeneralizationSet();
 
     // Owned attributes
-    QSet<QUmlGeneralization *> generalization() const;
+    const QSet<QUmlGeneralization *> generalization() const;
     void addGeneralization(QUmlGeneralization *generalization);
     void removeGeneralization(QUmlGeneralization *generalization);
     bool isCovering() const;
diff --git a/src/uml/qumlinformationflow.cpp b/src/uml/qumlinformationflow.cpp
index 4a68dfc8..dfafd653 100644
--- a/src/uml/qumlinformationflow.cpp
+++ b/src/uml/qumlinformationflow.cpp
@@ -74,7 +74,7 @@ QUmlInformationFlow::QUmlInformationFlow()
 /*!
     Specifies the information items that may circulate on this information flow.
  */
-QSet<QUmlClassifier *> QUmlInformationFlow::conveyed() const
+const QSet<QUmlClassifier *> QUmlInformationFlow::conveyed() const
 {
     // This is a read-write association end
 
@@ -102,7 +102,7 @@ void QUmlInformationFlow::removeConveyed(QUmlClassifier *conveyed)
 /*!
     Defines from which source the conveyed InformationItems are initiated.
  */
-QSet<QUmlNamedElement *> QUmlInformationFlow::informationSource() const
+const QSet<QUmlNamedElement *> QUmlInformationFlow::informationSource() const
 {
     // This is a read-write association end
 
@@ -136,7 +136,7 @@ void QUmlInformationFlow::removeInformationSource(QUmlNamedElement *informationS
 /*!
     Defines to which target the conveyed InformationItems are directed.
  */
-QSet<QUmlNamedElement *> QUmlInformationFlow::informationTarget() const
+const QSet<QUmlNamedElement *> QUmlInformationFlow::informationTarget() const
 {
     // This is a read-write association end
 
@@ -170,7 +170,7 @@ void QUmlInformationFlow::removeInformationTarget(QUmlNamedElement *informationT
 /*!
     Determines which Relationship will realize the specified flow
  */
-QSet<QUmlRelationship *> QUmlInformationFlow::realization() const
+const QSet<QUmlRelationship *> QUmlInformationFlow::realization() const
 {
     // This is a read-write association end
 
@@ -198,7 +198,7 @@ void QUmlInformationFlow::removeRealization(QUmlRelationship *realization)
 /*!
     Determines which ActivityEdges will realize the specified flow.
  */
-QSet<QUmlActivityEdge *> QUmlInformationFlow::realizingActivityEdge() const
+const QSet<QUmlActivityEdge *> QUmlInformationFlow::realizingActivityEdge() const
 {
     // This is a read-write association end
 
@@ -226,7 +226,7 @@ void QUmlInformationFlow::removeRealizingActivityEdge(QUmlActivityEdge *realizin
 /*!
     Determines which Connectors will realize the specified flow.
  */
-QSet<QUmlConnector *> QUmlInformationFlow::realizingConnector() const
+const QSet<QUmlConnector *> QUmlInformationFlow::realizingConnector() const
 {
     // This is a read-write association end
 
@@ -254,7 +254,7 @@ void QUmlInformationFlow::removeRealizingConnector(QUmlConnector *realizingConne
 /*!
     Determines which Messages will realize the specified flow.
  */
-QSet<QUmlMessage *> QUmlInformationFlow::realizingMessage() const
+const QSet<QUmlMessage *> QUmlInformationFlow::realizingMessage() const
 {
     // This is a read-write association end
 
diff --git a/src/uml/qumlinformationflow.h b/src/uml/qumlinformationflow.h
index 68f309ca..90305a9f 100644
--- a/src/uml/qumlinformationflow.h
+++ b/src/uml/qumlinformationflow.h
@@ -65,25 +65,25 @@ public:
     QUmlInformationFlow();
 
     // Owned attributes
-    QSet<QUmlClassifier *> conveyed() const;
+    const QSet<QUmlClassifier *> conveyed() const;
     void addConveyed(QUmlClassifier *conveyed);
     void removeConveyed(QUmlClassifier *conveyed);
-    QSet<QUmlNamedElement *> informationSource() const;
+    const QSet<QUmlNamedElement *> informationSource() const;
     void addInformationSource(QUmlNamedElement *informationSource);
     void removeInformationSource(QUmlNamedElement *informationSource);
-    QSet<QUmlNamedElement *> informationTarget() const;
+    const QSet<QUmlNamedElement *> informationTarget() const;
     void addInformationTarget(QUmlNamedElement *informationTarget);
     void removeInformationTarget(QUmlNamedElement *informationTarget);
-    QSet<QUmlRelationship *> realization() const;
+    const QSet<QUmlRelationship *> realization() const;
     void addRealization(QUmlRelationship *realization);
     void removeRealization(QUmlRelationship *realization);
-    QSet<QUmlActivityEdge *> realizingActivityEdge() const;
+    const QSet<QUmlActivityEdge *> realizingActivityEdge() const;
     void addRealizingActivityEdge(QUmlActivityEdge *realizingActivityEdge);
     void removeRealizingActivityEdge(QUmlActivityEdge *realizingActivityEdge);
-    QSet<QUmlConnector *> realizingConnector() const;
+    const QSet<QUmlConnector *> realizingConnector() const;
     void addRealizingConnector(QUmlConnector *realizingConnector);
     void removeRealizingConnector(QUmlConnector *realizingConnector);
-    QSet<QUmlMessage *> realizingMessage() const;
+    const QSet<QUmlMessage *> realizingMessage() const;
     void addRealizingMessage(QUmlMessage *realizingMessage);
     void removeRealizingMessage(QUmlMessage *realizingMessage);
 
diff --git a/src/uml/qumlinformationitem.cpp b/src/uml/qumlinformationitem.cpp
index 66d10194..789f4795 100644
--- a/src/uml/qumlinformationitem.cpp
+++ b/src/uml/qumlinformationitem.cpp
@@ -61,7 +61,7 @@ QUmlInformationItem::QUmlInformationItem()
 /*!
     Determines the classifiers that will specify the structure and nature of the information. An information item represents all its represented classifiers.
  */
-QSet<QUmlClassifier *> QUmlInformationItem::represented() const
+const QSet<QUmlClassifier *> QUmlInformationItem::represented() const
 {
     // This is a read-write association end
 
diff --git a/src/uml/qumlinformationitem.h b/src/uml/qumlinformationitem.h
index 14d5113d..3ec7da14 100644
--- a/src/uml/qumlinformationitem.h
+++ b/src/uml/qumlinformationitem.h
@@ -57,7 +57,7 @@ public:
     QUmlInformationItem();
 
     // Owned attributes
-    QSet<QUmlClassifier *> represented() const;
+    const QSet<QUmlClassifier *> represented() const;
     void addRepresented(QUmlClassifier *represented);
     void removeRepresented(QUmlClassifier *represented);
 
diff --git a/src/uml/qumlinstancespecification.cpp b/src/uml/qumlinstancespecification.cpp
index c1cad898..a3549c62 100644
--- a/src/uml/qumlinstancespecification.cpp
+++ b/src/uml/qumlinstancespecification.cpp
@@ -68,7 +68,7 @@ QUmlInstanceSpecification::QUmlInstanceSpecification() :
 /*!
     The classifier or classifiers of the represented instance. If multiple classifiers are specified, the instance is classified by all of them.
  */
-QSet<QUmlClassifier *> QUmlInstanceSpecification::classifier() const
+const QSet<QUmlClassifier *> QUmlInstanceSpecification::classifier() const
 {
     // This is a read-write association end
 
@@ -96,7 +96,7 @@ void QUmlInstanceSpecification::removeClassifier(QUmlClassifier *classifier)
 /*!
     A slot giving the value or values of a structural feature of the instance. An instance specification can have one slot per structural feature of its classifiers, including inherited features. It is not necessary to model a slot for each structural feature, in which case the instance specification is a partial description.
  */
-QSet<QUmlSlot *> QUmlInstanceSpecification::slot_() const
+const QSet<QUmlSlot *> QUmlInstanceSpecification::slot_() const
 {
     // This is a read-write association end
 
diff --git a/src/uml/qumlinstancespecification.h b/src/uml/qumlinstancespecification.h
index 46b66808..4fa0b158 100644
--- a/src/uml/qumlinstancespecification.h
+++ b/src/uml/qumlinstancespecification.h
@@ -63,10 +63,10 @@ public:
     QUmlInstanceSpecification();
 
     // Owned attributes
-    QSet<QUmlClassifier *> classifier() const;
+    const QSet<QUmlClassifier *> classifier() const;
     void addClassifier(QUmlClassifier *classifier);
     void removeClassifier(QUmlClassifier *classifier);
-    QSet<QUmlSlot *> slot_() const;
+    const QSet<QUmlSlot *> slot_() const;
     void addSlot(QUmlSlot *slot_);
     void removeSlot(QUmlSlot *slot_);
     QUmlValueSpecification *specification() const;
diff --git a/src/uml/qumlinteraction.cpp b/src/uml/qumlinteraction.cpp
index 6c25a50b..1bff9cef 100644
--- a/src/uml/qumlinteraction.cpp
+++ b/src/uml/qumlinteraction.cpp
@@ -70,7 +70,7 @@ QUmlInteraction::QUmlInteraction()
 /*!
     Actions owned by the Interaction.
  */
-QSet<QUmlAction *> QUmlInteraction::action() const
+const QSet<QUmlAction *> QUmlInteraction::action() const
 {
     // This is a read-write association end
 
@@ -104,7 +104,7 @@ void QUmlInteraction::removeAction(QUmlAction *action)
 /*!
     Specifies the gates that form the message interface between this Interaction and any InteractionUses which reference it.
  */
-QSet<QUmlGate *> QUmlInteraction::formalGate() const
+const QSet<QUmlGate *> QUmlInteraction::formalGate() const
 {
     // This is a read-write association end
 
@@ -138,7 +138,7 @@ void QUmlInteraction::removeFormalGate(QUmlGate *formalGate)
 /*!
     The ordered set of fragments in the Interaction.
  */
-QList<QUmlInteractionFragment *> QUmlInteraction::fragment() const
+const QList<QUmlInteractionFragment *> QUmlInteraction::fragment() const
 {
     // This is a read-write association end
 
@@ -182,7 +182,7 @@ void QUmlInteraction::removeFragment(QUmlInteractionFragment *fragment)
 /*!
     Specifies the participants in this Interaction.
  */
-QSet<QUmlLifeline *> QUmlInteraction::lifeline() const
+const QSet<QUmlLifeline *> QUmlInteraction::lifeline() const
 {
     // This is a read-write association end
 
@@ -226,7 +226,7 @@ void QUmlInteraction::removeLifeline(QUmlLifeline *lifeline)
 /*!
     The Messages contained in this Interaction.
  */
-QSet<QUmlMessage *> QUmlInteraction::message() const
+const QSet<QUmlMessage *> QUmlInteraction::message() const
 {
     // This is a read-write association end
 
diff --git a/src/uml/qumlinteraction.h b/src/uml/qumlinteraction.h
index ef82deb9..f93be498 100644
--- a/src/uml/qumlinteraction.h
+++ b/src/uml/qumlinteraction.h
@@ -63,19 +63,19 @@ public:
     QUmlInteraction();
 
     // Owned attributes
-    QSet<QUmlAction *> action() const;
+    const QSet<QUmlAction *> action() const;
     void addAction(QUmlAction *action);
     void removeAction(QUmlAction *action);
-    QSet<QUmlGate *> formalGate() const;
+    const QSet<QUmlGate *> formalGate() const;
     void addFormalGate(QUmlGate *formalGate);
     void removeFormalGate(QUmlGate *formalGate);
-    QList<QUmlInteractionFragment *> fragment() const;
+    const QList<QUmlInteractionFragment *> fragment() const;
     void addFragment(QUmlInteractionFragment *fragment);
     void removeFragment(QUmlInteractionFragment *fragment);
-    QSet<QUmlLifeline *> lifeline() const;
+    const QSet<QUmlLifeline *> lifeline() const;
     void addLifeline(QUmlLifeline *lifeline);
     void removeLifeline(QUmlLifeline *lifeline);
-    QSet<QUmlMessage *> message() const;
+    const QSet<QUmlMessage *> message() const;
     void addMessage(QUmlMessage *message);
     void removeMessage(QUmlMessage *message);
 
diff --git a/src/uml/qumlinteractionfragment.cpp b/src/uml/qumlinteractionfragment.cpp
index c2c4347f..36917cc1 100644
--- a/src/uml/qumlinteractionfragment.cpp
+++ b/src/uml/qumlinteractionfragment.cpp
@@ -71,7 +71,7 @@ QUmlInteractionFragment::QUmlInteractionFragment() :
 /*!
     References the Lifelines that the InteractionFragment involves.
  */
-QSet<QUmlLifeline *> QUmlInteractionFragment::covered() const
+const QSet<QUmlLifeline *> QUmlInteractionFragment::covered() const
 {
     // This is a read-write association end
 
@@ -157,7 +157,7 @@ void QUmlInteractionFragment::setEnclosingOperand(QUmlInteractionOperand *enclos
 /*!
     The general ordering relationships contained in this fragment.
  */
-QSet<QUmlGeneralOrdering *> QUmlInteractionFragment::generalOrdering() const
+const QSet<QUmlGeneralOrdering *> QUmlInteractionFragment::generalOrdering() const
 {
     // This is a read-write association end
 
diff --git a/src/uml/qumlinteractionfragment.h b/src/uml/qumlinteractionfragment.h
index 342a7b1f..f4fbdadd 100644
--- a/src/uml/qumlinteractionfragment.h
+++ b/src/uml/qumlinteractionfragment.h
@@ -62,14 +62,14 @@ public:
     Q_DECL_HIDDEN QUmlInteractionFragment();
 
     // Owned attributes
-    QSet<QUmlLifeline *> covered() const;
+    const QSet<QUmlLifeline *> covered() const;
     void addCovered(QUmlLifeline *covered);
     void removeCovered(QUmlLifeline *covered);
     QUmlInteraction *enclosingInteraction() const;
     void setEnclosingInteraction(QUmlInteraction *enclosingInteraction);
     QUmlInteractionOperand *enclosingOperand() const;
     void setEnclosingOperand(QUmlInteractionOperand *enclosingOperand);
-    QSet<QUmlGeneralOrdering *> generalOrdering() const;
+    const QSet<QUmlGeneralOrdering *> generalOrdering() const;
     void addGeneralOrdering(QUmlGeneralOrdering *generalOrdering);
     void removeGeneralOrdering(QUmlGeneralOrdering *generalOrdering);
 
diff --git a/src/uml/qumlinteractionoperand.cpp b/src/uml/qumlinteractionoperand.cpp
index dcaf1d6c..9e9ef549 100644
--- a/src/uml/qumlinteractionoperand.cpp
+++ b/src/uml/qumlinteractionoperand.cpp
@@ -65,7 +65,7 @@ QUmlInteractionOperand::QUmlInteractionOperand() :
 /*!
     The fragments of the operand.
  */
-QList<QUmlInteractionFragment *> QUmlInteractionOperand::fragment() const
+const QList<QUmlInteractionFragment *> QUmlInteractionOperand::fragment() const
 {
     // This is a read-write association end
 
diff --git a/src/uml/qumlinteractionoperand.h b/src/uml/qumlinteractionoperand.h
index cd4c7cbb..406b765c 100644
--- a/src/uml/qumlinteractionoperand.h
+++ b/src/uml/qumlinteractionoperand.h
@@ -60,7 +60,7 @@ public:
     QUmlInteractionOperand();
 
     // Owned attributes
-    QList<QUmlInteractionFragment *> fragment() const;
+    const QList<QUmlInteractionFragment *> fragment() const;
     void addFragment(QUmlInteractionFragment *fragment);
     void removeFragment(QUmlInteractionFragment *fragment);
     QUmlInteractionConstraint *guard() const;
diff --git a/src/uml/qumlinteractionuse.cpp b/src/uml/qumlinteractionuse.cpp
index af7e4ff9..0db86d0d 100644
--- a/src/uml/qumlinteractionuse.cpp
+++ b/src/uml/qumlinteractionuse.cpp
@@ -73,7 +73,7 @@ QUmlInteractionUse::QUmlInteractionUse() :
 /*!
     The actual gates of the InteractionUse
  */
-QSet<QUmlGate *> QUmlInteractionUse::actualGate() const
+const QSet<QUmlGate *> QUmlInteractionUse::actualGate() const
 {
     // This is a read-write association end
 
@@ -107,7 +107,7 @@ void QUmlInteractionUse::removeActualGate(QUmlGate *actualGate)
 /*!
     The actual arguments of the Interaction
  */
-QList<QUmlValueSpecification *> QUmlInteractionUse::argument() const
+const QList<QUmlValueSpecification *> QUmlInteractionUse::argument() const
 {
     // This is a read-write association end
 
diff --git a/src/uml/qumlinteractionuse.h b/src/uml/qumlinteractionuse.h
index 8d632e13..7a19218d 100644
--- a/src/uml/qumlinteractionuse.h
+++ b/src/uml/qumlinteractionuse.h
@@ -62,10 +62,10 @@ public:
     QUmlInteractionUse();
 
     // Owned attributes
-    QSet<QUmlGate *> actualGate() const;
+    const QSet<QUmlGate *> actualGate() const;
     void addActualGate(QUmlGate *actualGate);
     void removeActualGate(QUmlGate *actualGate);
-    QList<QUmlValueSpecification *> argument() const;
+    const QList<QUmlValueSpecification *> argument() const;
     void addArgument(QUmlValueSpecification *argument);
     void removeArgument(QUmlValueSpecification *argument);
     QUmlInteraction *refersTo() const;
diff --git a/src/uml/qumlinterface.cpp b/src/uml/qumlinterface.cpp
index e0c97a2f..73b5eba0 100644
--- a/src/uml/qumlinterface.cpp
+++ b/src/uml/qumlinterface.cpp
@@ -72,7 +72,7 @@ QUmlInterface::QUmlInterface() :
 /*!
     References all the Classifiers that are defined (nested) within the Class.
  */
-QList<QUmlClassifier *> QUmlInterface::nestedClassifier() const
+const QList<QUmlClassifier *> QUmlInterface::nestedClassifier() const
 {
     // This is a read-write association end
 
@@ -106,7 +106,7 @@ void QUmlInterface::removeNestedClassifier(QUmlClassifier *nestedClassifier)
 /*!
     The attributes (i.e. the properties) owned by the class.
  */
-QList<QUmlProperty *> QUmlInterface::ownedAttribute() const
+const QList<QUmlProperty *> QUmlInterface::ownedAttribute() const
 {
     // This is a read-write association end
 
@@ -152,7 +152,7 @@ void QUmlInterface::removeOwnedAttribute(QUmlProperty *ownedAttribute)
 /*!
     The operations owned by the class.
  */
-QList<QUmlOperation *> QUmlInterface::ownedOperation() const
+const QList<QUmlOperation *> QUmlInterface::ownedOperation() const
 {
     // This is a read-write association end
 
@@ -198,7 +198,7 @@ void QUmlInterface::removeOwnedOperation(QUmlOperation *ownedOperation)
 /*!
     Receptions that objects providing this interface are willing to accept.
  */
-QSet<QUmlReception *> QUmlInterface::ownedReception() const
+const QSet<QUmlReception *> QUmlInterface::ownedReception() const
 {
     // This is a read-write association end
 
@@ -261,7 +261,7 @@ void QUmlInterface::setProtocol(QUmlProtocolStateMachine *protocol)
 /*!
     References all the Interfaces redefined by this Interface.
  */
-QSet<QUmlInterface *> QUmlInterface::redefinedInterface() const
+const QSet<QUmlInterface *> QUmlInterface::redefinedInterface() const
 {
     // This is a read-write association end
 
diff --git a/src/uml/qumlinterface.h b/src/uml/qumlinterface.h
index 3e0c960c..2cc007a0 100644
--- a/src/uml/qumlinterface.h
+++ b/src/uml/qumlinterface.h
@@ -62,21 +62,21 @@ public:
     QUmlInterface();
 
     // Owned attributes
-    QList<QUmlClassifier *> nestedClassifier() const;
+    const QList<QUmlClassifier *> nestedClassifier() const;
     void addNestedClassifier(QUmlClassifier *nestedClassifier);
     void removeNestedClassifier(QUmlClassifier *nestedClassifier);
-    QList<QUmlProperty *> ownedAttribute() const;
+    const QList<QUmlProperty *> ownedAttribute() const;
     void addOwnedAttribute(QUmlProperty *ownedAttribute);
     void removeOwnedAttribute(QUmlProperty *ownedAttribute);
-    QList<QUmlOperation *> ownedOperation() const;
+    const QList<QUmlOperation *> ownedOperation() const;
     void addOwnedOperation(QUmlOperation *ownedOperation);
     void removeOwnedOperation(QUmlOperation *ownedOperation);
-    QSet<QUmlReception *> ownedReception() const;
+    const QSet<QUmlReception *> ownedReception() const;
     void addOwnedReception(QUmlReception *ownedReception);
     void removeOwnedReception(QUmlReception *ownedReception);
     QUmlProtocolStateMachine *protocol() const;
     void setProtocol(QUmlProtocolStateMachine *protocol);
-    QSet<QUmlInterface *> redefinedInterface() const;
+    const QSet<QUmlInterface *> redefinedInterface() const;
     void addRedefinedInterface(QUmlInterface *redefinedInterface);
     void removeRedefinedInterface(QUmlInterface *redefinedInterface);
 
diff --git a/src/uml/qumlinterruptibleactivityregion.cpp b/src/uml/qumlinterruptibleactivityregion.cpp
index 9930995e..e9e22975 100644
--- a/src/uml/qumlinterruptibleactivityregion.cpp
+++ b/src/uml/qumlinterruptibleactivityregion.cpp
@@ -65,7 +65,7 @@ QUmlInterruptibleActivityRegion::QUmlInterruptibleActivityRegion()
 /*!
     The edges leaving the region that will abort other tokens flowing in the region.
  */
-QSet<QUmlActivityEdge *> QUmlInterruptibleActivityRegion::interruptingEdge() const
+const QSet<QUmlActivityEdge *> QUmlInterruptibleActivityRegion::interruptingEdge() const
 {
     // This is a read-write association end
 
@@ -103,7 +103,7 @@ void QUmlInterruptibleActivityRegion::removeInterruptingEdge(QUmlActivityEdge *i
 /*!
     Nodes immediately contained in the group.
  */
-QSet<QUmlActivityNode *> QUmlInterruptibleActivityRegion::node() const
+const QSet<QUmlActivityNode *> QUmlInterruptibleActivityRegion::node() const
 {
     // This is a read-write association end
 
diff --git a/src/uml/qumlinterruptibleactivityregion.h b/src/uml/qumlinterruptibleactivityregion.h
index 02dbe03d..f4c69f2d 100644
--- a/src/uml/qumlinterruptibleactivityregion.h
+++ b/src/uml/qumlinterruptibleactivityregion.h
@@ -60,10 +60,10 @@ public:
     QUmlInterruptibleActivityRegion();
 
     // Owned attributes
-    QSet<QUmlActivityEdge *> interruptingEdge() const;
+    const QSet<QUmlActivityEdge *> interruptingEdge() const;
     void addInterruptingEdge(QUmlActivityEdge *interruptingEdge);
     void removeInterruptingEdge(QUmlActivityEdge *interruptingEdge);
-    QSet<QUmlActivityNode *> node() const;
+    const QSet<QUmlActivityNode *> node() const;
     void addNode(QUmlActivityNode *node);
     void removeNode(QUmlActivityNode *node);
 
diff --git a/src/uml/qumlinvocationaction.cpp b/src/uml/qumlinvocationaction.cpp
index b7708705..8cb4241d 100644
--- a/src/uml/qumlinvocationaction.cpp
+++ b/src/uml/qumlinvocationaction.cpp
@@ -66,7 +66,7 @@ QUmlInvocationAction::QUmlInvocationAction() :
 /*!
     Specification of the ordered set of argument values that appears during execution.
  */
-QList<QUmlInputPin *> QUmlInvocationAction::argument() const
+const QList<QUmlInputPin *> QUmlInvocationAction::argument() const
 {
     // This is a read-write association end
 
diff --git a/src/uml/qumlinvocationaction.h b/src/uml/qumlinvocationaction.h
index 559918cc..10024bec 100644
--- a/src/uml/qumlinvocationaction.h
+++ b/src/uml/qumlinvocationaction.h
@@ -60,7 +60,7 @@ public:
     Q_DECL_HIDDEN QUmlInvocationAction();
 
     // Owned attributes
-    QList<QUmlInputPin *> argument() const;
+    const QList<QUmlInputPin *> argument() const;
     void addArgument(QUmlInputPin *argument);
     void removeArgument(QUmlInputPin *argument);
     QUmlPort *onPort() const;
diff --git a/src/uml/qumljoinnode.cpp b/src/uml/qumljoinnode.cpp
index f7c01a8e..5dce9c42 100644
--- a/src/uml/qumljoinnode.cpp
+++ b/src/uml/qumljoinnode.cpp
@@ -57,7 +57,7 @@ QUmlJoinNode::QUmlJoinNode() :
     _isCombineDuplicate(true),
     _joinSpec(0)
 {
-    d_ptr->object.setProperty("isCombineDuplicate", QVariant::fromValue(false));
+    d_ptr->object.setProperty("isCombineDuplicate", QVariant::fromValue(true));
     d_ptr->object.setProperty("joinSpec", QVariant::fromValue((QUmlValueSpecification *)(0)));
 }
 
diff --git a/src/uml/qumllifeline.cpp b/src/uml/qumllifeline.cpp
index 81563892..cc8eee1c 100644
--- a/src/uml/qumllifeline.cpp
+++ b/src/uml/qumllifeline.cpp
@@ -75,7 +75,7 @@ QUmlLifeline::QUmlLifeline() :
 /*!
     References the InteractionFragments in which this Lifeline takes part.
  */
-QSet<QUmlInteractionFragment *> QUmlLifeline::coveredBy() const
+const QSet<QUmlInteractionFragment *> QUmlLifeline::coveredBy() const
 {
     // This is a read-write association end
 
diff --git a/src/uml/qumllifeline.h b/src/uml/qumllifeline.h
index 1e1facca..d9faba5d 100644
--- a/src/uml/qumllifeline.h
+++ b/src/uml/qumllifeline.h
@@ -63,7 +63,7 @@ public:
     QUmlLifeline();
 
     // Owned attributes
-    QSet<QUmlInteractionFragment *> coveredBy() const;
+    const QSet<QUmlInteractionFragment *> coveredBy() const;
     void addCoveredBy(QUmlInteractionFragment *coveredBy);
     void removeCoveredBy(QUmlInteractionFragment *coveredBy);
     QUmlPartDecomposition *decomposedAs() const;
diff --git a/src/uml/qumllinkaction.cpp b/src/uml/qumllinkaction.cpp
index d6459113..88c5eb98 100644
--- a/src/uml/qumllinkaction.cpp
+++ b/src/uml/qumllinkaction.cpp
@@ -66,7 +66,7 @@ QUmlLinkAction::QUmlLinkAction()
 /*!
     Data identifying one end of a link by the objects on its ends and qualifiers.
  */
-QSet<QUmlLinkEndData *> QUmlLinkAction::endData() const
+const QSet<QUmlLinkEndData *> QUmlLinkAction::endData() const
 {
     // This is a read-write association end
 
@@ -100,7 +100,7 @@ void QUmlLinkAction::removeEndData(QUmlLinkEndData *endData)
 /*!
     Pins taking end objects and qualifier values as input.
  */
-QSet<QUmlInputPin *> QUmlLinkAction::inputValue() const
+const QSet<QUmlInputPin *> QUmlLinkAction::inputValue() const
 {
     // This is a read-write association end
 
diff --git a/src/uml/qumllinkaction.h b/src/uml/qumllinkaction.h
index fb3596e8..6402eb1f 100644
--- a/src/uml/qumllinkaction.h
+++ b/src/uml/qumllinkaction.h
@@ -61,10 +61,10 @@ public:
     Q_DECL_HIDDEN QUmlLinkAction();
 
     // Owned attributes
-    QSet<QUmlLinkEndData *> endData() const;
+    const QSet<QUmlLinkEndData *> endData() const;
     void addEndData(QUmlLinkEndData *endData);
     void removeEndData(QUmlLinkEndData *endData);
-    QSet<QUmlInputPin *> inputValue() const;
+    const QSet<QUmlInputPin *> inputValue() const;
     void addInputValue(QUmlInputPin *inputValue);
     void removeInputValue(QUmlInputPin *inputValue);
 
diff --git a/src/uml/qumllinkenddata.cpp b/src/uml/qumllinkenddata.cpp
index 66199fb2..5069819a 100644
--- a/src/uml/qumllinkenddata.cpp
+++ b/src/uml/qumllinkenddata.cpp
@@ -88,7 +88,7 @@ void QUmlLinkEndData::setEnd(QUmlProperty *end)
 /*!
     List of qualifier values
  */
-QSet<QUmlQualifierValue *> QUmlLinkEndData::qualifier() const
+const QSet<QUmlQualifierValue *> QUmlLinkEndData::qualifier() const
 {
     // This is a read-write association end
 
diff --git a/src/uml/qumllinkenddata.h b/src/uml/qumllinkenddata.h
index b0373ce2..57109fc7 100644
--- a/src/uml/qumllinkenddata.h
+++ b/src/uml/qumllinkenddata.h
@@ -63,7 +63,7 @@ public:
     // Owned attributes
     QUmlProperty *end() const;
     void setEnd(QUmlProperty *end);
-    QSet<QUmlQualifierValue *> qualifier() const;
+    const QSet<QUmlQualifierValue *> qualifier() const;
     void addQualifier(QUmlQualifierValue *qualifier);
     void removeQualifier(QUmlQualifierValue *qualifier);
     QUmlInputPin *value() const;
diff --git a/src/uml/qumlloopnode.cpp b/src/uml/qumlloopnode.cpp
index 3048b46e..dcaf3a41 100644
--- a/src/uml/qumlloopnode.cpp
+++ b/src/uml/qumlloopnode.cpp
@@ -75,7 +75,7 @@ QUmlLoopNode::QUmlLoopNode() :
 /*!
     A list of output pins within the body fragment the values of which are moved to the loop variable pins after completion of execution of the body, before the next iteration of the loop begins or before the loop exits.
  */
-QList<QUmlOutputPin *> QUmlLoopNode::bodyOutput() const
+const QList<QUmlOutputPin *> QUmlLoopNode::bodyOutput() const
 {
     // This is a read-write association end
 
@@ -103,7 +103,7 @@ void QUmlLoopNode::removeBodyOutput(QUmlOutputPin *bodyOutput)
 /*!
     The set of nodes and edges that perform the repetitive computations of the loop. The body section is executed as long as the test section produces a true value.
  */
-QSet<QUmlExecutableNode *> QUmlLoopNode::bodyPart() const
+const QSet<QUmlExecutableNode *> QUmlLoopNode::bodyPart() const
 {
     // This is a read-write association end
 
@@ -169,7 +169,7 @@ void QUmlLoopNode::setTestedFirst(bool isTestedFirst)
 /*!
     A list of output pins that hold the values of the loop variables during an execution of the loop. When the test fails, the values are movied to the result pins of the loop.
  */
-QList<QUmlOutputPin *> QUmlLoopNode::loopVariable() const
+const QList<QUmlOutputPin *> QUmlLoopNode::loopVariable() const
 {
     // This is a read-write association end
 
@@ -197,7 +197,7 @@ void QUmlLoopNode::removeLoopVariable(QUmlOutputPin *loopVariable)
 /*!
     A list of values that are moved into the loop variable pins before the first iteration of the loop.
  */
-QList<QUmlInputPin *> QUmlLoopNode::loopVariableInput() const
+const QList<QUmlInputPin *> QUmlLoopNode::loopVariableInput() const
 {
     // This is a read-write association end
 
@@ -225,7 +225,7 @@ void QUmlLoopNode::removeLoopVariableInput(QUmlInputPin *loopVariableInput)
 /*!
     A list of output pins that constitute the data flow output of the entire loop.
  */
-QList<QUmlOutputPin *> QUmlLoopNode::result() const
+const QList<QUmlOutputPin *> QUmlLoopNode::result() const
 {
     // This is a read-write association end
 
@@ -253,7 +253,7 @@ void QUmlLoopNode::removeResult(QUmlOutputPin *result)
 /*!
     The set of nodes and edges that initialize values or perform other setup computations for the loop.
  */
-QSet<QUmlExecutableNode *> QUmlLoopNode::setupPart() const
+const QSet<QUmlExecutableNode *> QUmlLoopNode::setupPart() const
 {
     // This is a read-write association end
 
@@ -281,7 +281,7 @@ void QUmlLoopNode::removeSetupPart(QUmlExecutableNode *setupPart)
 /*!
     The set of nodes, edges, and designated value that compute a Boolean value to determine if another execution of the body will be performed.
  */
-QSet<QUmlExecutableNode *> QUmlLoopNode::test() const
+const QSet<QUmlExecutableNode *> QUmlLoopNode::test() const
 {
     // This is a read-write association end
 
diff --git a/src/uml/qumlloopnode.h b/src/uml/qumlloopnode.h
index b49a6185..007ea1f0 100644
--- a/src/uml/qumlloopnode.h
+++ b/src/uml/qumlloopnode.h
@@ -61,29 +61,29 @@ public:
     QUmlLoopNode();
 
     // Owned attributes
-    QList<QUmlOutputPin *> bodyOutput() const;
+    const QList<QUmlOutputPin *> bodyOutput() const;
     void addBodyOutput(QUmlOutputPin *bodyOutput);
     void removeBodyOutput(QUmlOutputPin *bodyOutput);
-    QSet<QUmlExecutableNode *> bodyPart() const;
+    const QSet<QUmlExecutableNode *> bodyPart() const;
     void addBodyPart(QUmlExecutableNode *bodyPart);
     void removeBodyPart(QUmlExecutableNode *bodyPart);
     QUmlOutputPin *decider() const;
     void setDecider(QUmlOutputPin *decider);
     bool isTestedFirst() const;
     void setTestedFirst(bool isTestedFirst);
-    QList<QUmlOutputPin *> loopVariable() const;
+    const QList<QUmlOutputPin *> loopVariable() const;
     void addLoopVariable(QUmlOutputPin *loopVariable);
     void removeLoopVariable(QUmlOutputPin *loopVariable);
-    QList<QUmlInputPin *> loopVariableInput() const;
+    const QList<QUmlInputPin *> loopVariableInput() const;
     void addLoopVariableInput(QUmlInputPin *loopVariableInput);
     void removeLoopVariableInput(QUmlInputPin *loopVariableInput);
-    QList<QUmlOutputPin *> result() const;
+    const QList<QUmlOutputPin *> result() const;
     void addResult(QUmlOutputPin *result);
     void removeResult(QUmlOutputPin *result);
-    QSet<QUmlExecutableNode *> setupPart() const;
+    const QSet<QUmlExecutableNode *> setupPart() const;
     void addSetupPart(QUmlExecutableNode *setupPart);
     void removeSetupPart(QUmlExecutableNode *setupPart);
-    QSet<QUmlExecutableNode *> test() const;
+    const QSet<QUmlExecutableNode *> test() const;
     void addTest(QUmlExecutableNode *test);
     void removeTest(QUmlExecutableNode *test);
 
diff --git a/src/uml/qumlmessage.cpp b/src/uml/qumlmessage.cpp
index dcd09690..781cf3c6 100644
--- a/src/uml/qumlmessage.cpp
+++ b/src/uml/qumlmessage.cpp
@@ -67,8 +67,8 @@ QUmlMessage::QUmlMessage() :
     d_ptr->object.setProperty("argument", QVariant::fromValue(&_argument));
     d_ptr->object.setProperty("connector", QVariant::fromValue((QUmlConnector *)(0)));
     d_ptr->object.setProperty("interaction", QVariant::fromValue((QUmlInteraction *)(0)));
-    d_ptr->object.setProperty("messageKind", QVariant::fromValue(QtUml::MessageKindNone));
-    d_ptr->object.setProperty("messageSort", QVariant::fromValue(QtUml::MessageSortNone));
+    d_ptr->object.setProperty("messageKind", QVariant::fromValue(QtUml::MessageKindUnknown));
+    d_ptr->object.setProperty("messageSort", QVariant::fromValue(QtUml::MessageSortSynchCall));
     d_ptr->object.setProperty("receiveEvent", QVariant::fromValue((QUmlMessageEnd *)(0)));
     d_ptr->object.setProperty("sendEvent", QVariant::fromValue((QUmlMessageEnd *)(0)));
     d_ptr->object.setProperty("signature", QVariant::fromValue((QUmlNamedElement *)(0)));
@@ -79,7 +79,7 @@ QUmlMessage::QUmlMessage() :
 /*!
     The arguments of the Message
  */
-QList<QUmlValueSpecification *> QUmlMessage::argument() const
+const QList<QUmlValueSpecification *> QUmlMessage::argument() const
 {
     // This is a read-write association end
 
diff --git a/src/uml/qumlmessage.h b/src/uml/qumlmessage.h
index 23b45e88..a34df4b3 100644
--- a/src/uml/qumlmessage.h
+++ b/src/uml/qumlmessage.h
@@ -63,7 +63,7 @@ public:
     QUmlMessage();
 
     // Owned attributes
-    QList<QUmlValueSpecification *> argument() const;
+    const QList<QUmlValueSpecification *> argument() const;
     void addArgument(QUmlValueSpecification *argument);
     void removeArgument(QUmlValueSpecification *argument);
     QUmlConnector *connector() const;
diff --git a/src/uml/qumlmultiplicityelement.cpp b/src/uml/qumlmultiplicityelement.cpp
index 07467b31..8bcad237 100644
--- a/src/uml/qumlmultiplicityelement.cpp
+++ b/src/uml/qumlmultiplicityelement.cpp
@@ -60,10 +60,10 @@ QUmlMultiplicityElement::QUmlMultiplicityElement() :
     _upperValue(0)
 {
     d_ptr->object.setProperty("isOrdered", QVariant::fromValue(false));
-    d_ptr->object.setProperty("isUnique", QVariant::fromValue(false));
-    d_ptr->object.setProperty("lower", QVariant::fromValue((int)(0)));
+    d_ptr->object.setProperty("isUnique", QVariant::fromValue(true));
+    d_ptr->object.setProperty("lower", QVariant::fromValue((int)(1)));
     d_ptr->object.setProperty("lowerValue", QVariant::fromValue((QUmlValueSpecification *)(0)));
-    d_ptr->object.setProperty("upper", QVariant::fromValue((int)(0)));
+    d_ptr->object.setProperty("upper", QVariant::fromValue((int)(1)));
     d_ptr->object.setProperty("upperValue", QVariant::fromValue((QUmlValueSpecification *)(0)));
 }
 
diff --git a/src/uml/qumlnamedelement.cpp b/src/uml/qumlnamedelement.cpp
index d7125e6a..96876251 100644
--- a/src/uml/qumlnamedelement.cpp
+++ b/src/uml/qumlnamedelement.cpp
@@ -73,7 +73,7 @@ QUmlNamedElement::QUmlNamedElement() :
 /*!
     Indicates the dependencies that reference the client.
  */
-QSet<QUmlDependency *> QUmlNamedElement::clientDependency() const
+const QSet<QUmlDependency *> QUmlNamedElement::clientDependency() const
 {
     // This is a read-write association end
 
diff --git a/src/uml/qumlnamedelement.h b/src/uml/qumlnamedelement.h
index c273c0dd..243cd38e 100644
--- a/src/uml/qumlnamedelement.h
+++ b/src/uml/qumlnamedelement.h
@@ -63,7 +63,7 @@ public:
     Q_DECL_HIDDEN QUmlNamedElement();
 
     // Owned attributes
-    QSet<QUmlDependency *> clientDependency() const;
+    const QSet<QUmlDependency *> clientDependency() const;
     void addClientDependency(QUmlDependency *clientDependency);
     void removeClientDependency(QUmlDependency *clientDependency);
     QString name() const;
diff --git a/src/uml/qumlnamespace.cpp b/src/uml/qumlnamespace.cpp
index 14ccbf29..831ea20c 100644
--- a/src/uml/qumlnamespace.cpp
+++ b/src/uml/qumlnamespace.cpp
@@ -71,7 +71,7 @@ QUmlNamespace::QUmlNamespace()
 /*!
     References the ElementImports owned by the Namespace.
  */
-QSet<QUmlElementImport *> QUmlNamespace::elementImport() const
+const QSet<QUmlElementImport *> QUmlNamespace::elementImport() const
 {
     // This is a read-write association end
 
@@ -115,7 +115,7 @@ void QUmlNamespace::removeElementImport(QUmlElementImport *elementImport)
 /*!
     References the PackageableElements that are members of this Namespace as a result of either PackageImports or ElementImports.
  */
-QSet<QUmlPackageableElement *> QUmlNamespace::importedMember() const
+const QSet<QUmlPackageableElement *> QUmlNamespace::importedMember() const
 {
     // This is a read-only derived association end
 
@@ -157,7 +157,7 @@ void QUmlNamespace::removeImportedMember(QUmlPackageableElement *importedMember)
 /*!
     A collection of NamedElements identifiable within the Namespace, either by being owned or by being introduced by importing or inheritance.
  */
-QSet<QUmlNamedElement *> QUmlNamespace::member() const
+const QSet<QUmlNamedElement *> QUmlNamespace::member() const
 {
     // This is a read-only derived union association end
 
@@ -185,7 +185,7 @@ void QUmlNamespace::removeMember(QUmlNamedElement *member)
 /*!
     A collection of NamedElements owned by the Namespace.
  */
-QSet<QUmlNamedElement *> QUmlNamespace::ownedMember() const
+const QSet<QUmlNamedElement *> QUmlNamespace::ownedMember() const
 {
     // This is a read-only derived union association end
 
@@ -231,7 +231,7 @@ void QUmlNamespace::removeOwnedMember(QUmlNamedElement *ownedMember)
 /*!
     Specifies a set of Constraints owned by this Namespace.
  */
-QSet<QUmlConstraint *> QUmlNamespace::ownedRule() const
+const QSet<QUmlConstraint *> QUmlNamespace::ownedRule() const
 {
     // This is a read-write association end
 
@@ -275,7 +275,7 @@ void QUmlNamespace::removeOwnedRule(QUmlConstraint *ownedRule)
 /*!
     References the PackageImports owned by the Namespace.
  */
-QSet<QUmlPackageImport *> QUmlNamespace::packageImport() const
+const QSet<QUmlPackageImport *> QUmlNamespace::packageImport() const
 {
     // This is a read-write association end
 
diff --git a/src/uml/qumlnamespace.h b/src/uml/qumlnamespace.h
index e6a198d5..0a1ad295 100644
--- a/src/uml/qumlnamespace.h
+++ b/src/uml/qumlnamespace.h
@@ -62,22 +62,22 @@ public:
     Q_DECL_HIDDEN QUmlNamespace();
 
     // Owned attributes
-    QSet<QUmlElementImport *> elementImport() const;
+    const QSet<QUmlElementImport *> elementImport() const;
     void addElementImport(QUmlElementImport *elementImport);
     void removeElementImport(QUmlElementImport *elementImport);
-    QSet<QUmlPackageableElement *> importedMember() const;
+    const QSet<QUmlPackageableElement *> importedMember() const;
     Q_DECL_HIDDEN void addImportedMember(QUmlPackageableElement *importedMember);
     Q_DECL_HIDDEN void removeImportedMember(QUmlPackageableElement *importedMember);
-    QSet<QUmlNamedElement *> member() const;
+    const QSet<QUmlNamedElement *> member() const;
     Q_DECL_HIDDEN void addMember(QUmlNamedElement *member);
     Q_DECL_HIDDEN void removeMember(QUmlNamedElement *member);
-    QSet<QUmlNamedElement *> ownedMember() const;
+    const QSet<QUmlNamedElement *> ownedMember() const;
     Q_DECL_HIDDEN void addOwnedMember(QUmlNamedElement *ownedMember);
     Q_DECL_HIDDEN void removeOwnedMember(QUmlNamedElement *ownedMember);
-    QSet<QUmlConstraint *> ownedRule() const;
+    const QSet<QUmlConstraint *> ownedRule() const;
     void addOwnedRule(QUmlConstraint *ownedRule);
     void removeOwnedRule(QUmlConstraint *ownedRule);
-    QSet<QUmlPackageImport *> packageImport() const;
+    const QSet<QUmlPackageImport *> packageImport() const;
     void addPackageImport(QUmlPackageImport *packageImport);
     void removePackageImport(QUmlPackageImport *packageImport);
 
diff --git a/src/uml/qumlnode.cpp b/src/uml/qumlnode.cpp
index 4deb8113..191fb78f 100644
--- a/src/uml/qumlnode.cpp
+++ b/src/uml/qumlnode.cpp
@@ -61,7 +61,7 @@ QUmlNode::QUmlNode()
 /*!
     The Nodes that are defined (nested) within the Node.
  */
-QSet<QUmlNode *> QUmlNode::nestedNode() const
+const QSet<QUmlNode *> QUmlNode::nestedNode() const
 {
     // This is a read-write association end
 
diff --git a/src/uml/qumlnode.h b/src/uml/qumlnode.h
index ecce481a..cbbab562 100644
--- a/src/uml/qumlnode.h
+++ b/src/uml/qumlnode.h
@@ -58,7 +58,7 @@ public:
     QUmlNode();
 
     // Owned attributes
-    QSet<QUmlNode *> nestedNode() const;
+    const QSet<QUmlNode *> nestedNode() const;
     void addNestedNode(QUmlNode *nestedNode);
     void removeNestedNode(QUmlNode *nestedNode);
 
diff --git a/src/uml/qumlobjectnode.cpp b/src/uml/qumlobjectnode.cpp
index 0fc5f201..24e553c7 100644
--- a/src/uml/qumlobjectnode.cpp
+++ b/src/uml/qumlobjectnode.cpp
@@ -63,7 +63,7 @@ QUmlObjectNode::QUmlObjectNode() :
 {
     d_ptr->object.setProperty("inState", QVariant::fromValue(&_inState));
     d_ptr->object.setProperty("isControlType", QVariant::fromValue(false));
-    d_ptr->object.setProperty("ordering", QVariant::fromValue(QtUml::ObjectNodeOrderingKindNone));
+    d_ptr->object.setProperty("ordering", QVariant::fromValue(QtUml::ObjectNodeOrderingKindFIFO));
     d_ptr->object.setProperty("selection", QVariant::fromValue((QUmlBehavior *)(0)));
     d_ptr->object.setProperty("upperBound", QVariant::fromValue((QUmlValueSpecification *)(0)));
 }
@@ -73,7 +73,7 @@ QUmlObjectNode::QUmlObjectNode() :
 /*!
     The required states of the object available at this point in the activity.
  */
-QSet<QUmlState *> QUmlObjectNode::inState() const
+const QSet<QUmlState *> QUmlObjectNode::inState() const
 {
     // This is a read-write association end
 
diff --git a/src/uml/qumlobjectnode.h b/src/uml/qumlobjectnode.h
index 1bcdc69e..3a8f4280 100644
--- a/src/uml/qumlobjectnode.h
+++ b/src/uml/qumlobjectnode.h
@@ -63,7 +63,7 @@ public:
     Q_DECL_HIDDEN QUmlObjectNode();
 
     // Owned attributes
-    QSet<QUmlState *> inState() const;
+    const QSet<QUmlState *> inState() const;
     void addInState(QUmlState *inState);
     void removeInState(QUmlState *inState);
     bool isControlType() const;
diff --git a/src/uml/qumloccurrencespecification.cpp b/src/uml/qumloccurrencespecification.cpp
index 8f220858..0f7f9539 100644
--- a/src/uml/qumloccurrencespecification.cpp
+++ b/src/uml/qumloccurrencespecification.cpp
@@ -86,7 +86,7 @@ void QUmlOccurrenceSpecification::setCovered(QUmlLifeline *covered)
 /*!
     References the GeneralOrderings that specify EventOcurrences that must occur after this OccurrenceSpecification
  */
-QSet<QUmlGeneralOrdering *> QUmlOccurrenceSpecification::toAfter() const
+const QSet<QUmlGeneralOrdering *> QUmlOccurrenceSpecification::toAfter() const
 {
     // This is a read-write association end
 
@@ -124,7 +124,7 @@ void QUmlOccurrenceSpecification::removeToAfter(QUmlGeneralOrdering *toAfter)
 /*!
     References the GeneralOrderings that specify EventOcurrences that must occur before this OccurrenceSpecification
  */
-QSet<QUmlGeneralOrdering *> QUmlOccurrenceSpecification::toBefore() const
+const QSet<QUmlGeneralOrdering *> QUmlOccurrenceSpecification::toBefore() const
 {
     // This is a read-write association end
 
diff --git a/src/uml/qumloccurrencespecification.h b/src/uml/qumloccurrencespecification.h
index 2b34c4a9..14b42ff9 100644
--- a/src/uml/qumloccurrencespecification.h
+++ b/src/uml/qumloccurrencespecification.h
@@ -62,10 +62,10 @@ public:
     // Owned attributes
     QUmlLifeline *covered() const;
     void setCovered(QUmlLifeline *covered);
-    QSet<QUmlGeneralOrdering *> toAfter() const;
+    const QSet<QUmlGeneralOrdering *> toAfter() const;
     void addToAfter(QUmlGeneralOrdering *toAfter);
     void removeToAfter(QUmlGeneralOrdering *toAfter);
-    QSet<QUmlGeneralOrdering *> toBefore() const;
+    const QSet<QUmlGeneralOrdering *> toBefore() const;
     void addToBefore(QUmlGeneralOrdering *toBefore);
     void removeToBefore(QUmlGeneralOrdering *toBefore);
 
diff --git a/src/uml/qumlopaqueaction.cpp b/src/uml/qumlopaqueaction.cpp
index cb96a634..fce050fe 100644
--- a/src/uml/qumlopaqueaction.cpp
+++ b/src/uml/qumlopaqueaction.cpp
@@ -67,7 +67,7 @@ QUmlOpaqueAction::QUmlOpaqueAction()
 /*!
     Specifies the action in one or more languages.
  */
-QList<QString> QUmlOpaqueAction::body() const
+const QList<QString> QUmlOpaqueAction::body() const
 {
     // This is a read-write property
 
@@ -95,7 +95,7 @@ void QUmlOpaqueAction::removeBody(QString body)
 /*!
     Provides input to the action.
  */
-QSet<QUmlInputPin *> QUmlOpaqueAction::inputValue() const
+const QSet<QUmlInputPin *> QUmlOpaqueAction::inputValue() const
 {
     // This is a read-write association end
 
@@ -129,7 +129,7 @@ void QUmlOpaqueAction::removeInputValue(QUmlInputPin *inputValue)
 /*!
     Languages the body strings use, in the same order as the body strings
  */
-QList<QString> QUmlOpaqueAction::language() const
+const QList<QString> QUmlOpaqueAction::language() const
 {
     // This is a read-write property
 
@@ -157,7 +157,7 @@ void QUmlOpaqueAction::removeLanguage(QString language)
 /*!
     Takes output from the action.
  */
-QSet<QUmlOutputPin *> QUmlOpaqueAction::outputValue() const
+const QSet<QUmlOutputPin *> QUmlOpaqueAction::outputValue() const
 {
     // This is a read-write association end
 
diff --git a/src/uml/qumlopaqueaction.h b/src/uml/qumlopaqueaction.h
index becd8147..31c7ef8f 100644
--- a/src/uml/qumlopaqueaction.h
+++ b/src/uml/qumlopaqueaction.h
@@ -60,16 +60,16 @@ public:
     QUmlOpaqueAction();
 
     // Owned attributes
-    QList<QString> body() const;
+    const QList<QString> body() const;
     void addBody(QString body);
     void removeBody(QString body);
-    QSet<QUmlInputPin *> inputValue() const;
+    const QSet<QUmlInputPin *> inputValue() const;
     void addInputValue(QUmlInputPin *inputValue);
     void removeInputValue(QUmlInputPin *inputValue);
-    QList<QString> language() const;
+    const QList<QString> language() const;
     void addLanguage(QString language);
     void removeLanguage(QString language);
-    QSet<QUmlOutputPin *> outputValue() const;
+    const QSet<QUmlOutputPin *> outputValue() const;
     void addOutputValue(QUmlOutputPin *outputValue);
     void removeOutputValue(QUmlOutputPin *outputValue);
 
diff --git a/src/uml/qumlopaquebehavior.cpp b/src/uml/qumlopaquebehavior.cpp
index cdaea0bf..534f8981 100644
--- a/src/uml/qumlopaquebehavior.cpp
+++ b/src/uml/qumlopaquebehavior.cpp
@@ -62,7 +62,7 @@ QUmlOpaqueBehavior::QUmlOpaqueBehavior()
 /*!
     Specifies the behavior in one or more languages.
  */
-QList<QString> QUmlOpaqueBehavior::body() const
+const QList<QString> QUmlOpaqueBehavior::body() const
 {
     // This is a read-write property
 
@@ -90,7 +90,7 @@ void QUmlOpaqueBehavior::removeBody(QString body)
 /*!
     Languages the body strings use in the same order as the body strings.
  */
-QList<QString> QUmlOpaqueBehavior::language() const
+const QList<QString> QUmlOpaqueBehavior::language() const
 {
     // This is a read-write property
 
diff --git a/src/uml/qumlopaquebehavior.h b/src/uml/qumlopaquebehavior.h
index 038b2311..20d30652 100644
--- a/src/uml/qumlopaquebehavior.h
+++ b/src/uml/qumlopaquebehavior.h
@@ -57,10 +57,10 @@ public:
     QUmlOpaqueBehavior();
 
     // Owned attributes
-    QList<QString> body() const;
+    const QList<QString> body() const;
     void addBody(QString body);
     void removeBody(QString body);
-    QList<QString> language() const;
+    const QList<QString> language() const;
     void addLanguage(QString language);
     void removeLanguage(QString language);
 
diff --git a/src/uml/qumlopaqueexpression.cpp b/src/uml/qumlopaqueexpression.cpp
index 22c37be7..1af638c0 100644
--- a/src/uml/qumlopaqueexpression.cpp
+++ b/src/uml/qumlopaqueexpression.cpp
@@ -87,7 +87,7 @@ void QUmlOpaqueExpression::setBehavior(QUmlBehavior *behavior)
 /*!
     The text of the expression, possibly in multiple languages.
  */
-QList<QString> QUmlOpaqueExpression::body() const
+const QList<QString> QUmlOpaqueExpression::body() const
 {
     // This is a read-write property
 
@@ -115,7 +115,7 @@ void QUmlOpaqueExpression::removeBody(QString body)
 /*!
     Specifies the languages in which the expression is stated. The interpretation of the expression body depends on the languages. If the languages are unspecified, they might be implicit from the expression body or the context. Languages are matched to body strings by order.
  */
-QList<QString> QUmlOpaqueExpression::language() const
+const QList<QString> QUmlOpaqueExpression::language() const
 {
     // This is a read-write property
 
diff --git a/src/uml/qumlopaqueexpression.h b/src/uml/qumlopaqueexpression.h
index 473c8f23..02aef439 100644
--- a/src/uml/qumlopaqueexpression.h
+++ b/src/uml/qumlopaqueexpression.h
@@ -62,10 +62,10 @@ public:
     // Owned attributes
     QUmlBehavior *behavior() const;
     void setBehavior(QUmlBehavior *behavior);
-    QList<QString> body() const;
+    const QList<QString> body() const;
     void addBody(QString body);
     void removeBody(QString body);
-    QList<QString> language() const;
+    const QList<QString> language() const;
     void addLanguage(QString language);
     void removeLanguage(QString language);
     QUmlParameter *result() const;
diff --git a/src/uml/qumloperation.cpp b/src/uml/qumloperation.cpp
index f1109810..0ba867e0 100644
--- a/src/uml/qumloperation.cpp
+++ b/src/uml/qumloperation.cpp
@@ -74,8 +74,8 @@ QUmlOperation::QUmlOperation() :
     d_ptr->object.setProperty("interface", QVariant::fromValue((QUmlInterface *)(0)));
     d_ptr->object.setProperty("isOrdered", QVariant::fromValue(false));
     d_ptr->object.setProperty("isQuery", QVariant::fromValue(false));
-    d_ptr->object.setProperty("isUnique", QVariant::fromValue(false));
-    d_ptr->object.setProperty("lower", QVariant::fromValue((int)(0)));
+    d_ptr->object.setProperty("isUnique", QVariant::fromValue(true));
+    d_ptr->object.setProperty("lower", QVariant::fromValue((int)(1)));
     d_ptr->object.setProperty("ownedParameter", QVariant::fromValue(&_ownedParameter));
     d_ptr->object.setProperty("postcondition", QVariant::fromValue(&_postcondition));
     d_ptr->object.setProperty("precondition", QVariant::fromValue(&_precondition));
@@ -83,7 +83,7 @@ QUmlOperation::QUmlOperation() :
     d_ptr->object.setProperty("redefinedOperation", QVariant::fromValue(&_redefinedOperation));
     d_ptr->object.setProperty("templateParameter", QVariant::fromValue((QUmlOperationTemplateParameter *)(0)));
     d_ptr->object.setProperty("type", QVariant::fromValue((QUmlType *)(0)));
-    d_ptr->object.setProperty("upper", QVariant::fromValue((int)(0)));
+    d_ptr->object.setProperty("upper", QVariant::fromValue((int)(1)));
 }
 
 // OWNED ATTRIBUTES
@@ -305,7 +305,7 @@ void QUmlOperation::setLower(int lower)
 /*!
     Specifies the ordered set of formal parameters of this BehavioralFeature.Specifies the parameters owned by this Operation.
  */
-QList<QUmlParameter *> QUmlOperation::ownedParameter() const
+const QList<QUmlParameter *> QUmlOperation::ownedParameter() const
 {
     // This is a read-write association end
 
@@ -343,7 +343,7 @@ void QUmlOperation::removeOwnedParameter(QUmlParameter *ownedParameter)
 /*!
     An optional set of Constraints specifying the state of the system when the Operation is completed.
  */
-QSet<QUmlConstraint *> QUmlOperation::postcondition() const
+const QSet<QUmlConstraint *> QUmlOperation::postcondition() const
 {
     // This is a read-write association end
 
@@ -377,7 +377,7 @@ void QUmlOperation::removePostcondition(QUmlConstraint *postcondition)
 /*!
     An optional set of Constraints on the state of the system when the Operation is invoked.
  */
-QSet<QUmlConstraint *> QUmlOperation::precondition() const
+const QSet<QUmlConstraint *> QUmlOperation::precondition() const
 {
     // This is a read-write association end
 
@@ -411,7 +411,7 @@ void QUmlOperation::removePrecondition(QUmlConstraint *precondition)
 /*!
     References the Types representing exceptions that may be raised during an invocation of this operation.
  */
-QSet<QUmlType *> QUmlOperation::raisedException() const
+const QSet<QUmlType *> QUmlOperation::raisedException() const
 {
     // This is a read-write association end
 
@@ -439,7 +439,7 @@ void QUmlOperation::removeRaisedException(QUmlType *raisedException)
 /*!
     References the Operations that are redefined by this Operation.
  */
-QSet<QUmlOperation *> QUmlOperation::redefinedOperation() const
+const QSet<QUmlOperation *> QUmlOperation::redefinedOperation() const
 {
     // This is a read-write association end
 
diff --git a/src/uml/qumloperation.h b/src/uml/qumloperation.h
index 64b68020..abfbae0e 100644
--- a/src/uml/qumloperation.h
+++ b/src/uml/qumloperation.h
@@ -84,19 +84,19 @@ public:
     Q_DECL_HIDDEN void setUnique(bool isUnique);
     int lower() const;
     Q_DECL_HIDDEN void setLower(int lower);
-    QList<QUmlParameter *> ownedParameter() const;
+    const QList<QUmlParameter *> ownedParameter() const;
     void addOwnedParameter(QUmlParameter *ownedParameter);
     void removeOwnedParameter(QUmlParameter *ownedParameter);
-    QSet<QUmlConstraint *> postcondition() const;
+    const QSet<QUmlConstraint *> postcondition() const;
     void addPostcondition(QUmlConstraint *postcondition);
     void removePostcondition(QUmlConstraint *postcondition);
-    QSet<QUmlConstraint *> precondition() const;
+    const QSet<QUmlConstraint *> precondition() const;
     void addPrecondition(QUmlConstraint *precondition);
     void removePrecondition(QUmlConstraint *precondition);
-    QSet<QUmlType *> raisedException() const;
+    const QSet<QUmlType *> raisedException() const;
     void addRaisedException(QUmlType *raisedException);
     void removeRaisedException(QUmlType *raisedException);
-    QSet<QUmlOperation *> redefinedOperation() const;
+    const QSet<QUmlOperation *> redefinedOperation() const;
     void addRedefinedOperation(QUmlOperation *redefinedOperation);
     void removeRedefinedOperation(QUmlOperation *redefinedOperation);
     QUmlOperationTemplateParameter *templateParameter() const;
diff --git a/src/uml/qumlpackage.cpp b/src/uml/qumlpackage.cpp
index c90a8b4b..0c99d59f 100644
--- a/src/uml/qumlpackage.cpp
+++ b/src/uml/qumlpackage.cpp
@@ -95,7 +95,7 @@ void QUmlPackage::setURI(QString URI)
 /*!
     References the packaged elements that are Packages.
  */
-QSet<QUmlPackage *> QUmlPackage::nestedPackage() const
+const QSet<QUmlPackage *> QUmlPackage::nestedPackage() const
 {
     // This is a read-write derived association end
 
@@ -156,7 +156,7 @@ void QUmlPackage::setNestingPackage(QUmlPackage *nestingPackage)
 /*!
     References the Stereotypes that are owned by the Package
  */
-QSet<QUmlStereotype *> QUmlPackage::ownedStereotype() const
+const QSet<QUmlStereotype *> QUmlPackage::ownedStereotype() const
 {
     // This is a read-only derived association end
 
@@ -198,7 +198,7 @@ void QUmlPackage::removeOwnedStereotype(QUmlStereotype *ownedStereotype)
 /*!
     References the packaged elements that are Types.
  */
-QSet<QUmlType *> QUmlPackage::ownedType() const
+const QSet<QUmlType *> QUmlPackage::ownedType() const
 {
     // This is a read-write derived association end
 
@@ -250,7 +250,7 @@ void QUmlPackage::removeOwnedType(QUmlType *ownedType)
 /*!
     References the PackageMerges that are owned by this Package.
  */
-QSet<QUmlPackageMerge *> QUmlPackage::packageMerge() const
+const QSet<QUmlPackageMerge *> QUmlPackage::packageMerge() const
 {
     // This is a read-write association end
 
@@ -294,7 +294,7 @@ void QUmlPackage::removePackageMerge(QUmlPackageMerge *packageMerge)
 /*!
     Specifies the packageable elements that are owned by this Package.
  */
-QSet<QUmlPackageableElement *> QUmlPackage::packagedElement() const
+const QSet<QUmlPackageableElement *> QUmlPackage::packagedElement() const
 {
     // This is a read-write association end
 
@@ -328,7 +328,7 @@ void QUmlPackage::removePackagedElement(QUmlPackageableElement *packagedElement)
 /*!
     References the ProfileApplications that indicate which profiles have been applied to the Package.
  */
-QSet<QUmlProfileApplication *> QUmlPackage::profileApplication() const
+const QSet<QUmlProfileApplication *> QUmlPackage::profileApplication() const
 {
     // This is a read-write association end
 
diff --git a/src/uml/qumlpackage.h b/src/uml/qumlpackage.h
index 8f3a38d5..0e9cd73e 100644
--- a/src/uml/qumlpackage.h
+++ b/src/uml/qumlpackage.h
@@ -68,24 +68,24 @@ public:
     // Owned attributes
     QString URI() const;
     void setURI(QString URI);
-    QSet<QUmlPackage *> nestedPackage() const;
+    const QSet<QUmlPackage *> nestedPackage() const;
     void addNestedPackage(QUmlPackage *nestedPackage);
     void removeNestedPackage(QUmlPackage *nestedPackage);
     QUmlPackage *nestingPackage() const;
     void setNestingPackage(QUmlPackage *nestingPackage);
-    QSet<QUmlStereotype *> ownedStereotype() const;
+    const QSet<QUmlStereotype *> ownedStereotype() const;
     Q_DECL_HIDDEN void addOwnedStereotype(QUmlStereotype *ownedStereotype);
     Q_DECL_HIDDEN void removeOwnedStereotype(QUmlStereotype *ownedStereotype);
-    QSet<QUmlType *> ownedType() const;
+    const QSet<QUmlType *> ownedType() const;
     void addOwnedType(QUmlType *ownedType);
     void removeOwnedType(QUmlType *ownedType);
-    QSet<QUmlPackageMerge *> packageMerge() const;
+    const QSet<QUmlPackageMerge *> packageMerge() const;
     void addPackageMerge(QUmlPackageMerge *packageMerge);
     void removePackageMerge(QUmlPackageMerge *packageMerge);
-    QSet<QUmlPackageableElement *> packagedElement() const;
+    const QSet<QUmlPackageableElement *> packagedElement() const;
     void addPackagedElement(QUmlPackageableElement *packagedElement);
     void removePackagedElement(QUmlPackageableElement *packagedElement);
-    QSet<QUmlProfileApplication *> profileApplication() const;
+    const QSet<QUmlProfileApplication *> profileApplication() const;
     void addProfileApplication(QUmlProfileApplication *profileApplication);
     void removeProfileApplication(QUmlProfileApplication *profileApplication);
 
diff --git a/src/uml/qumlpackageableelement.cpp b/src/uml/qumlpackageableelement.cpp
index 35758252..23a1d9d6 100644
--- a/src/uml/qumlpackageableelement.cpp
+++ b/src/uml/qumlpackageableelement.cpp
@@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE
 QUmlPackageableElement::QUmlPackageableElement() :
     _visibility(QtUml::VisibilityKindPublic)
 {
-    d_ptr->object.setProperty("visibility", QVariant::fromValue(QtUml::VisibilityKindNone));
+    d_ptr->object.setProperty("visibility", QVariant::fromValue(QtUml::VisibilityKindPublic));
 }
 
 // OWNED ATTRIBUTES
diff --git a/src/uml/qumlpackageimport.cpp b/src/uml/qumlpackageimport.cpp
index ed58143a..2dbed17e 100644
--- a/src/uml/qumlpackageimport.cpp
+++ b/src/uml/qumlpackageimport.cpp
@@ -61,7 +61,7 @@ QUmlPackageImport::QUmlPackageImport() :
 {
     d_ptr->object.setProperty("importedPackage", QVariant::fromValue((QUmlPackage *)(0)));
     d_ptr->object.setProperty("importingNamespace", QVariant::fromValue((QUmlNamespace *)(0)));
-    d_ptr->object.setProperty("visibility", QVariant::fromValue(QtUml::VisibilityKindNone));
+    d_ptr->object.setProperty("visibility", QVariant::fromValue(QtUml::VisibilityKindPublic));
 }
 
 // OWNED ATTRIBUTES
diff --git a/src/uml/qumlparameter.cpp b/src/uml/qumlparameter.cpp
index ef1878cc..a9626b18 100644
--- a/src/uml/qumlparameter.cpp
+++ b/src/uml/qumlparameter.cpp
@@ -64,7 +64,7 @@ QUmlParameter::QUmlParameter() :
 {
     d_ptr->object.setProperty("default", QVariant::fromValue(QString()));
     d_ptr->object.setProperty("defaultValue", QVariant::fromValue((QUmlValueSpecification *)(0)));
-    d_ptr->object.setProperty("direction", QVariant::fromValue(QtUml::ParameterDirectionKindNone));
+    d_ptr->object.setProperty("direction", QVariant::fromValue(QtUml::ParameterDirectionKindIn));
     d_ptr->object.setProperty("effect", QVariant::fromValue(QtUml::ParameterEffectKindNone));
     d_ptr->object.setProperty("isException", QVariant::fromValue(false));
     d_ptr->object.setProperty("isStream", QVariant::fromValue(false));
@@ -223,7 +223,7 @@ void QUmlParameter::setOperation(QUmlOperation *operation)
 /*!
     The parameter sets containing the parameter. See ParameterSet.
  */
-QSet<QUmlParameterSet *> QUmlParameter::parameterSet() const
+const QSet<QUmlParameterSet *> QUmlParameter::parameterSet() const
 {
     // This is a read-write association end
 
diff --git a/src/uml/qumlparameter.h b/src/uml/qumlparameter.h
index 318ad75f..151b5bdb 100644
--- a/src/uml/qumlparameter.h
+++ b/src/uml/qumlparameter.h
@@ -77,7 +77,7 @@ public:
     void setStream(bool isStream);
     QUmlOperation *operation() const;
     void setOperation(QUmlOperation *operation);
-    QSet<QUmlParameterSet *> parameterSet() const;
+    const QSet<QUmlParameterSet *> parameterSet() const;
     void addParameterSet(QUmlParameterSet *parameterSet);
     void removeParameterSet(QUmlParameterSet *parameterSet);
 
diff --git a/src/uml/qumlparameterset.cpp b/src/uml/qumlparameterset.cpp
index 611c324f..057d24f4 100644
--- a/src/uml/qumlparameterset.cpp
+++ b/src/uml/qumlparameterset.cpp
@@ -65,7 +65,7 @@ QUmlParameterSet::QUmlParameterSet()
 /*!
     Constraint that should be satisfied for the owner of the parameters in an input parameter set to start execution using the values provided for those parameters, or the owner of the parameters in an output parameter set to end execution providing the values for those parameters, if all preconditions and conditions on input parameter sets were satisfied.
  */
-QSet<QUmlConstraint *> QUmlParameterSet::condition() const
+const QSet<QUmlConstraint *> QUmlParameterSet::condition() const
 {
     // This is a read-write association end
 
@@ -99,7 +99,7 @@ void QUmlParameterSet::removeCondition(QUmlConstraint *condition)
 /*!
     Parameters in the parameter set.
  */
-QSet<QUmlParameter *> QUmlParameterSet::parameter() const
+const QSet<QUmlParameter *> QUmlParameterSet::parameter() const
 {
     // This is a read-write association end
 
diff --git a/src/uml/qumlparameterset.h b/src/uml/qumlparameterset.h
index 65c824cc..c69e97f9 100644
--- a/src/uml/qumlparameterset.h
+++ b/src/uml/qumlparameterset.h
@@ -60,10 +60,10 @@ public:
     QUmlParameterSet();
 
     // Owned attributes
-    QSet<QUmlConstraint *> condition() const;
+    const QSet<QUmlConstraint *> condition() const;
     void addCondition(QUmlConstraint *condition);
     void removeCondition(QUmlConstraint *condition);
-    QSet<QUmlParameter *> parameter() const;
+    const QSet<QUmlParameter *> parameter() const;
     void addParameter(QUmlParameter *parameter);
     void removeParameter(QUmlParameter *parameter);
 
diff --git a/src/uml/qumlport.cpp b/src/uml/qumlport.cpp
index 10bbdd9f..6207870c 100644
--- a/src/uml/qumlport.cpp
+++ b/src/uml/qumlport.cpp
@@ -62,7 +62,7 @@ QUmlPort::QUmlPort() :
 {
     d_ptr->object.setProperty("isBehavior", QVariant::fromValue(false));
     d_ptr->object.setProperty("isConjugated", QVariant::fromValue(false));
-    d_ptr->object.setProperty("isService", QVariant::fromValue(false));
+    d_ptr->object.setProperty("isService", QVariant::fromValue(true));
     d_ptr->object.setProperty("protocol", QVariant::fromValue((QUmlProtocolStateMachine *)(0)));
     d_ptr->object.setProperty("provided", QVariant::fromValue(QSet<QUmlInterface *>()));
     d_ptr->object.setProperty("redefinedPort", QVariant::fromValue(&_redefinedPort));
@@ -150,7 +150,7 @@ void QUmlPort::setProtocol(QUmlProtocolStateMachine *protocol)
 /*!
     References the interfaces specifying the set of operations and receptions that the classifier offers to its environment via this port, and which it will handle either directly or by forwarding it to a part of its internal structure. This association is derived according to the value of isConjugated. If isConjugated is false, provided is derived as the union of the sets of interfaces realized by the type of the port and its supertypes, or directly from the type of the port if the port is typed by an interface. If isConjugated is true, it is derived as the union of the sets of interfaces used by the type of the port and its supertypes.
  */
-QSet<QUmlInterface *> QUmlPort::provided() const
+const QSet<QUmlInterface *> QUmlPort::provided() const
 {
     // This is a read-only derived association end
 
@@ -186,7 +186,7 @@ void QUmlPort::removeProvided(QUmlInterface *provided)
 /*!
     A port may be redefined when its containing classifier is specialized. The redefining port may have additional interfaces to those that are associated with the redefined port or it may replace an interface by one of its subtypes.
  */
-QSet<QUmlPort *> QUmlPort::redefinedPort() const
+const QSet<QUmlPort *> QUmlPort::redefinedPort() const
 {
     // This is a read-write association end
 
@@ -220,7 +220,7 @@ void QUmlPort::removeRedefinedPort(QUmlPort *redefinedPort)
 /*!
     References the interfaces specifying the set of operations and receptions that the classifier expects its environment to handle via this port. This association is derived according to the value of isConjugated. If isConjugated is false, required is derived as the union of the sets of interfaces used by the type of the port and its supertypes. If isConjugated is true, it is derived as the union of the sets of interfaces realized by the type of the port and its supertypes, or directly from the type of the port if the port is typed by an interface.
  */
-QSet<QUmlInterface *> QUmlPort::required() const
+const QSet<QUmlInterface *> QUmlPort::required() const
 {
     // This is a read-only derived association end
 
diff --git a/src/uml/qumlport.h b/src/uml/qumlport.h
index 59c84c92..3eab4945 100644
--- a/src/uml/qumlport.h
+++ b/src/uml/qumlport.h
@@ -68,13 +68,13 @@ public:
     void setService(bool isService);
     QUmlProtocolStateMachine *protocol() const;
     void setProtocol(QUmlProtocolStateMachine *protocol);
-    QSet<QUmlInterface *> provided() const;
+    const QSet<QUmlInterface *> provided() const;
     Q_DECL_HIDDEN void addProvided(QUmlInterface *provided);
     Q_DECL_HIDDEN void removeProvided(QUmlInterface *provided);
-    QSet<QUmlPort *> redefinedPort() const;
+    const QSet<QUmlPort *> redefinedPort() const;
     void addRedefinedPort(QUmlPort *redefinedPort);
     void removeRedefinedPort(QUmlPort *redefinedPort);
-    QSet<QUmlInterface *> required() const;
+    const QSet<QUmlInterface *> required() const;
     Q_DECL_HIDDEN void addRequired(QUmlInterface *required);
     Q_DECL_HIDDEN void removeRequired(QUmlInterface *required);
 
diff --git a/src/uml/qumlprofile.cpp b/src/uml/qumlprofile.cpp
index 2185107c..a25a4a43 100644
--- a/src/uml/qumlprofile.cpp
+++ b/src/uml/qumlprofile.cpp
@@ -65,7 +65,7 @@ QUmlProfile::QUmlProfile()
 /*!
     References a metaclass that may be extended.
  */
-QSet<QUmlElementImport *> QUmlProfile::metaclassReference() const
+const QSet<QUmlElementImport *> QUmlProfile::metaclassReference() const
 {
     // This is a read-write association end
 
@@ -99,7 +99,7 @@ void QUmlProfile::removeMetaclassReference(QUmlElementImport *metaclassReference
 /*!
     References a package containing (directly or indirectly) metaclasses that may be extended.
  */
-QSet<QUmlPackageImport *> QUmlProfile::metamodelReference() const
+const QSet<QUmlPackageImport *> QUmlProfile::metamodelReference() const
 {
     // This is a read-write association end
 
diff --git a/src/uml/qumlprofile.h b/src/uml/qumlprofile.h
index fda14034..30629b98 100644
--- a/src/uml/qumlprofile.h
+++ b/src/uml/qumlprofile.h
@@ -60,10 +60,10 @@ public:
     QUmlProfile();
 
     // Owned attributes
-    QSet<QUmlElementImport *> metaclassReference() const;
+    const QSet<QUmlElementImport *> metaclassReference() const;
     void addMetaclassReference(QUmlElementImport *metaclassReference);
     void removeMetaclassReference(QUmlElementImport *metaclassReference);
-    QSet<QUmlPackageImport *> metamodelReference() const;
+    const QSet<QUmlPackageImport *> metamodelReference() const;
     void addMetamodelReference(QUmlPackageImport *metamodelReference);
     void removeMetamodelReference(QUmlPackageImport *metamodelReference);
 
diff --git a/src/uml/qumlproperty.cpp b/src/uml/qumlproperty.cpp
index 789d9263..45950475 100644
--- a/src/uml/qumlproperty.cpp
+++ b/src/uml/qumlproperty.cpp
@@ -441,7 +441,7 @@ void QUmlProperty::setOwningAssociation(QUmlAssociation *owningAssociation)
 /*!
     An optional list of ordered qualifier attributes for the end. If the list is empty, then the Association is not qualified.
  */
-QList<QUmlProperty *> QUmlProperty::qualifier() const
+const QList<QUmlProperty *> QUmlProperty::qualifier() const
 {
     // This is a read-write association end
 
@@ -475,7 +475,7 @@ void QUmlProperty::removeQualifier(QUmlProperty *qualifier)
 /*!
     References the properties that are redefined by this property.
  */
-QSet<QUmlProperty *> QUmlProperty::redefinedProperty() const
+const QSet<QUmlProperty *> QUmlProperty::redefinedProperty() const
 {
     // This is a read-write association end
 
@@ -509,7 +509,7 @@ void QUmlProperty::removeRedefinedProperty(QUmlProperty *redefinedProperty)
 /*!
     References the properties of which this property is constrained to be a subset.
  */
-QSet<QUmlProperty *> QUmlProperty::subsettedProperty() const
+const QSet<QUmlProperty *> QUmlProperty::subsettedProperty() const
 {
     // This is a read-write association end
 
diff --git a/src/uml/qumlproperty.h b/src/uml/qumlproperty.h
index c9672b94..fe585d40 100644
--- a/src/uml/qumlproperty.h
+++ b/src/uml/qumlproperty.h
@@ -99,13 +99,13 @@ public:
     void setOpposite(QUmlProperty *opposite);
     QUmlAssociation *owningAssociation() const;
     void setOwningAssociation(QUmlAssociation *owningAssociation);
-    QList<QUmlProperty *> qualifier() const;
+    const QList<QUmlProperty *> qualifier() const;
     void addQualifier(QUmlProperty *qualifier);
     void removeQualifier(QUmlProperty *qualifier);
-    QSet<QUmlProperty *> redefinedProperty() const;
+    const QSet<QUmlProperty *> redefinedProperty() const;
     void addRedefinedProperty(QUmlProperty *redefinedProperty);
     void removeRedefinedProperty(QUmlProperty *redefinedProperty);
-    QSet<QUmlProperty *> subsettedProperty() const;
+    const QSet<QUmlProperty *> subsettedProperty() const;
     void addSubsettedProperty(QUmlProperty *subsettedProperty);
     void removeSubsettedProperty(QUmlProperty *subsettedProperty);
 
diff --git a/src/uml/qumlprotocolstatemachine.cpp b/src/uml/qumlprotocolstatemachine.cpp
index 6225a2b1..f74b517c 100644
--- a/src/uml/qumlprotocolstatemachine.cpp
+++ b/src/uml/qumlprotocolstatemachine.cpp
@@ -63,7 +63,7 @@ QUmlProtocolStateMachine::QUmlProtocolStateMachine()
 /*!
     Conformance between protocol state machines.
  */
-QSet<QUmlProtocolConformance *> QUmlProtocolStateMachine::conformance() const
+const QSet<QUmlProtocolConformance *> QUmlProtocolStateMachine::conformance() const
 {
     // This is a read-write association end
 
diff --git a/src/uml/qumlprotocolstatemachine.h b/src/uml/qumlprotocolstatemachine.h
index 9a8742b4..af96bda6 100644
--- a/src/uml/qumlprotocolstatemachine.h
+++ b/src/uml/qumlprotocolstatemachine.h
@@ -59,7 +59,7 @@ public:
     QUmlProtocolStateMachine();
 
     // Owned attributes
-    QSet<QUmlProtocolConformance *> conformance() const;
+    const QSet<QUmlProtocolConformance *> conformance() const;
     void addConformance(QUmlProtocolConformance *conformance);
     void removeConformance(QUmlProtocolConformance *conformance);
 
diff --git a/src/uml/qumlprotocoltransition.cpp b/src/uml/qumlprotocoltransition.cpp
index 1450475c..1235c7d8 100644
--- a/src/uml/qumlprotocoltransition.cpp
+++ b/src/uml/qumlprotocoltransition.cpp
@@ -119,7 +119,7 @@ void QUmlProtocolTransition::setPreCondition(QUmlConstraint *preCondition)
 /*!
     This association refers to the associated operation. It is derived from the operation of the call trigger when applicable.
  */
-QSet<QUmlOperation *> QUmlProtocolTransition::referred() const
+const QSet<QUmlOperation *> QUmlProtocolTransition::referred() const
 {
     // This is a read-only derived association end
 
diff --git a/src/uml/qumlprotocoltransition.h b/src/uml/qumlprotocoltransition.h
index d42ad67f..79914050 100644
--- a/src/uml/qumlprotocoltransition.h
+++ b/src/uml/qumlprotocoltransition.h
@@ -64,7 +64,7 @@ public:
     void setPostCondition(QUmlConstraint *postCondition);
     QUmlConstraint *preCondition() const;
     void setPreCondition(QUmlConstraint *preCondition);
-    QSet<QUmlOperation *> referred() const;
+    const QSet<QUmlOperation *> referred() const;
     Q_DECL_HIDDEN void addReferred(QUmlOperation *referred);
     Q_DECL_HIDDEN void removeReferred(QUmlOperation *referred);
 
diff --git a/src/uml/qumlpseudostate.cpp b/src/uml/qumlpseudostate.cpp
index 7ff29fb2..5750cee6 100644
--- a/src/uml/qumlpseudostate.cpp
+++ b/src/uml/qumlpseudostate.cpp
@@ -59,7 +59,7 @@ QUmlPseudostate::QUmlPseudostate() :
     _state(0),
     _stateMachine(0)
 {
-    d_ptr->object.setProperty("kind", QVariant::fromValue(QtUml::PseudostateKindNone));
+    d_ptr->object.setProperty("kind", QVariant::fromValue(QtUml::PseudostateKindInitial));
     d_ptr->object.setProperty("state", QVariant::fromValue((QUmlState *)(0)));
     d_ptr->object.setProperty("stateMachine", QVariant::fromValue((QUmlStateMachine *)(0)));
 }
diff --git a/src/uml/qumlreclassifyobjectaction.cpp b/src/uml/qumlreclassifyobjectaction.cpp
index 41a04154..aedf61c5 100644
--- a/src/uml/qumlreclassifyobjectaction.cpp
+++ b/src/uml/qumlreclassifyobjectaction.cpp
@@ -88,7 +88,7 @@ void QUmlReclassifyObjectAction::setReplaceAll(bool isReplaceAll)
 /*!
     A set of classifiers to be added to the classifiers of the object.
  */
-QSet<QUmlClassifier *> QUmlReclassifyObjectAction::newClassifier() const
+const QSet<QUmlClassifier *> QUmlReclassifyObjectAction::newClassifier() const
 {
     // This is a read-write association end
 
@@ -143,7 +143,7 @@ void QUmlReclassifyObjectAction::setObject(QUmlInputPin *object)
 /*!
     A set of classifiers to be removed from the classifiers of the object.
  */
-QSet<QUmlClassifier *> QUmlReclassifyObjectAction::oldClassifier() const
+const QSet<QUmlClassifier *> QUmlReclassifyObjectAction::oldClassifier() const
 {
     // This is a read-write association end
 
diff --git a/src/uml/qumlreclassifyobjectaction.h b/src/uml/qumlreclassifyobjectaction.h
index 691e5ae1..56ccf86d 100644
--- a/src/uml/qumlreclassifyobjectaction.h
+++ b/src/uml/qumlreclassifyobjectaction.h
@@ -62,12 +62,12 @@ public:
     // Owned attributes
     bool isReplaceAll() const;
     void setReplaceAll(bool isReplaceAll);
-    QSet<QUmlClassifier *> newClassifier() const;
+    const QSet<QUmlClassifier *> newClassifier() const;
     void addNewClassifier(QUmlClassifier *newClassifier);
     void removeNewClassifier(QUmlClassifier *newClassifier);
     QUmlInputPin *object() const;
     void setObject(QUmlInputPin *object);
-    QSet<QUmlClassifier *> oldClassifier() const;
+    const QSet<QUmlClassifier *> oldClassifier() const;
     void addOldClassifier(QUmlClassifier *oldClassifier);
     void removeOldClassifier(QUmlClassifier *oldClassifier);
 
diff --git a/src/uml/qumlredefinableelement.cpp b/src/uml/qumlredefinableelement.cpp
index 0095dde3..77aa3451 100644
--- a/src/uml/qumlredefinableelement.cpp
+++ b/src/uml/qumlredefinableelement.cpp
@@ -85,7 +85,7 @@ void QUmlRedefinableElement::setLeaf(bool isLeaf)
 /*!
     The redefinable element that is being redefined by this element.
  */
-QSet<QUmlRedefinableElement *> QUmlRedefinableElement::redefinedElement() const
+const QSet<QUmlRedefinableElement *> QUmlRedefinableElement::redefinedElement() const
 {
     // This is a read-only derived union association end
 
@@ -113,7 +113,7 @@ void QUmlRedefinableElement::removeRedefinedElement(QUmlRedefinableElement *rede
 /*!
     References the contexts that this element may be redefined from.
  */
-QSet<QUmlClassifier *> QUmlRedefinableElement::redefinitionContext() const
+const QSet<QUmlClassifier *> QUmlRedefinableElement::redefinitionContext() const
 {
     // This is a read-only derived union association end
 
diff --git a/src/uml/qumlredefinableelement.h b/src/uml/qumlredefinableelement.h
index dc87a68e..adef346a 100644
--- a/src/uml/qumlredefinableelement.h
+++ b/src/uml/qumlredefinableelement.h
@@ -61,10 +61,10 @@ public:
     // Owned attributes
     bool isLeaf() const;
     void setLeaf(bool isLeaf);
-    QSet<QUmlRedefinableElement *> redefinedElement() const;
+    const QSet<QUmlRedefinableElement *> redefinedElement() const;
     Q_DECL_HIDDEN void addRedefinedElement(QUmlRedefinableElement *redefinedElement);
     Q_DECL_HIDDEN void removeRedefinedElement(QUmlRedefinableElement *redefinedElement);
-    QSet<QUmlClassifier *> redefinitionContext() const;
+    const QSet<QUmlClassifier *> redefinitionContext() const;
     Q_DECL_HIDDEN void addRedefinitionContext(QUmlClassifier *redefinitionContext);
     Q_DECL_HIDDEN void removeRedefinitionContext(QUmlClassifier *redefinitionContext);
 
diff --git a/src/uml/qumlredefinabletemplatesignature.cpp b/src/uml/qumlredefinabletemplatesignature.cpp
index faf2dca2..c1a82cc6 100644
--- a/src/uml/qumlredefinabletemplatesignature.cpp
+++ b/src/uml/qumlredefinabletemplatesignature.cpp
@@ -94,7 +94,7 @@ void QUmlRedefinableTemplateSignature::setClassifier(QUmlClassifier *classifier)
 /*!
     The template signature that is extended by this template signature.
  */
-QSet<QUmlRedefinableTemplateSignature *> QUmlRedefinableTemplateSignature::extendedSignature() const
+const QSet<QUmlRedefinableTemplateSignature *> QUmlRedefinableTemplateSignature::extendedSignature() const
 {
     // This is a read-write association end
 
@@ -128,7 +128,7 @@ void QUmlRedefinableTemplateSignature::removeExtendedSignature(QUmlRedefinableTe
 /*!
     The formal template parameters of the extendedSignature.
  */
-QSet<QUmlTemplateParameter *> QUmlRedefinableTemplateSignature::inheritedParameter() const
+const QSet<QUmlTemplateParameter *> QUmlRedefinableTemplateSignature::inheritedParameter() const
 {
     // This is a read-only derived association end
 
diff --git a/src/uml/qumlredefinabletemplatesignature.h b/src/uml/qumlredefinabletemplatesignature.h
index 4496fbfb..92ce208a 100644
--- a/src/uml/qumlredefinabletemplatesignature.h
+++ b/src/uml/qumlredefinabletemplatesignature.h
@@ -63,10 +63,10 @@ public:
     // Owned attributes
     QUmlClassifier *classifier() const;
     void setClassifier(QUmlClassifier *classifier);
-    QSet<QUmlRedefinableTemplateSignature *> extendedSignature() const;
+    const QSet<QUmlRedefinableTemplateSignature *> extendedSignature() const;
     void addExtendedSignature(QUmlRedefinableTemplateSignature *extendedSignature);
     void removeExtendedSignature(QUmlRedefinableTemplateSignature *extendedSignature);
-    QSet<QUmlTemplateParameter *> inheritedParameter() const;
+    const QSet<QUmlTemplateParameter *> inheritedParameter() const;
     Q_DECL_HIDDEN void addInheritedParameter(QUmlTemplateParameter *inheritedParameter);
     Q_DECL_HIDDEN void removeInheritedParameter(QUmlTemplateParameter *inheritedParameter);
 
diff --git a/src/uml/qumlregion.cpp b/src/uml/qumlregion.cpp
index 2fa614ea..2bd66360 100644
--- a/src/uml/qumlregion.cpp
+++ b/src/uml/qumlregion.cpp
@@ -174,7 +174,7 @@ void QUmlRegion::setStateMachine(QUmlStateMachine *stateMachine)
 /*!
     The set of vertices that are owned by this region.
  */
-QSet<QUmlVertex *> QUmlRegion::subvertex() const
+const QSet<QUmlVertex *> QUmlRegion::subvertex() const
 {
     // This is a read-write association end
 
@@ -218,7 +218,7 @@ void QUmlRegion::removeSubvertex(QUmlVertex *subvertex)
 /*!
     The set of transitions owned by the region.
  */
-QSet<QUmlTransition *> QUmlRegion::transition() const
+const QSet<QUmlTransition *> QUmlRegion::transition() const
 {
     // This is a read-write association end
 
diff --git a/src/uml/qumlregion.h b/src/uml/qumlregion.h
index 8871ea65..dfeb86d2 100644
--- a/src/uml/qumlregion.h
+++ b/src/uml/qumlregion.h
@@ -72,10 +72,10 @@ public:
     void setState(QUmlState *state);
     QUmlStateMachine *stateMachine() const;
     void setStateMachine(QUmlStateMachine *stateMachine);
-    QSet<QUmlVertex *> subvertex() const;
+    const QSet<QUmlVertex *> subvertex() const;
     void addSubvertex(QUmlVertex *subvertex);
     void removeSubvertex(QUmlVertex *subvertex);
-    QSet<QUmlTransition *> transition() const;
+    const QSet<QUmlTransition *> transition() const;
     void addTransition(QUmlTransition *transition);
     void removeTransition(QUmlTransition *transition);
 
diff --git a/src/uml/qumlrelationship.cpp b/src/uml/qumlrelationship.cpp
index 51ce440f..31394580 100644
--- a/src/uml/qumlrelationship.cpp
+++ b/src/uml/qumlrelationship.cpp
@@ -61,7 +61,7 @@ QUmlRelationship::QUmlRelationship()
 /*!
     Specifies the elements related by the Relationship.
  */
-QSet<QUmlElement *> QUmlRelationship::relatedElement() const
+const QSet<QUmlElement *> QUmlRelationship::relatedElement() const
 {
     // This is a read-only derived union association end
 
diff --git a/src/uml/qumlrelationship.h b/src/uml/qumlrelationship.h
index 9c0b43a2..12c62469 100644
--- a/src/uml/qumlrelationship.h
+++ b/src/uml/qumlrelationship.h
@@ -57,7 +57,7 @@ public:
     Q_DECL_HIDDEN QUmlRelationship();
 
     // Owned attributes
-    QSet<QUmlElement *> relatedElement() const;
+    const QSet<QUmlElement *> relatedElement() const;
     Q_DECL_HIDDEN void addRelatedElement(QUmlElement *relatedElement);
     Q_DECL_HIDDEN void removeRelatedElement(QUmlElement *relatedElement);
 
diff --git a/src/uml/qumlreplyaction.cpp b/src/uml/qumlreplyaction.cpp
index 438bb827..573dcc47 100644
--- a/src/uml/qumlreplyaction.cpp
+++ b/src/uml/qumlreplyaction.cpp
@@ -87,7 +87,7 @@ void QUmlReplyAction::setReplyToCall(QUmlTrigger *replyToCall)
 /*!
     A list of pins containing the reply values of the operation. These values are returned to the caller.
  */
-QSet<QUmlInputPin *> QUmlReplyAction::replyValue() const
+const QSet<QUmlInputPin *> QUmlReplyAction::replyValue() const
 {
     // This is a read-write association end
 
diff --git a/src/uml/qumlreplyaction.h b/src/uml/qumlreplyaction.h
index 8cee6bd5..44144151 100644
--- a/src/uml/qumlreplyaction.h
+++ b/src/uml/qumlreplyaction.h
@@ -62,7 +62,7 @@ public:
     // Owned attributes
     QUmlTrigger *replyToCall() const;
     void setReplyToCall(QUmlTrigger *replyToCall);
-    QSet<QUmlInputPin *> replyValue() const;
+    const QSet<QUmlInputPin *> replyValue() const;
     void addReplyValue(QUmlInputPin *replyValue);
     void removeReplyValue(QUmlInputPin *replyValue);
     QUmlInputPin *returnInformation() const;
diff --git a/src/uml/qumlsequencenode.cpp b/src/uml/qumlsequencenode.cpp
index 22ea54b2..49031b95 100644
--- a/src/uml/qumlsequencenode.cpp
+++ b/src/uml/qumlsequencenode.cpp
@@ -63,7 +63,7 @@ QUmlSequenceNode::QUmlSequenceNode()
 /*!
     An ordered set of executable nodes.
  */
-QList<QUmlExecutableNode *> QUmlSequenceNode::executableNode() const
+const QList<QUmlExecutableNode *> QUmlSequenceNode::executableNode() const
 {
     // This is a read-write association end
 
diff --git a/src/uml/qumlsequencenode.h b/src/uml/qumlsequencenode.h
index fbc6d6fb..cc952a3b 100644
--- a/src/uml/qumlsequencenode.h
+++ b/src/uml/qumlsequencenode.h
@@ -59,7 +59,7 @@ public:
     QUmlSequenceNode();
 
     // Owned attributes
-    QList<QUmlExecutableNode *> executableNode() const;
+    const QList<QUmlExecutableNode *> executableNode() const;
     void addExecutableNode(QUmlExecutableNode *executableNode);
     void removeExecutableNode(QUmlExecutableNode *executableNode);
 
diff --git a/src/uml/qumlsignal.cpp b/src/uml/qumlsignal.cpp
index 873dc96b..ca5dce18 100644
--- a/src/uml/qumlsignal.cpp
+++ b/src/uml/qumlsignal.cpp
@@ -63,7 +63,7 @@ QUmlSignal::QUmlSignal()
 /*!
     The attributes owned by the signal.
  */
-QList<QUmlProperty *> QUmlSignal::ownedAttribute() const
+const QList<QUmlProperty *> QUmlSignal::ownedAttribute() const
 {
     // This is a read-write association end
 
diff --git a/src/uml/qumlsignal.h b/src/uml/qumlsignal.h
index 114e419a..d8dcad62 100644
--- a/src/uml/qumlsignal.h
+++ b/src/uml/qumlsignal.h
@@ -59,7 +59,7 @@ public:
     QUmlSignal();
 
     // Owned attributes
-    QList<QUmlProperty *> ownedAttribute() const;
+    const QList<QUmlProperty *> ownedAttribute() const;
     void addOwnedAttribute(QUmlProperty *ownedAttribute);
     void removeOwnedAttribute(QUmlProperty *ownedAttribute);
 
diff --git a/src/uml/qumlslot.cpp b/src/uml/qumlslot.cpp
index e60b1fb6..96fcc407 100644
--- a/src/uml/qumlslot.cpp
+++ b/src/uml/qumlslot.cpp
@@ -112,7 +112,7 @@ void QUmlSlot::setOwningInstance(QUmlInstanceSpecification *owningInstance)
 /*!
     The value or values corresponding to the defining feature for the owning instance specification.
  */
-QList<QUmlValueSpecification *> QUmlSlot::value() const
+const QList<QUmlValueSpecification *> QUmlSlot::value() const
 {
     // This is a read-write association end
 
diff --git a/src/uml/qumlslot.h b/src/uml/qumlslot.h
index 2e8904cb..cd7ae192 100644
--- a/src/uml/qumlslot.h
+++ b/src/uml/qumlslot.h
@@ -65,7 +65,7 @@ public:
     void setDefiningFeature(QUmlStructuralFeature *definingFeature);
     QUmlInstanceSpecification *owningInstance() const;
     void setOwningInstance(QUmlInstanceSpecification *owningInstance);
-    QList<QUmlValueSpecification *> value() const;
+    const QList<QUmlValueSpecification *> value() const;
     void addValue(QUmlValueSpecification *value);
     void removeValue(QUmlValueSpecification *value);
 
diff --git a/src/uml/qumlstate.cpp b/src/uml/qumlstate.cpp
index 56c02351..92678af7 100644
--- a/src/uml/qumlstate.cpp
+++ b/src/uml/qumlstate.cpp
@@ -76,7 +76,7 @@ QUmlState::QUmlState() :
     d_ptr->object.setProperty("exit", QVariant::fromValue((QUmlBehavior *)(0)));
     d_ptr->object.setProperty("isComposite", QVariant::fromValue(false));
     d_ptr->object.setProperty("isOrthogonal", QVariant::fromValue(false));
-    d_ptr->object.setProperty("isSimple", QVariant::fromValue(false));
+    d_ptr->object.setProperty("isSimple", QVariant::fromValue(true));
     d_ptr->object.setProperty("isSubmachineState", QVariant::fromValue(false));
     d_ptr->object.setProperty("redefinedState", QVariant::fromValue((QUmlState *)(0)));
     d_ptr->object.setProperty("redefinitionContext", QVariant::fromValue((QUmlClassifier *)(0)));
@@ -90,7 +90,7 @@ QUmlState::QUmlState() :
 /*!
     The entry and exit connection points used in conjunction with this (submachine) state, i.e. as targets and sources, respectively, in the region with the submachine state. A connection point reference references the corresponding definition of a connection point pseudostate in the statemachine referenced by the submachinestate.
  */
-QSet<QUmlConnectionPointReference *> QUmlState::connection() const
+const QSet<QUmlConnectionPointReference *> QUmlState::connection() const
 {
     // This is a read-write association end
 
@@ -134,7 +134,7 @@ void QUmlState::removeConnection(QUmlConnectionPointReference *connection)
 /*!
     The entry and exit pseudostates of a composite state. These can only be entry or exit Pseudostates, and they must have different names. They can only be defined for composite states.
  */
-QSet<QUmlPseudostate *> QUmlState::connectionPoint() const
+const QSet<QUmlPseudostate *> QUmlState::connectionPoint() const
 {
     // This is a read-write association end
 
@@ -178,7 +178,7 @@ void QUmlState::removeConnectionPoint(QUmlPseudostate *connectionPoint)
 /*!
     A list of triggers that are candidates to be retained by the state machine if they trigger no transitions out of the state (not consumed). A deferred trigger is retained until the state machine reaches a state configuration where it is no longer deferred.
  */
-QSet<QUmlTrigger *> QUmlState::deferrableTrigger() const
+const QSet<QUmlTrigger *> QUmlState::deferrableTrigger() const
 {
     // This is a read-write association end
 
@@ -440,7 +440,7 @@ void QUmlState::setRedefinitionContext(QUmlClassifier *redefinitionContext)
 /*!
     The regions owned directly by the state.
  */
-QSet<QUmlRegion *> QUmlState::region() const
+const QSet<QUmlRegion *> QUmlState::region() const
 {
     // This is a read-write association end
 
diff --git a/src/uml/qumlstate.h b/src/uml/qumlstate.h
index 80b7a59c..655ca16b 100644
--- a/src/uml/qumlstate.h
+++ b/src/uml/qumlstate.h
@@ -68,13 +68,13 @@ public:
     QUmlState();
 
     // Owned attributes
-    QSet<QUmlConnectionPointReference *> connection() const;
+    const QSet<QUmlConnectionPointReference *> connection() const;
     void addConnection(QUmlConnectionPointReference *connection);
     void removeConnection(QUmlConnectionPointReference *connection);
-    QSet<QUmlPseudostate *> connectionPoint() const;
+    const QSet<QUmlPseudostate *> connectionPoint() const;
     void addConnectionPoint(QUmlPseudostate *connectionPoint);
     void removeConnectionPoint(QUmlPseudostate *connectionPoint);
-    QSet<QUmlTrigger *> deferrableTrigger() const;
+    const QSet<QUmlTrigger *> deferrableTrigger() const;
     void addDeferrableTrigger(QUmlTrigger *deferrableTrigger);
     void removeDeferrableTrigger(QUmlTrigger *deferrableTrigger);
     QUmlBehavior *doActivity() const;
@@ -95,7 +95,7 @@ public:
     void setRedefinedState(QUmlState *redefinedState);
     QUmlClassifier *redefinitionContext() const;
     Q_DECL_HIDDEN void setRedefinitionContext(QUmlClassifier *redefinitionContext);
-    QSet<QUmlRegion *> region() const;
+    const QSet<QUmlRegion *> region() const;
     void addRegion(QUmlRegion *region);
     void removeRegion(QUmlRegion *region);
     QUmlConstraint *stateInvariant() const;
diff --git a/src/uml/qumlstatemachine.cpp b/src/uml/qumlstatemachine.cpp
index 7db5c1dc..50123d01 100644
--- a/src/uml/qumlstatemachine.cpp
+++ b/src/uml/qumlstatemachine.cpp
@@ -70,7 +70,7 @@ QUmlStateMachine::QUmlStateMachine()
 /*!
     The connection points defined for this state machine. They represent the interface of the state machine when used as part of submachine state.
  */
-QSet<QUmlPseudostate *> QUmlStateMachine::connectionPoint() const
+const QSet<QUmlPseudostate *> QUmlStateMachine::connectionPoint() const
 {
     // This is a read-write association end
 
@@ -114,7 +114,7 @@ void QUmlStateMachine::removeConnectionPoint(QUmlPseudostate *connectionPoint)
 /*!
     The state machines of which this is an extension.
  */
-QSet<QUmlStateMachine *> QUmlStateMachine::extendedStateMachine() const
+const QSet<QUmlStateMachine *> QUmlStateMachine::extendedStateMachine() const
 {
     // This is a read-write association end
 
@@ -142,7 +142,7 @@ void QUmlStateMachine::removeExtendedStateMachine(QUmlStateMachine *extendedStat
 /*!
     The regions owned directly by the state machine.
  */
-QSet<QUmlRegion *> QUmlStateMachine::region() const
+const QSet<QUmlRegion *> QUmlStateMachine::region() const
 {
     // This is a read-write association end
 
@@ -186,7 +186,7 @@ void QUmlStateMachine::removeRegion(QUmlRegion *region)
 /*!
     References the submachine(s) in case of a submachine state. Multiple machines are referenced in case of a concurrent state.
  */
-QSet<QUmlState *> QUmlStateMachine::submachineState() const
+const QSet<QUmlState *> QUmlStateMachine::submachineState() const
 {
     // This is a read-write association end
 
diff --git a/src/uml/qumlstatemachine.h b/src/uml/qumlstatemachine.h
index b6c11203..98153876 100644
--- a/src/uml/qumlstatemachine.h
+++ b/src/uml/qumlstatemachine.h
@@ -63,16 +63,16 @@ public:
     QUmlStateMachine();
 
     // Owned attributes
-    QSet<QUmlPseudostate *> connectionPoint() const;
+    const QSet<QUmlPseudostate *> connectionPoint() const;
     void addConnectionPoint(QUmlPseudostate *connectionPoint);
     void removeConnectionPoint(QUmlPseudostate *connectionPoint);
-    QSet<QUmlStateMachine *> extendedStateMachine() const;
+    const QSet<QUmlStateMachine *> extendedStateMachine() const;
     void addExtendedStateMachine(QUmlStateMachine *extendedStateMachine);
     void removeExtendedStateMachine(QUmlStateMachine *extendedStateMachine);
-    QSet<QUmlRegion *> region() const;
+    const QSet<QUmlRegion *> region() const;
     void addRegion(QUmlRegion *region);
     void removeRegion(QUmlRegion *region);
-    QSet<QUmlState *> submachineState() const;
+    const QSet<QUmlState *> submachineState() const;
     void addSubmachineState(QUmlState *submachineState);
     void removeSubmachineState(QUmlState *submachineState);
 
diff --git a/src/uml/qumlstereotype.cpp b/src/uml/qumlstereotype.cpp
index 2c204ecc..ee428c79 100644
--- a/src/uml/qumlstereotype.cpp
+++ b/src/uml/qumlstereotype.cpp
@@ -65,7 +65,7 @@ QUmlStereotype::QUmlStereotype()
 /*!
     Stereotype can change the graphical appearance of the extended model element by using attached icons. When this association is not null, it references the location of the icon content to be displayed within diagrams presenting the extended model elements.
  */
-QSet<QUmlImage *> QUmlStereotype::icon() const
+const QSet<QUmlImage *> QUmlStereotype::icon() const
 {
     // This is a read-write association end
 
diff --git a/src/uml/qumlstereotype.h b/src/uml/qumlstereotype.h
index fa014e3a..56086c82 100644
--- a/src/uml/qumlstereotype.h
+++ b/src/uml/qumlstereotype.h
@@ -60,7 +60,7 @@ public:
     QUmlStereotype();
 
     // Owned attributes
-    QSet<QUmlImage *> icon() const;
+    const QSet<QUmlImage *> icon() const;
     void addIcon(QUmlImage *icon);
     void removeIcon(QUmlImage *icon);
     QUmlProfile *profile() const;
diff --git a/src/uml/qumlstringexpression.cpp b/src/uml/qumlstringexpression.cpp
index 6b30f7f9..7d6c4413 100644
--- a/src/uml/qumlstringexpression.cpp
+++ b/src/uml/qumlstringexpression.cpp
@@ -87,7 +87,7 @@ void QUmlStringExpression::setOwningExpression(QUmlStringExpression *owningExpre
 /*!
     The StringExpressions that constitute this StringExpression.
  */
-QSet<QUmlStringExpression *> QUmlStringExpression::subExpression() const
+const QSet<QUmlStringExpression *> QUmlStringExpression::subExpression() const
 {
     // This is a read-write association end
 
diff --git a/src/uml/qumlstringexpression.h b/src/uml/qumlstringexpression.h
index 68f2c02e..ca3f96ac 100644
--- a/src/uml/qumlstringexpression.h
+++ b/src/uml/qumlstringexpression.h
@@ -60,7 +60,7 @@ public:
     // Owned attributes
     QUmlStringExpression *owningExpression() const;
     void setOwningExpression(QUmlStringExpression *owningExpression);
-    QSet<QUmlStringExpression *> subExpression() const;
+    const QSet<QUmlStringExpression *> subExpression() const;
     void addSubExpression(QUmlStringExpression *subExpression);
     void removeSubExpression(QUmlStringExpression *subExpression);
 
diff --git a/src/uml/qumlstructuredactivitynode.cpp b/src/uml/qumlstructuredactivitynode.cpp
index 8bc8d7ff..1a7720b4 100644
--- a/src/uml/qumlstructuredactivitynode.cpp
+++ b/src/uml/qumlstructuredactivitynode.cpp
@@ -95,7 +95,7 @@ void QUmlStructuredActivityNode::setActivity(QUmlActivity *activity)
 /*!
     Edges immediately contained in the structured node.
  */
-QSet<QUmlActivityEdge *> QUmlStructuredActivityNode::edge() const
+const QSet<QUmlActivityEdge *> QUmlStructuredActivityNode::edge() const
 {
     // This is a read-write association end
 
@@ -160,7 +160,7 @@ void QUmlStructuredActivityNode::setMustIsolate(bool mustIsolate)
 /*!
     Nodes immediately contained in the group.
  */
-QSet<QUmlActivityNode *> QUmlStructuredActivityNode::node() const
+const QSet<QUmlActivityNode *> QUmlStructuredActivityNode::node() const
 {
     // This is a read-write association end
 
@@ -203,7 +203,7 @@ void QUmlStructuredActivityNode::removeNode(QUmlActivityNode *node)
     }
 }
 
-QSet<QUmlInputPin *> QUmlStructuredActivityNode::structuredNodeInput() const
+const QSet<QUmlInputPin *> QUmlStructuredActivityNode::structuredNodeInput() const
 {
     // This is a read-write association end
 
@@ -234,7 +234,7 @@ void QUmlStructuredActivityNode::removeStructuredNodeInput(QUmlInputPin *structu
     }
 }
 
-QSet<QUmlOutputPin *> QUmlStructuredActivityNode::structuredNodeOutput() const
+const QSet<QUmlOutputPin *> QUmlStructuredActivityNode::structuredNodeOutput() const
 {
     // This is a read-write association end
 
@@ -268,7 +268,7 @@ void QUmlStructuredActivityNode::removeStructuredNodeOutput(QUmlOutputPin *struc
 /*!
     A variable defined in the scope of the structured activity node. It has no value and may not be accessed
  */
-QSet<QUmlVariable *> QUmlStructuredActivityNode::variable() const
+const QSet<QUmlVariable *> QUmlStructuredActivityNode::variable() const
 {
     // This is a read-write association end
 
diff --git a/src/uml/qumlstructuredactivitynode.h b/src/uml/qumlstructuredactivitynode.h
index 0845203f..f24f7fee 100644
--- a/src/uml/qumlstructuredactivitynode.h
+++ b/src/uml/qumlstructuredactivitynode.h
@@ -68,21 +68,21 @@ public:
     // Owned attributes
     QUmlActivity *activity() const;
     void setActivity(QUmlActivity *activity);
-    QSet<QUmlActivityEdge *> edge() const;
+    const QSet<QUmlActivityEdge *> edge() const;
     void addEdge(QUmlActivityEdge *edge);
     void removeEdge(QUmlActivityEdge *edge);
     bool mustIsolate() const;
     void setMustIsolate(bool mustIsolate);
-    QSet<QUmlActivityNode *> node() const;
+    const QSet<QUmlActivityNode *> node() const;
     void addNode(QUmlActivityNode *node);
     void removeNode(QUmlActivityNode *node);
-    QSet<QUmlInputPin *> structuredNodeInput() const;
+    const QSet<QUmlInputPin *> structuredNodeInput() const;
     void addStructuredNodeInput(QUmlInputPin *structuredNodeInput);
     void removeStructuredNodeInput(QUmlInputPin *structuredNodeInput);
-    QSet<QUmlOutputPin *> structuredNodeOutput() const;
+    const QSet<QUmlOutputPin *> structuredNodeOutput() const;
     void addStructuredNodeOutput(QUmlOutputPin *structuredNodeOutput);
     void removeStructuredNodeOutput(QUmlOutputPin *structuredNodeOutput);
-    QSet<QUmlVariable *> variable() const;
+    const QSet<QUmlVariable *> variable() const;
     void addVariable(QUmlVariable *variable);
     void removeVariable(QUmlVariable *variable);
 
diff --git a/src/uml/qumlstructuredclassifier.cpp b/src/uml/qumlstructuredclassifier.cpp
index 105fc654..af301b62 100644
--- a/src/uml/qumlstructuredclassifier.cpp
+++ b/src/uml/qumlstructuredclassifier.cpp
@@ -68,7 +68,7 @@ QUmlStructuredClassifier::QUmlStructuredClassifier()
 /*!
     References the properties owned by the classifier.
  */
-QList<QUmlProperty *> QUmlStructuredClassifier::ownedAttribute() const
+const QList<QUmlProperty *> QUmlStructuredClassifier::ownedAttribute() const
 {
     // This is a read-write association end
 
@@ -106,7 +106,7 @@ void QUmlStructuredClassifier::removeOwnedAttribute(QUmlProperty *ownedAttribute
 /*!
     References the connectors owned by the classifier.
  */
-QSet<QUmlConnector *> QUmlStructuredClassifier::ownedConnector() const
+const QSet<QUmlConnector *> QUmlStructuredClassifier::ownedConnector() const
 {
     // This is a read-write association end
 
@@ -142,7 +142,7 @@ void QUmlStructuredClassifier::removeOwnedConnector(QUmlConnector *ownedConnecto
 /*!
     References the properties specifying instances that the classifier owns by composition. This association is derived, selecting those owned properties where isComposite is true.
  */
-QSet<QUmlProperty *> QUmlStructuredClassifier::part() const
+const QSet<QUmlProperty *> QUmlStructuredClassifier::part() const
 {
     // This is a read-only derived association end
 
@@ -178,7 +178,7 @@ void QUmlStructuredClassifier::removePart(QUmlProperty *part)
 /*!
     References the roles that instances may play in this classifier.
  */
-QSet<QUmlConnectableElement *> QUmlStructuredClassifier::role() const
+const QSet<QUmlConnectableElement *> QUmlStructuredClassifier::role() const
 {
     // This is a read-only derived union association end
 
diff --git a/src/uml/qumlstructuredclassifier.h b/src/uml/qumlstructuredclassifier.h
index 7e4c39ef..65a5d098 100644
--- a/src/uml/qumlstructuredclassifier.h
+++ b/src/uml/qumlstructuredclassifier.h
@@ -61,16 +61,16 @@ public:
     Q_DECL_HIDDEN QUmlStructuredClassifier();
 
     // Owned attributes
-    QList<QUmlProperty *> ownedAttribute() const;
+    const QList<QUmlProperty *> ownedAttribute() const;
     void addOwnedAttribute(QUmlProperty *ownedAttribute);
     void removeOwnedAttribute(QUmlProperty *ownedAttribute);
-    QSet<QUmlConnector *> ownedConnector() const;
+    const QSet<QUmlConnector *> ownedConnector() const;
     void addOwnedConnector(QUmlConnector *ownedConnector);
     void removeOwnedConnector(QUmlConnector *ownedConnector);
-    QSet<QUmlProperty *> part() const;
+    const QSet<QUmlProperty *> part() const;
     Q_DECL_HIDDEN void addPart(QUmlProperty *part);
     Q_DECL_HIDDEN void removePart(QUmlProperty *part);
-    QSet<QUmlConnectableElement *> role() const;
+    const QSet<QUmlConnectableElement *> role() const;
     Q_DECL_HIDDEN void addRole(QUmlConnectableElement *role);
     Q_DECL_HIDDEN void removeRole(QUmlConnectableElement *role);
 
diff --git a/src/uml/qumltemplateableelement.cpp b/src/uml/qumltemplateableelement.cpp
index c6c20ecb..7da278eb 100644
--- a/src/uml/qumltemplateableelement.cpp
+++ b/src/uml/qumltemplateableelement.cpp
@@ -94,7 +94,7 @@ void QUmlTemplateableElement::setOwnedTemplateSignature(QUmlTemplateSignature *o
 /*!
     The optional bindings from this element to templates.
  */
-QSet<QUmlTemplateBinding *> QUmlTemplateableElement::templateBinding() const
+const QSet<QUmlTemplateBinding *> QUmlTemplateableElement::templateBinding() const
 {
     // This is a read-write association end
 
diff --git a/src/uml/qumltemplateableelement.h b/src/uml/qumltemplateableelement.h
index 21c661c2..b4bebfac 100644
--- a/src/uml/qumltemplateableelement.h
+++ b/src/uml/qumltemplateableelement.h
@@ -63,7 +63,7 @@ public:
     // Owned attributes
     QUmlTemplateSignature *ownedTemplateSignature() const;
     void setOwnedTemplateSignature(QUmlTemplateSignature *ownedTemplateSignature);
-    QSet<QUmlTemplateBinding *> templateBinding() const;
+    const QSet<QUmlTemplateBinding *> templateBinding() const;
     void addTemplateBinding(QUmlTemplateBinding *templateBinding);
     void removeTemplateBinding(QUmlTemplateBinding *templateBinding);
 
diff --git a/src/uml/qumltemplatebinding.cpp b/src/uml/qumltemplatebinding.cpp
index ef6fe6c7..55127b7e 100644
--- a/src/uml/qumltemplatebinding.cpp
+++ b/src/uml/qumltemplatebinding.cpp
@@ -97,7 +97,7 @@ void QUmlTemplateBinding::setBoundElement(QUmlTemplateableElement *boundElement)
 /*!
     The parameter substitutions owned by this template binding.
  */
-QSet<QUmlTemplateParameterSubstitution *> QUmlTemplateBinding::parameterSubstitution() const
+const QSet<QUmlTemplateParameterSubstitution *> QUmlTemplateBinding::parameterSubstitution() const
 {
     // This is a read-write association end
 
diff --git a/src/uml/qumltemplatebinding.h b/src/uml/qumltemplatebinding.h
index 4a4b3178..da7fae95 100644
--- a/src/uml/qumltemplatebinding.h
+++ b/src/uml/qumltemplatebinding.h
@@ -63,7 +63,7 @@ public:
     // Owned attributes
     QUmlTemplateableElement *boundElement() const;
     void setBoundElement(QUmlTemplateableElement *boundElement);
-    QSet<QUmlTemplateParameterSubstitution *> parameterSubstitution() const;
+    const QSet<QUmlTemplateParameterSubstitution *> parameterSubstitution() const;
     void addParameterSubstitution(QUmlTemplateParameterSubstitution *parameterSubstitution);
     void removeParameterSubstitution(QUmlTemplateParameterSubstitution *parameterSubstitution);
     QUmlTemplateSignature *signature() const;
diff --git a/src/uml/qumltemplatesignature.cpp b/src/uml/qumltemplatesignature.cpp
index 8c4e4a79..c1fc6719 100644
--- a/src/uml/qumltemplatesignature.cpp
+++ b/src/uml/qumltemplatesignature.cpp
@@ -67,7 +67,7 @@ QUmlTemplateSignature::QUmlTemplateSignature() :
 /*!
     The formal template parameters that are owned by this template signature.
  */
-QList<QUmlTemplateParameter *> QUmlTemplateSignature::ownedParameter() const
+const QList<QUmlTemplateParameter *> QUmlTemplateSignature::ownedParameter() const
 {
     // This is a read-write association end
 
@@ -113,7 +113,7 @@ void QUmlTemplateSignature::removeOwnedParameter(QUmlTemplateParameter *ownedPar
 /*!
     The ordered set of all formal template parameters for this template signature.
  */
-QList<QUmlTemplateParameter *> QUmlTemplateSignature::parameter() const
+const QList<QUmlTemplateParameter *> QUmlTemplateSignature::parameter() const
 {
     // This is a read-write association end
 
diff --git a/src/uml/qumltemplatesignature.h b/src/uml/qumltemplatesignature.h
index 304cf143..40f8e655 100644
--- a/src/uml/qumltemplatesignature.h
+++ b/src/uml/qumltemplatesignature.h
@@ -60,10 +60,10 @@ public:
     QUmlTemplateSignature();
 
     // Owned attributes
-    QList<QUmlTemplateParameter *> ownedParameter() const;
+    const QList<QUmlTemplateParameter *> ownedParameter() const;
     void addOwnedParameter(QUmlTemplateParameter *ownedParameter);
     void removeOwnedParameter(QUmlTemplateParameter *ownedParameter);
-    QList<QUmlTemplateParameter *> parameter() const;
+    const QList<QUmlTemplateParameter *> parameter() const;
     void addParameter(QUmlTemplateParameter *parameter);
     void removeParameter(QUmlTemplateParameter *parameter);
     QUmlTemplateableElement *template_() const;
diff --git a/src/uml/qumltimeconstraint.cpp b/src/uml/qumltimeconstraint.cpp
index 33c2a1fe..dea56895 100644
--- a/src/uml/qumltimeconstraint.cpp
+++ b/src/uml/qumltimeconstraint.cpp
@@ -57,7 +57,7 @@ QUmlTimeConstraint::QUmlTimeConstraint() :
     _firstEvent(true),
     _specification(0)
 {
-    d_ptr->object.setProperty("firstEvent", QVariant::fromValue(false));
+    d_ptr->object.setProperty("firstEvent", QVariant::fromValue(true));
     d_ptr->object.setProperty("specification", QVariant::fromValue((QUmlTimeInterval *)(0)));
 }
 
diff --git a/src/uml/qumltimeexpression.cpp b/src/uml/qumltimeexpression.cpp
index 9437afea..11e051d6 100644
--- a/src/uml/qumltimeexpression.cpp
+++ b/src/uml/qumltimeexpression.cpp
@@ -92,7 +92,7 @@ void QUmlTimeExpression::setExpr(QUmlValueSpecification *expr)
 /*!
     Refers to the time and duration observations that are involved in expr.
  */
-QSet<QUmlObservation *> QUmlTimeExpression::observation() const
+const QSet<QUmlObservation *> QUmlTimeExpression::observation() const
 {
     // This is a read-write association end
 
diff --git a/src/uml/qumltimeexpression.h b/src/uml/qumltimeexpression.h
index f78cfe35..c68960f3 100644
--- a/src/uml/qumltimeexpression.h
+++ b/src/uml/qumltimeexpression.h
@@ -61,7 +61,7 @@ public:
     // Owned attributes
     QUmlValueSpecification *expr() const;
     void setExpr(QUmlValueSpecification *expr);
-    QSet<QUmlObservation *> observation() const;
+    const QSet<QUmlObservation *> observation() const;
     void addObservation(QUmlObservation *observation);
     void removeObservation(QUmlObservation *observation);
 
diff --git a/src/uml/qumltimeobservation.cpp b/src/uml/qumltimeobservation.cpp
index 9787ddcb..e2567c10 100644
--- a/src/uml/qumltimeobservation.cpp
+++ b/src/uml/qumltimeobservation.cpp
@@ -58,7 +58,7 @@ QUmlTimeObservation::QUmlTimeObservation() :
     _firstEvent(true)
 {
     d_ptr->object.setProperty("event", QVariant::fromValue((QUmlNamedElement *)(0)));
-    d_ptr->object.setProperty("firstEvent", QVariant::fromValue(false));
+    d_ptr->object.setProperty("firstEvent", QVariant::fromValue(true));
 }
 
 // OWNED ATTRIBUTES
diff --git a/src/uml/qumltransition.cpp b/src/uml/qumltransition.cpp
index 198d2511..a9dc7a14 100644
--- a/src/uml/qumltransition.cpp
+++ b/src/uml/qumltransition.cpp
@@ -71,7 +71,7 @@ QUmlTransition::QUmlTransition() :
     d_ptr->object.setProperty("container", QVariant::fromValue((QUmlRegion *)(0)));
     d_ptr->object.setProperty("effect", QVariant::fromValue((QUmlBehavior *)(0)));
     d_ptr->object.setProperty("guard", QVariant::fromValue((QUmlConstraint *)(0)));
-    d_ptr->object.setProperty("kind", QVariant::fromValue(QtUml::TransitionKindNone));
+    d_ptr->object.setProperty("kind", QVariant::fromValue(QtUml::TransitionKindExternal));
     d_ptr->object.setProperty("redefinedTransition", QVariant::fromValue((QUmlTransition *)(0)));
     d_ptr->object.setProperty("redefinitionContext", QVariant::fromValue((QUmlClassifier *)(0)));
     d_ptr->object.setProperty("source", QVariant::fromValue((QUmlVertex *)(0)));
@@ -270,7 +270,7 @@ void QUmlTransition::setTarget(QUmlVertex *target)
 /*!
     Specifies the triggers that may fire the transition.
  */
-QSet<QUmlTrigger *> QUmlTransition::trigger() const
+const QSet<QUmlTrigger *> QUmlTransition::trigger() const
 {
     // This is a read-write association end
 
diff --git a/src/uml/qumltransition.h b/src/uml/qumltransition.h
index 5b5ac56d..4c45a187 100644
--- a/src/uml/qumltransition.h
+++ b/src/uml/qumltransition.h
@@ -83,7 +83,7 @@ public:
     void setSource(QUmlVertex *source);
     QUmlVertex *target() const;
     void setTarget(QUmlVertex *target);
-    QSet<QUmlTrigger *> trigger() const;
+    const QSet<QUmlTrigger *> trigger() const;
     void addTrigger(QUmlTrigger *trigger);
     void removeTrigger(QUmlTrigger *trigger);
 
diff --git a/src/uml/qumltrigger.cpp b/src/uml/qumltrigger.cpp
index 392b7fef..f3bd58d7 100644
--- a/src/uml/qumltrigger.cpp
+++ b/src/uml/qumltrigger.cpp
@@ -85,7 +85,7 @@ void QUmlTrigger::setEvent(QUmlEvent *event)
 /*!
     A optional port of the receiver object on which the behavioral feature is invoked.
  */
-QSet<QUmlPort *> QUmlTrigger::port() const
+const QSet<QUmlPort *> QUmlTrigger::port() const
 {
     // This is a read-write association end
 
diff --git a/src/uml/qumltrigger.h b/src/uml/qumltrigger.h
index b1fc471b..55b2dcc8 100644
--- a/src/uml/qumltrigger.h
+++ b/src/uml/qumltrigger.h
@@ -62,7 +62,7 @@ public:
     // Owned attributes
     QUmlEvent *event() const;
     void setEvent(QUmlEvent *event);
-    QSet<QUmlPort *> port() const;
+    const QSet<QUmlPort *> port() const;
     void addPort(QUmlPort *port);
     void removePort(QUmlPort *port);
 
diff --git a/src/uml/qumlunmarshallaction.cpp b/src/uml/qumlunmarshallaction.cpp
index ab0e180d..c5244937 100644
--- a/src/uml/qumlunmarshallaction.cpp
+++ b/src/uml/qumlunmarshallaction.cpp
@@ -96,7 +96,7 @@ void QUmlUnmarshallAction::setObject(QUmlInputPin *object)
 /*!
     The values of the structural features of the input object.
  */
-QSet<QUmlOutputPin *> QUmlUnmarshallAction::result() const
+const QSet<QUmlOutputPin *> QUmlUnmarshallAction::result() const
 {
     // This is a read-write association end
 
diff --git a/src/uml/qumlunmarshallaction.h b/src/uml/qumlunmarshallaction.h
index e1c29383..526a237c 100644
--- a/src/uml/qumlunmarshallaction.h
+++ b/src/uml/qumlunmarshallaction.h
@@ -63,7 +63,7 @@ public:
     // Owned attributes
     QUmlInputPin *object() const;
     void setObject(QUmlInputPin *object);
-    QSet<QUmlOutputPin *> result() const;
+    const QSet<QUmlOutputPin *> result() const;
     void addResult(QUmlOutputPin *result);
     void removeResult(QUmlOutputPin *result);
     QUmlClassifier *unmarshallType() const;
diff --git a/src/uml/qumlusecase.cpp b/src/uml/qumlusecase.cpp
index 90ee153a..1dda8e57 100644
--- a/src/uml/qumlusecase.cpp
+++ b/src/uml/qumlusecase.cpp
@@ -69,7 +69,7 @@ QUmlUseCase::QUmlUseCase()
 /*!
     References the Extend relationships owned by this use case.
  */
-QSet<QUmlExtend *> QUmlUseCase::extend() const
+const QSet<QUmlExtend *> QUmlUseCase::extend() const
 {
     // This is a read-write association end
 
@@ -113,7 +113,7 @@ void QUmlUseCase::removeExtend(QUmlExtend *extend)
 /*!
     References the ExtensionPoints owned by the use case.
  */
-QSet<QUmlExtensionPoint *> QUmlUseCase::extensionPoint() const
+const QSet<QUmlExtensionPoint *> QUmlUseCase::extensionPoint() const
 {
     // This is a read-write association end
 
@@ -157,7 +157,7 @@ void QUmlUseCase::removeExtensionPoint(QUmlExtensionPoint *extensionPoint)
 /*!
     References the Include relationships owned by this use case.
  */
-QSet<QUmlInclude *> QUmlUseCase::include() const
+const QSet<QUmlInclude *> QUmlUseCase::include() const
 {
     // This is a read-write association end
 
@@ -201,7 +201,7 @@ void QUmlUseCase::removeInclude(QUmlInclude *include)
 /*!
     References the subjects to which this use case applies. The subject or its parts realize all the use cases that apply to this subject. Use cases need not be attached to any specific subject, however. The subject may, but need not, own the use cases that apply to it.
  */
-QSet<QUmlClassifier *> QUmlUseCase::subject() const
+const QSet<QUmlClassifier *> QUmlUseCase::subject() const
 {
     // This is a read-write association end
 
diff --git a/src/uml/qumlusecase.h b/src/uml/qumlusecase.h
index f06926ff..0781b254 100644
--- a/src/uml/qumlusecase.h
+++ b/src/uml/qumlusecase.h
@@ -62,16 +62,16 @@ public:
     QUmlUseCase();
 
     // Owned attributes
-    QSet<QUmlExtend *> extend() const;
+    const QSet<QUmlExtend *> extend() const;
     void addExtend(QUmlExtend *extend);
     void removeExtend(QUmlExtend *extend);
-    QSet<QUmlExtensionPoint *> extensionPoint() const;
+    const QSet<QUmlExtensionPoint *> extensionPoint() const;
     void addExtensionPoint(QUmlExtensionPoint *extensionPoint);
     void removeExtensionPoint(QUmlExtensionPoint *extensionPoint);
-    QSet<QUmlInclude *> include() const;
+    const QSet<QUmlInclude *> include() const;
     void addInclude(QUmlInclude *include);
     void removeInclude(QUmlInclude *include);
-    QSet<QUmlClassifier *> subject() const;
+    const QSet<QUmlClassifier *> subject() const;
     void addSubject(QUmlClassifier *subject);
     void removeSubject(QUmlClassifier *subject);
 
diff --git a/src/uml/qumlvertex.cpp b/src/uml/qumlvertex.cpp
index abc0878d..459fbc96 100644
--- a/src/uml/qumlvertex.cpp
+++ b/src/uml/qumlvertex.cpp
@@ -92,7 +92,7 @@ void QUmlVertex::setContainer(QUmlRegion *container)
 /*!
     Specifies the transitions entering this vertex.
  */
-QSet<QUmlTransition *> QUmlVertex::incoming() const
+const QSet<QUmlTransition *> QUmlVertex::incoming() const
 {
     // This is a read-only derived association end
 
@@ -138,7 +138,7 @@ void QUmlVertex::removeIncoming(QUmlTransition *incoming)
 /*!
     Specifies the transitions departing from this vertex.
  */
-QSet<QUmlTransition *> QUmlVertex::outgoing() const
+const QSet<QUmlTransition *> QUmlVertex::outgoing() const
 {
     // This is a read-only derived association end
 
diff --git a/src/uml/qumlvertex.h b/src/uml/qumlvertex.h
index 1ddfae5b..8146dcf1 100644
--- a/src/uml/qumlvertex.h
+++ b/src/uml/qumlvertex.h
@@ -63,10 +63,10 @@ public:
     // Owned attributes
     QUmlRegion *container() const;
     void setContainer(QUmlRegion *container);
-    QSet<QUmlTransition *> incoming() const;
+    const QSet<QUmlTransition *> incoming() const;
     Q_DECL_HIDDEN void addIncoming(QUmlTransition *incoming);
     Q_DECL_HIDDEN void removeIncoming(QUmlTransition *incoming);
-    QSet<QUmlTransition *> outgoing() const;
+    const QSet<QUmlTransition *> outgoing() const;
     Q_DECL_HIDDEN void addOutgoing(QUmlTransition *outgoing);
     Q_DECL_HIDDEN void removeOutgoing(QUmlTransition *outgoing);
author	Sandro S. Andrade <sandroandrade@kde.org>	2013-08-27 12:01:42 -0300
committer	Sandro S. Andrade <sandroandrade@kde.org>	2013-08-27 17:12:52 +0200
commit	53b5fa7c58cc496b34679f51e6fcedfaa5f5d448 (patch)
tree	a131696409baa9a6a14294c5d22e4c9cb7eab7cd
parent	bc5342512ed3605bbd1953eaf395fe137ca239f0 (diff)