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

Timestamp:

Feb 19, 2010, 12:29:57 AM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: Removed qmime.h dependency on private qpmobjectwindow_pm_p.h and on qt_os2.h (which drags in non-portable OS/2 API).

File:

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

trunk/src/gui/kernel/qmime.h

@@ -115 +115 @@
 */
 
-QT_END_NAMESPACE
-#include "qt_os2.h"
-#if !defined(QT_NO_DRAGANDDROP)
-# include "private/qpmobjectwindow_pm_p.h"
-#endif
-QT_BEGIN_NAMESPACE
+QT_BEGIN_INCLUDE_NAMESPACE
+
+#include "qwindowdefs_pm.h"
+typedef LHANDLE HSTR;
+typedef struct _DRAGINFO DRAGINFO;
+typedef struct _DRAGITEM DRAGITEM;
+
+QT_END_INCLUDE_NAMESPACE
 
 class QPMDragData;
@@ -162 +164 @@
     };
 
-    class DefaultDragWorker : public DragWorker, public QPMObjectWindow
+    class DefaultDragWorker : public DragWorker
     {
     private:
@@ -173 +175 @@
         bool isExclusive() const;
         ULONG itemCount() const;
-        HWND hwnd() const { return QPMObjectWindow::hwnd(); }
+        HWND hwnd() const;
         QByteArray composeFormatString();
         bool prepare(const char *drm, const char *drf, DRAGITEM *item,
                      ULONG itemIndex);
         void defaultFileType(QString &type, QString &ext);
-
-        // QPMObjectWindow interface
-        MRESULT message(ULONG msg, MPARAM mp1, MPARAM mp2);
 
         class Provider
@@ -224 +223 @@
     };
 
-    class DefaultDropWorker : public DropWorker, public QPMObjectWindow
+    class DefaultDropWorker : public DropWorker
     {
     private:
@@ -238 +237 @@
         QVariant retrieveData(const QString &mimeType,
                               QVariant::Type preferredType) const;
-
-        // QPMObjectWindow interface
-        MRESULT message(ULONG msg, MPARAM mp1, MPARAM mp2);
 
         class Provider