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

Timestamp:

Nov 18, 2009, 1:49:31 AM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

gui/kernel: Improved mime <-> PM clipboard format conversion interfaces.

File:

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

trunk/src/gui/kernel/qmime.h

@@ -123 +123 @@
 
     // for converting from Qt
-    virtual bool canConvertFromMime(ULONG format, const QMimeData *mimeData) const = 0;
-    virtual bool convertFromMime(ULONG format, const QMimeData *mimeData,
-                                 ULONG &flags, ULONG &data) const = 0;
-    virtual QVector<ULONG> formatsForMime(const QString &mimeType, const QMimeData *mimeData) const = 0;
+    virtual QList<ULONG> formatsForMimeData(const QMimeData *mimeData) const = 0;
+    virtual bool convertFromMimeData(const QMimeData *mimeData, ULONG format,
+                                     ULONG &flags, ULONG *data) const = 0;
 
     // for converting to Qt
-    virtual bool canConvertToMime(const QString &mimeType, ULONG format) const = 0;
-    virtual QVariant convertToMime(const QString &mimeType, QVariant::Type preferredType,
-                                   ULONG format, ULONG flags, ULONG data) const = 0;
-    virtual QString mimeForFormat(ULONG format) const = 0;
+    virtual QStringList mimesForFormats(const QList<ULONG> &formats) const = 0;
+    virtual QVariant convertFromFormat(ULONG format, ULONG flags, ULONG data,
+                                       const QString &mimeType,
+                                       QVariant::Type preferredType) const = 0;
 
     static ULONG registerMimeType(const QString &mime);
@@ -138 +137 @@
 private:
     friend class QClipboardWatcher;
-
-    static QPMMime *converterToMime(const QString &mimeType, ULONG format);
-    static QStringList allMimesForFormats(const QVector<ULONG> &formats);
-    static QPMMime *converterFromMime(ULONG format, const QMimeData *mimeData);
-    static QVector<ULONG> allFormatsForMime(const QMimeData *mimeData);
+    friend class QClipboard;
+
+    struct Match
+    {
+        Match(QPMMime *c, const QString f, int p) :
+            converter(c), mime(f), format(0), priority(p) {}
+
+        Match(QPMMime *c, ULONG f, int p) :
+            converter(c), format(f), priority(p) {}
+
+        QPMMime *converter;
+        QString mime; // used by allConvertersFromFormats()
+        ULONG format; // used by allConvertersFromMimeData()
+        int priority;
+    };
+
+    static QList<Match> allConvertersFromFormats(const QList<ULONG> &formats);
+    static QList<Match> allConvertersFromMimeData(const QMimeData *mimeData);
 };