[Uml-devel] kdesdk/umbrello/umbrello

[Oliver Kellogg]

CVS commit by okellogg: 

critical fixes for the new externalized folder support


  M +3 -1      umldoc.cpp   1.246
  M +1 -0      umllistview.cpp   1.154


--- kdesdk/umbrello/umbrello/umllistview.cpp  #1.153:1.154
@@ -2634,4 +2634,5 @@ bool UMLListView::loadChildrenFromXMI( U
                                                         QString folderFile = domElement.attribute( "external_file", "" );
                                                         if (!folderFile.isEmpty()) {
+                                                                setCurrentItem(item);
                                                                 item->setFolderFile(folderFile);
                                                                 const QString fqfn(m_doc->URL().directory(false) + folderFile);

--- kdesdk/umbrello/umbrello/umldoc.cpp  #1.245:1.246
@@ -1842,4 +1842,6 @@ bool UMLDoc::loadFolderFile( QString fil
                                                   << "): Error loading type " << type << endl;
                                         delete pObject;
+                                } else {
+                                        addObject(pObject);
                                 }
                         } else {
@@ -2801,5 +2803,5 @@ void UMLDoc::createDatatype(const QStrin
 void UMLDoc::addObject(UMLObject* o) {
         m_objectList.append(o);
-        emit sigObjectCreated(o);
+        signalUMLObjectCreated(o);
         setModified(true);
 }