Changeset 338 for trunk/src/gui/kernel

Timestamp:

Nov 22, 2009, 10:43:33 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

gui/kernel: mime: Make sure the fallback converter doesn't participate in the conversion if there is a specialized converter that already presented the given MIME type in the clipboard (to avoid unnecessary duplication of representations).

Location:

trunk/src/gui/kernel

Files:

• qmime.h (modified) (2 diffs)
• qmime_pm.cpp (modified) (14 diffs)

trunk/src/gui/kernel/qmime.h

@@ -122 +122 @@
     virtual ~QPMMime();
 
+
+
+
+
+
+
+
     // for converting from Qt
-    virtual QList<ULONG> formatsForMimeData(const QMimeData *mimeData) const = 0;
+    virtual QList<> formatsForMimeData(const QMimeData *mimeData) const = 0;
     virtual bool convertFromMimeData(const QMimeData *mimeData, ULONG format,
                                      ULONG &flags, ULONG *data) const = 0;
-
-    typedef QPair<QString, ULONG> MimeCFPair;
-
     // for converting to Qt
     virtual QList<MimeCFPair> mimesForFormats(const QList<ULONG> &formats) const = 0;
@@ -154 +158 @@
             converter(c), mime(f), format(cf), 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 allConvertersFromFormats()/allConvertersFromMimeData()
+        QString mime;
+        ULONG format;
         int priority;
     };

trunk/src/gui/kernel/qmime_pm.cpp

@@ -204 +204 @@
 
 /*!
-    \fn QList<ULONG> QPMMime::formatsForMimeData(const QMimeData *mimeData) const
+    \fn QList<> QPMMime::formatsForMimeData(const QMimeData *mimeData) const
 
     Returns a list of ULONG values representing the different OS/2 PM
@@ -210 +210 @@
     precedence (the most suitable format goes first), or an empty list if
     neither of the mime types provided by \a mimeData is supported by this
-    converter.
+    converter. Note that each item in the returned list is actually a pair
+    consisting of the mime type name and the corresponding format identifier.
 
     All subclasses must reimplement this pure virtual function.
@@ -250 +251 @@
     of \a formats, in order of precedence (the most suitable mime type comes
     first), or an empty list if neither of the \a formats is supported by this
-    converter. Note that each pair in the returned list consists of the mime
-    type name and the corresponding format identifier.
+    converter. Note that each