summaryrefslogtreecommitdiffstats
path: root/src/uml/qobjects/qumljoinnodeobject.cpp
diff options
context:
space:
mode:
authorSandro S. Andrade <sandroandrade@kde.org>2013-10-25 14:30:04 -0300
committerSandro S. Andrade <sandroandrade@kde.org>2013-10-25 19:27:40 +0200
commit19865b5cdc94512d2dae89f5b50ca813d1962eac (patch)
tree2ae80daf5c0906c443961a1bf9e67d9d66e4e1b7 /src/uml/qobjects/qumljoinnodeobject.cpp
parentb715a4573294771118213d866d70b947bade715b (diff)
Fix reset of properties with default value
Change-Id: Ib1be0e68757479a14561f70c79b2f38917b8dff8 Reviewed-by: Sandro S. Andrade <sandroandrade@kde.org>
Diffstat (limited to 'src/uml/qobjects/qumljoinnodeobject.cpp')
-rw-r--r--src/uml/qobjects/qumljoinnodeobject.cpp3
1 files changed, 3 insertions, 0 deletions
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"));
}