diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2021-05-10 17:11:01 +0200 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2021-05-11 13:22:44 +0200 |
| commit | 8929e90e8665e9cd1434c32faeeda835f23aaf87 (patch) | |
| tree | 90a76d2f6883f0ebed0a561cfb9bff74faa69872 /src | |
| parent | 2a5ac249179871abc220e7707223c6587aca153b (diff) | |
macOS: Remove MIME plumbing from QCocoaNativeInterface
The functions are available as private API though
qt_mac_addToGlobalMimeList and qt_mac_removeFromGlobalMimeList for
those that need it.
Task-number: QTBUG-83252
Change-Id: Ibc17aedd9aaced236a082d3d8de4b28313406a02
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoanativeinterface.h | 5 | ||||
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoanativeinterface.mm | 14 |
2 files changed, 0 insertions, 19 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoanativeinterface.h b/src/plugins/platforms/cocoa/qcocoanativeinterface.h index 6606d61b7a..e69bafce7b 100644 --- a/src/plugins/platforms/cocoa/qcocoanativeinterface.h +++ b/src/plugins/platforms/cocoa/qcocoanativeinterface.h @@ -75,11 +75,6 @@ private: Q_INVOKABLE void clearCurrentThreadCocoaEventDispatcherInterruptFlag(); - // QMacPastebardMime support. The mac pasteboard void pointers are - // QMacPastebardMime instances from the cocoa plugin or qtmacextras - // These two classes are kept in sync and can be casted between. - static void addToMimeList(void *macPasteboardMime); - static void removeFromMimeList(void *macPasteboardMime); static void registerDraggedTypes(const QStringList &types); // Set a QWindow as a "guest" (subwindow) of a non-QWindow diff --git a/src/plugins/platforms/cocoa/qcocoanativeinterface.mm b/src/plugins/platforms/cocoa/qcocoanativeinterface.mm index 199ea99eb6..7dc5e9099d 100644 --- a/src/plugins/platforms/cocoa/qcocoanativeinterface.mm +++ b/src/plugins/platforms/cocoa/qcocoanativeinterface.mm @@ -94,10 +94,6 @@ void *QCocoaNativeInterface::nativeResourceForWindow(const QByteArray &resourceS QPlatformNativeInterface::NativeResourceForIntegrationFunction QCocoaNativeInterface::nativeResourceFunctionForIntegration(const QByteArray &resource) { - if (resource.toLower() == "addtomimelist") - return NativeResourceForIntegrationFunction(QCocoaNativeInterface::addToMimeList); - if (resource.toLower() == "removefrommimelist") - return NativeResourceForIntegrationFunction(QCocoaNativeInterface::removeFromMimeList); if (resource.toLower() == "registerdraggedtypes") return NativeResourceForIntegrationFunction(QCocoaNativeInterface::registerDraggedTypes); if (resource.toLower() == "registertouchwindow") @@ -158,16 +154,6 @@ void QCocoaNativeInterface::onAppFocusWindowChanged(QWindow *window) QCocoaMenuBar::updateMenuBarImmediately(); } -void QCocoaNativeInterface::addToMimeList(void *macPasteboardMime) -{ - qt_mac_addToGlobalMimeList(reinterpret_cast<QMacInternalPasteboardMime *>(macPasteboardMime)); -} - -void QCocoaNativeInterface::removeFromMimeList(void *macPasteboardMime) -{ - qt_mac_removeFromGlobalMimeList(reinterpret_cast<QMacInternalPasteboardMime *>(macPasteboardMime)); -} - void QCocoaNativeInterface::registerDraggedTypes(const QStringList &types) { qt_mac_registerDraggedTypes(types); |