Changeset 441 for trunk/src/gui/kernel/qmime.h

Timestamp:

Dec 26, 2009, 2:14:18 AM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: QPMMime: Adding more DND support code, fixing the build.

File:

• trunk/src/gui/kernel/qmime.h (modified) (5 diffs)

trunk/src/gui/kernel/qmime.h

@@ -115 +115 @@
 */
 
-typedef unsigned long ULONG;
+#if !defined(QT_NO_DRAGANDDROP)
+QT_END_NAMESPACE
+#include "private/qpmobjectwindow_pm_p.h"
+QT_BEGIN_NAMESPACE
+#endif
 
 class QPMCoopDragWorker;
@@ -125 +129 @@
 #if !defined(QT_NO_DRAGANDDROP)
 
+    typedef QList<QByteArray> QByteArrayList;
+
     class DragWorker
     {
     public:
-        DragWorker() : data(0) {}
+        DragWorker() : src(0) {}
         virtual ~DragWorker() {}
 
@@ -177 +183 @@
         {
         public:
-            virtual const char *format( const char *drf ) const = 0;
+            virtual const QString &format(const char *drf) const = 0;
             virtual bool provide(const char *drf, const QByteArray &allData,
                                  ULONG itemIndex, QByteArray &itemData) = 0;
@@ -246 +252 @@
 
         static bool canRender(DRAGITEM *item, const char *drf );
-        static bool getSupportedRMFs(DRAGITEM *item, QPtrList<QStrList> &list);
+        static bool getSupportedRMFs(DRAGITEM *item, QList<QByteArrayList> &list);
 
     private:
@@ -297 +303 @@
     static QByteArray querySourceNameFull(DRAGITEM *item);
     static bool canTargetRenderAsOS2File(DRAGITEM *item, QByteArray *fullName = 0);
-    static bool parseRMFs(HSTR rmfs, QList<QList<QByteArray> > &list);
+    static bool parseRMFs(HSTR rmfs, QList<QByteArrayList> &list);
     static bool parseRMF(HSTR rmf, QByteArray &mechanism, QByteArray &format);