Fix reset of properties with default value

Change-Id: Ib1be0e68757479a14561f70c79b2f38917b8dff8
Reviewed-by: Sandro S. Andrade <sandroandrade@kde.org>

160 files changed, 538 insertions, 19 deletions

diff --git a/scripts/templates/common.tmpl b/scripts/templates/common.tmpl
index 5f4a2ef1..20a52790 100644
--- a/scripts/templates/common.tmpl
+++ b/scripts/templates/common.tmpl
@@ -433,6 +433,39 @@ void Q${namespace}${originalClassName}Object::set${attributeName.remove("^Is")}(
 void Q${namespace}${originalClassName}Object::unset${qtAttribute.remove("^is").ucfirst}()
 {
     Q_D(QModelingObject);
+[% SET defaultType = attribute.findvalue("defaultValue/@xmi:type") -%]
+    [%- SET type = QT_TYPE(namespace, attribute) -%]
+    [%- IF defaultType == "uml:LiteralBoolean" || defaultType == "uml:InstanceValue" || defaultType == "uml:LiteralInteger" || defaultType == "uml:LiteralUnlimitedNatural" || type.match('\*$') -%]
+        [%- IF defaultType == "uml:LiteralBoolean" -%]
+            [%- SET defaultValue = attribute.findvalue("defaultValue/@value") -%]
+            [%- IF defaultValue != "" %]
+    set${qtAttribute.remove("^is").ucfirst}(${defaultValue});
+            [%- ELSE -%]
+    set${qtAttribute.remove("^is").ucfirst}(false);
+            [%- END -%]
+        [%- ELSIF defaultType == "uml:InstanceValue" -%]
+            [%- SET defaultInstance = attribute.findvalue("defaultValue/@instance") -%]
+    set${qtAttribute.remove("^is").ucfirst}(Qt${namespace}::${defaultInstance.split("-").0}${defaultInstance.split("-").1.ucfirst});
+        [%- ELSIF defaultType == "uml:LiteralInteger" -%]
+            [%- SET defaultValue = attribute.findvalue("defaultValue/@value") -%]
+            [%- IF defaultValue != "" -%]
+    set${qtAttribute.remove("^is").ucfirst}(${defaultValue});
+            [%- ELSE -%]
+    set${qtAttribute.remove("^is").ucfirst}(0);
+            [%- END -%]
+        [%- ELSIF defaultType == "uml:LiteralUnlimitedNatural" -%]
+            [%- SET defaultValue = attribute.findvalue("defaultValue/@value") -%]
+            [%- IF defaultValue != "" -%]
+    set${qtAttribute.remove("^is").ucfirst}(${defaultValue});
+            [%- ELSE -%]
+    set${qtAttribute.remove("^is").ucfirst}(0);
+            [%- END -%]
+        [%- ELSIF type.match('\*$') -%]
+    set${qtAttribute.remove("^is").ucfirst}(0);
+        [%- END -%]
+    [%- ELSIF xmi.findvalue("//packagedElement[@xmi:id=\"${type}\"]/xmi:type") == "uml:Enumeration" -%]
+    set${qtAttribute.remove("^is").ucfirst}(Qt${namespace}::${type}None);
+    [%- END %]
     d->modifiedResettableProperties.removeAll(QStringLiteral("${attributeName.remove("^Is").lcfirst}"));
 }
 
diff --git a/scripts/templates/qclass.cpp b/scripts/templates/qclass.cpp
index bc3cdf37..6b23944a 100644
--- a/scripts/templates/qclass.cpp
+++ b/scripts/templates/qclass.cpp
@@ -92,33 +92,39 @@ Q${namespace}${className}::Q${namespace}${className}([%- IF class.findvalue("@is
 [% SET found = "true" -%]
         [%- ELSE %],
 [% END -%]
-    [%- IF defaultType == "uml:LiteralBoolean" -%]
-        [%- SET defaultValue = attribute.findvalue("defaultValue/@value") -%]
-        [%- IF defaultValue != "" -%]
+        [%- IF defaultType == "uml:LiteralBoolean" -%]
+            [%- SET defaultValue = attribute.findvalue("defaultValue/@value") -%]
+            [%- IF defaultValue != "" -%]
     _[% QT_ATTRIBUTE(attribute) %](${defaultValue})
-        [%- ELSE -%]
+            [%- ELSE -%]
     _[% QT_ATTRIBUTE(attribute) %](false)
-        [%- END -%]
-    [%- ELSIF defaultType == "uml:InstanceValue" -%]
-        [%- SET defaultInstance = attribute.findvalue("defaultValue/@instance") -%]
+            [%- END -%]
+        [%- ELSIF defaultType == "uml:InstanceValue" -%]
+            [%- SET defaultInstance = attribute.findvalue("defaultValue/@instance") -%]
     _[% QT_ATTRIBUTE(attribute) %](Qt${namespace}::${defaultInstance.split("-").0}${defaultInstance.split("-").1.ucfirst})
-    [%- ELSIF defaultType == "uml:LiteralInteger" -%]
-        [%- SET defaultValue = attribute.findvalue("defaultValue/@value") -%]
-        [%- IF defaultValue != "" -%]
+        [%- ELSIF defaultType == "uml:LiteralInteger" -%]
+            [%- SET defaultValue = attribute.findvalue("defaultValue/@value") -%]
+            [%- IF defaultValue != "" -%]
     _[% QT_ATTRIBUTE(attribute) %](${defaultValue})
-        [%- ELSE -%]
+            [%- ELSE -%]
     _[% QT_ATTRIBUTE(attribute) %](0)
-        [%- END -%]
-    [%- ELSIF defaultType == "uml:LiteralUnlimitedNatural" -%]
-        [%- SET defaultValue = attribute.findvalue("defaultValue/@value") -%]
-        [%- IF defaultValue != "" -%]
+            [%- END -%]
+        [%- ELSIF defaultType == "uml:LiteralUnlimitedNatural" -%]
+            [%- SET defaultValue = attribute.findvalue("defaultValue/@value") -%]
+            [%- IF defaultValue != "" -%]
     _[% QT_ATTRIBUTE(attribute) %](${defaultValue})
-        [%- ELSE -%]
+            [%- ELSE -%]
     _[% QT_ATTRIBUTE(attribute) %](0)
-        [%- END -%]
-    [%- ELSIF type.match('\*$') -%]
+            [%- END -%]
+        [%- ELSIF type.match('\*$') -%]
     _[% QT_ATTRIBUTE(attribute) %](0)
-    [%- END -%]
+        [%- END -%]
+    [%- ELSIF xmi.findvalue("//packagedElement[@xmi:id=\"${type}\"]/xmi:type") == "uml:Enumeration" -%]
+        [%- IF found == "false" %] :
+[% SET found = "true" -%]
+        [%- ELSE %],
+[% END -%]
+    _[% QT_ATTRIBUTE(attribute) %](Qt${namespace}::${type}None)
     [%- END -%]
 [%- END %]
 {
diff --git a/src/uml/qobjects/qumlabstractionobject.cpp b/src/uml/qobjects/qumlabstractionobject.cpp
index 332da0ca..b041c9e7 100644
--- a/src/uml/qobjects/qumlabstractionobject.cpp
+++ b/src/uml/qobjects/qumlabstractionobject.cpp
@@ -340,6 +340,7 @@ void QUmlAbstractionObject::setVisibility(QtUml::VisibilityKind visibility)
 void QUmlAbstractionObject::unsetVisibility()
 {
     Q_D(QModelingObject);
+    setVisibility(QtUml::VisibilityKindPublic);
     d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
diff --git a/src/uml/qobjects/qumlacceptcallactionobject.cpp b/src/uml/qobjects/qumlacceptcallactionobject.cpp
index 2b3fa8ce..54f31cff 100644
--- a/src/uml/qobjects/qumlacceptcallactionobject.cpp
+++ b/src/uml/qobjects/qumlacceptcallactionobject.cpp
@@ -448,6 +448,7 @@ void QUmlAcceptCallActionObject::setLeaf(bool isLeaf)
 void QUmlAcceptCallActionObject::unsetLeaf()
 {
     Q_D(QModelingObject);
+    setLeaf(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
@@ -580,6 +581,7 @@ void QUmlAcceptCallActionObject::setLocallyReentrant(bool isLocallyReentrant)
 void QUmlAcceptCallActionObject::unsetLocallyReentrant()
 {
     Q_D(QModelingObject);
+    setLocallyReentrant(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("locallyReentrant"));
 }
 
@@ -623,6 +625,7 @@ void QUmlAcceptCallActionObject::setUnmarshall(bool isUnmarshall)
 void QUmlAcceptCallActionObject::unsetUnmarshall()
 {
     Q_D(QModelingObject);
+    setUnmarshall(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("unmarshall"));
 }
 
diff --git a/src/uml/qobjects/qumlaccepteventactionobject.cpp b/src/uml/qobjects/qumlaccepteventactionobject.cpp
index 3f85b37e..87ec9779 100644
--- a/src/uml/qobjects/qumlaccepteventactionobject.cpp
+++ b/src/uml/qobjects/qumlaccepteventactionobject.cpp
@@ -438,6 +438,7 @@ void QUmlAcceptEventActionObject::setLeaf(bool isLeaf)
 void QUmlAcceptEventActionObject::unsetLeaf()
 {
     Q_D(QModelingObject);
+    setLeaf(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
@@ -570,6 +571,7 @@ void QUmlAcceptEventActionObject::setLocallyReentrant(bool isLocallyReentrant)
 void QUmlAcceptEventActionObject::unsetLocallyReentrant()
 {
     Q_D(QModelingObject);
+    setLocallyReentrant(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("locallyReentrant"));
 }
 
@@ -613,6 +615,7 @@ void QUmlAcceptEventActionObject::setUnmarshall(bool isUnmarshall)
 void QUmlAcceptEventActionObject::unsetUnmarshall()
 {
     Q_D(QModelingObject);
+    setUnmarshall(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("unmarshall"));
 }
 
diff --git a/src/uml/qobjects/qumlactioninputpinobject.cpp b/src/uml/qobjects/qumlactioninputpinobject.cpp
index f121b4a9..a7a6912c 100644
--- a/src/uml/qobjects/qumlactioninputpinobject.cpp
+++ b/src/uml/qobjects/qumlactioninputpinobject.cpp
@@ -460,6 +460,7 @@ void QUmlActionInputPinObject::setOrdered(bool isOrdered)
 void QUmlActionInputPinObject::unsetOrdered()
 {
     Q_D(QModelingObject);
+    setOrdered(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("ordered"));
 }
 
@@ -471,6 +472,8 @@ void QUmlActionInputPinObject::setUnique(bool isUnique)
 void QUmlActionInputPinObject::unsetUnique()
 {
     Q_D(QModelingObject);
+
+    setUnique(true);
     d->modifiedResettableProperties.removeAll(QStringLiteral("unique"));
 }
 
@@ -482,6 +485,7 @@ void QUmlActionInputPinObject::setLower(int lower)
 void QUmlActionInputPinObject::unsetLower()
 {
     Q_D(QModelingObject);
+    setLower(1);
     d->modifiedResettableProperties.removeAll(QStringLiteral("lower"));
 }
 
@@ -498,6 +502,7 @@ void QUmlActionInputPinObject::setUpper(int upper)
 void QUmlActionInputPinObject::unsetUpper()
 {
     Q_D(QModelingObject);
+    setUpper(1);
     d->modifiedResettableProperties.removeAll(QStringLiteral("upper"));
 }
 
@@ -553,6 +558,7 @@ void QUmlActionInputPinObject::setLeaf(bool isLeaf)
 void QUmlActionInputPinObject::unsetLeaf()
 {
     Q_D(QModelingObject);
+    setLeaf(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
@@ -675,6 +681,7 @@ void QUmlActionInputPinObject::setControlType(bool isControlType)
 void QUmlActionInputPinObject::unsetControlType()
 {
     Q_D(QModelingObject);
+    setControlType(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("controlType"));
 }
 
@@ -686,6 +693,7 @@ void QUmlActionInputPinObject::setOrdering(QtUml::ObjectNodeOrderingKind orderin
 void QUmlActionInputPinObject::unsetOrdering()
 {
     Q_D(QModelingObject);
+    setOrdering(QtUml::ObjectNodeOrderingKindFIFO);
     d->modifiedResettableProperties.removeAll(QStringLiteral("ordering"));
 }
 
@@ -709,6 +717,7 @@ void QUmlActionInputPinObject::setControl(bool isControl)
 void QUmlActionInputPinObject::unsetControl()
 {
     Q_D(QModelingObject);
+    setControl(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("control"));
 }
 
diff --git a/src/uml/qobjects/qumlactivityfinalnodeobject.cpp b/src/uml/qobjects/qumlactivityfinalnodeobject.cpp
index 9383a387..ab867883 100644
--- a/src/uml/qobjects/qumlactivityfinalnodeobject.cpp
+++ b/src/uml/qobjects/qumlactivityfinalnodeobject.cpp
@@ -353,6 +353,7 @@ void QUmlActivityFinalNodeObject::setLeaf(bool isLeaf)
 void QUmlActivityFinalNodeObject::unsetLeaf()
 {
     Q_D(QModelingObject);
+    setLeaf(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
diff --git a/src/uml/qobjects/qumlactivityobject.cpp b/src/uml/qobjects/qumlactivityobject.cpp
index fe153f2f..9a5d3fe0 100644
--- a/src/uml/qobjects/qumlactivityobject.cpp
+++ b/src/uml/qobjects/qumlactivityobject.cpp
@@ -942,6 +942,7 @@ void QUmlActivityObject::setVisibility(QtUml::VisibilityKind visibility)
 void QUmlActivityObject::unsetVisibility()
 {
     Q_D(QModelingObject);
+    setVisibility(QtUml::VisibilityKindPublic);
     d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
@@ -962,6 +963,7 @@ void QUmlActivityObject::setLeaf(bool isLeaf)
 void QUmlActivityObject::unsetLeaf()
 {
     Q_D(QModelingObject);
+    setLeaf(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
@@ -1057,6 +1059,7 @@ void QUmlActivityObject::setFinalSpecialization(bool isFinalSpecialization)
 void QUmlActivityObject::unsetFinalSpecialization()
 {
     Q_D(QModelingObject);
+    setFinalSpecialization(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("finalSpecialization"));
 }
 
@@ -1216,6 +1219,7 @@ void QUmlActivityObject::setAbstract(bool isAbstract)
 void QUmlActivityObject::unsetAbstract()
 {
     Q_D(QModelingObject);
+    setAbstract(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("abstract"));
 }
 
@@ -1227,6 +1231,7 @@ void QUmlActivityObject::setActive(bool isActive)
 void QUmlActivityObject::unsetActive()
 {
     Q_D(QModelingObject);
+    setActive(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("active"));
 }
 
@@ -1295,6 +1300,8 @@ void QUmlActivityObject::setReentrant(bool isReentrant)
 void QUmlActivityObject::unsetReentrant()
 {
     Q_D(QModelingObject);
+
+    setReentrant(true);
     d->modifiedResettableProperties.removeAll(QStringLiteral("reentrant"));
 }
 
@@ -1383,6 +1390,7 @@ void QUmlActivityObject::setReadOnly(bool isReadOnly)
 void QUmlActivityObject::unsetReadOnly()
 {
     Q_D(QModelingObject);
+    setReadOnly(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("readOnly"));
 }
 
@@ -1394,6 +1402,7 @@ void QUmlActivityObject::setSingleExecution(bool isSingleExecution)
 void QUmlActivityObject::unsetSingleExecution()
 {
     Q_D(QModelingObject);
+    setSingleExecution(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("singleExecution"));
 }
 
diff --git a/src/uml/qobjects/qumlactivityparameternodeobject.cpp b/src/uml/qobjects/qumlactivityparameternodeobject.cpp
index 5130f14b..5920aad6 100644
--- a/src/uml/qobjects/qumlactivityparameternodeobject.cpp
+++ b/src/uml/qobjects/qumlactivityparameternodeobject.cpp
@@ -414,6 +414,7 @@ void QUmlActivityParameterNodeObject::setLeaf(bool isLeaf)
 void QUmlActivityParameterNodeObject::unsetLeaf()
 {
     Q_D(QModelingObject);
+    setLeaf(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
@@ -536,6 +537,7 @@ void QUmlActivityParameterNodeObject::setControlType(bool isControlType)
 void QUmlActivityParameterNodeObject::unsetControlType()
 {
     Q_D(QModelingObject);
+    setControlType(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("controlType"));
 }
 
@@ -547,6 +549,7 @@ void QUmlActivityParameterNodeObject::setOrdering(QtUml::ObjectNodeOrderingKind
 void QUmlActivityParameterNodeObject::unsetOrdering()
 {
     Q_D(QModelingObject);
+    setOrdering(QtUml::ObjectNodeOrderingKindFIFO);
     d->modifiedResettableProperties.removeAll(QStringLiteral("ordering"));
 }
 
diff --git a/src/uml/qobjects/qumlactivitypartitionobject.cpp b/src/uml/qobjects/qumlactivitypartitionobject.cpp
index ea394b8e..1c389198 100644
--- a/src/uml/qobjects/qumlactivitypartitionobject.cpp
+++ b/src/uml/qobjects/qumlactivitypartitionobject.cpp
@@ -393,6 +393,7 @@ void QUmlActivityPartitionObject::setDimension(bool isDimension)
 void QUmlActivityPartitionObject::unsetDimension()
 {
     Q_D(QModelingObject);
+    setDimension(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("dimension"));
 }
 
@@ -404,6 +405,7 @@ void QUmlActivityPartitionObject::setExternal(bool isExternal)
 void QUmlActivityPartitionObject::unsetExternal()
 {
     Q_D(QModelingObject);
+    setExternal(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("external"));
 }
 
diff --git a/src/uml/qobjects/qumlactorobject.cpp b/src/uml/qobjects/qumlactorobject.cpp
index 2f10b58b..015d6b1d 100644
--- a/src/uml/qobjects/qumlactorobject.cpp
+++ b/src/uml/qobjects/qumlactorobject.cpp
@@ -717,6 +717,7 @@ void QUmlActorObject::setVisibility(QtUml::VisibilityKind visibility)
 void QUmlActorObject::unsetVisibility()
 {
     Q_D(QModelingObject);
+    setVisibility(QtUml::VisibilityKindPublic);
     d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
@@ -737,6 +738,7 @@ void QUmlActorObject::setLeaf(bool isLeaf)
 void QUmlActorObject::unsetLeaf()
 {
     Q_D(QModelingObject);
+    setLeaf(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
@@ -842,6 +844,7 @@ void QUmlActorObject::setAbstract(bool isAbstract)
 void QUmlActorObject::unsetAbstract()
 {
     Q_D(QModelingObject);
+    setAbstract(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("abstract"));
 }
 
@@ -853,6 +856,7 @@ void QUmlActorObject::setFinalSpecialization(bool isFinalSpecialization)
 void QUmlActorObject::unsetFinalSpecialization()
 {
     Q_D(QModelingObject);
+    setFinalSpecialization(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("finalSpecialization"));
 }
 
diff --git a/src/uml/qobjects/qumladdstructuralfeaturevalueactionobject.cpp b/src/uml/qobjects/qumladdstructuralfeaturevalueactionobject.cpp
index 92a5989d..43bd431a 100644
--- a/src/uml/qobjects/qumladdstructuralfeaturevalueactionobject.cpp
+++ b/src/uml/qobjects/qumladdstructuralfeaturevalueactionobject.cpp
@@ -466,6 +466,7 @@ void QUmlAddStructuralFeatureValueActionObject::setLeaf(bool isLeaf)
 void QUmlAddStructuralFeatureValueActionObject::unsetLeaf()
 {
     Q_D(QModelingObject);
+    setLeaf(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
@@ -598,6 +599,7 @@ void QUmlAddStructuralFeatureValueActionObject::setLocallyReentrant(bool isLocal
 void QUmlAddStructuralFeatureValueActionObject::unsetLocallyReentrant()
 {
     Q_D(QModelingObject);
+    setLocallyReentrant(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("locallyReentrant"));
 }
 
@@ -670,6 +672,7 @@ void QUmlAddStructuralFeatureValueActionObject::setReplaceAll(bool isReplaceAll)
 void QUmlAddStructuralFeatureValueActionObject::unsetReplaceAll()
 {
     Q_D(QModelingObject);
+    setReplaceAll(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("replaceAll"));
 }
 
diff --git a/src/uml/qobjects/qumladdvariablevalueactionobject.cpp b/src/uml/qobjects/qumladdvariablevalueactionobject.cpp
index 90b2b6de..4e91fd68 100644
--- a/src/uml/qobjects/qumladdvariablevalueactionobject.cpp
+++ b/src/uml/qobjects/qumladdvariablevalueactionobject.cpp
@@ -450,6 +450,7 @@ void QUmlAddVariableValueActionObject::setLeaf(bool isLeaf)
 void QUmlAddVariableValueActionObject::unsetLeaf()
 {
     Q_D(QModelingObject);
+    setLeaf(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
@@ -582,6 +583,7 @@ void QUmlAddVariableValueActionObject::setLocallyReentrant(bool isLocallyReentra
 void QUmlAddVariableValueActionObject::unsetLocallyReentrant()
 {
     Q_D(QModelingObject);
+    setLocallyReentrant(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("locallyReentrant"));
 }
 
@@ -644,6 +646,7 @@ void QUmlAddVariableValueActionObject::setReplaceAll(bool isReplaceAll)
 void QUmlAddVariableValueActionObject::unsetReplaceAll()
 {
     Q_D(QModelingObject);
+    setReplaceAll(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("replaceAll"));
 }
 
diff --git a/src/uml/qobjects/qumlanyreceiveeventobject.cpp b/src/uml/qobjects/qumlanyreceiveeventobject.cpp
index 6a6b448d..189d6dfe 100644
--- a/src/uml/qobjects/qumlanyreceiveeventobject.cpp
+++ b/src/uml/qobjects/qumlanyreceiveeventobject.cpp
@@ -283,6 +283,7 @@ void QUmlAnyReceiveEventObject::setVisibility(QtUml::VisibilityKind visibility)
 void QUmlAnyReceiveEventObject::unsetVisibility()
 {
     Q_D(QModelingObject);
+    setVisibility(QtUml::VisibilityKindPublic);
     d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
diff --git a/src/uml/qobjects/qumlartifactobject.cpp b/src/uml/qobjects/qumlartifactobject.cpp
index 80702361..06c9ae5d 100644
--- a/src/uml/qobjects/qumlartifactobject.cpp
+++ b/src/uml/qobjects/qumlartifactobject.cpp
@@ -730,6 +730,7 @@ void QUmlArtifactObject::setVisibility(QtUml::VisibilityKind visibility)
 void QUmlArtifactObject::unsetVisibility()
 {
     Q_D(QModelingObject);
+    setVisibility(QtUml::VisibilityKindPublic);
     d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
@@ -750,6 +751,7 @@ void QUmlArtifactObject::setLeaf(bool isLeaf)
 void QUmlArtifactObject::unsetLeaf()
 {
     Q_D(QModelingObject);
+    setLeaf(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
@@ -855,6 +857,7 @@ void QUmlArtifactObject::setAbstract(bool isAbstract)
 void QUmlArtifactObject::unsetAbstract()
 {
     Q_D(QModelingObject);
+    setAbstract(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("abstract"));
 }
 
@@ -866,6 +869,7 @@ void QUmlArtifactObject::setFinalSpecialization(bool isFinalSpecialization)
 void QUmlArtifactObject::unsetFinalSpecialization()
 {
     Q_D(QModelingObject);
+    setFinalSpecialization(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("finalSpecialization"));
 }
 
diff --git a/src/uml/qobjects/qumlassociationclassobject.cpp b/src/uml/qobjects/qumlassociationclassobject.cpp
index 18fe5826..49345c37 100644
--- a/src/uml/qobjects/qumlassociationclassobject.cpp
+++ b/src/uml/qobjects/qumlassociationclassobject.cpp
@@ -858,6 +858,7 @@ void QUmlAssociationClassObject::setVisibility(QtUml::VisibilityKind visibility)
 void QUmlAssociationClassObject::unsetVisibility()
 {
     Q_D(QModelingObject);
+    setVisibility(QtUml::VisibilityKindPublic);
     d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
@@ -878,6 +879,7 @@ void QUmlAssociationClassObject::setLeaf(bool isLeaf)
 void QUmlAssociationClassObject::unsetLeaf()
 {
     Q_D(QModelingObject);
+    setLeaf(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
@@ -973,6 +975,7 @@ void QUmlAssociationClassObject::setFinalSpecialization(bool isFinalSpecializati
 void QUmlAssociationClassObject::unsetFinalSpecialization()
 {
     Q_D(QModelingObject);
+    setFinalSpecialization(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("finalSpecialization"));
 }
 
@@ -1132,6 +1135,7 @@ void QUmlAssociationClassObject::setAbstract(bool isAbstract)
 void QUmlAssociationClassObject::unsetAbstract()
 {
     Q_D(QModelingObject);
+    setAbstract(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("abstract"));
 }
 
@@ -1143,6 +1147,7 @@ void QUmlAssociationClassObject::setActive(bool isActive)
 void QUmlAssociationClassObject::unsetActive()
 {
     Q_D(QModelingObject);
+    setActive(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("active"));
 }
 
@@ -1228,6 +1233,7 @@ void QUmlAssociationClassObject::setDerived(bool isDerived)
 void QUmlAssociationClassObject::unsetDerived()
 {
     Q_D(QModelingObject);
+    setDerived(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("derived"));
 }
 
diff --git a/src/uml/qobjects/qumlassociationobject.cpp b/src/uml/qobjects/qumlassociationobject.cpp
index 1728df1b..56bf1eed 100644
--- a/src/uml/qobjects/qumlassociationobject.cpp
+++ b/src/uml/qobjects/qumlassociationobject.cpp
@@ -738,6 +738,7 @@ void QUmlAssociationObject::setVisibility(QtUml::VisibilityKind visibility)
 void QUmlAssociationObject::unsetVisibility()
 {
     Q_D(QModelingObject);
+    setVisibility(QtUml::VisibilityKindPublic);
     d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
@@ -758,6 +759,7 @@ void QUmlAssociationObject::setLeaf(bool isLeaf)
 void QUmlAssociationObject::unsetLeaf()
 {
     Q_D(QModelingObject);
+    setLeaf(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
@@ -863,6 +865,7 @@ void QUmlAssociationObject::setAbstract(bool isAbstract)
 void QUmlAssociationObject::unsetAbstract()
 {
     Q_D(QModelingObject);
+    setAbstract(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("abstract"));
 }
 
@@ -874,6 +877,7 @@ void QUmlAssociationObject::setFinalSpecialization(bool isFinalSpecialization)
 void QUmlAssociationObject::unsetFinalSpecialization()
 {
     Q_D(QModelingObject);
+    setFinalSpecialization(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("finalSpecialization"));
 }
 
@@ -974,6 +978,7 @@ void QUmlAssociationObject::setDerived(bool isDerived)
 void QUmlAssociationObject::unsetDerived()
 {
     Q_D(QModelingObject);
+    setDerived(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("derived"));
 }
 
diff --git a/src/uml/qobjects/qumlbroadcastsignalactionobject.cpp b/src/uml/qobjects/qumlbroadcastsignalactionobject.cpp
index 1fb48a30..a5f558e5 100644
--- a/src/uml/qobjects/qumlbroadcastsignalactionobject.cpp
+++ b/src/uml/qobjects/qumlbroadcastsignalactionobject.cpp
@@ -444,6 +444,7 @@ void QUmlBroadcastSignalActionObject::setLeaf(bool isLeaf)
 void QUmlBroadcastSignalActionObject::unsetLeaf()
 {
     Q_D(QModelingObject);
+    setLeaf(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
@@ -576,6 +577,7 @@ void QUmlBroadcastSignalActionObject::setLocallyReentrant(bool isLocallyReentran
 void QUmlBroadcastSignalActionObject::unsetLocallyReentrant()
 {
     Q_D(QModelingObject);
+    setLocallyReentrant(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("locallyReentrant"));
 }
 
diff --git a/src/uml/qobjects/qumlcallbehavioractionobject.cpp b/src/uml/qobjects/qumlcallbehavioractionobject.cpp
index 41d1029a..f687dd57 100644
--- a/src/uml/qobjects/qumlcallbehavioractionobject.cpp
+++ b/src/uml/qobjects/qumlcallbehavioractionobject.cpp
@@ -459,6 +459,7 @@ void QUmlCallBehaviorActionObject::setLeaf(bool isLeaf)
 void QUmlCallBehaviorActionObject::unsetLeaf()
 {
     Q_D(QModelingObject);
+    setLeaf(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
@@ -591,6 +592,7 @@ void QUmlCallBehaviorActionObject::setLocallyReentrant(bool isLocallyReentrant)
 void QUmlCallBehaviorActionObject::unsetLocallyReentrant()
 {
     Q_D(QModelingObject);
+    setLocallyReentrant(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("locallyReentrant"));
 }
 
@@ -651,6 +653,8 @@ void QUmlCallBehaviorActionObject::setSynchronous(bool isSynchronous)
 void QUmlCallBehaviorActionObject::unsetSynchronous()
 {
     Q_D(QModelingObject);
+
+    setSynchronous(true);
     d->modifiedResettableProperties.removeAll(QStringLiteral("synchronous"));
 }
 
diff --git a/src/uml/qobjects/qumlcalleventobject.cpp b/src/uml/qobjects/qumlcalleventobject.cpp
index 049e7026..bb725e28 100644
--- a/src/uml/qobjects/qumlcalleventobject.cpp
+++ b/src/uml/qobjects/qumlcalleventobject.cpp
@@ -294,6 +294,7 @@ void QUmlCallEventObject::setVisibility(QtUml::VisibilityKind visibility)
 void QUmlCallEventObject::unsetVisibility()
 {
     Q_D(QModelingObject);
+    setVisibility(QtUml::VisibilityKindPublic);
     d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
diff --git a/src/uml/qobjects/qumlcalloperationactionobject.cpp b/src/uml/qobjects/qumlcalloperationactionobject.cpp
index 16c0659f..4479fc12 100644
--- a/src/uml/qobjects/qumlcalloperationactionobject.cpp
+++ b/src/uml/qobjects/qumlcalloperationactionobject.cpp
@@ -467,6 +467,7 @@ void QUmlCallOperationActionObject::setLeaf(bool isLeaf)
 void QUmlCallOperationActionObject::unsetLeaf()
 {
     Q_D(QModelingObject);
+    setLeaf(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
@@ -599,6 +600,7 @@ void QUmlCallOperationActionObject::setLocallyReentrant(bool isLocallyReentrant)
 void QUmlCallOperationActionObject::unsetLocallyReentrant()
 {
     Q_D(QModelingObject);
+    setLocallyReentrant(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("locallyReentrant"));
 }
 
@@ -659,6 +661,8 @@ void QUmlCallOperationActionObject::setSynchronous(bool isSynchronous)
 void QUmlCallOperationActionObject::unsetSynchronous()
 {
     Q_D(QModelingObject);
+
+    setSynchronous(true);
     d->modifiedResettableProperties.removeAll(QStringLiteral("synchronous"));
 }
 
diff --git a/src/uml/qobjects/qumlcentralbuffernodeobject.cpp b/src/uml/qobjects/qumlcentralbuffernodeobject.cpp
index 228ee9c8..6472b742 100644
--- a/src/uml/qobjects/qumlcentralbuffernodeobject.cpp
+++ b/src/uml/qobjects/qumlcentralbuffernodeobject.cpp
@@ -403,6 +403,7 @@ void QUmlCentralBufferNodeObject::setLeaf(bool isLeaf)
 void QUmlCentralBufferNodeObject::unsetLeaf()
 {
     Q_D(QModelingObject);
+    setLeaf(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
@@ -525,6 +526,7 @@ void QUmlCentralBufferNodeObject::setControlType(bool isControlType)
 void QUmlCentralBufferNodeObject::unsetControlType()
 {
     Q_D(QModelingObject);
+    setControlType(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("controlType"));
 }
 
@@ -536,6 +538,7 @@ void QUmlCentralBufferNodeObject::setOrdering(QtUml::ObjectNodeOrderingKind orde
 void QUmlCentralBufferNodeObject::unsetOrdering()
 {
     Q_D(QModelingObject);
+    setOrdering(QtUml::ObjectNodeOrderingKindFIFO);
     d->modifiedResettableProperties.removeAll(QStringLiteral("ordering"));
 }
 
diff --git a/src/uml/qobjects/qumlchangeeventobject.cpp b/src/uml/qobjects/qumlchangeeventobject.cpp
index 4c4dac54..68ff0a25 100644
--- a/src/uml/qobjects/qumlchangeeventobject.cpp
+++ b/src/uml/qobjects/qumlchangeeventobject.cpp
@@ -294,6 +294,7 @@ void QUmlChangeEventObject::setVisibility(QtUml::VisibilityKind visibility)
 void QUmlChangeEventObject::unsetVisibility()
 {
     Q_D(QModelingObject);
+    setVisibility(QtUml::VisibilityKindPublic);
     d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
diff --git a/src/uml/qobjects/qumlclassifiertemplateparameterobject.cpp b/src/uml/qobjects/qumlclassifiertemplateparameterobject.cpp
index 6c10f2d8..aba4f46f 100644
--- a/src/uml/qobjects/qumlclassifiertemplateparameterobject.cpp
+++ b/src/uml/qobjects/qumlclassifiertemplateparameterobject.cpp
@@ -214,6 +214,8 @@ void QUmlClassifierTemplateParameterObject::setAllowSubstitutable(bool allowSubs
 void QUmlClassifierTemplateParameterObject::unsetAllowSubstitutable()
 {
     Q_D(QModelingObject);
+
+    setAllowSubstitutable(true);
     d->modifiedResettableProperties.removeAll(QStringLiteral("allowSubstitutable"));
 }
 
diff --git a/src/uml/qobjects/qumlclassobject.cpp b/src/uml/qobjects/qumlclassobject.cpp
index b85e5381..bdfadde5 100644
--- a/src/uml/qobjects/qumlclassobject.cpp
+++ b/src/uml/qobjects/qumlclassobject.cpp
@@ -808,6 +808,7 @@ void QUmlClassObject::setVisibility(QtUml::VisibilityKind visibility)
 void QUmlClassObject::unsetVisibility()
 {
     Q_D(QModelingObject);
+    setVisibility(QtUml::VisibilityKindPublic);
     d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
@@ -828,6 +829,7 @@ void QUmlClassObject::setLeaf(bool isLeaf)
 void QUmlClassObject::unsetLeaf()
 {
     Q_D(QModelingObject);
+    setLeaf(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
@@ -923,6 +925,7 @@ void QUmlClassObject::setFinalSpecialization(bool isFinalSpecialization)
 void QUmlClassObject::unsetFinalSpecialization()
 {
     Q_D(QModelingObject);
+    setFinalSpecialization(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("finalSpecialization"));
 }
 
@@ -1082,6 +1085,7 @@ void QUmlClassObject::setAbstract(bool isAbstract)
 void QUmlClassObject::unsetAbstract()
 {
     Q_D(QModelingObject);
+    setAbstract(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("abstract"));
 }
 
@@ -1093,6 +1097,7 @@ void QUmlClassObject::setActive(bool isActive)
 void QUmlClassObject::unsetActive()
 {
     Q_D(QModelingObject);
+    setActive(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("active"));
 }
 
diff --git a/src/uml/qobjects/qumlclearassociationactionobject.cpp b/src/uml/qobjects/qumlclearassociationactionobject.cpp
index 0c4d48b7..d3cb4cc7 100644
--- a/src/uml/qobjects/qumlclearassociationactionobject.cpp
+++ b/src/uml/qobjects/qumlclearassociationactionobject.cpp
@@ -433,6 +433,7 @@ void QUmlClearAssociationActionObject::setLeaf(bool isLeaf)
 void QUmlClearAssociationActionObject::unsetLeaf()
 {
     Q_D(QModelingObject);
+    setLeaf(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
@@ -565,6 +566,7 @@ void QUmlClearAssociationActionObject::setLocallyReentrant(bool isLocallyReentra
 void QUmlClearAssociationActionObject::unsetLocallyReentrant()
 {
     Q_D(QModelingObject);
+    setLocallyReentrant(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("locallyReentrant"));
 }
 
diff --git a/src/uml/qobjects/qumlclearstructuralfeatureactionobject.cpp b/src/uml/qobjects/qumlclearstructuralfeatureactionobject.cpp
index 1cec88a3..e0984341 100644
--- a/src/uml/qobjects/qumlclearstructuralfeatureactionobject.cpp
+++ b/src/uml/qobjects/qumlclearstructuralfeatureactionobject.cpp
@@ -443,6 +443,7 @@ void QUmlClearStructuralFeatureActionObject::setLeaf(bool isLeaf)
 void QUmlClearStructuralFeatureActionObject::unsetLeaf()
 {
     Q_D(QModelingObject);
+    setLeaf(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
@@ -575,6 +576,7 @@ void QUmlClearStructuralFeatureActionObject::setLocallyReentrant(bool isLocallyR
 void QUmlClearStructuralFeatureActionObject::unsetLocallyReentrant()
 {
     Q_D(QModelingObject);
+    setLocallyReentrant(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("locallyReentrant"));
 }
 
diff --git a/src/uml/qobjects/qumlclearvariableactionobject.cpp b/src/uml/qobjects/qumlclearvariableactionobject.cpp
index 3781f211..ec888f8b 100644
--- a/src/uml/qobjects/qumlclearvariableactionobject.cpp
+++ b/src/uml/qobjects/qumlclearvariableactionobject.cpp
@@ -425,6 +425,7 @@ void QUmlClearVariableActionObject::setLeaf(bool isLeaf)
 void QUmlClearVariableActionObject::unsetLeaf()
 {
     Q_D(QModelingObject);
+    setLeaf(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
@@ -557,6 +558,7 @@ void QUmlClearVariableActionObject::setLocallyReentrant(bool isLocallyReentrant)
 void QUmlClearVariableActionObject::unsetLocallyReentrant()
 {
     Q_D(QModelingObject);
+    setLocallyReentrant(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("locallyReentrant"));
 }
 
diff --git a/src/uml/qobjects/qumlcollaborationobject.cpp b/src/uml/qobjects/qumlcollaborationobject.cpp
index ed185cff..489e2292 100644
--- a/src/uml/qobjects/qumlcollaborationobject.cpp
+++ b/src/uml/qobjects/qumlcollaborationobject.cpp
@@ -763,6 +763,7 @@ void QUmlCollaborationObject::setVisibility(QtUml::VisibilityKind visibility)
 void QUmlCollaborationObject::unsetVisibility()
 {
     Q_D(QModelingObject);
+    setVisibility(QtUml::VisibilityKindPublic);
     d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
@@ -783,6 +784,7 @@ void QUmlCollaborationObject::setLeaf(bool isLeaf)
 void QUmlCollaborationObject::unsetLeaf()
 {
     Q_D(QModelingObject);
+    setLeaf(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
@@ -888,6 +890,7 @@ void QUmlCollaborationObject::setAbstract(bool isAbstract)
 void QUmlCollaborationObject::unsetAbstract()
 {
     Q_D(QModelingObject);
+    setAbstract(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("abstract"));
 }
 
@@ -899,6 +902,7 @@ void QUmlCollaborationObject::setFinalSpecialization(bool isFinalSpecialization)
 void QUmlCollaborationObject::unsetFinalSpecialization()
 {
     Q_D(QModelingObject);
+    setFinalSpecialization(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("finalSpecialization"));
 }
 
diff --git a/src/uml/qobjects/qumlcombinedfragmentobject.cpp b/src/uml/qobjects/qumlcombinedfragmentobject.cpp
index 40520f09..6d17ea6c 100644
--- a/src/uml/qobjects/qumlcombinedfragmentobject.cpp
+++ b/src/uml/qobjects/qumlcombinedfragmentobject.cpp
@@ -347,6 +347,7 @@ void QUmlCombinedFragmentObject::setInteractionOperator(QtUml::InteractionOperat
 void QUmlCombinedFragmentObject::unsetInteractionOperator()
 {
     Q_D(QModelingObject);
+    setInteractionOperator(QtUml::InteractionOperatorKindSeq);
     d->modifiedResettableProperties.removeAll(QStringLiteral("interactionOperator"));
 }
 
diff --git a/src/uml/qobjects/qumlcommunicationpathobject.cpp b/src/uml/qobjects/qumlcommunicationpathobject.cpp
index 3ae87fdd..697bb437 100644
--- a/src/uml/qobjects/qumlcommunicationpathobject.cpp
+++ b/src/uml/qobjects/qumlcommunicationpathobject.cpp
@@ -738,6 +738,7 @@ void QUmlCommunicationPathObject::setVisibility(QtUml::VisibilityKind visibility
 void QUmlCommunicationPathObject::unsetVisibility()
 {
     Q_D(QModelingObject);
+    setVisibility(QtUml::VisibilityKindPublic);
     d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
@@ -758,6 +759,7 @@ void QUmlCommunicationPathObject::setLeaf(bool isLeaf)
 void QUmlCommunicationPathObject::unsetLeaf()
 {
     Q_D(QModelingObject);
+    setLeaf(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
@@ -863,6 +865,7 @@ void QUmlCommunicationPathObject::setAbstract(bool isAbstract)
 void QUmlCommunicationPathObject::unsetAbstract()
 {
     Q_D(QModelingObject);
+    setAbstract(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("abstract"));
 }
 
@@ -874,6 +877,7 @@ void QUmlCommunicationPathObject::setFinalSpecialization(bool isFinalSpecializat
 void QUmlCommunicationPathObject::unsetFinalSpecialization()
 {
     Q_D(QModelingObject);
+    setFinalSpecialization(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("finalSpecialization"));
 }
 
@@ -974,6 +978,7 @@ void QUmlCommunicationPathObject::setDerived(bool isDerived)
 void QUmlCommunicationPathObject::unsetDerived()
 {
     Q_D(QModelingObject);
+    setDerived(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("derived"));
 }
 
diff --git a/src/uml/qobjects/qumlcomponentobject.cpp b/src/uml/qobjects/qumlcomponentobject.cpp
index 1a18a553..636aa896 100644
--- a/src/uml/qobjects/qumlcomponentobject.cpp
+++ b/src/uml/qobjects/qumlcomponentobject.cpp
@@ -868,6 +868,7 @@ void QUmlComponentObject::setVisibility(QtUml::VisibilityKind visibility)
 void QUmlComponentObject::unsetVisibility()
 {
     Q_D(QModelingObject);
+    setVisibility(QtUml::VisibilityKindPublic);
     d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
@@ -888,6 +889,7 @@ void QUmlComponentObject::setLeaf(bool isLeaf)
 void QUmlComponentObject::unsetLeaf()
 {
     Q_D(QModelingObject);
+    setLeaf(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
@@ -983,6 +985,7 @@ void QUmlComponentObject::setFinalSpecialization(bool isFinalSpecialization)
 void QUmlComponentObject::unsetFinalSpecialization()
 {
     Q_D(QModelingObject);
+    setFinalSpecialization(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("finalSpecialization"));
 }
 
@@ -1142,6 +1145,7 @@ void QUmlComponentObject::setAbstract(bool isAbstract)
 void QUmlComponentObject::unsetAbstract()
 {
     Q_D(QModelingObject);
+    setAbstract(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("abstract"));
 }
 
@@ -1153,6 +1157,7 @@ void QUmlComponentObject::setActive(bool isActive)
 void QUmlComponentObject::unsetActive()
 {
     Q_D(QModelingObject);
+    setActive(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("active"));
 }
 
@@ -1216,6 +1221,8 @@ void QUmlComponentObject::setIndirectlyInstantiated(bool isIndirectlyInstantiate
 void QUmlComponentObject::unsetIndirectlyInstantiated()
 {
     Q_D(QModelingObject);
+
+    setIndirectlyInstantiated(true);
     d->modifiedResettableProperties.removeAll(QStringLiteral("indirectlyInstantiated"));
 }
 
diff --git a/src/uml/qobjects/qumlcomponentrealizationobject.cpp b/src/uml/qobjects/qumlcomponentrealizationobject.cpp
index 6b8a7190..529bcb7e 100644
--- a/src/uml/qobjects/qumlcomponentrealizationobject.cpp
+++ b/src/uml/qobjects/qumlcomponentrealizationobject.cpp
@@ -360,6 +360,7 @@ void QUmlComponentRealizationObject::setVisibility(QtUml::VisibilityKind visibil
 void QUmlComponentRealizationObject::unsetVisibility()
 {
     Q_D(QModelingObject);
+    setVisibility(QtUml::VisibilityKindPublic);
     d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
diff --git a/src/uml/qobjects/qumlconditionalnodeobject.cpp b/src/uml/qobjects/qumlconditionalnodeobject.cpp
index e84536fe..dd4a9171 100644
--- a/src/uml/qobjects/qumlconditionalnodeobject.cpp
+++ b/src/uml/qobjects/qumlconditionalnodeobject.cpp
@@ -604,6 +604,7 @@ void QUmlConditionalNodeObject::setLeaf(bool isLeaf)
 void QUmlConditionalNodeObject::unsetLeaf()
 {
     Q_D(QModelingObject);
+    setLeaf(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
@@ -731,6 +732,7 @@ void QUmlConditionalNodeObject::setLocallyReentrant(bool isLocallyReentrant)
 void QUmlConditionalNodeObject::unsetLocallyReentrant()
 {
     Q_D(QModelingObject);
+    setLocallyReentrant(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("locallyReentrant"));
 }
 
@@ -888,6 +890,7 @@ void QUmlConditionalNodeObject::setMustIsolate(bool mustIsolate)
 void QUmlConditionalNodeObject::unsetMustIsolate()
 {
     Q_D(QModelingObject);
+    setMustIsolate(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("mustIsolate"));
 }
 
@@ -941,6 +944,7 @@ void QUmlConditionalNodeObject::setAssured(bool isAssured)
 void QUmlConditionalNodeObject::unsetAssured()
 {
     Q_D(QModelingObject);
+    setAssured(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("assured"));
 }
 
@@ -952,6 +956,7 @@ void QUmlConditionalNodeObject::setDeterminate(bool isDeterminate)
 void QUmlConditionalNodeObject::unsetDeterminate()
 {
     Q_D(QModelingObject);
+    setDeterminate(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("determinate"));
 }
 
diff --git a/src/uml/qobjects/qumlconnectorendobject.cpp b/src/uml/qobjects/qumlconnectorendobject.cpp
index 479b6609..4e36dd00 100644
--- a/src/uml/qobjects/qumlconnectorendobject.cpp
+++ b/src/uml/qobjects/qumlconnectorendobject.cpp
@@ -237,6 +237,7 @@ void QUmlConnectorEndObject::setOrdered(bool isOrdered)
 void QUmlConnectorEndObject::unsetOrdered()
 {
     Q_D(QModelingObject);
+    setOrdered(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("ordered"));
 }
 
@@ -248,6 +249,8 @@ void QUmlConnectorEndObject::setUnique(bool isUnique)
 void QUmlConnectorEndObject::unsetUnique()
 {
     Q_D(QModelingObject);
+
+    setUnique(true);
     d->modifiedResettableProperties.removeAll(QStringLiteral("unique"));
 }
 
@@ -259,6 +262,7 @@ void QUmlConnectorEndObject::setLower(int lower)
 void QUmlConnectorEndObject::unsetLower()
 {
     Q_D(QModelingObject);
+    setLower(1);
     d->modifiedResettableProperties.removeAll(QStringLiteral("lower"));
 }
 
@@ -275,6 +279,7 @@ void QUmlConnectorEndObject::setUpper(int upper)
 void QUmlConnectorEndObject::unsetUpper()
 {
     Q_D(QModelingObject);
+    setUpper(1);
     d->modifiedResettableProperties.removeAll(QStringLiteral("upper"));
 }
 
diff --git a/src/uml/qobjects/qumlconnectorobject.cpp b/src/uml/qobjects/qumlconnectorobject.cpp
index ff4413bd..d1670d5a 100644
--- a/src/uml/qobjects/qumlconnectorobject.cpp
+++ b/src/uml/qobjects/qumlconnectorobject.cpp
@@ -337,6 +337,7 @@ void QUmlConnectorObject::setLeaf(bool isLeaf)
 void QUmlConnectorObject::unsetLeaf()
 {
     Q_D(QModelingObject);
+    setLeaf(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
@@ -380,6 +381,7 @@ void QUmlConnectorObject::setStatic(bool isStatic)
 void QUmlConnectorObject::unsetStatic()
 {
     Q_D(QModelingObject);
+    setStatic(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("static"));
 }
 
diff --git a/src/uml/qobjects/qumlconsiderignorefragmentobject.cpp b/src/uml/qobjects/qumlconsiderignorefragmentobject.cpp
index 8d0b20a4..f5f06b88 100644
--- a/src/uml/qobjects/qumlconsiderignorefragmentobject.cpp
+++ b/src/uml/qobjects/qumlconsiderignorefragmentobject.cpp
@@ -357,6 +357,7 @@ void QUmlConsiderIgnoreFragmentObject::setInteractionOperator(QtUml::Interaction
 void QUmlConsiderIgnoreFragmentObject::unsetInteractionOperator()
 {
     Q_D(QModelingObject);
+    setInteractionOperator(QtUml::InteractionOperatorKindSeq);
     d->modifiedResettableProperties.removeAll(QStringLiteral("interactionOperator"));
 }
 
diff --git a/src/uml/qobjects/qumlconstraintobject.cpp b/src/uml/qobjects/qumlconstraintobject.cpp
index c84cb380..7cd9bb48 100644
--- a/src/uml/qobjects/qumlconstraintobject.cpp
+++ b/src/uml/qobjects/qumlconstraintobject.cpp
@@ -310,6 +310,7 @@ void QUmlConstraintObject::setVisibility(QtUml::VisibilityKind visibility)
 void QUmlConstraintObject::unsetVisibility()
 {
     Q_D(QModelingObject);
+    setVisibility(QtUml::VisibilityKindPublic);
     d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
diff --git a/src/uml/qobjects/qumlcontinuationobject.cpp b/src/uml/qobjects/qumlcontinuationobject.cpp
index 04c85eba..562f6bd3 100644
--- a/src/uml/qobjects/qumlcontinuationobject.cpp
+++ b/src/uml/qobjects/qumlcontinuationobject.cpp
@@ -320,6 +320,8 @@ void QUmlContinuationObject::setSetting(bool setting)
 void QUmlContinuationObject::unsetSetting()
 {
     Q_D(QModelingObject);
+
+    setSetting(true);
     d->modifiedResettableProperties.removeAll(QStringLiteral("setting"));
 }
 
diff --git a/src/uml/qobjects/qumlcontrolflowobject.cpp b/src/uml/qobjects/qumlcontrolflowobject.cpp
index 476dc03c..1639e701 100644
--- a/src/uml/qobjects/qumlcontrolflowobject.cpp
+++ b/src/uml/qobjects/qumlcontrolflowobject.cpp
@@ -370,6 +370,7 @@ void QUmlControlFlowObject::setLeaf(bool isLeaf)
 void QUmlControlFlowObject::unsetLeaf()
 {
     Q_D(QModelingObject);
+    setLeaf(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
diff --git a/src/uml/qobjects/qumlcreatelinkactionobject.cpp b/src/uml/qobjects/qumlcreatelinkactionobject.cpp
index 9ccd9156..799b15b6 100644
--- a/src/uml/qobjects/qumlcreatelinkactionobject.cpp
+++ b/src/uml/qobjects/qumlcreatelinkactionobject.cpp
@@ -447,6 +447,7 @@ void QUmlCreateLinkActionObject::setLeaf(bool isLeaf)
 void QUmlCreateLinkActionObject::unsetLeaf()
 {
     Q_D(QModelingObject);
+    setLeaf(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
@@ -579,6 +580,7 @@ void QUmlCreateLinkActionObject::setLocallyReentrant(bool isLocallyReentrant)
 void QUmlCreateLinkActionObject::unsetLocallyReentrant()
 {
     Q_D(QModelingObject);
+    setLocallyReentrant(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("locallyReentrant"));
 }
 
diff --git a/src/uml/qobjects/qumlcreatelinkobjectactionobject.cpp b/src/uml/qobjects/qumlcreatelinkobjectactionobject.cpp
index 8cff0108..ed246d29 100644
--- a/src/uml/qobjects/qumlcreatelinkobjectactionobject.cpp
+++ b/src/uml/qobjects/qumlcreatelinkobjectactionobject.cpp
@@ -457,6 +457,7 @@ void QUmlCreateLinkObjectActionObject::setLeaf(bool isLeaf)
 void QUmlCreateLinkObjectActionObject::unsetLeaf()
 {
     Q_D(QModelingObject);
+    setLeaf(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
@@ -589,6 +590,7 @@ void QUmlCreateLinkObjectActionObject::setLocallyReentrant(bool isLocallyReentra
 void QUmlCreateLinkObjectActionObject::unsetLocallyReentrant()
 {
     Q_D(QModelingObject);
+    setLocallyReentrant(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("locallyReentrant"));
 }
 
diff --git a/src/uml/qobjects/qumlcreateobjectactionobject.cpp b/src/uml/qobjects/qumlcreateobjectactionobject.cpp
index 215bbbd2..706b97cc 100644
--- a/src/uml/qobjects/qumlcreateobjectactionobject.cpp
+++ b/src/uml/qobjects/qumlcreateobjectactionobject.cpp
@@ -432,6 +432,7 @@ void QUmlCreateObjectActionObject::setLeaf(bool isLeaf)
 void QUmlCreateObjectActionObject::unsetLeaf()
 {
     Q_D(QModelingObject);
+    setLeaf(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
@@ -564,6 +565,7 @@ void QUmlCreateObjectActionObject::setLocallyReentrant(bool isLocallyReentrant)
 void QUmlCreateObjectActionObject::unsetLocallyReentrant()
 {
     Q_D(QModelingObject);
+    setLocallyReentrant(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("locallyReentrant"));
 }
 
diff --git a/src/uml/qobjects/qumldatastorenodeobject.cpp b/src/uml/qobjects/qumldatastorenodeobject.cpp
index f8b43e3a..2609fec6 100644
--- a/src/uml/qobjects/qumldatastorenodeobject.cpp
+++ b/src/uml/qobjects/qumldatastorenodeobject.cpp
@@ -403,6 +403,7 @@ void QUmlDataStoreNodeObject::setLeaf(bool isLeaf)
 void QUmlDataStoreNodeObject::unsetLeaf()
 {
     Q_D(QModelingObject);
+    setLeaf(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
@@ -525,6 +526,7 @@ void QUmlDataStoreNodeObject::setControlType(bool isControlType)
 void QUmlDataStoreNodeObject::unsetControlType()
 {
     Q_D(QModelingObject);
+    setControlType(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("controlType"));
 }
 
@@ -536,6 +538,7 @@ void QUmlDataStoreNodeObject::setOrdering(QtUml::ObjectNodeOrderingKind ordering
 void QUmlDataStoreNodeObject::unsetOrdering()
 {
     Q_D(QModelingObject);
+    setOrdering(QtUml::ObjectNodeOrderingKindFIFO);
     d->modifiedResettableProperties.removeAll(QStringLiteral("ordering"));
 }
 
diff --git a/src/uml/qobjects/qumldatatypeobject.cpp b/src/uml/qobjects/qumldatatypeobject.cpp
index 58044170..57dc73fa 100644
--- a/src/uml/qobjects/qumldatatypeobject.cpp
+++ b/src/uml/qobjects/qumldatatypeobject.cpp
@@ -710,6 +710,7 @@ void QUmlDataTypeObject::setVisibility(QtUml::VisibilityKind visibility)
 void QUmlDataTypeObject::unsetVisibility()
 {
     Q_D(QModelingObject);
+    setVisibility(QtUml::VisibilityKindPublic);
     d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
@@ -730,6 +731,7 @@ void QUmlDataTypeObject::setLeaf(bool isLeaf)
 void QUmlDataTypeObject::unsetLeaf()
 {
     Q_D(QModelingObject);
+    setLeaf(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
@@ -835,6 +837,7 @@ void QUmlDataTypeObject::setAbstract(bool isAbstract)
 void QUmlDataTypeObject::unsetAbstract()
 {
     Q_D(QModelingObject);
+    setAbstract(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("abstract"));
 }
 
@@ -846,6 +849,7 @@ void QUmlDataTypeObject::setFinalSpecialization(bool isFinalSpecialization)
 void QUmlDataTypeObject::unsetFinalSpecialization()
 {
     Q_D(QModelingObject);
+    setFinalSpecialization(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("finalSpecialization"));
 }
 
diff --git a/src/uml/qobjects/qumldecisionnodeobject.cpp b/src/uml/qobjects/qumldecisionnodeobject.cpp
index 9d0f2c93..345208d2 100644
--- a/src/uml/qobjects/qumldecisionnodeobject.cpp
+++ b/src/uml/qobjects/qumldecisionnodeobject.cpp
@@ -373,6 +373,7 @@ void QUmlDecisionNodeObject::setLeaf(bool isLeaf)
 void QUmlDecisionNodeObject::unsetLeaf()
 {
     Q_D(QModelingObject);
+    setLeaf(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
diff --git a/src/uml/qobjects/qumldependencyobject.cpp b/src/uml/qobjects/qumldependencyobject.cpp
index fcf08c37..0d89c63f 100644
--- a/src/uml/qobjects/qumldependencyobject.cpp
+++ b/src/uml/qobjects/qumldependencyobject.cpp
@@ -328,6 +328,7 @@ void QUmlDependencyObject::setVisibility(QtUml::VisibilityKind visibility)
 void QUmlDependencyObject::unsetVisibility()
 {
     Q_D(QModelingObject);
+    setVisibility(QtUml::VisibilityKindPublic);
     d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
diff --git a/src/uml/qobjects/qumldeploymentobject.cpp b/src/uml/qobjects/qumldeploymentobject.cpp
index 6aa25eb6..44740134 100644
--- a/src/uml/qobjects/qumldeploymentobject.cpp
+++ b/src/uml/qobjects/qumldeploymentobject.cpp
@@ -358,6 +358,7 @@ void QUmlDeploymentObject::setVisibility(QtUml::VisibilityKind visibility)
 void QUmlDeploymentObject::unsetVisibility()
 {
     Q_D(QModelingObject);
+    setVisibility(QtUml::VisibilityKindPublic);
     d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
diff --git a/src/uml/qobjects/qumldeploymentspecificationobject.cpp b/src/uml/qobjects/qumldeploymentspecificationobject.cpp
index 6bbcac75..4dce986a 100644
--- a/src/uml/qobjects/qumldeploymentspecificationobject.cpp
+++ b/src/uml/qobjects/qumldeploymentspecificationobject.cpp
@@ -752,6 +752,7 @@ void QUmlDeploymentSpecificationObject::setVisibility(QtUml::VisibilityKind visi
 void QUmlDeploymentSpecificationObject::unsetVisibility()
 {
     Q_D(QModelingObject);
+    setVisibility(QtUml::VisibilityKindPublic);
     d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
@@ -772,6 +773,7 @@ void QUmlDeploymentSpecificationObject::setLeaf(bool isLeaf)
 void QUmlDeploymentSpecificationObject::unsetLeaf()
 {
     Q_D(QModelingObject);
+    setLeaf(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
@@ -877,6 +879,7 @@ void QUmlDeploymentSpecificationObject::setAbstract(bool isAbstract)
 void QUmlDeploymentSpecificationObject::unsetAbstract()
 {
     Q_D(QModelingObject);
+    setAbstract(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("abstract"));
 }
 
@@ -888,6 +891,7 @@ void QUmlDeploymentSpecificationObject::setFinalSpecialization(bool isFinalSpeci
 void QUmlDeploymentSpecificationObject::unsetFinalSpecialization()
 {
     Q_D(QModelingObject);
+    setFinalSpecialization(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("finalSpecialization"));
 }
 
diff --git a/src/uml/qobjects/qumldestroylinkactionobject.cpp b/src/uml/qobjects/qumldestroylinkactionobject.cpp
index 5b7277a8..f69f6b93 100644
--- a/src/uml/qobjects/qumldestroylinkactionobject.cpp
+++ b/src/uml/qobjects/qumldestroylinkactionobject.cpp
@@ -447,6 +447,7 @@ void QUmlDestroyLinkActionObject::setLeaf(bool isLeaf)
 void QUmlDestroyLinkActionObject::unsetLeaf()
 {
     Q_D(QModelingObject);
+    setLeaf(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
@@ -579,6 +580,7 @@ void QUmlDestroyLinkActionObject::setLocallyReentrant(bool isLocallyReentrant)
 void QUmlDestroyLinkActionObject::unsetLocallyReentrant()
 {
     Q_D(QModelingObject);
+    setLocallyReentrant(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("locallyReentrant"));
 }
 
diff --git a/src/uml/qobjects/qumldestroyobjectactionobject.cpp b/src/uml/qobjects/qumldestroyobjectactionobject.cpp
index 1cbbfce8..1e35c898 100644
--- a/src/uml/qobjects/qumldestroyobjectactionobject.cpp
+++ b/src/uml/qobjects/qumldestroyobjectactionobject.cpp
@@ -434,6 +434,7 @@ void QUmlDestroyObjectActionObject::setLeaf(bool isLeaf)
 void QUmlDestroyObjectActionObject::unsetLeaf()
 {
     Q_D(QModelingObject);
+    setLeaf(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
@@ -566,6 +567,7 @@ void QUmlDestroyObjectActionObject::setLocallyReentrant(bool isLocallyReentrant)
 void QUmlDestroyObjectActionObject::unsetLocallyReentrant()
 {
     Q_D(QModelingObject);
+    setLocallyReentrant(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("locallyReentrant"));
 }
 
@@ -609,6 +611,7 @@ void QUmlDestroyObjectActionObject::setDestroyLinks(bool isDestroyLinks)
 void QUmlDestroyObjectActionObject::unsetDestroyLinks()
 {
     Q_D(QModelingObject);
+    setDestroyLinks(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("destroyLinks"));
 }
 
@@ -620,6 +623,7 @@ void QUmlDestroyObjectActionObject::setDestroyOwnedObjects(bool isDestroyOwnedOb
 void QUmlDestroyObjectActionObject::unsetDestroyOwnedObjects()
 {
     Q_D(QModelingObject);
+    setDestroyOwnedObjects(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("destroyOwnedObjects"));
 }
 
diff --git a/src/uml/qobjects/qumldeviceobject.cpp b/src/uml/qobjects/qumldeviceobject.cpp
index 9bf22125..680c711b 100644
--- a/src/uml/qobjects/qumldeviceobject.cpp
+++ b/src/uml/qobjects/qumldeviceobject.cpp
@@ -839,6 +839,7 @@ void QUmlDeviceObject::setVisibility(QtUml::VisibilityKind visibility)
 void QUmlDeviceObject::unsetVisibility()
 {
     Q_D(QModelingObject);
+    setVisibility(QtUml::VisibilityKindPublic);
     d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
@@ -859,6 +860,7 @@ void QUmlDeviceObject::setLeaf(bool isLeaf)
 void QUmlDeviceObject::unsetLeaf()
 {
     Q_D(QModelingObject);
+    setLeaf(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
@@ -954,6 +956,7 @@ void QUmlDeviceObject::setFinalSpecialization(bool isFinalSpecialization)
 void QUmlDeviceObject::unsetFinalSpecialization()
 {
     Q_D(QModelingObject);
+    setFinalSpecialization(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("finalSpecialization"));
 }
 
@@ -1113,6 +1116,7 @@ void QUmlDeviceObject::setAbstract(bool isAbstract)
 void QUmlDeviceObject::unsetAbstract()
 {
     Q_D(QModelingObject);
+    setAbstract(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("abstract"));
 }
 
@@ -1124,6 +1128,7 @@ void QUmlDeviceObject::setActive(bool isActive)
 void QUmlDeviceObject::unsetActive()
 {
     Q_D(QModelingObject);
+    setActive(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("active"));
 }
 
diff --git a/src/uml/qobjects/qumldurationconstraintobject.cpp b/src/uml/qobjects/qumldurationconstraintobject.cpp
index f171f955..f9845215 100644
--- a/src/uml/qobjects/qumldurationconstraintobject.cpp
+++ b/src/uml/qobjects/qumldurationconstraintobject.cpp
@@ -319,6 +319,7 @@ void QUmlDurationConstraintObject::setVisibility(QtUml::VisibilityKind visibilit
 void QUmlDurationConstraintObject::unsetVisibility()
 {
     Q_D(QModelingObject);
+    setVisibility(QtUml::VisibilityKindPublic);
     d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
diff --git a/src/uml/qobjects/qumldurationintervalobject.cpp b/src/uml/qobjects/qumldurationintervalobject.cpp
index 5e65b7da..2968b049 100644
--- a/src/uml/qobjects/qumldurationintervalobject.cpp
+++ b/src/uml/qobjects/qumldurationintervalobject.cpp
@@ -358,6 +358,7 @@ void QUmlDurationIntervalObject::setVisibility(QtUml::VisibilityKind visibility)
 void QUmlDurationIntervalObject::unsetVisibility()
 {
     Q_D(QModelingObject);
+    setVisibility(QtUml::VisibilityKindPublic);
     d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
diff --git a/src/uml/qobjects/qumldurationobject.cpp b/src/uml/qobjects/qumldurationobject.cpp
index e3ecb068..ccd27661 100644
--- a/src/uml/qobjects/qumldurationobject.cpp
+++ b/src/uml/qobjects/qumldurationobject.cpp
@@ -358,6 +358,7 @@ void QUmlDurationObject::setVisibility(QtUml::VisibilityKind visibility)
 void QUmlDurationObject::unsetVisibility()
 {
     Q_D(QModelingObject);
+    setVisibility(QtUml::VisibilityKindPublic);
     d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
diff --git a/src/uml/qobjects/qumldurationobservationobject.cpp b/src/uml/qobjects/qumldurationobservationobject.cpp
index 98c4c79e..488eedb6 100644
--- a/src/uml/qobjects/qumldurationobservationobject.cpp
+++ b/src/uml/qobjects/qumldurationobservationobject.cpp
@@ -298,6 +298,7 @@ void QUmlDurationObservationObject::setVisibility(QtUml::VisibilityKind visibili
 void QUmlDurationObservationObject::unsetVisibility()
 {
     Q_D(QModelingObject);
+    setVisibility(QtUml::VisibilityKindPublic);
     d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
diff --git a/src/uml/qobjects/qumlelementimportobject.cpp b/src/uml/qobjects/qumlelementimportobject.cpp
index aacdb16b..fd5c6c86 100644
--- a/src/uml/qobjects/qumlelementimportobject.cpp
+++ b/src/uml/qobjects/qumlelementimportobject.cpp
@@ -246,6 +246,7 @@ void QUmlElementImportObject::setVisibility(QtUml::VisibilityKind visibility)
 void QUmlElementImportObject::unsetVisibility()
 {
     Q_D(QModelingObject);
+    setVisibility(QtUml::VisibilityKindPublic);
     d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
diff --git a/src/uml/qobjects/qumlenumerationliteralobject.cpp b/src/uml/qobjects/qumlenumerationliteralobject.cpp
index 031e71d9..b3830d04 100644
--- a/src/uml/qobjects/qumlenumerationliteralobject.cpp
+++ b/src/uml/qobjects/qumlenumerationliteralobject.cpp
@@ -343,6 +343,7 @@ void QUmlEnumerationLiteralObject::setVisibility(QtUml::VisibilityKind visibilit
 void QUmlEnumerationLiteralObject::unsetVisibility()
 {
     Q_D(QModelingObject);
+    setVisibility(QtUml::VisibilityKindPublic);
     d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
diff --git a/src/uml/qobjects/qumlenumerationobject.cpp b/src/uml/qobjects/qumlenumerationobject.cpp
index a4ee33c8..5e607717 100644
--- a/src/uml/qobjects/qumlenumerationobject.cpp
+++ b/src/uml/qobjects/qumlenumerationobject.cpp
@@ -721,6 +721,7 @@ void QUmlEnumerationObject::setVisibility(QtUml::VisibilityKind visibility)
 void QUmlEnumerationObject::unsetVisibility()
 {
     Q_D(QModelingObject);
+    setVisibility(QtUml::VisibilityKindPublic);
     d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
@@ -741,6 +742,7 @@ void QUmlEnumerationObject::setLeaf(bool isLeaf)
 void QUmlEnumerationObject::unsetLeaf()
 {
     Q_D(QModelingObject);
+    setLeaf(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
@@ -846,6 +848,7 @@ void QUmlEnumerationObject::setAbstract(bool isAbstract)
 void QUmlEnumerationObject::unsetAbstract()
 {
     Q_D(QModelingObject);
+    setAbstract(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("abstract"));
 }
 
@@ -857,6 +860,7 @@ void QUmlEnumerationObject::setFinalSpecialization(bool isFinalSpecialization)
 void QUmlEnumerationObject::unsetFinalSpecialization()
 {
     Q_D(QModelingObject);
+    setFinalSpecialization(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("finalSpecialization"));
 }
 
diff --git a/src/uml/qobjects/qumlexecutionenvironmentobject.cpp b/src/uml/qobjects/qumlexecutionenvironmentobject.cpp
index 813c443b..2040ab06 100644
--- a/src/uml/qobjects/qumlexecutionenvironmentobject.cpp
+++ b/src/uml/qobjects/qumlexecutionenvironmentobject.cpp
@@ -839,6 +839,7 @@ void QUmlExecutionEnvironmentObject::setVisibility(QtUml::VisibilityKind visibil
 void QUmlExecutionEnvironmentObject::unsetVisibility()
 {
     Q_D(QModelingObject);
+    setVisibility(QtUml::VisibilityKindPublic);
     d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
@@ -859,6 +860,7 @@ void QUmlExecutionEnvironmentObject::setLeaf(bool isLeaf)
 void QUmlExecutionEnvironmentObject::unsetLeaf()
 {
     Q_D(QModelingObject);
+    setLeaf(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
@@ -954,6 +956,7 @@ void QUmlExecutionEnvironmentObject::setFinalSpecialization(bool isFinalSpeciali
 void QUmlExecutionEnvironmentObject::unsetFinalSpecialization()
 {
     Q_D(QModelingObject);
+    setFinalSpecialization(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("finalSpecialization"));
 }
 
@@ -1113,6 +1116,7 @@ void QUmlExecutionEnvironmentObject::setAbstract(bool isAbstract)
 void QUmlExecutionEnvironmentObject::unsetAbstract()
 {
     Q_D(QModelingObject);
+    setAbstract(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("abstract"));
 }
 
@@ -1124,6 +1128,7 @@ void QUmlExecutionEnvironmentObject::setActive(bool isActive)
 void QUmlExecutionEnvironmentObject::unsetActive()
 {
     Q_D(QModelingObject);
+    setActive(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("active"));
 }
 
diff --git a/src/uml/qobjects/qumlexpansionnodeobject.cpp b/src/uml/qobjects/qumlexpansionnodeobject.cpp
index c425436b..9369bbb7 100644
--- a/src/uml/qobjects/qumlexpansionnodeobject.cpp
+++ b/src/uml/qobjects/qumlexpansionnodeobject.cpp
@@ -422,6 +422,7 @@ void QUmlExpansionNodeObject::setLeaf(bool isLeaf)
 void QUmlExpansionNodeObject::unsetLeaf()
 {
     Q_D(QModelingObject);
+    setLeaf(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
@@ -544,6 +545,7 @@ void QUmlExpansionNodeObject::setControlType(bool isControlType)
 void QUmlExpansionNodeObject::unsetControlType()
 {
     Q_D(QModelingObject);
+    setControlType(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("controlType"));
 }
 
@@ -555,6 +557,7 @@ void QUmlExpansionNodeObject::setOrdering(QtUml::ObjectNodeOrderingKind ordering
 void QUmlExpansionNodeObject::unsetOrdering()
 {
     Q_D(QModelingObject);
+    setOrdering(QtUml::ObjectNodeOrderingKindFIFO);
     d->modifiedResettableProperties.removeAll(QStringLiteral("ordering"));
 }
 
diff --git a/src/uml/qobjects/qumlexpansionregionobject.cpp b/src/uml/qobjects/qumlexpansionregionobject.cpp
index da9f0062..cf5312b8 100644
--- a/src/uml/qobjects/qumlexpansionregionobject.cpp
+++ b/src/uml/qobjects/qumlexpansionregionobject.cpp
@@ -607,6 +607,7 @@ void QUmlExpansionRegionObject::setLeaf(bool isLeaf)
 void QUmlExpansionRegionObject::unsetLeaf()
 {
     Q_D(QModelingObject);
+    setLeaf(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
@@ -734,6 +735,7 @@ void QUmlExpansionRegionObject::setLocallyReentrant(bool isLocallyReentrant)
 void QUmlExpansionRegionObject::unsetLocallyReentrant()
 {
     Q_D(QModelingObject);
+    setLocallyReentrant(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("locallyReentrant"));
 }
 
@@ -891,6 +893,7 @@ void QUmlExpansionRegionObject::setMustIsolate(bool mustIsolate)
 void QUmlExpansionRegionObject::unsetMustIsolate()
 {
     Q_D(QModelingObject);
+    setMustIsolate(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("mustIsolate"));
 }
 
@@ -954,6 +957,7 @@ void QUmlExpansionRegionObject::setMode(QtUml::ExpansionKind mode)
 void QUmlExpansionRegionObject::unsetMode()
 {
     Q_D(QModelingObject);
+    setMode(QtUml::ExpansionKindIterative);
     d->modifiedResettableProperties.removeAll(QStringLiteral("mode"));
 }
 
diff --git a/src/uml/qobjects/qumlexpressionobject.cpp b/src/uml/qobjects/qumlexpressionobject.cpp
index a3e22009..2754d5fe 100644
--- a/src/uml/qobjects/qumlexpressionobject.cpp
+++ b/src/uml/qobjects/qumlexpressionobject.cpp
@@ -354,6 +354,7 @@ void QUmlExpressionObject::setVisibility(QtUml::VisibilityKind visibility)
 void QUmlExpressionObject::unsetVisibility()
 {
     Q_D(QModelingObject);
+    setVisibility(QtUml::VisibilityKindPublic);
     d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
diff --git a/src/uml/qobjects/qumlextensionendobject.cpp b/src/uml/qobjects/qumlextensionendobject.cpp
index 1f9612f0..8d267f32 100644
--- a/src/uml/qobjects/qumlextensionendobject.cpp
+++ b/src/uml/qobjects/qumlextensionendobject.cpp
@@ -600,6 +600,7 @@ void QUmlExtensionEndObject::setOrdered(bool isOrdered)
 void QUmlExtensionEndObject::unsetOrdered()
 {
     Q_D(QModelingObject);
+    setOrdered(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("ordered"));
 }
 
@@ -611,6 +612,8 @@ void QUmlExtensionEndObject::setUnique(bool isUnique)
 void QUmlExtensionEndObject::unsetUnique()
 {
     Q_D(QModelingObject);
+
+    setUnique(true);
     d->modifiedResettableProperties.removeAll(QStringLiteral("unique"));
 }
 
@@ -627,6 +630,7 @@ void QUmlExtensionEndObject::setUpper(int upper)
 void QUmlExtensionEndObject::unsetUpper()
 {
     Q_D(QModelingObject);
+    setUpper(1);
     d->modifiedResettableProperties.removeAll(QStringLiteral("upper"));
 }
 
@@ -645,6 +649,7 @@ void QUmlExtensionEndObject::setLeaf(bool isLeaf)
 void QUmlExtensionEndObject::unsetLeaf()
 {
     Q_D(QModelingObject);
+    setLeaf(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
@@ -688,6 +693,7 @@ void QUmlExtensionEndObject::setStatic(bool isStatic)
 void QUmlExtensionEndObject::unsetStatic()
 {
     Q_D(QModelingObject);
+    setStatic(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("static"));
 }
 
@@ -746,6 +752,7 @@ void QUmlExtensionEndObject::setAggregation(QtUml::AggregationKind aggregation)
 void QUmlExtensionEndObject::unsetAggregation()
 {
     Q_D(QModelingObject);
+    setAggregation(QtUml::AggregationKindNone);
     d->modifiedResettableProperties.removeAll(QStringLiteral("aggregation"));
 }
 
@@ -792,6 +799,7 @@ void QUmlExtensionEndObject::setComposite(bool isComposite)
 void QUmlExtensionEndObject::unsetComposite()
 {
     Q_D(QModelingObject);
+    setComposite(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("composite"));
 }
 
@@ -803,6 +811,7 @@ void QUmlExtensionEndObject::setDerived(bool isDerived)
 void QUmlExtensionEndObject::unsetDerived()
 {
     Q_D(QModelingObject);
+    setDerived(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("derived"));
 }
 
@@ -814,6 +823,7 @@ void QUmlExtensionEndObject::setDerivedUnion(bool isDerivedUnion)
 void QUmlExtensionEndObject::unsetDerivedUnion()
 {
     Q_D(QModelingObject);
+    setDerivedUnion(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("derivedUnion"));
 }
 
@@ -825,6 +835,7 @@ void QUmlExtensionEndObject::setID(bool isID)
 void QUmlExtensionEndObject::unsetID()
 {
     Q_D(QModelingObject);
+    setID(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("iD"));
 }
 
@@ -836,6 +847,7 @@ void QUmlExtensionEndObject::setReadOnly(bool isReadOnly)
 void QUmlExtensionEndObject::unsetReadOnly()
 {
     Q_D(QModelingObject);
+    setReadOnly(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("readOnly"));
 }
 
@@ -889,6 +901,7 @@ void QUmlExtensionEndObject::setLower(int lower)
 void QUmlExtensionEndObject::unsetLower()
 {
     Q_D(QModelingObject);
+    setLower(0);
     d->modifiedResettableProperties.removeAll(QStringLiteral("lower"));
 }
 
diff --git a/src/uml/qobjects/qumlextensionobject.cpp b/src/uml/qobjects/qumlextensionobject.cpp
index 25c6a3ea..c962c7ee 100644
--- a/src/uml/qobjects/qumlextensionobject.cpp
+++ b/src/uml/qobjects/qumlextensionobject.cpp
@@ -765,6 +765,7 @@ void QUmlExtensionObject::setVisibility(QtUml::VisibilityKind visibility)
 void QUmlExtensionObject::unsetVisibility()
 {
     Q_D(QModelingObject);
+    setVisibility(QtUml::VisibilityKindPublic);
     d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
@@ -785,6 +786,7 @@ void QUmlExtensionObject::setLeaf(bool isLeaf)
 void QUmlExtensionObject::unsetLeaf()
 {
     Q_D(QModelingObject);
+    setLeaf(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
@@ -890,6 +892,7 @@ void QUmlExtensionObject::setAbstract(bool isAbstract)
 void QUmlExtensionObject::unsetAbstract()
 {
     Q_D(QModelingObject);
+    setAbstract(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("abstract"));
 }
 
@@ -901,6 +904,7 @@ void QUmlExtensionObject::setFinalSpecialization(bool isFinalSpecialization)
 void QUmlExtensionObject::unsetFinalSpecialization()
 {
     Q_D(QModelingObject);
+    setFinalSpecialization(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("finalSpecialization"));
 }
 
@@ -1001,6 +1005,7 @@ void QUmlExtensionObject::setDerived(bool isDerived)
 void QUmlExtensionObject::unsetDerived()
 {
     Q_D(QModelingObject);
+    setDerived(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("derived"));
 }
 
@@ -1033,6 +1038,7 @@ void QUmlExtensionObject::setRequired(bool isRequired)
 void QUmlExtensionObject::unsetRequired()
 {
     Q_D(QModelingObject);
+    setRequired(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("required"));
 }
 
diff --git a/src/uml/qobjects/qumlextensionpointobject.cpp b/src/uml/qobjects/qumlextensionpointobject.cpp
index e2c8d1e1..8fb0e267 100644
--- a/src/uml/qobjects/qumlextensionpointobject.cpp
+++ b/src/uml/qobjects/qumlextensionpointobject.cpp
@@ -291,6 +291,7 @@ void QUmlExtensionPointObject::setLeaf(bool isLeaf)
 void QUmlExtensionPointObject::unsetLeaf()
 {
     Q_D(QModelingObject);
+    setLeaf(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
diff --git a/src/uml/qobjects/qumlfinalstateobject.cpp b/src/uml/qobjects/qumlfinalstateobject.cpp
index 2c3e172a..21a4385d 100644
--- a/src/uml/qobjects/qumlfinalstateobject.cpp
+++ b/src/uml/qobjects/qumlfinalstateobject.cpp
@@ -578,6 +578,7 @@ void QUmlFinalStateObject::setLeaf(bool isLeaf)
 void QUmlFinalStateObject::unsetLeaf()
 {
     Q_D(QModelingObject);
+    setLeaf(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
@@ -672,6 +673,7 @@ void QUmlFinalStateObject::setComposite(bool isComposite)
 void QUmlFinalStateObject::unsetComposite()
 {
     Q_D(QModelingObject);
+    setComposite(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("composite"));
 }
 
@@ -683,6 +685,7 @@ void QUmlFinalStateObject::setOrthogonal(bool isOrthogonal)
 void QUmlFinalStateObject::unsetOrthogonal()
 {
     Q_D(QModelingObject);
+    setOrthogonal(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("orthogonal"));
 }
 
@@ -694,6 +697,8 @@ void QUmlFinalStateObject::setSimple(bool isSimple)
 void QUmlFinalStateObject::unsetSimple()
 {
     Q_D(QModelingObject);
+
+    setSimple(true);
     d->modifiedResettableProperties.removeAll(QStringLiteral("simple"));
 }
 
@@ -705,6 +710,7 @@ void QUmlFinalStateObject::setSubmachineState(bool isSubmachineState)
 void QUmlFinalStateObject::unsetSubmachineState()
 {
     Q_D(QModelingObject);
+    setSubmachineState(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("submachineState"));
 }
 
diff --git a/src/uml/qobjects/qumlflowfinalnodeobject.cpp b/src/uml/qobjects/qumlflowfinalnodeobject.cpp
index efe006ef..86eed0db 100644
--- a/src/uml/qobjects/qumlflowfinalnodeobject.cpp
+++ b/src/uml/qobjects/qumlflowfinalnodeobject.cpp
@@ -353,6 +353,7 @@ void QUmlFlowFinalNodeObject::setLeaf(bool isLeaf)
 void QUmlFlowFinalNodeObject::unsetLeaf()
 {
     Q_D(QModelingObject);
+    setLeaf(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
diff --git a/src/uml/qobjects/qumlforknodeobject.cpp b/src/uml/qobjects/qumlforknodeobject.cpp
index c4566538..ee502a1c 100644
--- a/src/uml/qobjects/qumlforknodeobject.cpp
+++ b/src/uml/qobjects/qumlforknodeobject.cpp
@@ -353,6 +353,7 @@ void QUmlForkNodeObject::setLeaf(bool isLeaf)
 void QUmlForkNodeObject::unsetLeaf()
 {
     Q_D(QModelingObject);
+    setLeaf(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
diff --git a/src/uml/qobjects/qumlfunctionbehaviorobject.cpp b/src/uml/qobjects/qumlfunctionbehaviorobject.cpp
index 4f18675e..5f15a3c8 100644
--- a/src/uml/qobjects/qumlfunctionbehaviorobject.cpp
+++ b/src/uml/qobjects/qumlfunctionbehaviorobject.cpp
@@ -888,6 +888,7 @@ void QUmlFunctionBehaviorObject::setVisibility(QtUml::VisibilityKind visibility)
 void QUmlFunctionBehaviorObject::unsetVisibility()
 {
     Q_D(QModelingObject);
+    setVisibility(QtUml::VisibilityKindPublic);
     d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
@@ -908,6 +909,7 @@ void QUmlFunctionBehaviorObject::setLeaf(bool isLeaf)
 void QUmlFunctionBehaviorObject::unsetLeaf()
 {
     Q_D(QModelingObject);
+    setLeaf(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
@@ -1003,6 +1005,7 @@ void QUmlFunctionBehaviorObject::setFinalSpecialization(bool isFinalSpecializati
 void QUmlFunctionBehaviorObject::unsetFinalSpecialization()
 {
     Q_D(QModelingObject);
+    setFinalSpecialization(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("finalSpecialization"));
 }
 
@@ -1162,6 +1165,7 @@ void QUmlFunctionBehaviorObject::setAbstract(bool isAbstract)
 void QUmlFunctionBehaviorObject::unsetAbstract()
 {
     Q_D(QModelingObject);
+    setAbstract(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("abstract"));
 }
 
@@ -1173,6 +1177,7 @@ void QUmlFunctionBehaviorObject::setActive(bool isActive)
 void QUmlFunctionBehaviorObject::unsetActive()
 {
     Q_D(QModelingObject);
+    setActive(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("active"));
 }
 
@@ -1241,6 +1246,8 @@ void QUmlFunctionBehaviorObject::setReentrant(bool isReentrant)
 void QUmlFunctionBehaviorObject::unsetReentrant()
 {
     Q_D(QModelingObject);
+
+    setReentrant(true);
     d->modifiedResettableProperties.removeAll(QStringLiteral("reentrant"));
 }
 
diff --git a/src/uml/qobjects/qumlgeneralizationobject.cpp b/src/uml/qobjects/qumlgeneralizationobject.cpp
index a8f9e05a..2495b896 100644
--- a/src/uml/qobjects/qumlgeneralizationobject.cpp
+++ b/src/uml/qobjects/qumlgeneralizationobject.cpp
@@ -242,6 +242,8 @@ void QUmlGeneralizationObject::setSubstitutable(bool isSubstitutable)
 void QUmlGeneralizationObject::unsetSubstitutable()
 {
     Q_D(QModelingObject);
+
+    setSubstitutable(true);
     d->modifiedResettableProperties.removeAll(QStringLiteral("substitutable"));
 }
 
diff --git a/src/uml/qobjects/qumlgeneralizationsetobject.cpp b/src/uml/qobjects/qumlgeneralizationsetobject.cpp
index 9ee40eaf..95203173 100644
--- a/src/uml/qobjects/qumlgeneralizationsetobject.cpp
+++ b/src/uml/qobjects/qumlgeneralizationsetobject.cpp
@@ -313,6 +313,7 @@ void QUmlGeneralizationSetObject::setVisibility(QtUml::VisibilityKind visibility
 void QUmlGeneralizationSetObject::unsetVisibility()
 {
     Q_D(QModelingObject);
+    setVisibility(QtUml::VisibilityKindPublic);
     d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
@@ -336,6 +337,7 @@ void QUmlGeneralizationSetObject::setCovering(bool isCovering)
 void QUmlGeneralizationSetObject::unsetCovering()
 {
     Q_D(QModelingObject);
+    setCovering(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("covering"));
 }
 
@@ -347,6 +349,7 @@ void QUmlGeneralizationSetObject::setDisjoint(bool isDisjoint)
 void QUmlGeneralizationSetObject::unsetDisjoint()
 {
     Q_D(QModelingObject);
+    setDisjoint(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("disjoint"));
 }
 
diff --git a/src/uml/qobjects/qumlinformationflowobject.cpp b/src/uml/qobjects/qumlinformationflowobject.cpp
index 5219a802..732e7622 100644
--- a/src/uml/qobjects/qumlinformationflowobject.cpp
+++ b/src/uml/qobjects/qumlinformationflowobject.cpp
@@ -408,6 +408,7 @@ void QUmlInformationFlowObject::setVisibility(QtUml::VisibilityKind visibility)
 void QUmlInformationFlowObject::unsetVisibility()
 {
     Q_D(QModelingObject);
+    setVisibility(QtUml::VisibilityKindPublic);
     d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
diff --git a/src/uml/qobjects/qumlinformationitemobject.cpp b/src/uml/qobjects/qumlinformationitemobject.cpp
index da67fdc2..1b2531f2 100644
--- a/src/uml/qobjects/qumlinformationitemobject.cpp
+++ b/src/uml/qobjects/qumlinformationitemobject.cpp
@@ -699,6 +699,7 @@ void QUmlInformationItemObject::setVisibility(QtUml::VisibilityKind visibility)
 void QUmlInformationItemObject::unsetVisibility()
 {
     Q_D(QModelingObject);
+    setVisibility(QtUml::VisibilityKindPublic);
     d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
@@ -719,6 +720,7 @@ void QUmlInformationItemObject::setLeaf(bool isLeaf)
 void QUmlInformationItemObject::unsetLeaf()
 {
     Q_D(QModelingObject);
+    setLeaf(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
@@ -824,6 +826,7 @@ void QUmlInformationItemObject::setAbstract(bool isAbstract)
 void QUmlInformationItemObject::unsetAbstract()
 {
     Q_D(QModelingObject);
+    setAbstract(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("abstract"));
 }
 
@@ -835,6 +838,7 @@ void QUmlInformationItemObject::setFinalSpecialization(bool isFinalSpecializatio
 void QUmlInformationItemObject::unsetFinalSpecialization()
 {
     Q_D(QModelingObject);
+    setFinalSpecialization(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("finalSpecialization"));
 }
 
diff --git a/src/uml/qobjects/qumlinitialnodeobject.cpp b/src/uml/qobjects/qumlinitialnodeobject.cpp
index 9021c060..c9e5eafd 100644
--- a/src/uml/qobjects/qumlinitialnodeobject.cpp
+++ b/src/uml/qobjects/qumlinitialnodeobject.cpp
@@ -353,6 +353,7 @@ void QUmlInitialNodeObject::setLeaf(bool isLeaf)
 void QUmlInitialNodeObject::unsetLeaf()
 {
     Q_D(QModelingObject);
+    setLeaf(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
diff --git a/src/uml/qobjects/qumlinputpinobject.cpp b/src/uml/qobjects/qumlinputpinobject.cpp
index ccfc29f0..a31eb011 100644
--- a/src/uml/qobjects/qumlinputpinobject.cpp
+++ b/src/uml/qobjects/qumlinputpinobject.cpp
@@ -449,6 +449,7 @@ void QUmlInputPinObject::setOrdered(bool isOrdered)
 void QUmlInputPinObject::unsetOrdered()
 {
     Q_D(QModelingObject);
+    setOrdered(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("ordered"));
 }
 
@@ -460,6 +461,8 @@ void QUmlInputPinObject::setUnique(bool isUnique)
 void QUmlInputPinObject::unsetUnique()
 {
     Q_D(QModelingObject);
+
+    setUnique(true);
     d->modifiedResettableProperties.removeAll(QStringLiteral("unique"));
 }
 
@@ -471,6 +474,7 @@ void QUmlInputPinObject::setLower(int lower)
 void QUmlInputPinObject::unsetLower()
 {
     Q_D(QModelingObject);
+    setLower(1);
     d->modifiedResettableProperties.removeAll(QStringLiteral("lower"));
 }
 
@@ -487,6 +491,7 @@ void QUmlInputPinObject::setUpper(int upper)
 void QUmlInputPinObject::unsetUpper()
 {
     Q_D(QModelingObject);
+    setUpper(1);
     d->modifiedResettableProperties.removeAll(QStringLiteral("upper"));
 }
 
@@ -542,6 +547,7 @@ void QUmlInputPinObject::setLeaf(bool isLeaf)
 void QUmlInputPinObject::unsetLeaf()
 {
     Q_D(QModelingObject);
+    setLeaf(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
@@ -664,6 +670,7 @@ void QUmlInputPinObject::setControlType(bool isControlType)
 void QUmlInputPinObject::unsetControlType()
 {
     Q_D(QModelingObject);
+    setControlType(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("controlType"));
 }
 
@@ -675,6 +682,7 @@ void QUmlInputPinObject::setOrdering(QtUml::ObjectNodeOrderingKind ordering)
 void QUmlInputPinObject::unsetOrdering()
 {
     Q_D(QModelingObject);
+    setOrdering(QtUml::ObjectNodeOrderingKindFIFO);
     d->modifiedResettableProperties.removeAll(QStringLiteral("ordering"));
 }
 
@@ -698,6 +706,7 @@ void QUmlInputPinObject::setControl(bool isControl)
 void QUmlInputPinObject::unsetControl()
 {
     Q_D(QModelingObject);
+    setControl(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("control"));
 }
 
diff --git a/src/uml/qobjects/qumlinstancespecificationobject.cpp b/src/uml/qobjects/qumlinstancespecificationobject.cpp
index 4705cfc5..8fabe166 100644
--- a/src/uml/qobjects/qumlinstancespecificationobject.cpp
+++ b/src/uml/qobjects/qumlinstancespecificationobject.cpp
@@ -332,6 +332,7 @@ void QUmlInstanceSpecificationObject::setVisibility(QtUml::VisibilityKind visibi
 void QUmlInstanceSpecificationObject::unsetVisibility()
 {
     Q_D(QModelingObject);
+    setVisibility(QtUml::VisibilityKindPublic);
     d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
diff --git a/src/uml/qobjects/qumlinstancevalueobject.cpp b/src/uml/qobjects/qumlinstancevalueobject.cpp
index 33cb9036..df068b27 100644
--- a/src/uml/qobjects/qumlinstancevalueobject.cpp
+++ b/src/uml/qobjects/qumlinstancevalueobject.cpp
@@ -349,6 +349,7 @@ void QUmlInstanceValueObject::setVisibility(QtUml::VisibilityKind visibility)
 void QUmlInstanceValueObject::unsetVisibility()
 {
     Q_D(QModelingObject);
+    setVisibility(QtUml::VisibilityKindPublic);
     d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
diff --git a/src/uml/qobjects/qumlinteractionconstraintobject.cpp b/src/uml/qobjects/qumlinteractionconstraintobject.cpp
index b035bf90..5ba67210 100644
--- a/src/uml/qobjects/qumlinteractionconstraintobject.cpp
+++ b/src/uml/qobjects/qumlinteractionconstraintobject.cpp
@@ -328,6 +328,7 @@ void QUmlInteractionConstraintObject::setVisibility(QtUml::VisibilityKind visibi
 void QUmlInteractionConstraintObject::unsetVisibility()
 {
     Q_D(QModelingObject);
+    setVisibility(QtUml::VisibilityKindPublic);
     d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
diff --git a/src/uml/qobjects/qumlinteractionobject.cpp b/src/uml/qobjects/qumlinteractionobject.cpp
index 2c8738a1..8d2f83a0 100644
--- a/src/uml/qobjects/qumlinteractionobject.cpp
+++ b/src/uml/qobjects/qumlinteractionobject.cpp
@@ -959,6 +959,7 @@ void QUmlInteractionObject::setVisibility(QtUml::VisibilityKind visibility)
 void QUmlInteractionObject::unsetVisibility()
 {
     Q_D(QModelingObject);
+    setVisibility(QtUml::VisibilityKindPublic);
     d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
@@ -979,6 +980,7 @@ void QUmlInteractionObject::setLeaf(bool isLeaf)
 void QUmlInteractionObject::unsetLeaf()
 {
     Q_D(QModelingObject);
+    setLeaf(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
@@ -1074,6 +1076,7 @@ void QUmlInteractionObject::setFinalSpecialization(bool isFinalSpecialization)
 void QUmlInteractionObject::unsetFinalSpecialization()
 {
     Q_D(QModelingObject);
+    setFinalSpecialization(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("finalSpecialization"));
 }
 
@@ -1233,6 +1236,7 @@ void QUmlInteractionObject::setAbstract(bool isAbstract)
 void QUmlInteractionObject::unsetAbstract()
 {
     Q_D(QModelingObject);
+    setAbstract(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("abstract"));
 }
 
@@ -1244,6 +1248,7 @@ void QUmlInteractionObject::setActive(bool isActive)
 void QUmlInteractionObject::unsetActive()
 {
     Q_D(QModelingObject);
+    setActive(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("active"));
 }
 
@@ -1312,6 +1317,8 @@ void QUmlInteractionObject::setReentrant(bool isReentrant)
 void QUmlInteractionObject::unsetReentrant()
 {
     Q_D(QModelingObject);
+
+    setReentrant(true);
     d->modifiedResettableProperties.removeAll(QStringLiteral("reentrant"));
 }
 
diff --git a/src/uml/qobjects/qumlinterfaceobject.cpp b/src/uml/qobjects/qumlinterfaceobject.cpp
index 47f2567b..25a1c3ff 100644
--- a/src/uml/qobjects/qumlinterfaceobject.cpp
+++ b/src/uml/qobjects/qumlinterfaceobject.cpp
@@ -742,6 +742,7 @@ void QUmlInterfaceObject::setVisibility(QtUml::VisibilityKind visibility)
 void QUmlInterfaceObject::unsetVisibility()
 {
     Q_D(QModelingObject);
+    setVisibility(QtUml::VisibilityKindPublic);
     d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
@@ -762,6 +763,7 @@ void QUmlInterfaceObject::setLeaf(bool isLeaf)
 void QUmlInterfaceObject::unsetLeaf()
 {
     Q_D(QModelingObject);
+    setLeaf(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
@@ -867,6 +869,7 @@ void QUmlInterfaceObject::setAbstract(bool isAbstract)
 void QUmlInterfaceObject::unsetAbstract()
 {
     Q_D(QModelingObject);
+    setAbstract(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("abstract"));
 }
 
@@ -878,6 +881,7 @@ void QUmlInterfaceObject::setFinalSpecialization(bool isFinalSpecialization)
 void QUmlInterfaceObject::unsetFinalSpecialization()
 {
     Q_D(QModelingObject);
+    setFinalSpecialization(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("finalSpecialization"));
 }
 
diff --git a/src/uml/qobjects/qumlinterfacerealizationobject.cpp b/src/uml/qobjects/qumlinterfacerealizationobject.cpp
index 5ddaf4b8..a74846f9 100644
--- a/src/uml/qobjects/qumlinterfacerealizationobject.cpp
+++ b/src/uml/qobjects/qumlinterfacerealizationobject.cpp
@@ -360,6 +360,7 @@ void QUmlInterfaceRealizationObject::setVisibility(QtUml::VisibilityKind visibil
 void QUmlInterfaceRealizationObject::unsetVisibility()
 {
     Q_D(QModelingObject);
+    setVisibility(QtUml::VisibilityKindPublic);
     d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
diff --git a/src/uml/qobjects/qumlintervalconstraintobject.cpp b/src/uml/qobjects/qumlintervalconstraintobject.cpp
index 5094221c..3eb83fa6 100644
--- a/src/uml/qobjects/qumlintervalconstraintobject.cpp
+++ b/src/uml/qobjects/qumlintervalconstraintobject.cpp
@@ -313,6 +313,7 @@ void QUmlIntervalConstraintObject::setVisibility(QtUml::VisibilityKind visibilit
 void QUmlIntervalConstraintObject::unsetVisibility()
 {
     Q_D(QModelingObject);
+    setVisibility(QtUml::VisibilityKindPublic);
     d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
diff --git a/src/uml/qobjects/qumlintervalobject.cpp b/src/uml/qobjects/qumlintervalobject.cpp
index e6b6d698..fc3dcdcc 100644
--- a/src/uml/qobjects/qumlintervalobject.cpp
+++ b/src/uml/qobjects/qumlintervalobject.cpp
@@ -357,6 +357,7 @@ void QUmlIntervalObject::setVisibility(QtUml::VisibilityKind visibility)
 void QUmlIntervalObject::unsetVisibility()
 {
     Q_D(QModelingObject);
+    setVisibility(QtUml::VisibilityKindPublic);
     d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
diff --git a/src/uml/qobjects/qumljoinnodeobject.cpp b/src/uml/qobjects/qumljoinnodeobject.cpp
index df236834..747b0f92 100644
--- a/src/uml/qobjects/qumljoinnodeobject.cpp
+++ b/src/uml/qobjects/qumljoinnodeobject.cpp
@@ -369,6 +369,7 @@ void QUmlJoinNodeObject::setLeaf(bool isLeaf)
 void QUmlJoinNodeObject::unsetLeaf()
 {
     Q_D(QModelingObject);
+    setLeaf(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
@@ -474,6 +475,8 @@ void QUmlJoinNodeObject::setCombineDuplicate(bool isCombineDuplicate)
 void QUmlJoinNodeObject::unsetCombineDuplicate()
 {
     Q_D(QModelingObject);
+
+    setCombineDuplicate(true);
     d->modifiedResettableProperties.removeAll(QStringLiteral("combineDuplicate"));
 }
 
diff --git a/src/uml/qobjects/qumllinkendcreationdataobject.cpp b/src/uml/qobjects/qumllinkendcreationdataobject.cpp
index 8d6cb68b..4ccfe73a 100644
--- a/src/uml/qobjects/qumllinkendcreationdataobject.cpp
+++ b/src/uml/qobjects/qumllinkendcreationdataobject.cpp
@@ -203,6 +203,7 @@ void QUmlLinkEndCreationDataObject::setReplaceAll(bool isReplaceAll)
 void QUmlLinkEndCreationDataObject::unsetReplaceAll()
 {
     Q_D(QModelingObject);
+    setReplaceAll(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("replaceAll"));
 }
 
diff --git a/src/uml/qobjects/qumllinkenddestructiondataobject.cpp b/src/uml/qobjects/qumllinkenddestructiondataobject.cpp
index 0a91fb34..0b9d5240 100644
--- a/src/uml/qobjects/qumllinkenddestructiondataobject.cpp
+++ b/src/uml/qobjects/qumllinkenddestructiondataobject.cpp
@@ -203,6 +203,7 @@ void QUmlLinkEndDestructionDataObject::setDestroyDuplicates(bool isDestroyDuplic
 void QUmlLinkEndDestructionDataObject::unsetDestroyDuplicates()
 {
     Q_D(QModelingObject);
+    setDestroyDuplicates(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("destroyDuplicates"));
 }
 
diff --git a/src/uml/qobjects/qumlliteralbooleanobject.cpp b/src/uml/qobjects/qumlliteralbooleanobject.cpp
index 16996ceb..7dd19af9 100644
--- a/src/uml/qobjects/qumlliteralbooleanobject.cpp
+++ b/src/uml/qobjects/qumlliteralbooleanobject.cpp
@@ -347,6 +347,7 @@ void QUmlLiteralBooleanObject::setVisibility(QtUml::VisibilityKind visibility)
 void QUmlLiteralBooleanObject::unsetVisibility()
 {
     Q_D(QModelingObject);
+    setVisibility(QtUml::VisibilityKindPublic);
     d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
@@ -360,6 +361,7 @@ void QUmlLiteralBooleanObject::setValue(bool value)
 void QUmlLiteralBooleanObject::unsetValue()
 {
     Q_D(QModelingObject);
+    setValue(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("value"));
 }
 
diff --git a/src/uml/qobjects/qumlliteralintegerobject.cpp b/src/uml/qobjects/qumlliteralintegerobject.cpp
index a9fc9a5a..c194be0c 100644
--- a/src/uml/qobjects/qumlliteralintegerobject.cpp
+++ b/src/uml/qobjects/qumlliteralintegerobject.cpp
@@ -347,6 +347,7 @@ void QUmlLiteralIntegerObject::setVisibility(QtUml::VisibilityKind visibility)
 void QUmlLiteralIntegerObject::unsetVisibility()
 {
     Q_D(QModelingObject);
+    setVisibility(QtUml::VisibilityKindPublic);
     d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
@@ -360,6 +361,7 @@ void QUmlLiteralIntegerObject::setValue(int value)
 void QUmlLiteralIntegerObject::unsetValue()
 {
     Q_D(QModelingObject);
+    setValue(0);
     d->modifiedResettableProperties.removeAll(QStringLiteral("value"));
 }
 
diff --git a/src/uml/qobjects/qumlliteralnullobject.cpp b/src/uml/qobjects/qumlliteralnullobject.cpp
index 0fb062bf..56204276 100644
--- a/src/uml/qobjects/qumlliteralnullobject.cpp
+++ b/src/uml/qobjects/qumlliteralnullobject.cpp
@@ -340,6 +340,7 @@ void QUmlLiteralNullObject::setVisibility(QtUml::VisibilityKind visibility)
 void QUmlLiteralNullObject::unsetVisibility()
 {
     Q_D(QModelingObject);
+    setVisibility(QtUml::VisibilityKindPublic);
     d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
diff --git a/src/uml/qobjects/qumlliteralrealobject.cpp b/src/uml/qobjects/qumlliteralrealobject.cpp
index 6d2af803..2f60ac62 100644
--- a/src/uml/qobjects/qumlliteralrealobject.cpp
+++ b/src/uml/qobjects/qumlliteralrealobject.cpp
@@ -347,6 +347,7 @@ void QUmlLiteralRealObject::setVisibility(QtUml::VisibilityKind visibility)
 void QUmlLiteralRealObject::unsetVisibility()
 {
     Q_D(QModelingObject);
+    setVisibility(QtUml::VisibilityKindPublic);
     d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
diff --git a/src/uml/qobjects/qumlliteralstringobject.cpp b/src/uml/qobjects/qumlliteralstringobject.cpp
index 4f1ae316..0cb60666 100644
--- a/src/uml/qobjects/qumlliteralstringobject.cpp
+++ b/src/uml/qobjects/qumlliteralstringobject.cpp
@@ -347,6 +347,7 @@ void QUmlLiteralStringObject::setVisibility(QtUml::VisibilityKind visibility)
 void QUmlLiteralStringObject::unsetVisibility()
 {
     Q_D(QModelingObject);
+    setVisibility(QtUml::VisibilityKindPublic);
     d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
diff --git a/src/uml/qobjects/qumlliteralunlimitednaturalobject.cpp b/src/uml/qobjects/qumlliteralunlimitednaturalobject.cpp
index 187cdc04..014cd467 100644
--- a/src/uml/qobjects/qumlliteralunlimitednaturalobject.cpp
+++ b/src/uml/qobjects/qumlliteralunlimitednaturalobject.cpp
@@ -347,6 +347,7 @@ void QUmlLiteralUnlimitedNaturalObject::setVisibility(QtUml::VisibilityKind visi
 void QUmlLiteralUnlimitedNaturalObject::unsetVisibility()
 {
     Q_D(QModelingObject);
+    setVisibility(QtUml::VisibilityKindPublic);
     d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
@@ -360,6 +361,7 @@ void QUmlLiteralUnlimitedNaturalObject::setValue(int value)
 void QUmlLiteralUnlimitedNaturalObject::unsetValue()
 {
     Q_D(QModelingObject);
+    setValue(0);
     d->modifiedResettableProperties.removeAll(QStringLiteral("value"));
 }
 
diff --git a/src/uml/qobjects/qumlloopnodeobject.cpp b/src/uml/qobjects/qumlloopnodeobject.cpp
index cdf98c90..f59aa77d 100644
--- a/src/uml/qobjects/qumlloopnodeobject.cpp
+++ b/src/uml/qobjects/qumlloopnodeobject.cpp
@@ -639,6 +639,7 @@ void QUmlLoopNodeObject::setLeaf(bool isLeaf)
 void QUmlLoopNodeObject::unsetLeaf()
 {
     Q_D(QModelingObject);
+    setLeaf(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
@@ -766,6 +767,7 @@ void QUmlLoopNodeObject::setLocallyReentrant(bool isLocallyReentrant)
 void QUmlLoopNodeObject::unsetLocallyReentrant()
 {
     Q_D(QModelingObject);
+    setLocallyReentrant(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("locallyReentrant"));
 }
 
@@ -923,6 +925,7 @@ void QUmlLoopNodeObject::setMustIsolate(bool mustIsolate)
 void QUmlLoopNodeObject::unsetMustIsolate()
 {
     Q_D(QModelingObject);
+    setMustIsolate(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("mustIsolate"));
 }
 
@@ -981,6 +984,7 @@ void QUmlLoopNodeObject::setTestedFirst(bool isTestedFirst)
 void QUmlLoopNodeObject::unsetTestedFirst()
 {
     Q_D(QModelingObject);
+    setTestedFirst(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("testedFirst"));
 }
 
diff --git a/src/uml/qobjects/qumlmanifestationobject.cpp b/src/uml/qobjects/qumlmanifestationobject.cpp
index 180f74c1..73d2de30 100644
--- a/src/uml/qobjects/qumlmanifestationobject.cpp
+++ b/src/uml/qobjects/qumlmanifestationobject.cpp
@@ -351,6 +351,7 @@ void QUmlManifestationObject::setVisibility(QtUml::VisibilityKind visibility)
 void QUmlManifestationObject::unsetVisibility()
 {
     Q_D(QModelingObject);
+    setVisibility(QtUml::VisibilityKindPublic);
     d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
diff --git a/src/uml/qobjects/qumlmergenodeobject.cpp b/src/uml/qobjects/qumlmergenodeobject.cpp
index 43388215..dcab038a 100644
--- a/src/uml/qobjects/qumlmergenodeobject.cpp
+++ b/src/uml/qobjects/qumlmergenodeobject.cpp
@@ -353,6 +353,7 @@ void QUmlMergeNodeObject::setLeaf(bool isLeaf)
 void QUmlMergeNodeObject::unsetLeaf()
 {
     Q_D(QModelingObject);
+    setLeaf(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
diff --git a/src/uml/qobjects/qumlmessageobject.cpp b/src/uml/qobjects/qumlmessageobject.cpp
index f17f8c32..1a457a9a 100644
--- a/src/uml/qobjects/qumlmessageobject.cpp
+++ b/src/uml/qobjects/qumlmessageobject.cpp
@@ -327,6 +327,7 @@ void QUmlMessageObject::setMessageKind(QtUml::MessageKind messageKind)
 void QUmlMessageObject::unsetMessageKind()
 {
     Q_D(QModelingObject);
+    setMessageKind(QtUml::MessageKindUnknown);
     d->modifiedResettableProperties.removeAll(QStringLiteral("messageKind"));
 }
 
@@ -338,6 +339,7 @@ void QUmlMessageObject::setMessageSort(QtUml::MessageSort messageSort)
 void QUmlMessageObject::unsetMessageSort()
 {
     Q_D(QModelingObject);
+    setMessageSort(QtUml::MessageSortSynchCall);
     d->modifiedResettableProperties.removeAll(QStringLiteral("messageSort"));
 }
 
diff --git a/src/uml/qobjects/qumlmodelobject.cpp b/src/uml/qobjects/qumlmodelobject.cpp
index 21de1b6a..5a84d89d 100644
--- a/src/uml/qobjects/qumlmodelobject.cpp
+++ b/src/uml/qobjects/qumlmodelobject.cpp
@@ -574,6 +574,7 @@ void QUmlModelObject::setVisibility(QtUml::VisibilityKind visibility)
 void QUmlModelObject::unsetVisibility()
 {
     Q_D(QModelingObject);
+    setVisibility(QtUml::VisibilityKindPublic);
     d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
diff --git a/src/uml/qobjects/qumlnodeobject.cpp b/src/uml/qobjects/qumlnodeobject.cpp
index 90743d75..f840736e 100644
--- a/src/uml/qobjects/qumlnodeobject.cpp
+++ b/src/uml/qobjects/qumlnodeobject.cpp
@@ -838,6 +838,7 @@ void QUmlNodeObject::setVisibility(QtUml::VisibilityKind visibility)
 void QUmlNodeObject::unsetVisibility()
 {
     Q_D(QModelingObject);
+    setVisibility(QtUml::VisibilityKindPublic);
     d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
@@ -858,6 +859,7 @@ void QUmlNodeObject::setLeaf(bool isLeaf)
 void QUmlNodeObject::unsetLeaf()
 {
     Q_D(QModelingObject);
+    setLeaf(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
@@ -953,6 +955,7 @@ void QUmlNodeObject::setFinalSpecialization(bool isFinalSpecialization)
 void QUmlNodeObject::unsetFinalSpecialization()
 {
     Q_D(QModelingObject);
+    setFinalSpecialization(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("finalSpecialization"));
 }
 
@@ -1112,6 +1115,7 @@ void QUmlNodeObject::setAbstract(bool isAbstract)
 void QUmlNodeObject::unsetAbstract()
 {
     Q_D(QModelingObject);
+    setAbstract(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("abstract"));
 }
 
@@ -1123,6 +1127,7 @@ void QUmlNodeObject::setActive(bool isActive)
 void QUmlNodeObject::unsetActive()
 {
     Q_D(QModelingObject);
+    setActive(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("active"));
 }
 
diff --git a/src/uml/qobjects/qumlobjectflowobject.cpp b/src/uml/qobjects/qumlobjectflowobject.cpp
index c4da1d74..e2e43ddd 100644
--- a/src/uml/qobjects/qumlobjectflowobject.cpp
+++ b/src/uml/qobjects/qumlobjectflowobject.cpp
@@ -399,6 +399,7 @@ void QUmlObjectFlowObject::setLeaf(bool isLeaf)
 void QUmlObjectFlowObject::unsetLeaf()
 {
     Q_D(QModelingObject);
+    setLeaf(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
@@ -499,6 +500,7 @@ void QUmlObjectFlowObject::setMulticast(bool isMulticast)
 void QUmlObjectFlowObject::unsetMulticast()
 {
     Q_D(QModelingObject);
+    setMulticast(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("multicast"));
 }
 
@@ -510,6 +512,7 @@ void QUmlObjectFlowObject::setMultireceive(bool isMultireceive)
 void QUmlObjectFlowObject::unsetMultireceive()
 {
     Q_D(QModelingObject);
+    setMultireceive(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("multireceive"));
 }
 
diff --git a/src/uml/qobjects/qumlopaqueactionobject.cpp b/src/uml/qobjects/qumlopaqueactionobject.cpp
index c5fd1289..cd2e24e6 100644
--- a/src/uml/qobjects/qumlopaqueactionobject.cpp
+++ b/src/uml/qobjects/qumlopaqueactionobject.cpp
@@ -442,6 +442,7 @@ void QUmlOpaqueActionObject::setLeaf(bool isLeaf)
 void QUmlOpaqueActionObject::unsetLeaf()
 {
     Q_D(QModelingObject);
+    setLeaf(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
@@ -574,6 +575,7 @@ void QUmlOpaqueActionObject::setLocallyReentrant(bool isLocallyReentrant)
 void QUmlOpaqueActionObject::unsetLocallyReentrant()
 {
     Q_D(QModelingObject);
+    setLocallyReentrant(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("locallyReentrant"));
 }
 
diff --git a/src/uml/qobjects/qumlopaquebehaviorobject.cpp b/src/uml/qobjects/qumlopaquebehaviorobject.cpp
index ae3a0872..abfe684f 100644
--- a/src/uml/qobjects/qumlopaquebehaviorobject.cpp
+++ b/src/uml/qobjects/qumlopaquebehaviorobject.cpp
@@ -888,6 +888,7 @@ void QUmlOpaqueBehaviorObject::setVisibility(QtUml::VisibilityKind visibility)
 void QUmlOpaqueBehaviorObject::unsetVisibility()
 {
     Q_D(QModelingObject);
+    setVisibility(QtUml::VisibilityKindPublic);
     d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
@@ -908,6 +909,7 @@ void QUmlOpaqueBehaviorObject::setLeaf(bool isLeaf)
 void QUmlOpaqueBehaviorObject::unsetLeaf()
 {
     Q_D(QModelingObject);
+    setLeaf(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
@@ -1003,6 +1005,7 @@ void QUmlOpaqueBehaviorObject::setFinalSpecialization(bool isFinalSpecialization
 void QUmlOpaqueBehaviorObject::unsetFinalSpecialization()
 {
     Q_D(QModelingObject);
+    setFinalSpecialization(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("finalSpecialization"));
 }
 
@@ -1162,6 +1165,7 @@ void QUmlOpaqueBehaviorObject::setAbstract(bool isAbstract)
 void QUmlOpaqueBehaviorObject::unsetAbstract()
 {
     Q_D(QModelingObject);
+    setAbstract(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("abstract"));
 }
 
@@ -1173,6 +1177,7 @@ void QUmlOpaqueBehaviorObject::setActive(bool isActive)
 void QUmlOpaqueBehaviorObject::unsetActive()
 {
     Q_D(QModelingObject);
+    setActive(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("active"));
 }
 
@@ -1241,6 +1246,8 @@ void QUmlOpaqueBehaviorObject::setReentrant(bool isReentrant)
 void QUmlOpaqueBehaviorObject::unsetReentrant()
 {
     Q_D(QModelingObject);
+
+    setReentrant(true);
     d->modifiedResettableProperties.removeAll(QStringLiteral("reentrant"));
 }
 
diff --git a/src/uml/qobjects/qumlopaqueexpressionobject.cpp b/src/uml/qobjects/qumlopaqueexpressionobject.cpp
index fd757f4c..e56f4164 100644
--- a/src/uml/qobjects/qumlopaqueexpressionobject.cpp
+++ b/src/uml/qobjects/qumlopaqueexpressionobject.cpp
@@ -390,6 +390,7 @@ void QUmlOpaqueExpressionObject::setVisibility(QtUml::VisibilityKind visibility)
 void QUmlOpaqueExpressionObject::unsetVisibility()
 {
     Q_D(QModelingObject);
+    setVisibility(QtUml::VisibilityKindPublic);
     d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
diff --git a/src/uml/qobjects/qumloperationobject.cpp b/src/uml/qobjects/qumloperationobject.cpp
index 20f38309..d039b909 100644
--- a/src/uml/qobjects/qumloperationobject.cpp
+++ b/src/uml/qobjects/qumloperationobject.cpp
@@ -684,6 +684,7 @@ void QUmlOperationObject::setLeaf(bool isLeaf)
 void QUmlOperationObject::unsetLeaf()
 {
     Q_D(QModelingObject);
+    setLeaf(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
@@ -727,6 +728,7 @@ void QUmlOperationObject::setStatic(bool isStatic)
 void QUmlOperationObject::unsetStatic()
 {
     Q_D(QModelingObject);
+    setStatic(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("static"));
 }
 
@@ -740,6 +742,7 @@ void QUmlOperationObject::setConcurrency(QtUml::CallConcurrencyKind concurrency)
 void QUmlOperationObject::unsetConcurrency()
 {
     Q_D(QModelingObject);
+    setConcurrency(QtUml::CallConcurrencyKindSequential);
     d->modifiedResettableProperties.removeAll(QStringLiteral("concurrency"));
 }
 
@@ -751,6 +754,7 @@ void QUmlOperationObject::setAbstract(bool isAbstract)
 void QUmlOperationObject::unsetAbstract()
 {
     Q_D(QModelingObject);
+    setAbstract(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("abstract"));
 }
 
@@ -809,6 +813,7 @@ void QUmlOperationObject::setOrdered(bool isOrdered)
 void QUmlOperationObject::unsetOrdered()
 {
     Q_D(QModelingObject);
+    setOrdered(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("ordered"));
 }
 
@@ -820,6 +825,7 @@ void QUmlOperationObject::setQuery(bool isQuery)
 void QUmlOperationObject::unsetQuery()
 {
     Q_D(QModelingObject);
+    setQuery(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("query"));
 }
 
@@ -831,6 +837,8 @@ void QUmlOperationObject::setUnique(bool isUnique)
 void QUmlOperationObject::unsetUnique()
 {
     Q_D(QModelingObject);
+
+    setUnique(true);
     d->modifiedResettableProperties.removeAll(QStringLiteral("unique"));
 }
 
@@ -842,6 +850,7 @@ void QUmlOperationObject::setLower(int lower)
 void QUmlOperationObject::unsetLower()
 {
     Q_D(QModelingObject);
+    setLower(1);
     d->modifiedResettableProperties.removeAll(QStringLiteral("lower"));
 }
 
@@ -913,6 +922,7 @@ void QUmlOperationObject::setUpper(int upper)
 void QUmlOperationObject::unsetUpper()
 {
     Q_D(QModelingObject);
+    setUpper(1);
     d->modifiedResettableProperties.removeAll(QStringLiteral("upper"));
 }
 
diff --git a/src/uml/qobjects/qumloutputpinobject.cpp b/src/uml/qobjects/qumloutputpinobject.cpp
index 10d51530..2bcf4194 100644
--- a/src/uml/qobjects/qumloutputpinobject.cpp
+++ b/src/uml/qobjects/qumloutputpinobject.cpp
@@ -449,6 +449,7 @@ void QUmlOutputPinObject::setOrdered(bool isOrdered)
 void QUmlOutputPinObject::unsetOrdered()
 {
     Q_D(QModelingObject);
+    setOrdered(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("ordered"));
 }
 
@@ -460,6 +461,8 @@ void QUmlOutputPinObject::setUnique(bool isUnique)
 void QUmlOutputPinObject::unsetUnique()
 {
     Q_D(QModelingObject);
+
+    setUnique(true);
     d->modifiedResettableProperties.removeAll(QStringLiteral("unique"));
 }
 
@@ -471,6 +474,7 @@ void QUmlOutputPinObject::setLower(int lower)
 void QUmlOutputPinObject::unsetLower()
 {
     Q_D(QModelingObject);
+    setLower(1);
     d->modifiedResettableProperties.removeAll(QStringLiteral("lower"));
 }
 
@@ -487,6 +491,7 @@ void QUmlOutputPinObject::setUpper(int upper)
 void QUmlOutputPinObject::unsetUpper()
 {
     Q_D(QModelingObject);
+    setUpper(1);
     d->modifiedResettableProperties.removeAll(QStringLiteral("upper"));
 }
 
@@ -542,6 +547,7 @@ void QUmlOutputPinObject::setLeaf(bool isLeaf)
 void QUmlOutputPinObject::unsetLeaf()
 {
     Q_D(QModelingObject);
+    setLeaf(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
@@ -664,6 +670,7 @@ void QUmlOutputPinObject::setControlType(bool isControlType)
 void QUmlOutputPinObject::unsetControlType()
 {
     Q_D(QModelingObject);
+    setControlType(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("controlType"));
 }
 
@@ -675,6 +682,7 @@ void QUmlOutputPinObject::setOrdering(QtUml::ObjectNodeOrderingKind ordering)
 void QUmlOutputPinObject::unsetOrdering()
 {
     Q_D(QModelingObject);
+    setOrdering(QtUml::ObjectNodeOrderingKindFIFO);
     d->modifiedResettableProperties.removeAll(QStringLiteral("ordering"));
 }
 
@@ -698,6 +706,7 @@ void QUmlOutputPinObject::setControl(bool isControl)
 void QUmlOutputPinObject::unsetControl()
 {
     Q_D(QModelingObject);
+    setControl(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("control"));
 }
 
diff --git a/src/uml/qobjects/qumlpackageimportobject.cpp b/src/uml/qobjects/qumlpackageimportobject.cpp
index 18fba445..c17a85d4 100644
--- a/src/uml/qobjects/qumlpackageimportobject.cpp
+++ b/src/uml/qobjects/qumlpackageimportobject.cpp
@@ -229,6 +229,7 @@ void QUmlPackageImportObject::setVisibility(QtUml::VisibilityKind visibility)
 void QUmlPackageImportObject::unsetVisibility()
 {
     Q_D(QModelingObject);
+    setVisibility(QtUml::VisibilityKindPublic);
     d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
diff --git a/src/uml/qobjects/qumlpackageobject.cpp b/src/uml/qobjects/qumlpackageobject.cpp
index 386d1fdb..d6396282 100644
--- a/src/uml/qobjects/qumlpackageobject.cpp
+++ b/src/uml/qobjects/qumlpackageobject.cpp
@@ -566,6 +566,7 @@ void QUmlPackageObject::setVisibility(QtUml::VisibilityKind visibility)
 void QUmlPackageObject::unsetVisibility()
 {
     Q_D(QModelingObject);
+    setVisibility(QtUml::VisibilityKindPublic);
     d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
diff --git a/src/uml/qobjects/qumlparameterobject.cpp b/src/uml/qobjects/qumlparameterobject.cpp
index a51ae631..26fe4526 100644
--- a/src/uml/qobjects/qumlparameterobject.cpp
+++ b/src/uml/qobjects/qumlparameterobject.cpp
@@ -391,6 +391,7 @@ void QUmlParameterObject::setOrdered(bool isOrdered)
 void QUmlParameterObject::unsetOrdered()
 {
     Q_D(QModelingObject);
+    setOrdered(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("ordered"));
 }
 
@@ -402,6 +403,8 @@ void QUmlParameterObject::setUnique(bool isUnique)
 void QUmlParameterObject::unsetUnique()
 {
     Q_D(QModelingObject);
+
+    setUnique(true);
     d->modifiedResettableProperties.removeAll(QStringLiteral("unique"));
 }
 
@@ -413,6 +416,7 @@ void QUmlParameterObject::setLower(int lower)
 void QUmlParameterObject::unsetLower()
 {
     Q_D(QModelingObject);
+    setLower(1);
     d->modifiedResettableProperties.removeAll(QStringLiteral("lower"));
 }
 
@@ -429,6 +433,7 @@ void QUmlParameterObject::setUpper(int upper)
 void QUmlParameterObject::unsetUpper()
 {
     Q_D(QModelingObject);
+    setUpper(1);
     d->modifiedResettableProperties.removeAll(QStringLiteral("upper"));
 }
 
@@ -524,6 +529,7 @@ void QUmlParameterObject::setDirection(QtUml::ParameterDirectionKind direction)
 void QUmlParameterObject::unsetDirection()
 {
     Q_D(QModelingObject);
+    setDirection(QtUml::ParameterDirectionKindIn);
     d->modifiedResettableProperties.removeAll(QStringLiteral("direction"));
 }
 
@@ -540,6 +546,7 @@ void QUmlParameterObject::setException(bool isException)
 void QUmlParameterObject::unsetException()
 {
     Q_D(QModelingObject);
+    setException(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("exception"));
 }
 
@@ -551,6 +558,7 @@ void QUmlParameterObject::setStream(bool isStream)
 void QUmlParameterObject::unsetStream()
 {
     Q_D(QModelingObject);
+    setStream(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("stream"));
 }
 
diff --git a/src/uml/qobjects/qumlportobject.cpp b/src/uml/qobjects/qumlportobject.cpp
index 173bfa3a..2ba403c4 100644
--- a/src/uml/qobjects/qumlportobject.cpp
+++ b/src/uml/qobjects/qumlportobject.cpp
@@ -654,6 +654,7 @@ void QUmlPortObject::setOrdered(bool isOrdered)
 void QUmlPortObject::unsetOrdered()
 {
     Q_D(QModelingObject);
+    setOrdered(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("ordered"));
 }
 
@@ -665,6 +666,8 @@ void QUmlPortObject::setUnique(bool isUnique)
 void QUmlPortObject::unsetUnique()
 {
     Q_D(QModelingObject);
+
+    setUnique(true);
     d->modifiedResettableProperties.removeAll(QStringLiteral("unique"));
 }
 
@@ -676,6 +679,7 @@ void QUmlPortObject::setLower(int lower)
 void QUmlPortObject::unsetLower()
 {
     Q_D(QModelingObject);
+    setLower(1);
     d->modifiedResettableProperties.removeAll(QStringLiteral("lower"));
 }
 
@@ -692,6 +696,7 @@ void QUmlPortObject::setUpper(int upper)
 void QUmlPortObject::unsetUpper()
 {
     Q_D(QModelingObject);
+    setUpper(1);
     d->modifiedResettableProperties.removeAll(QStringLiteral("upper"));
 }
 
@@ -710,6 +715,7 @@ void QUmlPortObject::setLeaf(bool isLeaf)
 void QUmlPortObject::unsetLeaf()
 {
     Q_D(QModelingObject);
+    setLeaf(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
@@ -753,6 +759,7 @@ void QUmlPortObject::setStatic(bool isStatic)
 void QUmlPortObject::unsetStatic()
 {
     Q_D(QModelingObject);
+    setStatic(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("static"));
 }
 
@@ -811,6 +818,7 @@ void QUmlPortObject::setAggregation(QtUml::AggregationKind aggregation)
 void QUmlPortObject::unsetAggregation()
 {
     Q_D(QModelingObject);
+    setAggregation(QtUml::AggregationKindNone);
     d->modifiedResettableProperties.removeAll(QStringLiteral("aggregation"));
 }
 
@@ -857,6 +865,7 @@ void QUmlPortObject::setComposite(bool isComposite)
 void QUmlPortObject::unsetComposite()
 {
     Q_D(QModelingObject);
+    setComposite(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("composite"));
 }
 
@@ -868,6 +877,7 @@ void QUmlPortObject::setDerived(bool isDerived)
 void QUmlPortObject::unsetDerived()
 {
     Q_D(QModelingObject);
+    setDerived(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("derived"));
 }
 
@@ -879,6 +889,7 @@ void QUmlPortObject::setDerivedUnion(bool isDerivedUnion)
 void QUmlPortObject::unsetDerivedUnion()
 {
     Q_D(QModelingObject);
+    setDerivedUnion(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("derivedUnion"));
 }
 
@@ -890,6 +901,7 @@ void QUmlPortObject::setID(bool isID)
 void QUmlPortObject::unsetID()
 {
     Q_D(QModelingObject);
+    setID(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("iD"));
 }
 
@@ -901,6 +913,7 @@ void QUmlPortObject::setReadOnly(bool isReadOnly)
 void QUmlPortObject::unsetReadOnly()
 {
     Q_D(QModelingObject);
+    setReadOnly(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("readOnly"));
 }
 
@@ -954,6 +967,7 @@ void QUmlPortObject::setBehavior(bool isBehavior)
 void QUmlPortObject::unsetBehavior()
 {
     Q_D(QModelingObject);
+    setBehavior(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("behavior"));
 }
 
@@ -965,6 +979,7 @@ void QUmlPortObject::setConjugated(bool isConjugated)
 void QUmlPortObject::unsetConjugated()
 {
     Q_D(QModelingObject);
+    setConjugated(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("conjugated"));
 }
 
@@ -976,6 +991,8 @@ void QUmlPortObject::setService(bool isService)
 void QUmlPortObject::unsetService()
 {
     Q_D(QModelingObject);
+
+    setService(true);
     d->modifiedResettableProperties.removeAll(QStringLiteral("service"));
 }
 
diff --git a/src/uml/qobjects/qumlprimitivetypeobject.cpp b/src/uml/qobjects/qumlprimitivetypeobject.cpp
index 85a52583..4605c072 100644
--- a/src/uml/qobjects/qumlprimitivetypeobject.cpp
+++ b/src/uml/qobjects/qumlprimitivetypeobject.cpp
@@ -710,6 +710,7 @@ void QUmlPrimitiveTypeObject::setVisibility(QtUml::VisibilityKind visibility)
 void QUmlPrimitiveTypeObject::unsetVisibility()
 {
     Q_D(QModelingObject);
+    setVisibility(QtUml::VisibilityKindPublic);
     d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
@@ -730,6 +731,7 @@ void QUmlPrimitiveTypeObject::setLeaf(bool isLeaf)
 void QUmlPrimitiveTypeObject::unsetLeaf()
 {
     Q_D(QModelingObject);
+    setLeaf(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
@@ -835,6 +837,7 @@ void QUmlPrimitiveTypeObject::setAbstract(bool isAbstract)
 void QUmlPrimitiveTypeObject::unsetAbstract()
 {
     Q_D(QModelingObject);
+    setAbstract(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("abstract"));
 }
 
@@ -846,6 +849,7 @@ void QUmlPrimitiveTypeObject::setFinalSpecialization(bool isFinalSpecialization)
 void QUmlPrimitiveTypeObject::unsetFinalSpecialization()
 {
     Q_D(QModelingObject);
+    setFinalSpecialization(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("finalSpecialization"));
 }
 
diff --git a/src/uml/qobjects/qumlprofileapplicationobject.cpp b/src/uml/qobjects/qumlprofileapplicationobject.cpp
index 949d8f99..06911bcb 100644
--- a/src/uml/qobjects/qumlprofileapplicationobject.cpp
+++ b/src/uml/qobjects/qumlprofileapplicationobject.cpp
@@ -229,6 +229,7 @@ void QUmlProfileApplicationObject::setStrict(bool isStrict)
 void QUmlProfileApplicationObject::unsetStrict()
 {
     Q_D(QModelingObject);
+    setStrict(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("strict"));
 }
 
diff --git a/src/uml/qobjects/qumlprofileobject.cpp b/src/uml/qobjects/qumlprofileobject.cpp
index e09fe17e..c08c1ae8 100644
--- a/src/uml/qobjects/qumlprofileobject.cpp
+++ b/src/uml/qobjects/qumlprofileobject.cpp
@@ -584,6 +584,7 @@ void QUmlProfileObject::setVisibility(QtUml::VisibilityKind visibility)
 void QUmlProfileObject::unsetVisibility()
 {
     Q_D(QModelingObject);
+    setVisibility(QtUml::VisibilityKindPublic);
     d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
diff --git a/src/uml/qobjects/qumlpropertyobject.cpp b/src/uml/qobjects/qumlpropertyobject.cpp
index 5861bf1c..8afeecc9 100644
--- a/src/uml/qobjects/qumlpropertyobject.cpp
+++ b/src/uml/qobjects/qumlpropertyobject.cpp
@@ -603,6 +603,7 @@ void QUmlPropertyObject::setOrdered(bool isOrdered)
 void QUmlPropertyObject::unsetOrdered()
 {
     Q_D(QModelingObject);
+    setOrdered(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("ordered"));
 }
 
@@ -614,6 +615,8 @@ void QUmlPropertyObject::setUnique(bool isUnique)
 void QUmlPropertyObject::unsetUnique()
 {
     Q_D(QModelingObject);
+
+    setUnique(true);
     d->modifiedResettableProperties.removeAll(QStringLiteral("unique"));
 }
 
@@ -625,6 +628,7 @@ void QUmlPropertyObject::setLower(int lower)
 void QUmlPropertyObject::unsetLower()
 {
     Q_D(QModelingObject);
+    setLower(1);
     d->modifiedResettableProperties.removeAll(QStringLiteral("lower"));
 }
 
@@ -641,6 +645,7 @@ void QUmlPropertyObject::setUpper(int upper)
 void QUmlPropertyObject::unsetUpper()
 {
     Q_D(QModelingObject);
+    setUpper(1);
     d->modifiedResettableProperties.removeAll(QStringLiteral("upper"));
 }
 
@@ -659,6 +664,7 @@ void QUmlPropertyObject::setLeaf(bool isLeaf)
 void QUmlPropertyObject::unsetLeaf()
 {
     Q_D(QModelingObject);
+    setLeaf(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
@@ -702,6 +708,7 @@ void QUmlPropertyObject::setStatic(bool isStatic)
 void QUmlPropertyObject::unsetStatic()
 {
     Q_D(QModelingObject);
+    setStatic(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("static"));
 }
 
@@ -760,6 +767,7 @@ void QUmlPropertyObject::setAggregation(QtUml::AggregationKind aggregation)
 void QUmlPropertyObject::unsetAggregation()
 {
     Q_D(QModelingObject);
+    setAggregation(QtUml::AggregationKindNone);
     d->modifiedResettableProperties.removeAll(QStringLiteral("aggregation"));
 }
 
@@ -806,6 +814,7 @@ void QUmlPropertyObject::setComposite(bool isComposite)
 void QUmlPropertyObject::unsetComposite()
 {
     Q_D(QModelingObject);
+    setComposite(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("composite"));
 }
 
@@ -817,6 +826,7 @@ void QUmlPropertyObject::setDerived(bool isDerived)
 void QUmlPropertyObject::unsetDerived()
 {
     Q_D(QModelingObject);
+    setDerived(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("derived"));
 }
 
@@ -828,6 +838,7 @@ void QUmlPropertyObject::setDerivedUnion(bool isDerivedUnion)
 void QUmlPropertyObject::unsetDerivedUnion()
 {
     Q_D(QModelingObject);
+    setDerivedUnion(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("derivedUnion"));
 }
 
@@ -839,6 +850,7 @@ void QUmlPropertyObject::setID(bool isID)
 void QUmlPropertyObject::unsetID()
 {
     Q_D(QModelingObject);
+    setID(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("iD"));
 }
 
@@ -850,6 +862,7 @@ void QUmlPropertyObject::setReadOnly(bool isReadOnly)
 void QUmlPropertyObject::unsetReadOnly()
 {
     Q_D(QModelingObject);
+    setReadOnly(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("readOnly"));
 }
 
diff --git a/src/uml/qobjects/qumlprotocolstatemachineobject.cpp b/src/uml/qobjects/qumlprotocolstatemachineobject.cpp
index 0addd043..76e5f978 100644
--- a/src/uml/qobjects/qumlprotocolstatemachineobject.cpp
+++ b/src/uml/qobjects/qumlprotocolstatemachineobject.cpp
@@ -932,6 +932,7 @@ void QUmlProtocolStateMachineObject::setVisibility(QtUml::VisibilityKind visibil
 void QUmlProtocolStateMachineObject::unsetVisibility()
 {
     Q_D(QModelingObject);
+    setVisibility(QtUml::VisibilityKindPublic);
     d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
@@ -952,6 +953,7 @@ void QUmlProtocolStateMachineObject::setLeaf(bool isLeaf)
 void QUmlProtocolStateMachineObject::unsetLeaf()
 {
     Q_D(QModelingObject);
+    setLeaf(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
@@ -1047,6 +1049,7 @@ void QUmlProtocolStateMachineObject::setFinalSpecialization(bool isFinalSpeciali
 void QUmlProtocolStateMachineObject::unsetFinalSpecialization()
 {
     Q_D(QModelingObject);
+    setFinalSpecialization(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("finalSpecialization"));
 }
 
@@ -1206,6 +1209,7 @@ void QUmlProtocolStateMachineObject::setAbstract(bool isAbstract)
 void QUmlProtocolStateMachineObject::unsetAbstract()
 {
     Q_D(QModelingObject);
+    setAbstract(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("abstract"));
 }
 
@@ -1217,6 +1221,7 @@ void QUmlProtocolStateMachineObject::setActive(bool isActive)
 void QUmlProtocolStateMachineObject::unsetActive()
 {
     Q_D(QModelingObject);
+    setActive(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("active"));
 }
 
@@ -1285,6 +1290,8 @@ void QUmlProtocolStateMachineObject::setReentrant(bool isReentrant)
 void QUmlProtocolStateMachineObject::unsetReentrant()
 {
     Q_D(QModelingObject);
+
+    setReentrant(true);
     d->modifiedResettableProperties.removeAll(QStringLiteral("reentrant"));
 }
 
diff --git a/src/uml/qobjects/qumlprotocoltransitionobject.cpp b/src/uml/qobjects/qumlprotocoltransitionobject.cpp
index ae512c1e..947e869e 100644
--- a/src/uml/qobjects/qumlprotocoltransitionobject.cpp
+++ b/src/uml/qobjects/qumlprotocoltransitionobject.cpp
@@ -474,6 +474,7 @@ void QUmlProtocolTransitionObject::setLeaf(bool isLeaf)
 void QUmlProtocolTransitionObject::unsetLeaf()
 {
     Q_D(QModelingObject);
+    setLeaf(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
@@ -573,6 +574,7 @@ void QUmlProtocolTransitionObject::setKind(QtUml::TransitionKind kind)
 void QUmlProtocolTransitionObject::unsetKind()
 {
     Q_D(QModelingObject);
+    setKind(QtUml::TransitionKindExternal);
     d->modifiedResettableProperties.removeAll(QStringLiteral("kind"));
 }
 
diff --git a/src/uml/qobjects/qumlpseudostateobject.cpp b/src/uml/qobjects/qumlpseudostateobject.cpp
index 3f927250..2b7e9070 100644
--- a/src/uml/qobjects/qumlpseudostateobject.cpp
+++ b/src/uml/qobjects/qumlpseudostateobject.cpp
@@ -333,6 +333,7 @@ void QUmlPseudostateObject::setKind(QtUml::PseudostateKind kind)
 void QUmlPseudostateObject::unsetKind()
 {
     Q_D(QModelingObject);
+    setKind(QtUml::PseudostateKindInitial);
     d->modifiedResettableProperties.removeAll(QStringLiteral("kind"));
 }
 
diff --git a/src/uml/qobjects/qumlraiseexceptionactionobject.cpp b/src/uml/qobjects/qumlraiseexceptionactionobject.cpp
index 476f4f66..947116dd 100644
--- a/src/uml/qobjects/qumlraiseexceptionactionobject.cpp
+++ b/src/uml/qobjects/qumlraiseexceptionactionobject.cpp
@@ -424,6 +424,7 @@ void QUmlRaiseExceptionActionObject::setLeaf(bool isLeaf)
 void QUmlRaiseExceptionActionObject::unsetLeaf()
 {
     Q_D(QModelingObject);
+    setLeaf(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
@@ -556,6 +557,7 @@ void QUmlRaiseExceptionActionObject::setLocallyReentrant(bool isLocallyReentrant
 void QUmlRaiseExceptionActionObject::unsetLocallyReentrant()
 {
     Q_D(QModelingObject);
+    setLocallyReentrant(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("locallyReentrant"));
 }
 
diff --git a/src/uml/qobjects/qumlreadextentactionobject.cpp b/src/uml/qobjects/qumlreadextentactionobject.cpp
index 3abaad2f..1aa60cee 100644
--- a/src/uml/qobjects/qumlreadextentactionobject.cpp
+++ b/src/uml/qobjects/qumlreadextentactionobject.cpp
@@ -432,6 +432,7 @@ void QUmlReadExtentActionObject::setLeaf(bool isLeaf)
 void QUmlReadExtentActionObject::unsetLeaf()
 {
     Q_D(QModelingObject);
+    setLeaf(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
@@ -564,6 +565,7 @@ void QUmlReadExtentActionObject::setLocallyReentrant(bool isLocallyReentrant)
 void QUmlReadExtentActionObject::unsetLocallyReentrant()
 {
     Q_D(QModelingObject);
+    setLocallyReentrant(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("locallyReentrant"));
 }
 
diff --git a/src/uml/qobjects/qumlreadisclassifiedobjectactionobject.cpp b/src/uml/qobjects/qumlreadisclassifiedobjectactionobject.cpp
index ea9269ff..8c5908f2 100644
--- a/src/uml/qobjects/qumlreadisclassifiedobjectactionobject.cpp
+++ b/src/uml/qobjects/qumlreadisclassifiedobjectactionobject.cpp
@@ -445,6 +445,7 @@ void QUmlReadIsClassifiedObjectActionObject::setLeaf(bool isLeaf)
 void QUmlReadIsClassifiedObjectActionObject::unsetLeaf()
 {
     Q_D(QModelingObject);
+    setLeaf(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
@@ -577,6 +578,7 @@ void QUmlReadIsClassifiedObjectActionObject::setLocallyReentrant(bool isLocallyR
 void QUmlReadIsClassifiedObjectActionObject::unsetLocallyReentrant()
 {
     Q_D(QModelingObject);
+    setLocallyReentrant(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("locallyReentrant"));
 }
 
@@ -625,6 +627,7 @@ void QUmlReadIsClassifiedObjectActionObject::setDirect(bool isDirect)
 void QUmlReadIsClassifiedObjectActionObject::unsetDirect()
 {
     Q_D(QModelingObject);
+    setDirect(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("direct"));
 }
 
diff --git a/src/uml/qobjects/qumlreadlinkactionobject.cpp b/src/uml/qobjects/qumlreadlinkactionobject.cpp
index 4ebf6c8f..d40cdc90 100644
--- a/src/uml/qobjects/qumlreadlinkactionobject.cpp
+++ b/src/uml/qobjects/qumlreadlinkactionobject.cpp
@@ -454,6 +454,7 @@ void QUmlReadLinkActionObject::setLeaf(bool isLeaf)
 void QUmlReadLinkActionObject::unsetLeaf()
 {
     Q_D(QModelingObject);
+    setLeaf(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
@@ -586,6 +587,7 @@ void QUmlReadLinkActionObject::setLocallyReentrant(bool isLocallyReentrant)
 void QUmlReadLinkActionObject::unsetLocallyReentrant()
 {
     Q_D(QModelingObject);
+    setLocallyReentrant(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("locallyReentrant"));
 }
 
diff --git a/src/uml/qobjects/qumlreadlinkobjectendactionobject.cpp b/src/uml/qobjects/qumlreadlinkobjectendactionobject.cpp
index 7b16e498..36ab8dd8 100644
--- a/src/uml/qobjects/qumlreadlinkobjectendactionobject.cpp
+++ b/src/uml/qobjects/qumlreadlinkobjectendactionobject.cpp
@@ -441,6 +441,7 @@ void QUmlReadLinkObjectEndActionObject::setLeaf(bool isLeaf)
 void QUmlReadLinkObjectEndActionObject::unsetLeaf()
 {
     Q_D(QModelingObject);
+    setLeaf(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
@@ -573,6 +574,7 @@ void QUmlReadLinkObjectEndActionObject::setLocallyReentrant(bool isLocallyReentr
 void QUmlReadLinkObjectEndActionObject::unsetLocallyReentrant()
 {
     Q_D(QModelingObject);
+    setLocallyReentrant(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("locallyReentrant"));
 }
 
diff --git a/src/uml/qobjects/qumlreadlinkobjectendqualifieractionobject.cpp b/src/uml/qobjects/qumlreadlinkobjectendqualifieractionobject.cpp
index 63e3a1be..7a4e1cd5 100644
--- a/src/uml/qobjects/qumlreadlinkobjectendqualifieractionobject.cpp
+++ b/src/uml/qobjects/qumlreadlinkobjectendqualifieractionobject.cpp
@@ -441,6 +441,7 @@ void QUmlReadLinkObjectEndQualifierActionObject::setLeaf(bool isLeaf)
 void QUmlReadLinkObjectEndQualifierActionObject::unsetLeaf()
 {
     Q_D(QModelingObject);
+    setLeaf(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
@@ -573,6 +574,7 @@ void QUmlReadLinkObjectEndQualifierActionObject::setLocallyReentrant(bool isLoca
 void QUmlReadLinkObjectEndQualifierActionObject::unsetLocallyReentrant()
 {
     Q_D(QModelingObject);
+    setLocallyReentrant(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("locallyReentrant"));
 }
 
diff --git a/src/uml/qobjects/qumlreadselfactionobject.cpp b/src/uml/qobjects/qumlreadselfactionobject.cpp
index 9b2221e3..b486591c 100644
--- a/src/uml/qobjects/qumlreadselfactionobject.cpp
+++ b/src/uml/qobjects/qumlreadselfactionobject.cpp
@@ -424,6 +424,7 @@ void QUmlReadSelfActionObject::setLeaf(bool isLeaf)
 void QUmlReadSelfActionObject::unsetLeaf()
 {
     Q_D(QModelingObject);
+    setLeaf(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
@@ -556,6 +557,7 @@ void QUmlReadSelfActionObject::setLocallyReentrant(bool isLocallyReentrant)
 void QUmlReadSelfActionObject::unsetLocallyReentrant()
 {
     Q_D(QModelingObject);
+    setLocallyReentrant(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("locallyReentrant"));
 }
 
diff --git a/src/uml/qobjects/qumlreadstructuralfeatureactionobject.cpp b/src/uml/qobjects/qumlreadstructuralfeatureactionobject.cpp
index 8a515f1e..601b88ed 100644
--- a/src/uml/qobjects/qumlreadstructuralfeatureactionobject.cpp
+++ b/src/uml/qobjects/qumlreadstructuralfeatureactionobject.cpp
@@ -443,6 +443,7 @@ void QUmlReadStructuralFeatureActionObject::setLeaf(bool isLeaf)
 void QUmlReadStructuralFeatureActionObject::unsetLeaf()
 {
     Q_D(QModelingObject);
+    setLeaf(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
@@ -575,6 +576,7 @@ void QUmlReadStructuralFeatureActionObject::setLocallyReentrant(bool isLocallyRe
 void QUmlReadStructuralFeatureActionObject::unsetLocallyReentrant()
 {
     Q_D(QModelingObject);
+    setLocallyReentrant(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("locallyReentrant"));
 }
 
diff --git a/src/uml/qobjects/qumlreadvariableactionobject.cpp b/src/uml/qobjects/qumlreadvariableactionobject.cpp
index 9d347e79..bd06a53e 100644
--- a/src/uml/qobjects/qumlreadvariableactionobject.cpp
+++ b/src/uml/qobjects/qumlreadvariableactionobject.cpp
@@ -435,6 +435,7 @@ void QUmlReadVariableActionObject::setLeaf(bool isLeaf)
 void QUmlReadVariableActionObject::unsetLeaf()
 {
     Q_D(QModelingObject);
+    setLeaf(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
@@ -567,6 +568,7 @@ void QUmlReadVariableActionObject::setLocallyReentrant(bool isLocallyReentrant)
 void QUmlReadVariableActionObject::unsetLocallyReentrant()
 {
     Q_D(QModelingObject);
+    setLocallyReentrant(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("locallyReentrant"));
 }
 
diff --git a/src/uml/qobjects/qumlrealizationobject.cpp b/src/uml/qobjects/qumlrealizationobject.cpp
index f2f59b9f..491b3063 100644
--- a/src/uml/qobjects/qumlrealizationobject.cpp
+++ b/src/uml/qobjects/qumlrealizationobject.cpp
@@ -340,6 +340,7 @@ void QUmlRealizationObject::setVisibility(QtUml::VisibilityKind visibility)
 void QUmlRealizationObject::unsetVisibility()
 {
     Q_D(QModelingObject);
+    setVisibility(QtUml::VisibilityKindPublic);
     d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
diff --git a/src/uml/qobjects/qumlreceptionobject.cpp b/src/uml/qobjects/qumlreceptionobject.cpp
index 6a09d4f5..613a13fa 100644
--- a/src/uml/qobjects/qumlreceptionobject.cpp
+++ b/src/uml/qobjects/qumlreceptionobject.cpp
@@ -506,6 +506,7 @@ void QUmlReceptionObject::setLeaf(bool isLeaf)
 void QUmlReceptionObject::unsetLeaf()
 {
     Q_D(QModelingObject);
+    setLeaf(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
@@ -549,6 +550,7 @@ void QUmlReceptionObject::setStatic(bool isStatic)
 void QUmlReceptionObject::unsetStatic()
 {
     Q_D(QModelingObject);
+    setStatic(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("static"));
 }
 
@@ -562,6 +564,7 @@ void QUmlReceptionObject::setConcurrency(QtUml::CallConcurrencyKind concurrency)
 void QUmlReceptionObject::unsetConcurrency()
 {
     Q_D(QModelingObject);
+    setConcurrency(QtUml::CallConcurrencyKindSequential);
     d->modifiedResettableProperties.removeAll(QStringLiteral("concurrency"));
 }
 
@@ -573,6 +576,7 @@ void QUmlReceptionObject::setAbstract(bool isAbstract)
 void QUmlReceptionObject::unsetAbstract()
 {
     Q_D(QModelingObject);
+    setAbstract(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("abstract"));
 }
 
diff --git a/src/uml/qobjects/qumlreclassifyobjectactionobject.cpp b/src/uml/qobjects/qumlreclassifyobjectactionobject.cpp
index e7b62b5a..a8271a3c 100644
--- a/src/uml/qobjects/qumlreclassifyobjectactionobject.cpp
+++ b/src/uml/qobjects/qumlreclassifyobjectactionobject.cpp
@@ -445,6 +445,7 @@ void QUmlReclassifyObjectActionObject::setLeaf(bool isLeaf)
 void QUmlReclassifyObjectActionObject::unsetLeaf()
 {
     Q_D(QModelingObject);
+    setLeaf(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
@@ -577,6 +578,7 @@ void QUmlReclassifyObjectActionObject::setLocallyReentrant(bool isLocallyReentra
 void QUmlReclassifyObjectActionObject::unsetLocallyReentrant()
 {
     Q_D(QModelingObject);
+    setLocallyReentrant(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("locallyReentrant"));
 }
 
@@ -620,6 +622,7 @@ void QUmlReclassifyObjectActionObject::setReplaceAll(bool isReplaceAll)
 void QUmlReclassifyObjectActionObject::unsetReplaceAll()
 {
     Q_D(QModelingObject);
+    setReplaceAll(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("replaceAll"));
 }
 
diff --git a/src/uml/qobjects/qumlredefinabletemplatesignatureobject.cpp b/src/uml/qobjects/qumlredefinabletemplatesignatureobject.cpp
index f19fdfef..a37fac9c 100644
--- a/src/uml/qobjects/qumlredefinabletemplatesignatureobject.cpp
+++ b/src/uml/qobjects/qumlredefinabletemplatesignatureobject.cpp
@@ -363,6 +363,7 @@ void QUmlRedefinableTemplateSignatureObject::setLeaf(bool isLeaf)
 void QUmlRedefinableTemplateSignatureObject::unsetLeaf()
 {
     Q_D(QModelingObject);
+    setLeaf(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
diff --git a/src/uml/qobjects/qumlreduceactionobject.cpp b/src/uml/qobjects/qumlreduceactionobject.cpp
index 878170d3..9fc329d8 100644
--- a/src/uml/qobjects/qumlreduceactionobject.cpp
+++ b/src/uml/qobjects/qumlreduceactionobject.cpp
@@ -446,6 +446,7 @@ void QUmlReduceActionObject::setLeaf(bool isLeaf)
 void QUmlReduceActionObject::unsetLeaf()
 {
     Q_D(QModelingObject);
+    setLeaf(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
@@ -578,6 +579,7 @@ void QUmlReduceActionObject::setLocallyReentrant(bool isLocallyReentrant)
 void QUmlReduceActionObject::unsetLocallyReentrant()
 {
     Q_D(QModelingObject);
+    setLocallyReentrant(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("locallyReentrant"));
 }
 
@@ -626,6 +628,7 @@ void QUmlReduceActionObject::setOrdered(bool isOrdered)
 void QUmlReduceActionObject::unsetOrdered()
 {
     Q_D(QModelingObject);
+    setOrdered(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("ordered"));
 }
 
diff --git a/src/uml/qobjects/qumlregionobject.cpp b/src/uml/qobjects/qumlregionobject.cpp
index 0a650763..9e3eadee 100644
--- a/src/uml/qobjects/qumlregionobject.cpp
+++ b/src/uml/qobjects/qumlregionobject.cpp
@@ -429,6 +429,7 @@ void QUmlRegionObject::setLeaf(bool isLeaf)
 void QUmlRegionObject::unsetLeaf()
 {
     Q_D(QModelingObject);
+    setLeaf(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
diff --git a/src/uml/qobjects/qumlremovestructuralfeaturevalueactionobject.cpp b/src/uml/qobjects/qumlremovestructuralfeaturevalueactionobject.cpp
index 4a26c468..b5efb8a4 100644
--- a/src/uml/qobjects/qumlremovestructuralfeaturevalueactionobject.cpp
+++ b/src/uml/qobjects/qumlremovestructuralfeaturevalueactionobject.cpp
@@ -466,6 +466,7 @@ void QUmlRemoveStructuralFeatureValueActionObject::setLeaf(bool isLeaf)
 void QUmlRemoveStructuralFeatureValueActionObject::unsetLeaf()
 {
     Q_D(QModelingObject);
+    setLeaf(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
@@ -598,6 +599,7 @@ void QUmlRemoveStructuralFeatureValueActionObject::setLocallyReentrant(bool isLo
 void QUmlRemoveStructuralFeatureValueActionObject::unsetLocallyReentrant()
 {
     Q_D(QModelingObject);
+    setLocallyReentrant(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("locallyReentrant"));
 }
 
@@ -665,6 +667,7 @@ void QUmlRemoveStructuralFeatureValueActionObject::setRemoveDuplicates(bool isRe
 void QUmlRemoveStructuralFeatureValueActionObject::unsetRemoveDuplicates()
 {
     Q_D(QModelingObject);
+    setRemoveDuplicates(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("removeDuplicates"));
 }
 
diff --git a/src/uml/qobjects/qumlremovevariablevalueactionobject.cpp b/src/uml/qobjects/qumlremovevariablevalueactionobject.cpp
index 506c4984..dc6b1a9a 100644
--- a/src/uml/qobjects/qumlremovevariablevalueactionobject.cpp
+++ b/src/uml/qobjects/qumlremovevariablevalueactionobject.cpp
@@ -450,6 +450,7 @@ void QUmlRemoveVariableValueActionObject::setLeaf(bool isLeaf)
 void QUmlRemoveVariableValueActionObject::unsetLeaf()
 {
     Q_D(QModelingObject);
+    setLeaf(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
@@ -582,6 +583,7 @@ void QUmlRemoveVariableValueActionObject::setLocallyReentrant(bool isLocallyReen
 void QUmlRemoveVariableValueActionObject::unsetLocallyReentrant()
 {
     Q_D(QModelingObject);
+    setLocallyReentrant(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("locallyReentrant"));
 }
 
@@ -639,6 +641,7 @@ void QUmlRemoveVariableValueActionObject::setRemoveDuplicates(bool isRemoveDupli
 void QUmlRemoveVariableValueActionObject::unsetRemoveDuplicates()
 {
     Q_D(QModelingObject);
+    setRemoveDuplicates(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("removeDuplicates"));
 }
 
diff --git a/src/uml/qobjects/qumlreplyactionobject.cpp b/src/uml/qobjects/qumlreplyactionobject.cpp
index da628141..efdbd626 100644
--- a/src/uml/qobjects/qumlreplyactionobject.cpp
+++ b/src/uml/qobjects/qumlreplyactionobject.cpp
@@ -441,6 +441,7 @@ void QUmlReplyActionObject::setLeaf(bool isLeaf)
 void QUmlReplyActionObject::unsetLeaf()
 {
     Q_D(QModelingObject);
+    setLeaf(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
@@ -573,6 +574,7 @@ void QUmlReplyActionObject::setLocallyReentrant(bool isLocallyReentrant)
 void QUmlReplyActionObject::unsetLocallyReentrant()
 {
     Q_D(QModelingObject);
+    setLocallyReentrant(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("locallyReentrant"));
 }
 
diff --git a/src/uml/qobjects/qumlsendobjectactionobject.cpp b/src/uml/qobjects/qumlsendobjectactionobject.cpp
index 349e02cb..670adc74 100644
--- a/src/uml/qobjects/qumlsendobjectactionobject.cpp
+++ b/src/uml/qobjects/qumlsendobjectactionobject.cpp
@@ -443,6 +443,7 @@ void QUmlSendObjectActionObject::setLeaf(bool isLeaf)
 void QUmlSendObjectActionObject::unsetLeaf()
 {
     Q_D(QModelingObject);
+    setLeaf(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
@@ -575,6 +576,7 @@ void QUmlSendObjectActionObject::setLocallyReentrant(bool isLocallyReentrant)
 void QUmlSendObjectActionObject::unsetLocallyReentrant()
 {
     Q_D(QModelingObject);
+    setLocallyReentrant(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("locallyReentrant"));
 }
 
diff --git a/src/uml/qobjects/qumlsendsignalactionobject.cpp b/src/uml/qobjects/qumlsendsignalactionobject.cpp
index f416f928..92c8582c 100644
--- a/src/uml/qobjects/qumlsendsignalactionobject.cpp
+++ b/src/uml/qobjects/qumlsendsignalactionobject.cpp
@@ -452,6 +452,7 @@ void QUmlSendSignalActionObject::setLeaf(bool isLeaf)
 void QUmlSendSignalActionObject::unsetLeaf()
 {
     Q_D(QModelingObject);
+    setLeaf(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
@@ -584,6 +585,7 @@ void QUmlSendSignalActionObject::setLocallyReentrant(bool isLocallyReentrant)
 void QUmlSendSignalActionObject::unsetLocallyReentrant()
 {
     Q_D(QModelingObject);
+    setLocallyReentrant(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("locallyReentrant"));
 }
 
diff --git a/src/uml/qobjects/qumlsequencenodeobject.cpp b/src/uml/qobjects/qumlsequencenodeobject.cpp
index bde13d00..0aa541b8 100644
--- a/src/uml/qobjects/qumlsequencenodeobject.cpp
+++ b/src/uml/qobjects/qumlsequencenodeobject.cpp
@@ -586,6 +586,7 @@ void QUmlSequenceNodeObject::setLeaf(bool isLeaf)
 void QUmlSequenceNodeObject::unsetLeaf()
 {
     Q_D(QModelingObject);
+    setLeaf(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
@@ -713,6 +714,7 @@ void QUmlSequenceNodeObject::setLocallyReentrant(bool isLocallyReentrant)
 void QUmlSequenceNodeObject::unsetLocallyReentrant()
 {
     Q_D(QModelingObject);
+    setLocallyReentrant(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("locallyReentrant"));
 }
 
@@ -870,6 +872,7 @@ void QUmlSequenceNodeObject::setMustIsolate(bool mustIsolate)
 void QUmlSequenceNodeObject::unsetMustIsolate()
 {
     Q_D(QModelingObject);
+    setMustIsolate(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("mustIsolate"));
 }
 
diff --git a/src/uml/qobjects/qumlsignaleventobject.cpp b/src/uml/qobjects/qumlsignaleventobject.cpp
index 07233e44..8c487e0b 100644
--- a/src/uml/qobjects/qumlsignaleventobject.cpp
+++ b/src/uml/qobjects/qumlsignaleventobject.cpp
@@ -294,6 +294,7 @@ void QUmlSignalEventObject::setVisibility(QtUml::VisibilityKind visibility)
 void QUmlSignalEventObject::unsetVisibility()
 {
     Q_D(QModelingObject);
+    setVisibility(QtUml::VisibilityKindPublic);
     d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
diff --git a/src/uml/qobjects/qumlsignalobject.cpp b/src/uml/qobjects/qumlsignalobject.cpp
index 80fec808..0320bc5b 100644
--- a/src/uml/qobjects/qumlsignalobject.cpp
+++ b/src/uml/qobjects/qumlsignalobject.cpp
@@ -699,6 +699,7 @@ void QUmlSignalObject::setVisibility(QtUml::VisibilityKind visibility)
 void QUmlSignalObject::unsetVisibility()
 {
     Q_D(QModelingObject);
+    setVisibility(QtUml::VisibilityKindPublic);
     d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
@@ -719,6 +720,7 @@ void QUmlSignalObject::setLeaf(bool isLeaf)
 void QUmlSignalObject::unsetLeaf()
 {
     Q_D(QModelingObject);
+    setLeaf(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
@@ -824,6 +826,7 @@ void QUmlSignalObject::setAbstract(bool isAbstract)
 void QUmlSignalObject::unsetAbstract()
 {
     Q_D(QModelingObject);
+    setAbstract(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("abstract"));
 }
 
@@ -835,6 +838,7 @@ void QUmlSignalObject::setFinalSpecialization(bool isFinalSpecialization)
 void QUmlSignalObject::unsetFinalSpecialization()
 {
     Q_D(QModelingObject);
+    setFinalSpecialization(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("finalSpecialization"));
 }
 
diff --git a/src/uml/qobjects/qumlstartclassifierbehavioractionobject.cpp b/src/uml/qobjects/qumlstartclassifierbehavioractionobject.cpp
index 5e681dfd..e066680e 100644
--- a/src/uml/qobjects/qumlstartclassifierbehavioractionobject.cpp
+++ b/src/uml/qobjects/qumlstartclassifierbehavioractionobject.cpp
@@ -424,6 +424,7 @@ void QUmlStartClassifierBehaviorActionObject::setLeaf(bool isLeaf)
 void QUmlStartClassifierBehaviorActionObject::unsetLeaf()
 {
     Q_D(QModelingObject);
+    setLeaf(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
@@ -556,6 +557,7 @@ void QUmlStartClassifierBehaviorActionObject::setLocallyReentrant(bool isLocally
 void QUmlStartClassifierBehaviorActionObject::unsetLocallyReentrant()
 {
     Q_D(QModelingObject);
+    setLocallyReentrant(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("locallyReentrant"));
 }
 
diff --git a/src/uml/qobjects/qumlstartobjectbehavioractionobject.cpp b/src/uml/qobjects/qumlstartobjectbehavioractionobject.cpp
index 5c06655c..d7edc469 100644
--- a/src/uml/qobjects/qumlstartobjectbehavioractionobject.cpp
+++ b/src/uml/qobjects/qumlstartobjectbehavioractionobject.cpp
@@ -458,6 +458,7 @@ void QUmlStartObjectBehaviorActionObject::setLeaf(bool isLeaf)
 void QUmlStartObjectBehaviorActionObject::unsetLeaf()
 {
     Q_D(QModelingObject);
+    setLeaf(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
@@ -590,6 +591,7 @@ void QUmlStartObjectBehaviorActionObject::setLocallyReentrant(bool isLocallyReen
 void QUmlStartObjectBehaviorActionObject::unsetLocallyReentrant()
 {
     Q_D(QModelingObject);
+    setLocallyReentrant(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("locallyReentrant"));
 }
 
@@ -650,6 +652,8 @@ void QUmlStartObjectBehaviorActionObject::setSynchronous(bool isSynchronous)
 void QUmlStartObjectBehaviorActionObject::unsetSynchronous()
 {
     Q_D(QModelingObject);
+
+    setSynchronous(true);
     d->modifiedResettableProperties.removeAll(QStringLiteral("synchronous"));
 }
 
diff --git a/src/uml/qobjects/qumlstatemachineobject.cpp b/src/uml/qobjects/qumlstatemachineobject.cpp
index c42f6698..3d3c2162 100644
--- a/src/uml/qobjects/qumlstatemachineobject.cpp
+++ b/src/uml/qobjects/qumlstatemachineobject.cpp
@@ -920,6 +920,7 @@ void QUmlStateMachineObject::setVisibility(QtUml::VisibilityKind visibility)
 void QUmlStateMachineObject::unsetVisibility()
 {
     Q_D(QModelingObject);
+    setVisibility(QtUml::VisibilityKindPublic);
     d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
@@ -940,6 +941,7 @@ void QUmlStateMachineObject::setLeaf(bool isLeaf)
 void QUmlStateMachineObject::unsetLeaf()
 {
     Q_D(QModelingObject);
+    setLeaf(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
@@ -1035,6 +1037,7 @@ void QUmlStateMachineObject::setFinalSpecialization(bool isFinalSpecialization)
 void QUmlStateMachineObject::unsetFinalSpecialization()
 {
     Q_D(QModelingObject);
+    setFinalSpecialization(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("finalSpecialization"));
 }
 
@@ -1194,6 +1197,7 @@ void QUmlStateMachineObject::setAbstract(bool isAbstract)
 void QUmlStateMachineObject::unsetAbstract()
 {
     Q_D(QModelingObject);
+    setAbstract(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("abstract"));
 }
 
@@ -1205,6 +1209,7 @@ void QUmlStateMachineObject::setActive(bool isActive)
 void QUmlStateMachineObject::unsetActive()
 {
     Q_D(QModelingObject);
+    setActive(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("active"));
 }
 
@@ -1273,6 +1278,8 @@ void QUmlStateMachineObject::setReentrant(bool isReentrant)
 void QUmlStateMachineObject::unsetReentrant()
 {
     Q_D(QModelingObject);
+
+    setReentrant(true);
     d->modifiedResettableProperties.removeAll(QStringLiteral("reentrant"));
 }
 
diff --git a/src/uml/qobjects/qumlstateobject.cpp b/src/uml/qobjects/qumlstateobject.cpp
index 078d8fe8..a27212f3 100644
--- a/src/uml/qobjects/qumlstateobject.cpp
+++ b/src/uml/qobjects/qumlstateobject.cpp
@@ -577,6 +577,7 @@ void QUmlStateObject::setLeaf(bool isLeaf)
 void QUmlStateObject::unsetLeaf()
 {
     Q_D(QModelingObject);
+    setLeaf(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
@@ -671,6 +672,7 @@ void QUmlStateObject::setComposite(bool isComposite)
 void QUmlStateObject::unsetComposite()
 {
     Q_D(QModelingObject);
+    setComposite(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("composite"));
 }
 
@@ -682,6 +684,7 @@ void QUmlStateObject::setOrthogonal(bool isOrthogonal)
 void QUmlStateObject::unsetOrthogonal()
 {
     Q_D(QModelingObject);
+    setOrthogonal(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("orthogonal"));
 }
 
@@ -693,6 +696,8 @@ void QUmlStateObject::setSimple(bool isSimple)
 void QUmlStateObject::unsetSimple()
 {
     Q_D(QModelingObject);
+
+    setSimple(true);
     d->modifiedResettableProperties.removeAll(QStringLiteral("simple"));
 }
 
@@ -704,6 +709,7 @@ void QUmlStateObject::setSubmachineState(bool isSubmachineState)
 void QUmlStateObject::unsetSubmachineState()
 {
     Q_D(QModelingObject);
+    setSubmachineState(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("submachineState"));
 }
 
diff --git a/src/uml/qobjects/qumlstereotypeobject.cpp b/src/uml/qobjects/qumlstereotypeobject.cpp
index d77a13b8..399aa93d 100644
--- a/src/uml/qobjects/qumlstereotypeobject.cpp
+++ b/src/uml/qobjects/qumlstereotypeobject.cpp
@@ -839,6 +839,7 @@ void QUmlStereotypeObject::setVisibility(QtUml::VisibilityKind visibility)
 void QUmlStereotypeObject::unsetVisibility()
 {
     Q_D(QModelingObject);
+    setVisibility(QtUml::VisibilityKindPublic);
     d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
@@ -859,6 +860,7 @@ void QUmlStereotypeObject::setLeaf(bool isLeaf)
 void QUmlStereotypeObject::unsetLeaf()
 {
     Q_D(QModelingObject);
+    setLeaf(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
@@ -954,6 +956,7 @@ void QUmlStereotypeObject::setFinalSpecialization(bool isFinalSpecialization)
 void QUmlStereotypeObject::unsetFinalSpecialization()
 {
     Q_D(QModelingObject);
+    setFinalSpecialization(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("finalSpecialization"));
 }
 
@@ -1113,6 +1116,7 @@ void QUmlStereotypeObject::setAbstract(bool isAbstract)
 void QUmlStereotypeObject::unsetAbstract()
 {
     Q_D(QModelingObject);
+    setAbstract(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("abstract"));
 }
 
@@ -1124,6 +1128,7 @@ void QUmlStereotypeObject::setActive(bool isActive)
 void QUmlStereotypeObject::unsetActive()
 {
     Q_D(QModelingObject);
+    setActive(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("active"));
 }
 
diff --git a/src/uml/qobjects/qumlstringexpressionobject.cpp b/src/uml/qobjects/qumlstringexpressionobject.cpp
index 0717dbc8..526c810d 100644
--- a/src/uml/qobjects/qumlstringexpressionobject.cpp
+++ b/src/uml/qobjects/qumlstringexpressionobject.cpp
@@ -408,6 +408,7 @@ void QUmlStringExpressionObject::setVisibility(QtUml::VisibilityKind visibility)
 void QUmlStringExpressionObject::unsetVisibility()
 {
     Q_D(QModelingObject);
+    setVisibility(QtUml::VisibilityKindPublic);
     d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
diff --git a/src/uml/qobjects/qumlstructuredactivitynodeobject.cpp b/src/uml/qobjects/qumlstructuredactivitynodeobject.cpp
index faa30b85..3e78fb80 100644
--- a/src/uml/qobjects/qumlstructuredactivitynodeobject.cpp
+++ b/src/uml/qobjects/qumlstructuredactivitynodeobject.cpp
@@ -582,6 +582,7 @@ void QUmlStructuredActivityNodeObject::setLeaf(bool isLeaf)
 void QUmlStructuredActivityNodeObject::unsetLeaf()
 {
     Q_D(QModelingObject);
+    setLeaf(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
@@ -709,6 +710,7 @@ void QUmlStructuredActivityNodeObject::setLocallyReentrant(bool isLocallyReentra
 void QUmlStructuredActivityNodeObject::unsetLocallyReentrant()
 {
     Q_D(QModelingObject);
+    setLocallyReentrant(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("locallyReentrant"));
 }
 
@@ -866,6 +868,7 @@ void QUmlStructuredActivityNodeObject::setMustIsolate(bool mustIsolate)
 void QUmlStructuredActivityNodeObject::unsetMustIsolate()
 {
     Q_D(QModelingObject);
+    setMustIsolate(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("mustIsolate"));
 }
 
diff --git a/src/uml/qobjects/qumlsubstitutionobject.cpp b/src/uml/qobjects/qumlsubstitutionobject.cpp
index ef58bccb..76624c2c 100644
--- a/src/uml/qobjects/qumlsubstitutionobject.cpp
+++ b/src/uml/qobjects/qumlsubstitutionobject.cpp
@@ -359,6 +359,7 @@ void QUmlSubstitutionObject::setVisibility(QtUml::VisibilityKind visibility)
 void QUmlSubstitutionObject::unsetVisibility()
 {
     Q_D(QModelingObject);
+    setVisibility(QtUml::VisibilityKindPublic);
     d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
diff --git a/src/uml/qobjects/qumltestidentityactionobject.cpp b/src/uml/qobjects/qumltestidentityactionobject.cpp
index 9826a8ec..3bfa3847 100644
--- a/src/uml/qobjects/qumltestidentityactionobject.cpp
+++ b/src/uml/qobjects/qumltestidentityactionobject.cpp
@@ -440,6 +440,7 @@ void QUmlTestIdentityActionObject::setLeaf(bool isLeaf)
 void QUmlTestIdentityActionObject::unsetLeaf()
 {
     Q_D(QModelingObject);
+    setLeaf(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
@@ -572,6 +573,7 @@ void QUmlTestIdentityActionObject::setLocallyReentrant(bool isLocallyReentrant)
 void QUmlTestIdentityActionObject::unsetLocallyReentrant()
 {
     Q_D(QModelingObject);
+    setLocallyReentrant(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("locallyReentrant"));
 }
 
diff --git a/src/uml/qobjects/qumltimeconstraintobject.cpp b/src/uml/qobjects/qumltimeconstraintobject.cpp
index dc4480ef..39d2213a 100644
--- a/src/uml/qobjects/qumltimeconstraintobject.cpp
+++ b/src/uml/qobjects/qumltimeconstraintobject.cpp
@@ -319,6 +319,7 @@ void QUmlTimeConstraintObject::setVisibility(QtUml::VisibilityKind visibility)
 void QUmlTimeConstraintObject::unsetVisibility()
 {
     Q_D(QModelingObject);
+    setVisibility(QtUml::VisibilityKindPublic);
     d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
@@ -348,6 +349,8 @@ void QUmlTimeConstraintObject::setFirstEvent(bool firstEvent)
 void QUmlTimeConstraintObject::unsetFirstEvent()
 {
     Q_D(QModelingObject);
+
+    setFirstEvent(true);
     d->modifiedResettableProperties.removeAll(QStringLiteral("firstEvent"));
 }
 
diff --git a/src/uml/qobjects/qumltimeeventobject.cpp b/src/uml/qobjects/qumltimeeventobject.cpp
index 653d75a7..b252baee 100644
--- a/src/uml/qobjects/qumltimeeventobject.cpp
+++ b/src/uml/qobjects/qumltimeeventobject.cpp
@@ -299,6 +299,7 @@ void QUmlTimeEventObject::setVisibility(QtUml::VisibilityKind visibility)
 void QUmlTimeEventObject::unsetVisibility()
 {
     Q_D(QModelingObject);
+    setVisibility(QtUml::VisibilityKindPublic);
     d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
@@ -312,6 +313,7 @@ void QUmlTimeEventObject::setRelative(bool isRelative)
 void QUmlTimeEventObject::unsetRelative()
 {
     Q_D(QModelingObject);
+    setRelative(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("relative"));
 }
 
diff --git a/src/uml/qobjects/qumltimeexpressionobject.cpp b/src/uml/qobjects/qumltimeexpressionobject.cpp
index 02700d1b..b1824bf0 100644
--- a/src/uml/qobjects/qumltimeexpressionobject.cpp
+++ b/src/uml/qobjects/qumltimeexpressionobject.cpp
@@ -358,6 +358,7 @@ void QUmlTimeExpressionObject::setVisibility(QtUml::VisibilityKind visibility)
 void QUmlTimeExpressionObject::unsetVisibility()
 {
     Q_D(QModelingObject);
+    setVisibility(QtUml::VisibilityKindPublic);
     d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
diff --git a/src/uml/qobjects/qumltimeintervalobject.cpp b/src/uml/qobjects/qumltimeintervalobject.cpp
index 1d5993a4..cbbccd4b 100644
--- a/src/uml/qobjects/qumltimeintervalobject.cpp
+++ b/src/uml/qobjects/qumltimeintervalobject.cpp
@@ -358,6 +358,7 @@ void QUmlTimeIntervalObject::setVisibility(QtUml::VisibilityKind visibility)
 void QUmlTimeIntervalObject::unsetVisibility()
 {
     Q_D(QModelingObject);
+    setVisibility(QtUml::VisibilityKindPublic);
     d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
diff --git a/src/uml/qobjects/qumltimeobservationobject.cpp b/src/uml/qobjects/qumltimeobservationobject.cpp
index c33b0db9..a790ccfb 100644
--- a/src/uml/qobjects/qumltimeobservationobject.cpp
+++ b/src/uml/qobjects/qumltimeobservationobject.cpp
@@ -298,6 +298,7 @@ void QUmlTimeObservationObject::setVisibility(QtUml::VisibilityKind visibility)
 void QUmlTimeObservationObject::unsetVisibility()
 {
     Q_D(QModelingObject);
+    setVisibility(QtUml::VisibilityKindPublic);
     d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
@@ -316,6 +317,8 @@ void QUmlTimeObservationObject::setFirstEvent(bool firstEvent)
 void QUmlTimeObservationObject::unsetFirstEvent()
 {
     Q_D(QModelingObject);
+
+    setFirstEvent(true);
     d->modifiedResettableProperties.removeAll(QStringLiteral("firstEvent"));
 }
 
diff --git a/src/uml/qobjects/qumltransitionobject.cpp b/src/uml/qobjects/qumltransitionobject.cpp
index 13ae14c8..5adc0554 100644
--- a/src/uml/qobjects/qumltransitionobject.cpp
+++ b/src/uml/qobjects/qumltransitionobject.cpp
@@ -446,6 +446,7 @@ void QUmlTransitionObject::setLeaf(bool isLeaf)
 void QUmlTransitionObject::unsetLeaf()
 {
     Q_D(QModelingObject);
+    setLeaf(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
@@ -545,6 +546,7 @@ void QUmlTransitionObject::setKind(QtUml::TransitionKind kind)
 void QUmlTransitionObject::unsetKind()
 {
     Q_D(QModelingObject);
+    setKind(QtUml::TransitionKindExternal);
     d->modifiedResettableProperties.removeAll(QStringLiteral("kind"));
 }
 
diff --git a/src/uml/qobjects/qumlunmarshallactionobject.cpp b/src/uml/qobjects/qumlunmarshallactionobject.cpp
index abcc4604..7664aee0 100644
--- a/src/uml/qobjects/qumlunmarshallactionobject.cpp
+++ b/src/uml/qobjects/qumlunmarshallactionobject.cpp
@@ -440,6 +440,7 @@ void QUmlUnmarshallActionObject::setLeaf(bool isLeaf)
 void QUmlUnmarshallActionObject::unsetLeaf()
 {
     Q_D(QModelingObject);
+    setLeaf(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
@@ -572,6 +573,7 @@ void QUmlUnmarshallActionObject::setLocallyReentrant(bool isLocallyReentrant)
 void QUmlUnmarshallActionObject::unsetLocallyReentrant()
 {
     Q_D(QModelingObject);
+    setLocallyReentrant(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("locallyReentrant"));
 }
 
diff --git a/src/uml/qobjects/qumlusageobject.cpp b/src/uml/qobjects/qumlusageobject.cpp
index e416be23..e0e68338 100644
--- a/src/uml/qobjects/qumlusageobject.cpp
+++ b/src/uml/qobjects/qumlusageobject.cpp
@@ -329,6 +329,7 @@ void QUmlUsageObject::setVisibility(QtUml::VisibilityKind visibility)
 void QUmlUsageObject::unsetVisibility()
 {
     Q_D(QModelingObject);
+    setVisibility(QtUml::VisibilityKindPublic);
     d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
diff --git a/src/uml/qobjects/qumlusecaseobject.cpp b/src/uml/qobjects/qumlusecaseobject.cpp
index 943600f7..0374647a 100644
--- a/src/uml/qobjects/qumlusecaseobject.cpp
+++ b/src/uml/qobjects/qumlusecaseobject.cpp
@@ -763,6 +763,7 @@ void QUmlUseCaseObject::setVisibility(QtUml::VisibilityKind visibility)
 void QUmlUseCaseObject::unsetVisibility()
 {
     Q_D(QModelingObject);
+    setVisibility(QtUml::VisibilityKindPublic);
     d->modifiedResettableProperties.removeAll(QStringLiteral("visibility"));
 }
 
@@ -783,6 +784,7 @@ void QUmlUseCaseObject::setLeaf(bool isLeaf)
 void QUmlUseCaseObject::unsetLeaf()
 {
     Q_D(QModelingObject);
+    setLeaf(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
@@ -888,6 +890,7 @@ void QUmlUseCaseObject::setAbstract(bool isAbstract)
 void QUmlUseCaseObject::unsetAbstract()
 {
     Q_D(QModelingObject);
+    setAbstract(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("abstract"));
 }
 
@@ -899,6 +902,7 @@ void QUmlUseCaseObject::setFinalSpecialization(bool isFinalSpecialization)
 void QUmlUseCaseObject::unsetFinalSpecialization()
 {
     Q_D(QModelingObject);
+    setFinalSpecialization(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("finalSpecialization"));
 }
 
diff --git a/src/uml/qobjects/qumlvaluepinobject.cpp b/src/uml/qobjects/qumlvaluepinobject.cpp
index 2a76d3ff..dc6917c2 100644
--- a/src/uml/qobjects/qumlvaluepinobject.cpp
+++ b/src/uml/qobjects/qumlvaluepinobject.cpp
@@ -459,6 +459,7 @@ void QUmlValuePinObject::setOrdered(bool isOrdered)
 void QUmlValuePinObject::unsetOrdered()
 {
     Q_D(QModelingObject);
+    setOrdered(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("ordered"));
 }
 
@@ -470,6 +471,8 @@ void QUmlValuePinObject::setUnique(bool isUnique)
 void QUmlValuePinObject::unsetUnique()
 {
     Q_D(QModelingObject);
+
+    setUnique(true);
     d->modifiedResettableProperties.removeAll(QStringLiteral("unique"));
 }
 
@@ -481,6 +484,7 @@ void QUmlValuePinObject::setLower(int lower)
 void QUmlValuePinObject::unsetLower()
 {
     Q_D(QModelingObject);
+    setLower(1);
     d->modifiedResettableProperties.removeAll(QStringLiteral("lower"));
 }
 
@@ -497,6 +501,7 @@ void QUmlValuePinObject::setUpper(int upper)
 void QUmlValuePinObject::unsetUpper()
 {
     Q_D(QModelingObject);
+    setUpper(1);
     d->modifiedResettableProperties.removeAll(QStringLiteral("upper"));
 }
 
@@ -552,6 +557,7 @@ void QUmlValuePinObject::setLeaf(bool isLeaf)
 void QUmlValuePinObject::unsetLeaf()
 {
     Q_D(QModelingObject);
+    setLeaf(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
@@ -674,6 +680,7 @@ void QUmlValuePinObject::setControlType(bool isControlType)
 void QUmlValuePinObject::unsetControlType()
 {
     Q_D(QModelingObject);
+    setControlType(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("controlType"));
 }
 
@@ -685,6 +692,7 @@ void QUmlValuePinObject::setOrdering(QtUml::ObjectNodeOrderingKind ordering)
 void QUmlValuePinObject::unsetOrdering()
 {
     Q_D(QModelingObject);
+    setOrdering(QtUml::ObjectNodeOrderingKindFIFO);
     d->modifiedResettableProperties.removeAll(QStringLiteral("ordering"));
 }
 
@@ -708,6 +716,7 @@ void QUmlValuePinObject::setControl(bool isControl)
 void QUmlValuePinObject::unsetControl()
 {
     Q_D(QModelingObject);
+    setControl(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("control"));
 }
 
diff --git a/src/uml/qobjects/qumlvaluespecificationactionobject.cpp b/src/uml/qobjects/qumlvaluespecificationactionobject.cpp
index 3b239332..cd3543e4 100644
--- a/src/uml/qobjects/qumlvaluespecificationactionobject.cpp
+++ b/src/uml/qobjects/qumlvaluespecificationactionobject.cpp
@@ -433,6 +433,7 @@ void QUmlValueSpecificationActionObject::setLeaf(bool isLeaf)
 void QUmlValueSpecificationActionObject::unsetLeaf()
 {
     Q_D(QModelingObject);
+    setLeaf(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("leaf"));
 }
 
@@ -565,6 +566,7 @@ void QUmlValueSpecificationActionObject::setLocallyReentrant(bool isLocallyReent
 void QUmlValueSpecificationActionObject::unsetLocallyReentrant()
 {
     Q_D(QModelingObject);
+    setLocallyReentrant(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("locallyReentrant"));
 }
 
diff --git a/src/uml/qobjects/qumlvariableobject.cpp b/src/uml/qobjects/qumlvariableobject.cpp
index 0b5eda18..66c2b6e5 100644
--- a/src/uml/qobjects/qumlvariableobject.cpp
+++ b/src/uml/qobjects/qumlvariableobject.cpp
@@ -366,6 +366,7 @@ void QUmlVariableObject::setOrdered(bool isOrdered)
 void QUmlVariableObject::unsetOrdered()
 {
     Q_D(QModelingObject);
+    setOrdered(false);
     d->modifiedResettableProperties.removeAll(QStringLiteral("ordered"));
 }
 
@@ -377,6 +378,8 @@ void QUmlVariableObject::setUnique(bool isUnique)
 void QUmlVariableObject::unsetUnique()
 {
     Q_D(QModelingObject);
+
+    setUnique(true);
     d->modifiedResettableProperties.removeAll(QStringLiteral("unique"));
 }
 
@@ -388,6 +391,7 @@ void QUmlVariableObject::setLower(int lower)
 void QUmlVariableObject::unsetLower()
 {
     Q_D(QModelingObject);
+    setLower(1);
     d->modifiedResettableProperties.removeAll(QStringLiteral("lower"));
 }
 
@@ -404,6 +408,7 @@ void QUmlVariableObject::setUpper(int upper)
 void QUmlVariableObject::unsetUpper()
 {
     Q_D(QModelingObject);
+    setUpper(1);
     d->modifiedResettableProperties.removeAll(QStringLiteral("upper"));
 }