From 669add92d9adc15ecfa0b2d62dd90ea9066d401e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= <tor.arne.vestbo@qt.io>
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 <jake.petroules@qt.io>
---
 src/corelib/kernel/qcore_mac.cpp | 24 ++----------------------
 1 file changed, 2 insertions(+), 22 deletions(-)

(limited to 'src/corelib/kernel/qcore_mac.cpp')

diff --git a/src/corelib/kernel/qcore_mac.cpp b/src/corelib/kernel/qcore_mac.cpp
index 10b8d03d1c..c689f47d8f 100644
--- a/src/corelib/kernel/qcore_mac.cpp
+++ b/src/corelib/kernel/qcore_mac.cpp
@@ -43,37 +43,17 @@
 
 QT_BEGIN_NAMESPACE
 
-QString QCFString::toQString(CFStringRef str)
-{
-    if(!str)
-        return QString();
-    CFIndex length = CFStringGetLength(str);
-    const UniChar *chars = CFStringGetCharactersPtr(str);
-    if (chars)
-        return QString(reinterpret_cast<const QChar *>(chars), length);
-
-    QVarLengthArray<UniChar> buffer(length);
-    CFStringGetCharacters(str, CFRangeMake(0, length), buffer.data());
-    return QString(reinterpret_cast<const QChar *>(buffer.constData()), length);
-}
-
 QCFString::operator QString() const
 {
     if (string.isEmpty() && type)
-        const_cast<QCFString*>(this)->string = toQString(type);
+        const_cast<QCFString*>(this)->string = QString::fromCFString(type);
     return string;
 }
 
-CFStringRef QCFString::toCFStringRef(const QString &string)
-{
-    return CFStringCreateWithCharacters(0, reinterpret_cast<const UniChar *>(string.unicode()),
-                                        string.length());
-}
-
 QCFString::operator CFStringRef() const
 {
     if (!type)
-        const_cast<QCFString*>(this)->type = toCFStringRef(string);
+        const_cast<QCFString*>(this)->type = string.toCFString();
     return type;
 }
 
-- 
cgit v1.2.3