diff options
author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2022-11-02 16:23:54 +0100 |
---|---|---|
committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2022-11-07 09:31:08 +0100 |
commit | 9f35db2a8af2b9c6b275d893c0b3fab15f656684 (patch) | |
tree | 1a911fc5356834f70ed65dcfb0c82ef8e1004bce /src/plugins/platforms/cocoa/qmacclipboard.mm | |
parent | bf08aac46ad50ae08cc0c5481bc66e962b8105bb (diff) |
Standardize QMacMime and QWindowsMime
Make name of virtual functions explicit, following the QWindowsMime
API.
Task-number: QTBUG-93632
Change-Id: I7ada2b1aa86bc6e28b47383a32ab9cbaf9ad93e5
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Diffstat (limited to 'src/plugins/platforms/cocoa/qmacclipboard.mm')
-rw-r--r-- | src/plugins/platforms/cocoa/qmacclipboard.mm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/platforms/cocoa/qmacclipboard.mm b/src/plugins/platforms/cocoa/qmacclipboard.mm index 9f27fb5bf9..a58a536108 100644 --- a/src/plugins/platforms/cocoa/qmacclipboard.mm +++ b/src/plugins/platforms/cocoa/qmacclipboard.mm @@ -320,9 +320,9 @@ QMacPasteboard::setMimeData(QMimeData *mime_src, DataRequestType dataRequestType // Hack: The Rtf handler converts incoming Rtf to Html. We do // not want to convert outgoing Html to Rtf but instead keep // posting it as Html. Skip the Rtf handler here. - if (c->flavorFor("text/html"_L1) == "public.rtf"_L1) + if (c->flavorForMime("text/html"_L1) == "public.rtf"_L1) continue; - QString flavor(c->flavorFor(mimeType)); + QString flavor(c->flavorForMime(mimeType)); if (!flavor.isEmpty()) { QMacMimeData *mimeData = static_cast<QMacMimeData*>(mime_src); @@ -435,7 +435,7 @@ QMacPasteboard::retrieveData(const QString &format, QMetaType) const qCDebug(lcQpaClipboard, "Pasteboard: retrieveData [%s]", qPrintable(format)); const QList<QMacMime *> availableConverters = QMacMimeRegistry::all(scope); for (const auto *c : availableConverters) { - QString c_flavor = c->flavorFor(format); + QString c_flavor = c->flavorForMime(format); if (!c_flavor.isEmpty()) { // Converting via PasteboardCopyItemFlavorData below will for some UITs result // in newlines mapping to '\r' instead of '\n'. To work around this we shortcut |