Changeset 465 for trunk/src/gui/kernel

Timestamp:

Jan 22, 2010, 12:24:57 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: DnD: QPMAnyMime: Added fallback support for any mime type not supported by dedicated converters.

Location:

trunk/src/gui/kernel

Files:

• qdnd_pm.cpp (modified) (3 diffs)
• qmime.h (modified) (6 diffs)
• qmime_pm.cpp (modified) (19 diffs)

trunk/src/gui/kernel/qdnd_pm.cpp

@@ -1024 +1024 @@
     static ULONG itemID = 0;
 
-    const char *type = 0;
-    const char *ext = 0;
+    ;
+    ;
     firstWorker->defaultFileType(type, ext);
 
@@ -1043 +1043 @@
             name = QString(QLatin1String("%1 %2")).arg(targetName).arg(i + 1);
 
-        if (ext) {
-            name += QLatin1Char('.');
-            name += QFile::decodeName(QByteArray(ext));
-        }
+        if (!ext.isEmpty())
+            name += QString(QLatin1String(".%1")).arg(ext);
 
         DEBUG(() << "QPMCoopDragWorker: item" << i << ": type" << type
@@ -1062 +1060 @@
         item->hwndItem = hwnd();
         item->ulItemID = itemID ++;
-        item->hstrType = DrgAddStrHandle(type ? type : DRT_UNKNOWN);
+        item->hstrType = DrgAddStrHandle(!type.isEmpty() ?
+                                         QFile::encodeName(type) : DRT_UNKNOWN);
         item->hstrRMF = DrgAddStrHandle(allFormats);
         item->hstrContainerName = 0;

trunk/src/gui/kernel/qmime.h

@@ -154 +154 @@
         virtual bool prepare(const char *drm, const char *drf, DRAGITEM *item,
                              ULONG itemIndex) { return false; }
-        virtual void defaultFileType(const char *&type, const char *&ext) {};
+        virtual void defaultFileType(&ext) {};
 
     private:
@@ -169 +169 @@
         virtual ~DefaultDragWorker();
 
-        // DragpWorker interface
+        // DragWorker interface
         bool cleanup(bool isCancelled);
         bool isExclusive() const;