Changeset 439 for trunk/src

Timestamp:

Dec 25, 2009, 12:21:47 AM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: More DnD code typed in.

Location:

trunk/src/gui/kernel

Files:

• qdnd_pm.cpp (modified) (8 diffs)
• qmime.h (modified) (3 diffs)
• qmime_pm.cpp (modified) (2 diffs)

trunk/src/gui/kernel/qdnd_pm.cpp

@@ -57 +57 @@
 #include "qt_os2.h"
 
+
+
+
+
+
+
+
+
 QT_BEGIN_NAMESPACE
 
@@ -79 +87 @@
     DRAGINFO *info() const { return di; }
 
-    bool provides( const char *format );
-    const char *format( int fn );
-    QByteArray encodedData( const char *format );
+    bool );
+    );
+    Q);
 
 private:
@@ -152 +160 @@
     }
 
-#if defined(QT_DEBUG_DND)
-    qDebug( "QPMDragData: %d drop workers for DRAGINFO %p",
-            workers.count(), di );
-#endif
+    DEBUG(() << "QPMDragData:" << workers.count() << "drop workers for DRAGINFO" << di);
 
     // init all workers
@@ -182 +187 @@
     di = NULL;
     initialized = dropped = gotWorkers = FALSE;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 }
 
@@ -527 +554 @@
 bool QDropData::hasFormat_sys(const QString &mimeType) const
 {
-    // @todo implement
+    Q_ASSERT(d);
+    if (d)
+        return d->hasFormat_sys(mimeType);
     return false;
 }
@@ -534 +563 @@
 {
     QStringList fmts;
-    // @todo implement
+    Q_ASSERT(d);
+    if (d)
+        fmts = d->formats_sys();
     return fmts;
 }
@@ -541 +572 @@
 {
     QVariant result;
-    // @todo implement
+    Q_ASSERT(d);
+    if (d)
+        result = d->retrieveData_sys(mimeType, type);
     return result;
 }
@@ -548 +581 @@
 
 {
-#ifdef QDND_DEBUG
-    qDebug("QDragManager::drag(QDrag *drag)");
-#endif
+    DEBUG(() << "QDragManager::drag");
 
     // @todo implement

trunk/src/gui/kernel/qmime.h

@@ -111 +111 @@
 
 /*
-  Encapsulation of conversion between MIME and OS/2 PM clipboard.
+  Encapsulation of conversion between MIME and OS/2 PM clipboard formats and
+  between MIME and Direct Manipulation (DND) objects.
 */
 
 typedef unsigned long ULONG;
+
+
 
 class Q_GUI_EXPORT QPMMime
 {
 public:
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     QPMMime();
     virtual ~QPMMime();
@@ -139 +276 @@
                                        QVariant::Type preferredType) const = 0;
 
+
+
+
+
+
+
+
 protected:
 
@@ -148 +292 @@
 
     static QString formatName(ULONG format);
+
+
+
+
+
+
+
+
+
+
+
+
 
 private:

trunk/src/gui/kernel/qmime_pm.cpp

@@ -60 +60 @@
 #include "qdir.h"
 
-#define QMIME_DEBUG
+#define QDND_DEBUG // in pair with qdnd_pm.cpp
+
+#ifdef QDND_DEBUG
+#   define DEBUG(a) qDebug a
+#else
+#   define DEBUG(a) do {} while(0)
+#endif
 
 QT_BEGIN_NAMESPACE
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+