[Uml-devel] branches/KDE/3.5/kdesdk/umbrello/umbrello

[Oliver Kellogg]

SVN commit 669599 by okellogg:

Emit removal signal before calling UMLObject::emitModified().

 M  +3 -3      classifier.cpp  
 M  +1 -1      entity.cpp  
 M  +1 -1      enum.cpp  


--- branches/KDE/3.5/kdesdk/umbrello/umbrello/classifier.cpp #669598:669599
@@ -272,8 +272,8 @@
     // disconnection needed.
     // note that we don't delete the operation, just remove it from the Classifier
     disconnect(op,SIGNAL(modified()),this,SIGNAL(modified()));
+    emit operationRemoved(op);
     UMLObject::emitModified();
-    emit operationRemoved(op);
     return m_List.count();
 }
 
@@ -592,8 +592,8 @@
         kDebug() << "can't find att given in list" << endl;
         return -1;
     }
+    emit attributeRemoved(a);
     UMLObject::emitModified();
-    emit attributeRemoved(a);
     // If we are deleting the object, then we don't need to disconnect..this is done auto-magically
     // for us by QObject. -b.t.
     // disconnect(a,SIGNAL(modified()),this,SIGNAL(modified()));
@@ -721,8 +721,8 @@
         kWarning() << "can't find att given in list" << endl;
         return -1;
     }
+    emit templateRemoved(umltemplate);
     UMLObject::emitModified();
-    emit templateRemoved(umltemplate);
     disconnect(umltemplate,SIGNAL(modified()),this,SIGNAL(modified()));
     return m_List.count();
 }
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/entity.cpp #669598:669599
@@ -143,8 +143,8 @@
         kDebug() << "can't find att given in list" << endl;
         return -1;
     }
+    emit entityAttributeRemoved(literal);
     UMLObject::emitModified();
-    emit entityAttributeRemoved(literal);
     // If we are deleting the object, then we don't need to disconnect..this is done auto-magically
     // for us by QObject. -b.t.
     // disconnect(a,SIGNAL(modified()),this,SIGNAL(modified()));
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/enum.cpp #669598:669599
@@ -135,8 +135,8 @@
         kDebug() << "can't find att given in list" << endl;
         return -1;
     }
+    emit enumLiteralRemoved(literal);
     UMLObject::emitModified();
-    emit enumLiteralRemoved(literal);
     // If we are deleting the object, then we don't need to disconnect..this is done auto-magically
     // for us by QObject. -b.t.
     // disconnect(a,SIGNAL(modified()),this,SIGNAL(modified()));