Changeset 338

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 
+    type name and the corresponding format identifier.
 
     All subclasses must reimplement this pure virtual function.
@@ -283 +284 @@
             for (; it != matches.end(); ++it) {
                 Match &match = *it;
-                if (match.mime == fmt.first) {
+                if (match.mime == fmt.) {
                     // replace if priority is higher, ignore otherwise
                     if (priority < match.priority) {
                         match.converter = mime;
-                        match.format = fmt.second;
+                        match.format = fmt.;
                         match.priority = priority;
                     }
@@ -294 +295 @@
             }
             if (it == matches.end()) {
-                matches += Match(mime, fmt.first, fmt.second, priority);
+                matches += Match(mime, fmt., priority);
             }
         }
@@ -309 +310 @@
     QList<QPMMime*> mimes = theMimeList()->mimes();
     foreach(QPMMime *mime, mimes) {
-        QList<ULONG> cfs = mime->formatsForMimeData(mimeData);
+        QList<s = mime->formatsForMimeData(mimeData);
         int priority = 0;
-        foreach (ULONG cf, cfs) {
+        foreach (s) {
             ++priority;
             QList<Match>::iterator it = matches.begin();
             for (; it != matches.end(); ++it) {
                 Match &match = *it;
-                if (match.format == cf) {
+                if (mime == mimes.last()) { // QPMMimeAnyMime?
+                    if (match.mime == fmt.mime){
+                        // we assume that specialized converters (that come
+                        // first) provide a more precise conversion than
+                        // QPMMimeAnyMime and don't let it get into the list in
+                        // order to avoid unnecessary duplicate representations
+                        break;
+                    }
+                }
+                if (match.format == fmt.format) {
                     // replace if priority is higher, ignore otherwise
                     if (priority < match.priority) {
                         match.converter = mime;
+
                         match.priority = priority;
                     }
@@ -326 +337 @@
             }
             if (it == matches.end()) {
-                matches += Match(mime, cf, priority);
+                matches += Match(mime, , priority);
             }
         }
@@ -355 +366 @@
 
     // for converting from Qt
-    QList<ULONG> formatsForMimeData(const QMimeData *mimeData) const;
+    QList<> formatsForMimeData(const QMimeData *mimeData) const;
     bool convertFromMimeData(const QMimeData *mimeData, ULONG format,
                              ULONG &flags, ULONG *data) const;
@@ -375 +386 @@
 }
 
-QList<ULONG> QPMMimeText::formatsForMimeData(const QMimeData *mimeData) const
-{
-    QList<ULONG> cfs;
+QList<> QPMMimeText::formatsForMimeData(const QMimeData *mimeData) const
+{
+    QList<s;
     if (mimeData->hasText())
-        cfs << CF_TEXT << CF_TextUnicode;
-    return cfs;
+        fmts << MimeCFPair(QLatin1String("text/plain"), CF_TEXT)
+             << MimeCFPair(QLatin1String("text/plain"), CF_TextUnicode);
+    return fmts;
 }
 
@@ -477 +489 @@
         // prefer unicode over local8Bit
         if (cf == CF_TextUnicode)
-            mimes.prepend(qMakePair(QString(QLatin1String("text/plain")), cf));
+            mimes.prepend(), cf));
         if (cf == CF_TEXT)
-            mimes.append(qMakePair(QString(QLatin1String("text/plain")), cf));
+            mimes.append(), cf));
     }
     return mimes;
@@ -535 +547 @@
 
     // for converting from Qt
-    QList<ULONG> formatsForMimeData(const QMimeData *mimeData) const;
+    QList<> formatsForMimeData(const QMimeData *mimeData) const;
     bool convertFromMimeData(const QMimeData *mimeData, ULONG format,
                              ULONG &flags, ULONG *data) const;
@@ -581 +593 @@
 }
 
-QList<ULONG> QPMMimeAnyMime::formatsForMimeData(const QMimeData *mimeData) const
-{
-    QList<ULONG> cfs;
+QList<> QPMMimeAnyMime::formatsForMimeData(const QMimeData *mimeData) const
+{
+    QList<s;
 
     QStringList mimes = QInternalMimeData::formatsHelper(mimeData);
@@ -591 +603 @@
             cf = registerMimeType(mime);
         if (cf)
-            cfs << cf;
-    }
-
-    return cfs;
+            ;
+    }
+
+    return s;
 }
 
@@ -631 +643 @@
             mime = registerFormat(format);
         if (!mime.isEmpty())
-            mimes << qMakePair(mime, format);
+            mimes << Pair(mime, format);
     }