Merge branch 'KDE/4.14'

[dolphin.git] / src / dolphinviewcontainer.h

diff --git a/src/dolphinviewcontainer.h b/src/dolphinviewcontainer.h
index 93fabecbc4c430d1b4645819975bfc22e7a155d7..31612f10afc4438c9015dc04e7fd0de2e20232ca 100644 (file)
--- a/src/dolphinviewcontainer.h
+++ b/src/dolphinviewcontainer.h
@@ -147,11 +147,6 @@ public slots:
      */
     void setFilterBarVisible(bool visible);
 
-    /**
-     * Sets focus to the item view.
-     */
-    void focusView();
-
 signals:
     /**
      * Is emitted whenever the filter bar has changed its visibility state.
@@ -266,9 +261,21 @@ private slots:
     /**
      * Is connected with the URL navigator and drops the URLs
      * above the destination \a destination.
+     *
+     * Creates a copy of \a event and invokes \a dropUrlsDelayed with a
+     * queued connection.
      */
     void dropUrls(const KUrl& destination, QDropEvent* event);
 
+    /**
+     * Is invoked with a queued connection by \a dropUrls to prevent that the
+     * drop actions are executed in the URL navigator menu's nested event loop,
+     * which might cause a crash. Simply using a queued connection from the URL
+     * navigator to \a dropUrls would not work because the \a event pointer
+     * would be dangling then.
+     */
+    void dropUrlsDelayed();
+
     /**
      * Is invoked when a redirection is done and changes the
      * URL of the URL navigator to \a newUrl without triggering
@@ -310,7 +317,7 @@ private slots:
 
 private:
     /**
-     * @return True if the URL protocol is a search URL (e. g. nepomuksearch:// or filenamesearch://).
+     * @return True if the URL protocol is a search URL (e. g. baloosearch:// or filenamesearch://).
      */
     bool isSearchUrl(const KUrl& url) const;
 
@@ -335,6 +342,9 @@ private:
     QElapsedTimer m_statusBarTimestamp;  // Time in ms since last update
     bool m_autoGrabFocus;
 
+    KUrl m_dropDestination;
+    QScopedPointer<QDropEvent> m_dropEvent;
+
 #ifdef KActivities_FOUND
 private:
     KActivities::ResourceInstance * m_activityResourceInstance;