Fix general bugs in template files

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

1 files changed, 6 insertions, 5 deletions

diff --git a/src/uml/qumlstringexpression.cpp b/src/uml/qumlstringexpression.cpp
index dd97a471..059c25c5 100644
--- a/src/uml/qumlstringexpression.cpp
+++ b/src/uml/qumlstringexpression.cpp
@@ -73,7 +73,8 @@ QUmlStringExpression::QUmlStringExpression(bool createQObject) :
 QUmlStringExpression::~QUmlStringExpression()
 {
     if (!deletingFromQObject) {
-        _qObject->setProperty("deletingFromModelingObject", true);
+        if (_qObject)
+            _qObject->setProperty("deletingFromModelingObject", true);
         delete _qObject;
     }
 }
@@ -129,7 +130,7 @@ void QUmlStringExpression::setOwningExpression(QUmlStringExpression *owningExpre
         // Adjust subsetted properties
 
         _owningExpression = owningExpression;
-        if (owningExpression->asQObject() && this->asQObject())
+        if (owningExpression && owningExpression->asQObject() && this->asQObject())
             QObject::connect(owningExpression->asQObject(), SIGNAL(destroyed()), this->asQObject(), SLOT(setOwningExpression()));
 
         // Adjust subsetted properties
@@ -153,7 +154,7 @@ void QUmlStringExpression::addSubExpression(QUmlStringExpression *subExpression)
 
     if (!_subExpression.contains(subExpression)) {
         _subExpression.insert(subExpression);
-        if (subExpression->asQObject() && this->asQObject())
+        if (subExpression && subExpression->asQObject() && this->asQObject())
             QObject::connect(subExpression->asQObject(), SIGNAL(destroyed(QObject*)), this->asQObject(), SLOT(removeSubExpression(QObject *)));
         subExpression->asQObject()->setParent(this->asQObject());
 
@@ -194,13 +195,13 @@ void QUmlStringExpression::setPropertyData()
     QModelingObject::propertyDataHash[QStringLiteral("owningExpression")][QtModeling::DocumentationRole] = QStringLiteral("The string expression of which this expression is a substring.");
     QModelingObject::propertyDataHash[QStringLiteral("owningExpression")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
     QModelingObject::propertyDataHash[QStringLiteral("owningExpression")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-owner");
-    QModelingObject::propertyDataHash[QStringLiteral("owningExpression")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("owningExpression")][QtModeling::OppositeEndRole] = QStringLiteral("StringExpression-subExpression");
 
     QModelingObject::propertyDataHash[QStringLiteral("subExpression")][QtModeling::AggregationRole] = QStringLiteral("composite");    QModelingObject::propertyDataHash[QStringLiteral("subExpression")][QtModeling::IsDerivedUnionRole] = false;
     QModelingObject::propertyDataHash[QStringLiteral("subExpression")][QtModeling::DocumentationRole] = QStringLiteral("The StringExpressions that constitute this StringExpression.");
     QModelingObject::propertyDataHash[QStringLiteral("subExpression")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
     QModelingObject::propertyDataHash[QStringLiteral("subExpression")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("subExpression")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("subExpression")][QtModeling::OppositeEndRole] = QStringLiteral("StringExpression-owningExpression");
 
 }