Merge branch 'frameworks'

1 files changed, 9 insertions, 18 deletions

diff --git a/src/views/draganddrophelper.h b/src/views/draganddrophelper.h
index eda5fc5c2..fe77b1e6e 100644
--- a/src/views/draganddrophelper.h
+++ b/src/views/draganddrophelper.h
@@ -21,17 +21,15 @@
 #ifndef DRAGANDDROPHELPER_H
 #define DRAGANDDROPHELPER_H
 
-#include "libdolphin_export.h"
+#include "dolphin_export.h"
 
-#include <QString>
 
-class KFileItem;
-class KUrl;
+class QUrl;
 class QDropEvent;
 class QWidget;
-class KonqOperations;
+namespace KIO { class DropJob; }
 
-class LIBDOLPHINPRIVATE_EXPORT DragAndDropHelper
+class DOLPHIN_EXPORT DragAndDropHelper
 {
 public:
     /**
@@ -40,22 +38,15 @@ public:
      * offered to the user. The drag destination must represent a directory or
      * a desktop-file, otherwise the dropping gets ignored.
      *
-     * @param destItem  Item of the destination. Can be 0 (KFileItem::isNull()) if
-     *                  no file-item is available for the destination. In this case
-     *                  destUrl is used as fallback. For performance reasons it is
-     *                  recommended to pass a file-item if available.
      * @param destUrl   URL of the item destination. Is used only if destItem::isNull()
      *                  is true.
      * @param event     Drop event.
-     * @param error     Error message intended to be shown for users if dropping is not
-     *                  possible. If an empty string is returned, the dropping has been
-     *                  successful.
-     * @return          KonqOperations pointer
+     * @param window    Associated widget.
+     * @return          KIO::DropJob pointer
      */
-    static KonqOperations* dropUrls(const KFileItem& destItem,
-                                    const KUrl& destUrl,
-                                    QDropEvent* event,
-                                    QString& error);
+    static KIO::DropJob* dropUrls(const QUrl& destUrl,
+                                  QDropEvent* event,
+                                  QWidget *window);
 };
 
 #endif