From 48e104aa1d7e3e8b42f239126fee756c6c920a1a Mon Sep 17 00:00:00 2001
From: Morten Johan Sorvig <morten.sorvig@nokia.com>
Date: Wed, 23 May 2012 12:31:39 +0200
Subject: Add QMacPasteboardMime::count(QMimeData*).

As QTBUG-25076 points out, the ### comment indicates
that we want to add virtual function to
QMacPasteboardMime.

The default implementation returns 1. Reimplement
for QMacPastebardMimeUrl and return the url count.

Change-Id: Ie300574eab9991af625986805d2b030914291cc0
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
---
 src/plugins/platforms/cocoa/qmacmime.mm | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'src/plugins/platforms/cocoa/qmacmime.mm')

diff --git a/src/plugins/platforms/cocoa/qmacmime.mm b/src/plugins/platforms/cocoa/qmacmime.mm
index 8cb684fbea..2895d7dda8 100644
--- a/src/plugins/platforms/cocoa/qmacmime.mm
+++ b/src/plugins/platforms/cocoa/qmacmime.mm
@@ -168,6 +168,14 @@ QMacPasteboardMime::~QMacPasteboardMime()
         globalMimeList()->removeAll(this);
 }
 
+/*!
+  Returns the item count for the given \a mimeData
+*/
+int QMacPasteboardMime::count(QMimeData *mimeData)
+{
+    return 1;
+}
+
 class QMacPasteboardMimeAny : public QMacPasteboardMime {
 private:
 
@@ -586,6 +594,7 @@ public:
     bool canConvert(const QString &mime, QString flav);
     QVariant convertToMime(const QString &mime, QList<QByteArray> data, QString flav);
     QList<QByteArray> convertFromMime(const QString &mime, QVariant data, QString flav);
+    int count(QMimeData *mimeData);
 };
 
 QString QMacPasteboardMimeFileUri::convertorName()
@@ -648,6 +657,11 @@ QList<QByteArray> QMacPasteboardMimeFileUri::convertFromMime(const QString &mime
     return ret;
 }
 
+int QMacPasteboardMimeFileUri::count(QMimeData *mimeData)
+{
+    return mimeData->urls().count();
+}
+
 class QMacPasteboardMimeUrl : public QMacPasteboardMime {
 public:
     QMacPasteboardMimeUrl() : QMacPasteboardMime(MIME_ALL) { }
-- 
cgit v1.2.3