Changeset 323

Timestamp:

Nov 16, 2009, 1:06:34 AM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

gui/kernel: More QPMMime work.

Location:

trunk/src/gui/kernel

Files:

• kernel.pri (modified) (1 diff)
• qclipboard_pm.cpp (modified) (6 diffs)
• qmime.h (modified) (2 diffs)
• qmime_pm.cpp (modified) (2 diffs)

trunk/src/gui/kernel/kernel.pri

@@ -98 +98 @@
                 kernel/qdesktopwidget_pm.cpp \
                 kernel/qdnd_pm.cpp \
+
                 kernel/qkeymapper_pm.cpp \
                 kernel/qsound_pm.cpp \

trunk/src/gui/kernel/qclipboard_pm.cpp

@@ -55 +55 @@
 #include "qdnd_p.h"
 
+
+
 QT_BEGIN_NAMESPACE
 
@@ -75 +77 @@
         ULONG cf = 0;
         while ((cf = WinEnumClipbrdFmts(NULLHANDLE, cf))) {
-//          if (QPMMime::converterToMime(mime, cf)) {
-//              ok = true;
-//              break;
-//          }
+          if (QPMMime::converterToMime(mime, cf)) {
+              ok = true;
+              break;
+          }
         }
         WinCloseClipbrd(NULLHANDLE);
@@ -94 +96 @@
     QStringList fmts;
     if (WinOpenClipbrd(NULLHANDLE)) {
-//      fmts = QPMMime::allMimesForFormats();
+        QVector<ULONG> cfs;
+        ULONG cf = 0;
+        while ((cf = WinEnumClipbrdFmts(NULLHANDLE, cf)))
+            cfs << cf;
+        fmts = QPMMime::allMimesForFormats(cfs);
         WinCloseClipbrd(NULLHANDLE);
     }
@@ -108 +114 @@
                                              QVariant::Type type) const
 {
-    QStringList fmts;
+    QVariant result;
+
     if (WinOpenClipbrd(NULLHANDLE)) {
-        // @todo enumerate all formats and select the best converter
-//      QPMMime *converter = QPMMime::converterToMime(mime, cf);
-//      if (converter)
-//          result = converter->convertToMime(mime, cf, type);
+        ULONG cf = 0;
+        while ((cf = WinEnumClipbrdFmts(NULLHANDLE, cf))) {
+            QPMMime *converter = QPMMime::converterToMime(mime, cf);
+            if (converter) {
+                ULONG flags;
+                if (WinQueryClipbrdFmtInfo(NULLHANDLE, cf, &flags)) {
+                    ULONG data = WinQueryClipbrdData(NULLHANDLE, cf);
+                    if (data) {
+                        result = converter->convertToMime(mime, type, cf, flags, data);
+                    }
+                }
+                break;
+            }
+        }
         WinCloseClipbrd(NULLHANDLE);
     }
@@ -121 +138 @@
                  WinGetLastError(NULLHANDLE));
 #endif
-    return fmts;
+    return ;
 }
 
@@ -171 +188 @@
 void QClipboard::setMimeData(QMimeData *src, Mode mode)
 {
-    // @todo implement
+    if (mode != Clipboard)
+        return;
+
+    if (!WinOpenClipbrd(NULLHANDLE)) {
+#ifndef QT_NO_DEBUG
+        qWarning("QClipboard: WinOpenClipbrd failed with %lX",
+                 WinGetLastError(NULLHANDLE));
+#endif
+        return;
+    }
+
+    // @todo
+//  QClipboardData *d = clipboardData();
+//  d->setSource(src);
+
+    WinCloseClipbrd(NULLHANDLE);
 }
 

trunk/src/gui/kernel/qmime.h

@@ -114 +114 @@
 */
 
+
+
 class Q_GUI_EXPORT QPMMime
 {
@@ -119 +121 @@
     QPMMime();
     virtual ~QPMMime();
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 };
 

trunk/src/gui/kernel/qmime_pm.cpp

@@ -60 +60 @@
 #include "qdir.h"
 
+
+
 QT_BEGIN_NAMESPACE
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 /*!
@@ -99 +119 @@
 */
 
-// @todo lots of stuff...
-
+/*!
+Constructs a new conversion object, adding it to the globally accessed
+list of available converters.
+*/
 QPMMime::QPMMime()
 {
-}
-
+    theMimeList()->addMime(this);
+}
+
+/*!
+Destroys a conversion object, removing it from the global
+list of available converters.
+*/
 QPMMime::~QPMMime()
 {
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 }