replace list.count() > 0 by !list.isEmpty()

[dolphin.git] / src / draganddrophelper.cpp

diff --git a/src/draganddrophelper.cpp b/src/draganddrophelper.cpp
index d8c55ed126751db9f1c2cf3b94a3c5048f0eed4f..637117a2b72a3af586dcc614173271fbb9969aa1 100644 (file)
--- a/src/draganddrophelper.cpp
+++ b/src/draganddrophelper.cpp
@@ -55,13 +55,21 @@ void DragAndDropHelper::startDrag(QAbstractItemView* itemView,
                                   Qt::DropActions supportedActions,
                                   DolphinController* controller)
 {
                                   Qt::DropActions supportedActions,
                                   DolphinController* controller)
 {

+    // Do not start a new drag until the previous one has been finished.
+    // This is a (possibly temporary) fix for bug #187884.
+    static bool isDragging = false;
+    if (isDragging) {
+        return;
+    }
+    isDragging = true;
+

     QModelIndexList indexes = itemView->selectionModel()->selectedIndexes();
     QModelIndexList indexes = itemView->selectionModel()->selectedIndexes();

-    if (indexes.count() > 0) {
+    if (!indexes.isEmpty()) {

         QMimeData *data = itemView->model()->mimeData(indexes);
         if (data == 0) {
             return;
         }
         QMimeData *data = itemView->model()->mimeData(indexes);
         if (data == 0) {
             return;
         }

-        
+

         if (controller != 0) {
             controller->emitHideToolTip();
         }
         if (controller != 0) {
             controller->emitHideToolTip();
         }


@@ -80,8 +88,17 @@ void DragAndDropHelper::startDrag(QAbstractItemView* itemView,
         }
         drag->setPixmap(pixmap);
         drag->setMimeData(data);
         }
         drag->setPixmap(pixmap);
         drag->setMimeData(data);

+
+        m_dragSource = itemView;

         drag->exec(supportedActions, Qt::IgnoreAction);
         drag->exec(supportedActions, Qt::IgnoreAction);

+        m_dragSource = 0;

     }
     }

+    isDragging = false;
+}
+
+bool DragAndDropHelper::isDragSource(QAbstractItemView* itemView)
+{
+    return (m_dragSource != 0) && (m_dragSource == itemView);

 }
 
 void DragAndDropHelper::dropUrls(const KFileItem& destItem,
 }
 
 void DragAndDropHelper::dropUrls(const KFileItem& destItem,


@@ -91,23 +108,21 @@ void DragAndDropHelper::dropUrls(const KFileItem& destItem,
 {
     const bool dropToItem = !destItem.isNull() && (destItem.isDir() || destItem.isDesktopFile());
     const KUrl destination = dropToItem ? destItem.url() : destPath;
 {
     const bool dropToItem = !destItem.isNull() && (destItem.isDir() || destItem.isDesktopFile());
     const KUrl destination = dropToItem ? destItem.url() : destPath;

-    
+

     const QMimeData* mimeData = event->mimeData();
     if (mimeData->hasFormat("application/x-kde-dndextract")) {
         QString remoteDBusClient = mimeData->data("application/x-kde-dndextract");
         QDBusMessage message = QDBusMessage::createMethodCall(remoteDBusClient, "/DndExtract",
     const QMimeData* mimeData = event->mimeData();
     if (mimeData->hasFormat("application/x-kde-dndextract")) {
         QString remoteDBusClient = mimeData->data("application/x-kde-dndextract");
         QDBusMessage message = QDBusMessage::createMethodCall(remoteDBusClient, "/DndExtract",

-                                                              "org.kde.DndExtract", "extractFilesTo");
+                                                              "org.kde.DndExtract", "extractSelectedFilesTo");

         message.setArguments(QVariantList() << destination.path());
         QDBusConnection::sessionBus().call(message);
         message.setArguments(QVariantList() << destination.path());
         QDBusConnection::sessionBus().call(message);

-    } else {                                
+    } else {

         const KUrl::List urls = KUrl::List::fromMimeData(event->mimeData());
         const KUrl::List urls = KUrl::List::fromMimeData(event->mimeData());

-        const KUrl sourceDir = KUrl(urls.first().directory());
-        if (sourceDir == destination) {
-            const QString msg = i18ncp("@info:status",
-                                       "The dropped item is already inside the folder %2",
-                                       "The dropped items are already inside the folder %2",
-                                       urls.count(), destination.fileName());
-            emit informationMessage(msg);
+        const int urlsCount = urls.count();
+        if (urlsCount == 0) {
+            // TODO: handle dropping of other data
+        } else if ((urlsCount == 1) && (urls.first() == destination)) {
+            emit errorMessage(i18nc("@info:status", "A folder cannot be dropped into itself"));

         } else if (dropToItem) {
             KonqOperations::doDrop(destItem, destination, event, widget);
         } else {
         } else if (dropToItem) {
             KonqOperations::doDrop(destItem, destination, event, widget);
         } else {


@@ -117,6 +132,7 @@ void DragAndDropHelper::dropUrls(const KFileItem& destItem,
 }
 
 DragAndDropHelper::DragAndDropHelper()
 }
 
 DragAndDropHelper::DragAndDropHelper()

+    : m_dragSource(0)

 {
 }
 
 {
 }