Refactor the folder expansion system. Main effect: instead of having a list of m_expandedViews which cannot yet be deleted, we more accurately identify the current source of the drag operation if any and store only this for later deletion.

This also fixes folder-expansion not working in Column view.

svn path=/trunk/KDE/kdebase/apps/; revision=916701

1 files changed, 9 insertions, 0 deletions

diff --git a/src/draganddrophelper.h b/src/draganddrophelper.h
index e362fd508..4859740cd 100644
--- a/src/draganddrophelper.h
+++ b/src/draganddrophelper.h
@@ -62,6 +62,12 @@ public:
                    DolphinController* controller = 0);
 
     /**
+     * Returns true if and only if the view \a itemView was the last view to 
+     * be passed to startDrag(...), and that drag is still in progress.
+     */
+    bool isDragSource(QAbstractItemView* itemView);
+
+    /**
      * Handles the dropping of URLs to the given
      * destination. A context menu with the options
      * 'Move Here', 'Copy Here', 'Link Here' and
@@ -80,6 +86,9 @@ signals:
 
 private:
     DragAndDropHelper();
+    // The last view passed in startDrag(...), or 0 if
+    // no startDrag(...) initiated drag is in progress.
+    QAbstractItemView *m_dragSource;
 
     friend class DragAndDropHelperSingleton;
 };