From 0bd46cc06201d7435ab6f494c1ca6ec21297cf33 Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Thu, 3 Nov 2022 20:10:37 +0100 Subject: Fix spelling of converter Primarily in the Cocoa clipboard code. Change-Id: I39fede6144be5a0007a94e2ac2464892c958732f Reviewed-by: Timur Pocheptsov --- src/plugins/platforms/cocoa/qmacclipboard.h | 4 ++-- src/plugins/platforms/cocoa/qmacclipboard.mm | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/plugins') diff --git a/src/plugins/platforms/cocoa/qmacclipboard.h b/src/plugins/platforms/cocoa/qmacclipboard.h index 3cd33f9591..6413cfbe8b 100644 --- a/src/plugins/platforms/cocoa/qmacclipboard.h +++ b/src/plugins/platforms/cocoa/qmacclipboard.h @@ -19,14 +19,14 @@ public: enum DataRequestType { EagerRequest, LazyRequest }; private: struct Promise { - Promise() : itemId(0), convertor(nullptr) { } + 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); int itemId, offset; - QMacInternalPasteboardMime *convertor; + QMacInternalPasteboardMime *converter; QString mime; QPointer mimeData; QVariant variantData; diff --git a/src/plugins/platforms/cocoa/qmacclipboard.mm b/src/plugins/platforms/cocoa/qmacclipboard.mm index 9900d0e6a9..46af5f1efe 100644 --- a/src/plugins/platforms/cocoa/qmacclipboard.mm +++ b/src/plugins/platforms/cocoa/qmacclipboard.mm @@ -55,7 +55,7 @@ private: }; QMacPasteboard::Promise::Promise(int itemId, QMacInternalPasteboardMime *c, QString m, QMacMimeData *md, int o, DataRequestType drt) - : itemId(itemId), offset(o), convertor(c), mime(m), dataRequestType(drt) + : itemId(itemId), offset(o), converter(c), mime(m), dataRequestType(drt) { // Request the data from the application immediately for eager requests. if (dataRequestType == QMacPasteboard::EagerRequest) { @@ -137,7 +137,7 @@ OSStatus QMacPasteboard::promiseKeeper(PasteboardRef paste, PasteboardItemID id, QMacPasteboard::Promise promise; for (int i = 0; i < qpaste->promises.size(); i++){ QMacPasteboard::Promise tmp = qpaste->promises[i]; - if (!availableConverters.contains(tmp.convertor)) { + if (!availableConverters.contains(tmp.converter)) { // promise.converter is a pointer initialized by the value found // in QMacInternalPasteboardMime's global list of QMacInternalPasteboardMimes. // We add pointers to this list in QMacInternalPasteboardMime's ctor; @@ -147,7 +147,7 @@ OSStatus QMacPasteboard::promiseKeeper(PasteboardRef paste, PasteboardItemID id, continue; } - if (tmp.itemId == promise_id && tmp.convertor->canConvert(tmp.mime, flavorAsQString)){ + if (tmp.itemId == promise_id && tmp.converter->canConvert(tmp.mime, flavorAsQString)){ promise = tmp; break; } @@ -188,7 +188,7 @@ OSStatus QMacPasteboard::promiseKeeper(PasteboardRef paste, PasteboardItemID id, promiseData = promise.variantData; } - QList md = promise.convertor->convertFromMime(promise.mime, promiseData, flavorAsQString); + QList md = promise.converter->convertFromMime(promise.mime, promiseData, flavorAsQString); if (md.size() <= promise.offset) return cantGetFlavorErr; const QByteArray &ba = md[promise.offset]; -- cgit v1.2.3