1 files changed, 15 insertions, 36 deletions

diff --git a/src/plugins/platforms/ios/qiosclipboard.mm b/src/plugins/platforms/ios/qiosclipboard.mm
index 7e1e4aa0d4..de8ab69dff 100644
--- a/src/plugins/platforms/ios/qiosclipboard.mm
+++ b/src/plugins/platforms/ios/qiosclipboard.mm
@@ -11,18 +11,6 @@
 #include <QtCore/QMimeData>
 #include <QtGui/QGuiApplication>
 
-@interface UIPasteboard (QUIPasteboard)
-+ (instancetype)pasteboardWithQClipboardMode:(QClipboard::Mode)mode;
-@end
-
-@implementation UIPasteboard (QUIPasteboard)
-+ (instancetype)pasteboardWithQClipboardMode:(QClipboard::Mode)mode
-{
-    NSString *name = (mode == QClipboard::Clipboard) ? UIPasteboardNameGeneral : UIPasteboardNameFind;
-    return [UIPasteboard pasteboardWithName:name create:NO];
-}
-@end
-
 // --------------------------------------------------------------------
 
 @interface QUIClipboard : NSObject
@@ -31,7 +19,6 @@
 @implementation QUIClipboard {
     QIOSClipboard *m_qiosClipboard;
     NSInteger m_changeCountClipboard;
-    NSInteger m_changeCountFindBuffer;
 }
 
 - (instancetype)initWithQIOSClipboard:(QIOSClipboard *)qiosClipboard
@@ -39,8 +26,7 @@
     self = [super init];
     if (self) {
         m_qiosClipboard = qiosClipboard;
-        m_changeCountClipboard = [UIPasteboard pasteboardWithQClipboardMode:QClipboard::Clipboard].changeCount;
-        m_changeCountFindBuffer = [UIPasteboard pasteboardWithQClipboardMode:QClipboard::FindBuffer].changeCount;
+        m_changeCountClipboard = UIPasteboard.generalPasteboard.changeCount;
 
         [[NSNotificationCenter defaultCenter]
             addObserver:self
@@ -77,18 +63,12 @@
 - (void)updatePasteboardChanged:(NSNotification *)notification
 {
     Q_UNUSED(notification);
-    NSInteger changeCountClipboard = [UIPasteboard pasteboardWithQClipboardMode:QClipboard::Clipboard].changeCount;
-    NSInteger changeCountFindBuffer = [UIPasteboard pasteboardWithQClipboardMode:QClipboard::FindBuffer].changeCount;
+    NSInteger changeCountClipboard = UIPasteboard.generalPasteboard.changeCount;
 
     if (m_changeCountClipboard != changeCountClipboard) {
         m_changeCountClipboard = changeCountClipboard;
         m_qiosClipboard->emitChanged(QClipboard::Clipboard);
     }
-
-    if (m_changeCountFindBuffer != changeCountFindBuffer) {
-        m_changeCountFindBuffer = changeCountFindBuffer;
-        m_qiosClipboard->emitChanged(QClipboard::FindBuffer);
-    }
 }
 
 @end
@@ -99,25 +79,22 @@ QT_BEGIN_NAMESPACE
 
 class QIOSMimeData : public QMimeData {
 public:
-    QIOSMimeData(QClipboard::Mode mode) : QMimeData(), m_mode(mode) { }
+    QIOSMimeData() : QMimeData() { }
     ~QIOSMimeData() { }
 
     QStringList formats() const override;
     QVariant retrieveData(const QString &mimeType, QMetaType type) const override;
-
-private:
-    const QClipboard::Mode m_mode;
 };
 
 QStringList QIOSMimeData::formats() const
 {
     QStringList foundMimeTypes;
-    UIPasteboard *pb = [UIPasteboard pasteboardWithQClipboardMode:m_mode];
+    UIPasteboard *pb = UIPasteboard.generalPasteboard;
     NSArray<NSString *> *pasteboardTypes = [pb pasteboardTypes];
 
     for (NSUInteger i = 0; i < [pasteboardTypes count]; ++i) {
         const QString uti = QString::fromNSString([pasteboardTypes objectAtIndex:i]);
-        const QString mimeType = QMacMimeRegistry::flavorToMime(QUtiMimeConverter::HandlerScope::All, uti);
+        const QString mimeType = QMacMimeRegistry::flavorToMime(QUtiMimeConverter::HandlerScopeFlag::All, uti);
         if (!mimeType.isEmpty() && !foundMimeTypes.contains(mimeType))
             foundMimeTypes << mimeType;
     }
@@ -127,10 +104,10 @@ QStringList QIOSMimeData::formats() const
 
 QVariant QIOSMimeData::retrieveData(const QString &mimeType, QMetaType) const
 {
-    UIPasteboard *pb = [UIPasteboard pasteboardWithQClipboardMode:m_mode];
+    UIPasteboard *pb = UIPasteboard.generalPasteboard;
     NSArray<NSString *> *pasteboardTypes = [pb pasteboardTypes];
 
-    const auto converters = QMacMimeRegistry::all(QUtiMimeConverter::HandlerScope::All);
+    const auto converters = QMacMimeRegistry::all(QUtiMimeConverter::HandlerScopeFlag::All);
     for (QUtiMimeConverter *converter : converters) {
         for (NSUInteger i = 0; i < [pasteboardTypes count]; ++i) {
             NSString *availableUtiNSString = [pasteboardTypes objectAtIndex:i];
@@ -164,7 +141,7 @@ QMimeData *QIOSClipboard::mimeData(QClipboard::Mode mode)
 {
     Q_ASSERT(supportsMode(mode));
     if (!m_mimeData.contains(mode))
-        return *m_mimeData.insert(mode, new QIOSMimeData(mode));
+        return *m_mimeData.insert(mode, new QIOSMimeData);
     return m_mimeData[mode];
 }
 
@@ -172,7 +149,7 @@ void QIOSClipboard::setMimeData(QMimeData *mimeData, QClipboard::Mode mode)
 {
     Q_ASSERT(supportsMode(mode));
 
-    UIPasteboard *pb = [UIPasteboard pasteboardWithQClipboardMode:mode];
+    UIPasteboard *pb = UIPasteboard.generalPasteboard;
     if (!mimeData) {
         pb.items = [NSArray<NSDictionary<NSString *, id> *> array];
         return;
@@ -183,7 +160,7 @@ void QIOSClipboard::setMimeData(QMimeData *mimeData, QClipboard::Mode mode)
 
     const auto formats = mimeData->formats();
     for (const QString &mimeType : formats) {
-        const auto converters = QMacMimeRegistry::all(QUtiMimeConverter::HandlerScope::All);
+        const auto converters = QMacMimeRegistry::all(QUtiMimeConverter::HandlerScopeFlag::All);
         for (const QUtiMimeConverter *converter : converters) {
             const QString uti = converter->utiForMime(mimeType);
             if (uti.isEmpty())
@@ -193,15 +170,17 @@ void QIOSClipboard::setMimeData(QMimeData *mimeData, QClipboard::Mode mode)
             if (mimeData->hasImage()) {
                 mimeDataAsVariant = mimeData->imageData();
             } else if (mimeData->hasUrls()) {
+                const auto urls = mimeData->urls();
                 QVariantList urlList;
-                for (QUrl url : mimeData->urls())
+                urlList.reserve(urls.size());
+                for (const QUrl& url : urls)
                     urlList << url;
                 mimeDataAsVariant = QVariant(urlList);
             } else {
                 mimeDataAsVariant = QVariant(mimeData->data(mimeType));
             }
 
-            QByteArray byteArray = converter->convertFromMime(mimeType, mimeDataAsVariant, uti).first();
+            QByteArray byteArray = converter->convertFromMime(mimeType, mimeDataAsVariant, uti).constFirst();
             NSData *nsData = [NSData dataWithBytes:byteArray.constData() length:byteArray.size()];
             [pbItem setValue:nsData forKey:uti.toNSString()];
             break;
@@ -213,7 +192,7 @@ void QIOSClipboard::setMimeData(QMimeData *mimeData, QClipboard::Mode mode)
 
 bool QIOSClipboard::supportsMode(QClipboard::Mode mode) const
 {
-    return (mode == QClipboard::Clipboard || mode == QClipboard::FindBuffer);
+    return mode == QClipboard::Clipboard;
 }
 
 bool QIOSClipboard::ownsMode(QClipboard::Mode mode) const