From 669add92d9adc15ecfa0b2d62dd90ea9066d401e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Mon, 3 Oct 2016 19:34:21 +0200 Subject: 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 --- src/corelib/io/qstandardpaths_mac.mm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/corelib/io/qstandardpaths_mac.mm') diff --git a/src/corelib/io/qstandardpaths_mac.mm b/src/corelib/io/qstandardpaths_mac.mm index 5aa894578b..a293d4862f 100644 --- a/src/corelib/io/qstandardpaths_mac.mm +++ b/src/corelib/io/qstandardpaths_mac.mm @@ -205,13 +205,13 @@ QStringList QStandardPaths::standardLocations(StandardLocation type) if (mainBundle) { CFURLRef bundleUrl = CFBundleCopyBundleURL(mainBundle); CFStringRef cfBundlePath = CFURLCopyPath(bundleUrl); - QString bundlePath = QCFString::toQString(cfBundlePath); + QString bundlePath = QString::fromCFString(cfBundlePath); CFRelease(cfBundlePath); CFRelease(bundleUrl); CFURLRef resourcesUrl = CFBundleCopyResourcesDirectoryURL(mainBundle); CFStringRef cfResourcesPath = CFURLCopyPath(resourcesUrl); - QString resourcesPath = QCFString::toQString(cfResourcesPath); + QString resourcesPath = QString::fromCFString(cfResourcesPath); CFRelease(cfResourcesPath); CFRelease(resourcesUrl); -- cgit v1.2.3