macOS: clean up clipboard code

Replace flavor with uti, remove unused parameters, remove unused
hasOSFlavor function. Hide QMacMimeData as an implementation detail, it
is generally undefined behavior to cast an object to a type it is not an
instance of (even if related and without new data members).

Apply const, fix coding style.

Task-number: QTBUG-93632
Change-Id: I3bc05a72bc47c78958f26211211e734387fbb024
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>

1 files changed, 7 insertions, 9 deletions

diff --git a/src/plugins/platforms/cocoa/qmacclipboard.h b/src/plugins/platforms/cocoa/qmacclipboard.h
index 99337b74fd..f2a90b1347 100644
--- a/src/plugins/platforms/cocoa/qmacclipboard.h
+++ b/src/plugins/platforms/cocoa/qmacclipboard.h
@@ -11,7 +11,6 @@
 
 QT_BEGIN_NAMESPACE
 
-class QMacMimeData;
 class QMacMime;
 
 class QMacPasteboard
@@ -22,14 +21,14 @@ private:
     struct Promise {
         Promise() : itemId(0), converter(nullptr) { }
 
-        static Promise eagerPromise(int itemId, QMacMime *c, QString m, QMacMimeData *d, int o = 0);
-        static Promise lazyPromise(int itemId, QMacMime *c, QString m, QMacMimeData *d, int o = 0);
-        Promise(int itemId, QMacMime *c, QString m, QMacMimeData *md, int o, DataRequestType drt);
+        static Promise eagerPromise(int itemId, const QMacMime *c, const QString &m, QMimeData *d, int o = 0);
+        static Promise lazyPromise(int itemId, const QMacMime *c, const QString &m, QMimeData *d, int o = 0);
+        Promise(int itemId, const QMacMime *c, const QString &m, QMimeData *md, int o, DataRequestType drt);
 
         int itemId, offset;
-        QMacMime *converter;
+        const QMacMime *converter;
         QString mime;
-        QPointer<QMacMimeData> mimeData;
+        QPointer<QMimeData> mimeData;
         QVariant variantData;
         DataRequestType dataRequestType;
         // QMimeData can be set from QVariant, holding
@@ -54,8 +53,7 @@ public:
     QMacPasteboard(CFStringRef name=nullptr, QMacMime::HandlerScope scope = QMacMime::HandlerScope::All);
     ~QMacPasteboard();
 
-    bool hasFlavor(QString flavor) const;
-    bool hasOSType(int c_flavor) const;
+    bool hasUti(const QString &uti) const;
 
     PasteboardRef pasteBoard() const;
     QMimeData *mimeData() const;
@@ -64,7 +62,7 @@ public:
 
     QStringList formats() const;
     bool hasFormat(const QString &format) const;
-    QVariant retrieveData(const QString &format, QMetaType) const;
+    QVariant retrieveData(const QString &format) const;
 
     void clear();
     bool sync() const;