[Uml-devel] kdesdk/umbrello/umbrello

[Jonathan Riddell]

CVS commit by jriddell: 

wee fix for UMLCanvasObject and UMLConcept from yesterday, loading attributes


  M +1 -8      concept.cpp   1.9
  M +0 -2      umlcanvasobject.cpp   1.2
  M +5 -6      umllistview.cpp   1.18


--- kdesdk/umbrello/umbrello/concept.cpp  #1.8:1.9
@@ -157,5 +157,4 @@ QPtrList<UMLObject> UMLConcept::findChil
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 UMLObject* UMLConcept::findChildObject(int id) {
-/*FIXME no idea what's upsetting this method
         UMLOperation * o=0;
         for(o=m_OpsList.first();o != 0;o=m_OpsList.next()) {
@@ -174,11 +173,5 @@ UMLObject* UMLConcept::findChildObject(i
                 }
         }
-        UMLAssociation * asso = 0;
-        for (asso = m_AssocsList.first(); asso != 0; asso = m_AssocsList.next()) {
-                if (asso->getID() == id)
-                        return asso;
-        }
-*/
-        return 0;
+        return UMLCanvasObject::findChildObject(id);
 }
 ////////////////////////////////////////////////////////////////////////////////////////////////////

--- kdesdk/umbrello/umbrello/umlcanvasobject.cpp  #1.1:1.2
@@ -79,5 +79,4 @@ QString UMLCanvasObject::uniqChildName(U
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 QPtrList<UMLObject> UMLCanvasObject::findChildObject(UMLObject_Type t, QString n) {
-        kdDebug() << k_funcinfo << endl;
         QPtrList<UMLObject> list;
         if (t == ot_Association) {
@@ -94,5 +93,4 @@ QPtrList<UMLObject> UMLCanvasObject::fin
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 UMLObject* UMLCanvasObject::findChildObject(int id) {
-        kdDebug() << k_funcinfo << endl;
         UMLAssociation * asso = 0;
         for (asso = m_AssocsList.first(); asso != 0; asso = m_AssocsList.next()) {

--- kdesdk/umbrello/umbrello/umllistview.cpp  #1.17:1.18
@@ -306,10 +306,9 @@ void UMLListView::popupMenuSel(int sel) 
 }
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-void UMLListView::diagramCreated(Diagram *d)
-{
-new UMLListViewItem( diagramFolder, d->name(), convert_DT_LVT((Uml::Diagram_Type)d->diagramType()), d->getID());        
-        
+void UMLListView::diagramCreated(Diagram* d) {
+        new UMLListViewItem( diagramFolder, d->name(),
+                             convert_DT_LVT((Uml::Diagram_Type)d->diagramType()), d->getID() );
 }
-/////
+////////////////////////////////////////////////////////////////////////////////////////////////////
 void UMLListView::slotDiagramCreated( int id ) {
         if( loading )