Merge branch 'master' into frameworks

[dolphin.git] / src / dolphinviewcontainer.h

diff --git a/src/dolphinviewcontainer.h b/src/dolphinviewcontainer.h
index bc58531a2700d6e50a1c32a4afccb77472255eff..4ca76961c546806786f4c35b45320521d8a62e85 100644 (file)
--- a/src/dolphinviewcontainer.h
+++ b/src/dolphinviewcontainer.h
@@ -22,7 +22,7 @@
 
 #include <KFileItem>
 #include <KFileItemDelegate>
 
 #include <KFileItem>
 #include <KFileItemDelegate>

-#include <KGlobalSettings>
+#include <KCompletion>

 #include <KIO/Job>
 
 #include <KUrlNavigator>
 #include <KIO/Job>
 
 #include <KUrlNavigator>


@@ -31,9 +31,9 @@
 #include <QWidget>
 
 #include <views/dolphinview.h>
 #include <QWidget>
 
 #include <views/dolphinview.h>

-#include <config-apps.h>
+#include <config-dolphin.h>

 
 

-#ifdef KActivities_FOUND
+#ifdef KF5Activities_FOUND

 namespace KActivities {
     class ResourceInstance;
 }
 namespace KActivities {
     class ResourceInstance;
 }


@@ -261,9 +261,21 @@ private slots:
     /**
      * Is connected with the URL navigator and drops the URLs
      * above the destination \a destination.
     /**
      * 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);
 
      */
     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
     /**
      * Is invoked when a redirection is done and changes the
      * URL of the URL navigator to \a newUrl without triggering


@@ -278,7 +290,7 @@ private slots:
      * Saves the currently used URL completion mode of
      * the URL navigator.
      */
      * Saves the currently used URL completion mode of
      * the URL navigator.
      */

-    void saveUrlCompletionMode(KGlobalSettings::Completion completion);
+    void saveUrlCompletionMode(KCompletion::CompletionMode completion);

 
     void slotHistoryChanged();
 
 
     void slotHistoryChanged();
 


@@ -305,7 +317,7 @@ private slots:
 
 private:
     /**
 
 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;
 
      */
     bool isSearchUrl(const KUrl& url) const;
 


@@ -330,7 +342,10 @@ private:
     QElapsedTimer m_statusBarTimestamp;  // Time in ms since last update
     bool m_autoGrabFocus;
 
     QElapsedTimer m_statusBarTimestamp;  // Time in ms since last update
     bool m_autoGrabFocus;
 

-#ifdef KActivities_FOUND
+    KUrl m_dropDestination;
+    QScopedPointer<QDropEvent> m_dropEvent;
+
+#ifdef KF5Activities_FOUND

 private:
     KActivities::ResourceInstance * m_activityResourceInstance;
 #endif
 private:
     KActivities::ResourceInstance * m_activityResourceInstance;
 #endif