diff options
author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2022-11-01 17:08:12 +0100 |
---|---|---|
committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2022-11-07 09:30:55 +0100 |
commit | 76fcd436c1af8a60b82105f24ecdcf7689612cea (patch) | |
tree | 3a0bdfac24210329a7822814b7ca23356519e201 /src/plugins/platforms/cocoa/qmacclipboard.h | |
parent | fe1075332cf0066d47432a98e3a4b68386d6523a (diff) |
Rename QMacInternalPasteboardMime to QMacMime
We want to make it public, and there is no need for "pasteboard" since
it also coveres drag'n'drop. Add a default constructor that defaults to
supporting both clipboard and drag'n'drop, and clean up the code by
using that constructor where applicable.
Historical note: the converter interface was called QMacMime up to
Qt 4.2, when due to macOS changes it had to be replaced by
QMacPasteboardMime.
Task-number: QTBUG-93632
Change-Id: Id9712300039375aa6394598b104827e6f5d6c948
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Diffstat (limited to 'src/plugins/platforms/cocoa/qmacclipboard.h')
-rw-r--r-- | src/plugins/platforms/cocoa/qmacclipboard.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/plugins/platforms/cocoa/qmacclipboard.h b/src/plugins/platforms/cocoa/qmacclipboard.h index 6413cfbe8b..c17b8f6dd8 100644 --- a/src/plugins/platforms/cocoa/qmacclipboard.h +++ b/src/plugins/platforms/cocoa/qmacclipboard.h @@ -11,7 +11,7 @@ QT_BEGIN_NAMESPACE class QMacMimeData; -class QMacInternalPasteboardMime; +class QMacMime; class QMacPasteboard { @@ -21,12 +21,12 @@ private: struct Promise { Promise() : itemId(0), converter(nullptr) { } - static Promise eagerPromise(int itemId, QMacInternalPasteboardMime *c, QString m, QMacMimeData *d, int o = 0); - static Promise lazyPromise(int itemId, QMacInternalPasteboardMime *c, QString m, QMacMimeData *d, int o = 0); - Promise(int itemId, QMacInternalPasteboardMime *c, QString m, QMacMimeData *md, int o, DataRequestType drt); + 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); int itemId, offset; - QMacInternalPasteboardMime *converter; + QMacMime *converter; QString mime; QPointer<QMacMimeData> mimeData; QVariant variantData; |