From ef68f84a6ecdd84ea4b49686a02984c768d9fa39 Mon Sep 17 00:00:00 2001 From: Peter Penz Date: Sun, 30 Aug 2009 20:49:34 +0000 Subject: Restore "open folders automatically when dragging items above it" (it had been temporary deactivated because of the column view refactoring). svn path=/trunk/KDE/kdebase/apps/; revision=1017531 --- src/dolphinview.h | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'src/dolphinview.h') diff --git a/src/dolphinview.h b/src/dolphinview.h index 822eb52b0..57bf5d2f9 100644 --- a/src/dolphinview.h +++ b/src/dolphinview.h @@ -674,13 +674,6 @@ private slots: */ void slotRefreshItems(); - /** - * If \a view can be positively identified as not being the source for the - * current drag operation, deleteLater() it immediately. Else stores - * it for later deletion. - */ - void deleteWhenNotDragSource(QAbstractItemView* view); - /** * Observes the item with the URL \a url. As soon as the directory * model indicates that the item is available, the item will @@ -761,6 +754,7 @@ private: { public: ViewAccessor(DolphinSortFilterProxyModel* proxyModel); + ~ViewAccessor(); void createView(QWidget* parent, DolphinController* controller, Mode mode); void deleteView(); @@ -784,7 +778,6 @@ private: KUrl rootUrl() const; bool supportsCategorizedSorting() const; - bool hasExpandableFolders() const; bool itemsExpandable() const; /** @@ -803,6 +796,7 @@ private: DolphinDetailsView* m_detailsView; DolphinColumnViewContainer* m_columnsContainer; DolphinSortFilterProxyModel* m_proxyModel; + QAbstractItemView* m_dragSource; }; bool m_active : 1; @@ -836,8 +830,6 @@ private: * slotDirListerCompleted(). */ QSet m_newFileNames; - - QAbstractItemView* m_expandedDragSource; // TODO: move to ViewAccessor }; /// Allow using DolphinView::Mode in QVariant -- cgit v1.3