Changeset 461 for trunk/src

Timestamp:

Jan 21, 2010, 6:36:45 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: DnD: Fixed representing local files as text/uri-list.

File:

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

trunk/src/gui/kernel/qmime_pm.cpp

@@ -1574 +1574 @@
 bool QPMMime::canTargetRenderAsOS2File(DRAGITEM *item, QByteArray *fullName /*= 0*/)
 {
-    if ( !item )
+    if (!item)
         return false;
 
@@ -1606 +1606 @@
             ok = false;
             int drmLen = strlen("DRM_OS2FILE");
-            for (int j = i + drmLen; j < (int) rmf.size(); ++j) {
+            for (int j = i + drmLen; j < rmf.size(); ++j) {
                 char ch = rmf[j];
                 if (ch == ' ')
@@ -1627 +1627 @@
     QByteArray srcFullName2(srcFullName.size(), '\0');
     APIRET rc = DosQueryPathInfo(srcFullName, FIL_QUERYFULLNAME,
-                                 srcFullName2.data(), srcFullName2.size());
+                                 srcFullName2.data(), srcFullName2.size() + 1);
     if (rc != 0)
         return false;
@@ -2182 +2182 @@
             return result;
         QString fn = QFile::decodeName(fullName);
-        urls += QUrl::fromLocalFile(fn).toString();
+        urls += QUrl::fromLocalFile(fn);
     }
 
@@ -2380 +2380 @@
     }
 
+    // Note: both allAreFiles and allAreURLs may be true here (e.g. a file on
+    // the desktop that represents an URL object). In this case, we will treat
+    // the list as files rather than as URLs for similarity with other platforms
+    // (e.g. an Internet shortcut on Windows is interpreted as a local file as
+    // well).
+
     if (allAreFiles) {
         // return an exclusive drop worker