Refactor: split QMacMime registry and virtual interface

The logic for registration of converter implementations is only used
internally through static functions. Move those, and related global
functions, to a QMacMimeRegistry namespace.

Reduce the QMacInternalPasteboardMime to the abstract interface for
converting between native and Qt clipboard data.

Historically, mime converters can have different "types"; make that API
type-safe.

Task-number: QTBUG-93632
Change-Id: I0e16fefa350398b693486199fe10357fd84abcd6
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>

10 files changed, 26 insertions, 15 deletions

diff --git a/src/plugins/platforms/cocoa/qcocoaclipboard.mm b/src/plugins/platforms/cocoa/qcocoaclipboard.mm
index 7363b011bf..8c48f282c9 100644
--- a/src/plugins/platforms/cocoa/qcocoaclipboard.mm
+++ b/src/plugins/platforms/cocoa/qcocoaclipboard.mm
@@ -3,6 +3,8 @@
 
 #include "qcocoaclipboard.h"
 
+#include <QtGui/private/qmacmime_p.h>
+
 #ifndef QT_NO_CLIPBOARD
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/platforms/cocoa/qcocoadrag.mm b/src/plugins/platforms/cocoa/qcocoadrag.mm
index 7a73344480..dc1f68bd23 100644
--- a/src/plugins/platforms/cocoa/qcocoadrag.mm
+++ b/src/plugins/platforms/cocoa/qcocoadrag.mm
@@ -7,6 +7,7 @@
 #include "qmacclipboard.h"
 #include "qcocoahelpers.h"
 #include <QtGui/private/qcoregraphics_p.h>
+#include <QtGui/private/qmacmime_p.h>
 #include <QtCore/qsysinfo.h>
 #include <QtCore/private/qcore_mac_p.h>
 
diff --git a/src/plugins/platforms/cocoa/qcocoaintegration.mm b/src/plugins/platforms/cocoa/qcocoaintegration.mm
index 2d2a7890d0..b17ab38b10 100644
--- a/src/plugins/platforms/cocoa/qcocoaintegration.mm
+++ b/src/plugins/platforms/cocoa/qcocoaintegration.mm
@@ -32,6 +32,7 @@
 
 #include <QtCore/private/qcore_mac_p.h>
 #include <QtGui/private/qcoregraphics_p.h>
+#include <QtGui/private/qmacmimeregistry_p.h>
 #include <QtGui/private/qopenglcontext_p.h>
 #include <QtGui/private/qrhibackingstore_p.h>
 #include <QtGui/private/qfontengine_coretext_p.h>
@@ -164,7 +165,7 @@ QCocoaIntegration::QCocoaIntegration(const QStringList &paramList)
 
     QCocoaScreen::initializeScreens();
 
-    QMacInternalPasteboardMime::initializeMimeTypes();
+    QMacMimeRegistry::initializeMimeTypes();
     QCocoaMimeTypes::initializeMimeTypes();
     QWindowSystemInterfacePrivate::TabletEvent::setPlatformSynthesizesMouse(false);
     QWindowSystemInterface::registerInputDevice(new QInputDevice(QString("keyboard"), 0,
@@ -194,7 +195,7 @@ QCocoaIntegration::~QCocoaIntegration()
     // Deleting the clipboard integration flushes promised pastes using
     // the mime converters - the ordering here is important.
     delete mCocoaClipboard;
-    QMacInternalPasteboardMime::destroyMimeTypes();
+    QMacMimeRegistry::destroyMimeTypes();
 #endif
 
     QCocoaScreen::cleanupScreens();
diff --git a/src/plugins/platforms/cocoa/qcocoanativeinterface.mm b/src/plugins/platforms/cocoa/qcocoanativeinterface.mm
index 38a6060256..fd7e1c07b7 100644
--- a/src/plugins/platforms/cocoa/qcocoanativeinterface.mm
+++ b/src/plugins/platforms/cocoa/qcocoanativeinterface.mm
@@ -26,6 +26,7 @@
 #include <QtGui/qguiapplication.h>
 #include <qdebug.h>
 
+#include <QtGui/private/qmacmimeregistry_p.h>
 #include <QtGui/private/qcoregraphics_p.h>
 
 #if QT_CONFIG(vulkan)
@@ -120,7 +121,7 @@ void QCocoaNativeInterface::onAppFocusWindowChanged(QWindow *window)
 
 void QCocoaNativeInterface::registerDraggedTypes(const QStringList &types)
 {
-    qt_mac_registerDraggedTypes(types);
+    QMacMimeRegistry::registerDraggedTypes(types);
 }
 
 void QCocoaNativeInterface::setEmbeddedInForeignView(QPlatformWindow *window, bool embedded)
diff --git a/src/plugins/platforms/cocoa/qmacclipboard.h b/src/plugins/platforms/cocoa/qmacclipboard.h
index 925e816831..3cd33f9591 100644
--- a/src/plugins/platforms/cocoa/qmacclipboard.h
+++ b/src/plugins/platforms/cocoa/qmacclipboard.h
@@ -5,13 +5,14 @@
 #define QMACCLIPBOARD_H
 
 #include <QtGui>
-#include <QtGui/private/qmacmime_p.h>
 
 #include <ApplicationServices/ApplicationServices.h>
 
 QT_BEGIN_NAMESPACE
 
 class QMacMimeData;
+class QMacInternalPasteboardMime;
+
 class QMacPasteboard
 {
 public:
diff --git a/src/plugins/platforms/cocoa/qmacclipboard.mm b/src/plugins/platforms/cocoa/qmacclipboard.mm
index b298a47bef..5287638d80 100644
--- a/src/plugins/platforms/cocoa/qmacclipboard.mm
+++ b/src/plugins/platforms/cocoa/qmacclipboard.mm
@@ -4,6 +4,8 @@
 #include <AppKit/AppKit.h>
 
 #include "qmacclipboard.h"
+#include <QtGui/private/qmacmimeregistry_p.h>
+#include <QtGui/private/qmacmime_p.h>
 #include <QtGui/qclipboard.h>
 #include <QtGui/qguiapplication.h>
 #include <QtGui/qbitmap.h>
@@ -130,7 +132,7 @@ OSStatus QMacPasteboard::promiseKeeper(PasteboardRef paste, PasteboardItemID id,
 
     // Find the kept promise
     QList<QMacInternalPasteboardMime*> availableConverters
-        = QMacInternalPasteboardMime::all(QMacInternalPasteboardMime::MIME_ALL);
+        = QMacMimeRegistry::all(QMacInternalPasteboardMime::MIME_ALL);
     const QString flavorAsQString = QString::fromCFString(flavor);
     QMacPasteboard::Promise promise;
     for (int i = 0; i < qpaste->promises.size(); i++){
@@ -297,7 +299,7 @@ QMacPasteboard::setMimeData(QMimeData *mime_src, DataRequestType dataRequestType
     delete mime;
     mime = mime_src;
 
-    QList<QMacInternalPasteboardMime*> availableConverters = QMacInternalPasteboardMime::all(mime_type);
+    QList<QMacInternalPasteboardMime*> availableConverters = QMacMimeRegistry::all(mime_type);
     if (mime != nullptr) {
         clear_helper();
         QStringList formats = mime_src->formats();
@@ -372,7 +374,7 @@ QMacPasteboard::formats() const
         for (int i = 0; i < type_count; ++i) {
             const QString flavor = QString::fromCFString((CFStringRef)CFArrayGetValueAtIndex(types, i));
             qCDebug(lcQpaClipboard, " -%s", qPrintable(QString(flavor)));
-            QString mimeType = QMacInternalPasteboardMime::flavorToMime(mime_type, flavor);
+            QString mimeType = QMacMimeRegistry::flavorToMime(mime_type, flavor);
             if (!mimeType.isEmpty() && !ret.contains(mimeType)) {
                 qCDebug(lcQpaClipboard, "   -<%lld> %s [%s]", ret.size(), qPrintable(mimeType), qPrintable(QString(flavor)));
                 ret << mimeType;
@@ -409,7 +411,7 @@ QMacPasteboard::hasFormat(const QString &format) const
         for (int i = 0; i < type_count; ++i) {
             const QString flavor = QString::fromCFString((CFStringRef)CFArrayGetValueAtIndex(types, i));
             qCDebug(lcQpaClipboard, " -%s [0x%x]", qPrintable(QString(flavor)), mime_type);
-            QString mimeType = QMacInternalPasteboardMime::flavorToMime(mime_type, flavor);
+            QString mimeType = QMacMimeRegistry::flavorToMime(mime_type, flavor);
             if (!mimeType.isEmpty())
                 qCDebug(lcQpaClipboard, "   - %s", qPrintable(mimeType));
             if (mimeType == format)
@@ -432,7 +434,7 @@ QMacPasteboard::retrieveData(const QString &format, QMetaType) const
         return QByteArray();
 
     qCDebug(lcQpaClipboard, "Pasteboard: retrieveData [%s]", qPrintable(format));
-    const QList<QMacInternalPasteboardMime *> mimes = QMacInternalPasteboardMime::all(mime_type);
+    const QList<QMacInternalPasteboardMime *> mimes = QMacMimeRegistry::all(mime_type);
     for (int mime = 0; mime < mimes.size(); ++mime) {
         QMacInternalPasteboardMime *c = mimes.at(mime);
         QString c_flavor = c->flavorFor(format);
diff --git a/src/plugins/platforms/cocoa/qnsview.mm b/src/plugins/platforms/cocoa/qnsview.mm
index b73d186612..eb4405ccd0 100644
--- a/src/plugins/platforms/cocoa/qnsview.mm
+++ b/src/plugins/platforms/cocoa/qnsview.mm
@@ -34,6 +34,7 @@
 #include "qcocoaglcontext.h"
 #endif
 #include "qcocoaintegration.h"
+#include <QtGui/private/qmacmimeregistry_p.h>
 
 // Private interface
 @interface QNSView ()
diff --git a/src/plugins/platforms/cocoa/qnsview_dragging.mm b/src/plugins/platforms/cocoa/qnsview_dragging.mm
index c88e5d502f..06b917945a 100644
--- a/src/plugins/platforms/cocoa/qnsview_dragging.mm
+++ b/src/plugins/platforms/cocoa/qnsview_dragging.mm
@@ -21,7 +21,7 @@
                    NSPasteboardTypeMultipleTextSelection, mimeTypeGeneric]];
 
     // Add custom types supported by the application
-    for (const QString &customType : qt_mac_enabledDraggedTypes())
+    for (const QString &customType : QMacMimeRegistry::enabledDraggedTypes())
         [supportedTypes addObject:customType.toNSString()];
 
     [self registerForDraggedTypes:supportedTypes];
diff --git a/src/plugins/platforms/ios/qiosclipboard.mm b/src/plugins/platforms/ios/qiosclipboard.mm
index 554c3ca118..62a9061086 100644
--- a/src/plugins/platforms/ios/qiosclipboard.mm
+++ b/src/plugins/platforms/ios/qiosclipboard.mm
@@ -6,6 +6,7 @@
 #ifndef QT_NO_CLIPBOARD
 
 #include <QtCore/qurl.h>
+#include <QtGui/private/qmacmimeregistry_p.h>
 #include <QtGui/private/qmacmime_p.h>
 #include <QtCore/QMimeData>
 #include <QtGui/QGuiApplication>
@@ -116,7 +117,7 @@ QStringList QIOSMimeData::formats() const
 
     for (NSUInteger i = 0; i < [pasteboardTypes count]; ++i) {
         QString uti = QString::fromNSString([pasteboardTypes objectAtIndex:i]);
-        QString mimeType = QMacInternalPasteboardMime::flavorToMime(QMacInternalPasteboardMime::MIME_ALL, uti);
+        QString mimeType = QMacMimeRegistry::flavorToMime(QMacInternalPasteboardMime::MIME_ALL, uti);
         if (!mimeType.isEmpty() && !foundMimeTypes.contains(mimeType))
             foundMimeTypes << mimeType;
     }
@@ -130,7 +131,7 @@ QVariant QIOSMimeData::retrieveData(const QString &mimeType, QMetaType) const
     NSArray<NSString *> *pasteboardTypes = [pb pasteboardTypes];
 
     foreach (QMacInternalPasteboardMime *converter,
-             QMacInternalPasteboardMime::all(QMacInternalPasteboardMime::MIME_ALL)) {
+             QMacMimeRegistry::all(QMacInternalPasteboardMime::MIME_ALL)) {
         if (!converter->canConvert(mimeType, converter->flavorFor(mimeType)))
             continue;
 
@@ -185,7 +186,7 @@ void QIOSClipboard::setMimeData(QMimeData *mimeData, QClipboard::Mode mode)
 
     foreach (const QString &mimeType, mimeData->formats()) {
         foreach (QMacInternalPasteboardMime *converter,
-                 QMacInternalPasteboardMime::all(QMacInternalPasteboardMime::MIME_ALL)) {
+                 QMacMimeRegistry::all(QMacInternalPasteboardMime::MIME_ALL)) {
             QString uti = converter->flavorFor(mimeType);
             if (uti.isEmpty() || !converter->canConvert(mimeType, uti))
                 continue;
diff --git a/src/plugins/platforms/ios/qiosintegration.mm b/src/plugins/platforms/ios/qiosintegration.mm
index 84caccc267..244b182f65 100644
--- a/src/plugins/platforms/ios/qiosintegration.mm
+++ b/src/plugins/platforms/ios/qiosintegration.mm
@@ -24,6 +24,7 @@
 #include <qpa/qplatformoffscreensurface.h>
 
 #include <QtGui/private/qcoretextfontdatabase_p.h>
+#include <QtGui/private/qmacmimeregistry_p.h>
 #include <QtGui/private/qmacmime_p.h>
 #include <QDir>
 #include <QOperatingSystemVersion>
@@ -89,7 +90,7 @@ void QIOSIntegration::initialize()
 #if QT_CONFIG(tabletevent)
     QWindowSystemInterfacePrivate::TabletEvent::setPlatformSynthesizesMouse(false);
 #endif
-    QMacInternalPasteboardMime::initializeMimeTypes();
+    QMacMimeRegistry::initializeMimeTypes();
 
     qsizetype size = QList<QPluginParsedMetaData>(m_optionalPlugins->metaData()).size();
     for (qsizetype i = 0; i < size; ++i)
@@ -105,7 +106,7 @@ QIOSIntegration::~QIOSIntegration()
     delete m_clipboard;
     m_clipboard = 0;
 #endif
-    QMacInternalPasteboardMime::destroyMimeTypes();
+    QMacMimeRegistry::destroyMimeTypes();
 
     delete m_inputContext;
     m_inputContext = 0;