diff options
| -rw-r--r-- | src/gui/painting/qoutlinemapper_p.h | 2 | ||||
| -rw-r--r-- | src/gui/platform/darwin/qmacmime.mm | 6 | ||||
| -rw-r--r-- | src/plugins/platforms/cocoa/qmacclipboard.h | 4 | ||||
| -rw-r--r-- | src/plugins/platforms/cocoa/qmacclipboard.mm | 8 |
4 files changed, 10 insertions, 10 deletions
diff --git a/src/gui/painting/qoutlinemapper_p.h b/src/gui/painting/qoutlinemapper_p.h index 372f9b4ec2..1f4c3f6670 100644 --- a/src/gui/painting/qoutlinemapper_p.h +++ b/src/gui/painting/qoutlinemapper_p.h @@ -45,7 +45,7 @@ Q_GUI_EXPORT bool qt_scaleForTransform(const QTransform &transform, qreal *scale * class QOutlineMapper * * Used to map between QPainterPath and the QT_FT_Outline structure used by the - * freetype scanconvertor. + * freetype scanconverter. * * The outline mapper uses a path iterator to get points from the path, * so that it is possible to transform the points as they are converted. The diff --git a/src/gui/platform/darwin/qmacmime.mm b/src/gui/platform/darwin/qmacmime.mm index dea57fe957..8b6180c216 100644 --- a/src/gui/platform/darwin/qmacmime.mm +++ b/src/gui/platform/darwin/qmacmime.mm @@ -793,7 +793,7 @@ void registerBuiltInTypes() /* \fn bool QMacPasteboardMime::canConvert(const QString &mime, QString flav) - Returns \c true if the convertor can convert (both ways) between + Returns \c true if the converter can convert (both ways) between \a mime and \a flav; otherwise returns \c false. All subclasses must reimplement this pure virtual function. @@ -803,7 +803,7 @@ void registerBuiltInTypes() \fn QString QMacPasteboardMime::mimeFor(QString flav) Returns the MIME UTI used for Mac flavor \a flav, or 0 if this - convertor does not support \a flav. + converter does not support \a flav. All subclasses must reimplement this pure virtual function. */ @@ -812,7 +812,7 @@ void registerBuiltInTypes() \fn QString QMacPasteboardMime::flavorFor(const QString &mime) Returns the Mac UTI used for MIME type \a mime, or 0 if this - convertor does not support \a mime. + converter does not support \a mime. All subclasses must reimplement this pure virtual function. */ 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<QMacMimeData> 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<QByteArray> md = promise.convertor->convertFromMime(promise.mime, promiseData, flavorAsQString); + QList<QByteArray> md = promise.converter->convertFromMime(promise.mime, promiseData, flavorAsQString); if (md.size() <= promise.offset) return cantGetFlavorErr; const QByteArray &ba = md[promise.offset]; |