Move QString <-> NSString conversion to QtCore

Add (private) API to QCFString:
	static QString toQString(NSString *)
	static NSString *toNSString(const QString &)

Add implementation to qcore_mac_objc.mm. Keep the
mac_cpp since it's used for building qmake as well
as bootstrapping.

Replace usage of NSString conversion functions
in the cocoa and corewlan plugin with QCFString.

Change-Id: I9f34edd5231255aef9d8d6e9a60306174bb279b3
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>

1 files changed, 2 insertions, 5 deletions

diff --git a/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm b/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm
index 80be157142..1eb1cbeece 100644
--- a/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm
+++ b/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm
@@ -86,9 +86,6 @@ static const char *languageForWritingSystem[] = {
 };
 enum { LanguageCount = sizeof(languageForWritingSystem) / sizeof(const char *) };
 
-inline QString qt_mac_NSStringToQString(const NSString *nsstr)
-{ return QCFString::toQString(reinterpret_cast<const CFStringRef>(nsstr)); }
-
 int qt_antialiasing_threshold = 0;
 bool qt_enable_font_smoothing = true;
 
@@ -141,7 +138,7 @@ QCoreTextFontDatabase::~QCoreTextFontDatabase()
 static QString familyNameFromPostScriptName(QHash<QString, QString> &psNameToFamily,
                                             NSString *psName)
 {
-    QString name = qt_mac_NSStringToQString(psName);
+    QString name = QCFString::toQString(psName);
     if (psNameToFamily.contains(name))
         return psNameToFamily[name];
     else {
@@ -240,7 +237,7 @@ void QCoreTextFontDatabase::populateFontDatabase()
                                             pixelSize, fixedPitch, writingSystems, (void *) font);
         CFStringRef psName = (CFStringRef) CTFontDescriptorCopyAttribute(font, kCTFontNameAttribute);
         // we need PostScript Name to family name mapping for fallback list construction
-        psNameToFamily[qt_mac_NSStringToQString((NSString *) psName)] = familyName;
+        psNameToFamily[QCFString::toQString((NSString *) psName)] = familyName;
         CFRelease(psName);
     }