From 8929e90e8665e9cd1434c32faeeda835f23aaf87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Mon, 10 May 2021 17:11:01 +0200 Subject: 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 --- src/plugins/platforms/cocoa/qcocoanativeinterface.h | 5 ----- src/plugins/platforms/cocoa/qcocoanativeinterface.mm | 14 -------------- 2 files changed, 19 deletions(-) (limited to 'src/plugins') 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(macPasteboardMime)); -} - -void QCocoaNativeInterface::removeFromMimeList(void *macPasteboardMime) -{ - qt_mac_removeFromGlobalMimeList(reinterpret_cast(macPasteboardMime)); -} - void QCocoaNativeInterface::registerDraggedTypes(const QStringList &types) { qt_mac_registerDraggedTypes(types); -- cgit v1.2.3