Changeset 465

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;
@@ -177 +177 @@
         bool prepare(const char *drm, const char *drf, DRAGITEM *item,
                      ULONG itemIndex);
-        void defaultFileType(const char *&type, const char *&ext);
+        void defaultFileType(&ext);
 
         // QPMObjectWindow interface
@@ -188 +188 @@
             virtual bool provide(const char *drf, const QByteArray &allData,
                                  ULONG itemIndex, QByteArray &itemData) = 0;
-            virtual void fileType(const char *drf, const char *&type,
-                                  const char *&ext) {};
+            virtual void fileType(const char *drf, QString &type, QString &ext) {};
         };
 
-        bool addProvider(const char *drf, Provider *provider,
+        bool addProvider(const drf, Provider *provider,
                          ULONG itemCount = 1);
 
@@ -246 +245 @@
         {
         public:
-            virtual const char *drf(const QString &mimeType) const = 0;
+            virtual drf(const QString &mimeType) const = 0;
             virtual bool provide(const QString &mimeType, ULONG itemIndex,
                                  const QByteArray &itemData,
@@ -255 +254 @@
         bool addExclusiveProvider(const QString &mimeType, Provider *provider);
 
-        static bool canRender(DRAGITEM *item, const char *drf );
+        static bool canRender(DRAGITEM *item, const char *drf);
         static bool getSupportedRMFs(DRAGITEM *item, QList<QByteArrayList> &list);
 

trunk/src/gui/kernel/qmime_pm.cpp

@@ -213 +213 @@
 }
 
-// -----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
 
 struct QPMMime::DefaultDragWorker::Data
@@ -248 +248 @@
     {
         DrfProvider() : prov(0) {}
-        DrfProvider(const char *d, Provider *p) : drf(d), prov(p) {}
+        DrfProvider(const d, Provider *p) : drf(d), prov(p) {}
         QByteArray drf;
         Provider *prov;
@@ -421 +421 @@
 }
 
-void QPMMime::DefaultDragWorker::defaultFileType(const char *&type,
-                                                 const char *&ext)
+void QPMMime::DefaultDragWorker::defaultFileType(&type,
+                                                 &ext)
 {
     Q_ASSERT(d->providers.count());
@@ -580 +580 @@
                         req->sharedMem = ptr;
                         DEBUG(() << "DefaultDragWorker: Created shared memory "
-                                    "object" << ptr);
+                                    "object" << ptr);
 #ifndef QT_NO_DEBUG
                     } else {
@@ -665 +665 @@
 }
 
-bool QPMMime::DefaultDragWorker::addProvider(const char *drf, Provider *provider,
+bool QPMMime::DefaultDragWorker::addProvider(const drf, Provider *provider,
                                              ULONG itemCnt /* = 1 */)
 {
@@ -671 +671 @@
     d->cleanupRequests();
 
-    Q_ASSERT(drf && provider && itemCnt >= 1);
-    if (drf && provider && itemCnt >= 1) {
+    Q_ASSERT( && provider && itemCnt >= 1);
+    if ( && provider && itemCnt >= 1) {
         if (d->providers.count() == 0) {
             // first provider
@@ -828 +828 @@
         return ret;
 
-    const char *drf = provider->drf(mimeType);
-    Q_ASSERT(drf);
-    if (!drf)
+    drf = provider->drf(mimeType);
+    Q_ASSERT();
+    if ()
         return ret;
 
@@ -849 +849 @@
 
     HSTR rmfOS2File =
-        DrgAddStrHandle(QString().sprintf("<DRM_OS2FILE,%s>", drf).toLocal8Bit());
+        DrgAddStrHandle(QString().sprintf("<DRM_OS2FILE,%s>",
+                                          drf.data()).toLocal8Bit());
     HSTR rmfSharedMem =
-        DrgAddStrHandle(QString().sprintf("<DRM_SHAREDMEM,%s>", drf).toLocal8Bit());
+        DrgAddStrHandle(QString().sprintf("<DRM_SHAREDMEM,%s>",
+                                          drf.data()).toLocal8Bit());
 
     MRESULT mrc;
@@ -1815 +1817 @@
 #endif // !QT_NO_DRAGANDDROP
 
-////////////////////////////////////////////////////////////////////////////////
+//
 
 class QPMMimeText : public QPMMime
@@ -1873 +1875 @@
         bool provide(const char *drf, const QByteArray &allData,
                      ULONG itemIndex, QByteArray &itemData);
-        void fileType(const char *drf, const char *&type, const char *&ext);
+        void fileType(const char *drf, &ext);
     };
 
@@ -1880 +1882 @@
     public:
         // Provider interface
-        const char *drf(const QString &mimeType) const;
-        bool provide(const QString &format, ULONG itemIndex,
+        drf(const QString &mimeType) const;
+        bool provide(const QString &, ULONG itemIndex,
                      const QByteArray &itemData, QByteArray &allData);
     };
@@ -2246 +2248 @@
 }
 
-void QPMMimeText::TextDragProvider::fileType(const char *drf, const char *&type,
-                                             const char *&ext)
+void QPMMimeText::TextDragProvider::fileType(const char *drf,
+                                             &ext)
 {
     if (qstrcmp(drf, "DRF_TEXT") == 0) {
         if (exclusive) {
-            type = "UniformResourceLocator";
+            type = ;
             // no extension for URLs
+
         } else {
-            type = DRT_TEXT;
-            ext = "txt";
+            type = ;
+            ext = ;
         }
     }
 };
 
-const char *QPMMimeText::TextDropProvider::drf(const QString &mimeType) const
+QPMMimeText::TextDropProvider::drf(const QString &mimeType) const
 {
     // sanity check
     if (mimeType == QLatin1String("text/plain") ||
         mimeType == QLatin1String("text/uri-list"))
-        return "DRF_TEXT";
+        return ;
     return 0;
 }
@@ -2400 +2403 @@
 #endif // !QT_NO_DRAGANDDROP
 
-////////////////////////////////////////////////////////////////////////////////
+//
 
 class QPMMimeImage : public QPMMime
@@ -2489 +2492 @@
 }
 
-////////////////////////////////////////////////////////////////////////////////
+//
 
 class QPMMimeAnyMime : public QPMMime
@@ -2507 +2510 @@
                                QVariant::Type preferredType) const;
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 private:
     ULONG registerMimeType(const QString &mime) const;
@@ -2517 +2553 @@
     static QString mimePrefix;
     static QString customPrefix;
+
+
+
+
+
+
+
+
+
+
+
+
+
 };
 
@@ -2525 +2574 @@
 
 QPMMimeAnyMime::QPMMimeAnyMime()
+
+
+
+
 {
     //MIME Media-Types
@@ -2637 +2690 @@
 }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 ULONG QPMMimeAnyMime::registerMimeType(const QString &mime) const
 {
@@ -2689 +2877 @@
 }
 
-////////////////////////////////////////////////////////////////////////////////
+#if !defined(QT_NO_DRAGANDDROP)
+
+// static
+ULONG QPMMimeAnyMime::drfToCf(const char *drf)
+{
+    if (qstrncmp(drf, "CF_", 3) == 0)
+        return QString(QLatin1String(drf + 3)).toULong(0, 16);
+    return 0;
+}
+
+// static
+QByteArray QPMMimeAnyMime::cfToDrf(ULONG cf)
+{
+    return QString().sprintf("CF_%08lX", cf).toLatin1();
+}
+
+#endif // !QT_NO_DRAGANDDROP
+
+//------------------------------------------------------------------------------
 
 QPMMimeList::QPMMimeList()