[Uml-devel] kdesdk/umbrello/umbrello

[Oliver Kellogg]

CVS commit by okellogg: 

Fix bug 57920 (can't move folder out of containing folder.)


  M +9 -1      umllistview.cpp   1.67


--- kdesdk/umbrello/umbrello/umllistview.cpp  #1.66:1.67
@@ -852,4 +852,5 @@ bool UMLListView::acceptDrag(QDropEvent*
                         case Uml::lvt_Activity_Diagram:
                         case Uml::lvt_Sequence_Diagram:
+                        case Uml::lvt_Logical_Folder:
                                 accept = (dstType == Uml::lvt_Logical_Folder ||
                                           dstType == Uml::lvt_Logical_View);
@@ -897,5 +898,6 @@ void UMLListView::slotDropped(QDropEvent
                 ++it;
                 UMLListViewItem * move;
-                Uml::ListView_Type srcType = src->type;
+
+                /****** Why aren't we just using findItem() here?
                 if( typeIsDiagram(srcType) ) {
                         UMLView * v = m_doc -> findView(src->id);
@@ -905,7 +907,12 @@ void UMLListView::slotDropped(QDropEvent
                         move = findUMLObject(o);
                 }
+                 ******/
+                // Let's use findItem() instead of the above code:
+                move = findItem( src->id );
+
                 if(!move)
                         continue;
                 UMLListViewItem *newItem = NULL;
+                Uml::ListView_Type srcType = src->type;
 
                 //make sure trying to place in correct location
@@ -945,4 +952,5 @@ void UMLListView::slotDropped(QDropEvent
                         case Uml::lvt_Activity_Diagram:
                         case Uml::lvt_Sequence_Diagram:
+                        case Uml::lvt_Logical_Folder:
                                 if (itemType == Uml::lvt_Logical_Folder ||
                                     itemType == Uml::lvt_Logical_View) {