Changeset 471 for trunk/src/gui/kernel/qdnd_pm.cpp

Timestamp:

Jan 25, 2010, 5:03:17 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: DnD: Replaced r470 with a better solution (simpler and doesn't report a dummy mime type "" in the dropped mime data -- for compatibility with other platforms).

File:

• trunk/src/gui/kernel/qdnd_pm.cpp (modified) (5 diffs)

trunk/src/gui/kernel/qdnd_pm.cpp

@@ -611 +611 @@
             DrgFreeDraginfo(info);
 
+
+
             return MRFROM2SHORT(dropReply, toPmDragDropOp(dragData->lastAction));
         }
@@ -913 +915 @@
     }
 
-    if (!mimeData->formats().count()) {
-        // The drag source doesn't provide any format, so we've got no workers.
-        // Although it may look strange, but it is a supported case: for
-        // example, designer uses it a lot for in-process DnD. Instead of MIME
-        // data, it works directly with the QMimeData object from the drag
-        // source. We will go through the converters passing a special value of
-        // QString::null as MIME type -- one of them (e.g. QPMAnyMime) should
-        // take it over and return itself.
-        Q_ASSERT(!workers.count());
-        DEBUG(() << "QPMCoopDragWorker: Source provides NO data, looking for a "
-                    "converter that can handle this");
-        foreach (QPMMime *mime, QPMMime::all()) {
-            DragWorker *wrk = mime->dragWorkerFor(QString::null, mimeData);
-            if (wrk) {
-                workers.append(wrk);
-                break;
-            }
-        }
-    }
-
 #if defined(QDND_DEBUG)
     foreach (DragWorker *wrk, workers) {
@@ -941 +923 @@
 #endif
 
+
+
+
+
+
+
+
+
+
+
+
+
     Q_ASSERT(workers.count() > 0);
     return workers.count() > 0;
@@ -947 +941 @@
 HWND QPMCoopDragWorker::hwnd() const
 {
-    DragWorker *firstWorker = workers.first();
-    Q_ASSERT(firstWorker);
-    if (!firstWorker)
-        return 0;
-
-    if (firstWorker->isExclusive() && firstWorker->itemCount() == 0) {
-        // this is a super exclusive worker that will do everything on its own
-        return firstWorker->hwnd();
+    
+    
+    
+        ;
+        if (firstWorker->isExclusive() && firstWorker->itemCount() == 0) {
+    
+        
+        
     }
 
@@ -989 +983 @@
     if (info)
         return 0;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
     DragWorker *firstWorker = workers.first();