[Uml-devel] kdesdk/umbrello/umbrello

[Jonathan Riddell]

CVS commit by jriddell: 

Fix pasteing object widgets (in sequence diagrams and collaboration diagram)


  M +1 -1      clipboard/umlclipboard.cpp   1.9
  M +2 -1      umldoc.cpp   1.46
  M +4 -2      umlview.cpp   1.63
  M +2 -1      umlwidget.cpp   1.33


--- kdesdk/umbrello/umbrello/umldoc.cpp  #1.45:1.46
@@ -1544,6 +1544,7 @@ ChangeLog */
 int UMLDoc::assignNewID(int OldID) {
         int result = ++uniqueID;
-        if(m_pChangeLog)
+        if (m_pChangeLog) {
                 m_pChangeLog->addIDChange(OldID, result);
+        }
         return result;
 }

--- kdesdk/umbrello/umbrello/umlview.cpp  #1.62:1.63
@@ -1726,6 +1726,7 @@ bool UMLView::createWidget(UMLWidgetData
 
 bool UMLView::addWidget( UMLWidgetData * pWidgetData ) {
-        if( !pWidgetData )
+        if( !pWidgetData ) {
                 return false;
+        }
 
         IDChangeLog * log = getDocument() -> getChangeLog();
@@ -1798,6 +1799,7 @@ bool UMLView::addWidget( UMLWidgetData *
                         if((pObjectData = static_cast<ObjectWidgetData*>(pWidgetData))) {
                                 newID = log->findNewID( pWidgetData -> getId() );
-                                if( newID == -1 )
+                                if (newID == -1) {
                                         return false;
+                                }
                                 pObjectData -> setId( newID );
                                 int nNewLocalID = m_pData -> getUniqueID();

--- kdesdk/umbrello/umbrello/umlwidget.cpp  #1.32:1.33
@@ -689,5 +689,6 @@ bool UMLWidget::widgetHasUMLObject(Uml::
             type == wt_Component ||
             type == wt_Node ||
-            type == wt_Artifact) {
+            type == wt_Artifact ||
+            type == wt_Object) {
                 return true;
         } else {

--- kdesdk/umbrello/umbrello/clipboard/umlclipboard.cpp  #1.8:1.9
@@ -677,5 +677,5 @@ bool UMLClipboard::pasteClip5(UMLDoc* do
                                 UMLClass * parent = dynamic_cast<UMLClass *>(lvitem -> getUMLObject());
                                 if (parent -> addAttribute(dynamic_cast<UMLAttribute*>(obj), idchanges)) {
-//IXME                                  doc -> signalChildUMLObjectCreated(obj);
+//FIXME                                 doc -> signalChildUMLObjectCreated(obj);
                                 } else {
                                         objectAlreadyExists = true;