diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2016-10-03 19:34:21 +0200 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com> | 2016-10-06 08:02:59 +0000 |
| commit | 669add92d9adc15ecfa0b2d62dd90ea9066d401e (patch) | |
| tree | 49ad8ef5a042c1f0cf9aa305bb8836b63e1d282f /src/plugins/platforms/cocoa/qcocoaprintersupport.mm | |
| parent | 1b567854e4787ac591f8039c88e8cd8a44edaef7 (diff) | |
Replace QCFString::to(CF/NS/Q)String usage with QString methods
Slims down QCFString and leaves only one implementation of converting
back and forth between CF/NS strings and QStrings.
Change-Id: I068568ffa25e6f4f6d6c99dcf47078b7a8e70e10
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Diffstat (limited to 'src/plugins/platforms/cocoa/qcocoaprintersupport.mm')
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoaprintersupport.mm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoaprintersupport.mm b/src/plugins/platforms/cocoa/qcocoaprintersupport.mm index f8fc23f681..c2f7d5b022 100644 --- a/src/plugins/platforms/cocoa/qcocoaprintersupport.mm +++ b/src/plugins/platforms/cocoa/qcocoaprintersupport.mm @@ -82,7 +82,7 @@ QStringList QCocoaPrinterSupport::availablePrintDeviceIds() const CFIndex count = CFArrayGetCount(printerList); for (CFIndex i = 0; i < count; ++i) { PMPrinter printer = static_cast<PMPrinter>(const_cast<void *>(CFArrayGetValueAtIndex(printerList, i))); - list.append(QCFString::toQString(PMPrinterGetID(printer))); + list.append(QString::fromCFString(PMPrinterGetID(printer))); } } return list; @@ -96,7 +96,7 @@ QString QCocoaPrinterSupport::defaultPrintDeviceId() const for (CFIndex i = 0; i < count; ++i) { PMPrinter printer = static_cast<PMPrinter>(const_cast<void *>(CFArrayGetValueAtIndex(printerList, i))); if (PMPrinterIsDefault(printer)) - return QCFString::toQString(PMPrinterGetID(printer)); + return QString::fromCFString(PMPrinterGetID(printer)); } } return QString(); |