From ae664f7dc7f5f6aef1a9d92f68974685dbac7e36 Mon Sep 17 00:00:00 2001
From: Morten Johan Sorvig <morten.sorvig@nokia.com>
Date: Mon, 30 Jan 2012 14:14:04 +0100
Subject: 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>
---
 src/corelib/kernel/qcore_mac_p.h | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'src/corelib/kernel/qcore_mac_p.h')

diff --git a/src/corelib/kernel/qcore_mac_p.h b/src/corelib/kernel/qcore_mac_p.h
index 1b2dedef11..78cb0eff3b 100644
--- a/src/corelib/kernel/qcore_mac_p.h
+++ b/src/corelib/kernel/qcore_mac_p.h
@@ -78,6 +78,10 @@
 #include <CoreServices/CoreServices.h>
 #endif
 
+#ifdef __OBJC__
+#include <Foundation/Foundation.h>
+#endif
+
 #undef DEBUG
 #ifdef OLD_DEBUG
 #  define DEBUG OLD_DEBUG
@@ -144,6 +148,11 @@ public:
     operator CFStringRef() const;
     static QString toQString(CFStringRef cfstr);
     static CFStringRef toCFStringRef(const QString &str);
+#ifdef __OBJC__
+    static QString toQString(const NSString *nsstr);
+    static  NSString *toNSString(const QString &string);
+#endif
+
 private:
     QString string;
 };
-- 
cgit v1.2.3