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/corelib.pro              |  1 +
 src/corelib/kernel/kernel.pri        |  2 ++
 src/corelib/kernel/qcore_mac_objc.mm | 54 ++++++++++++++++++++++++++++++++++++
 src/corelib/kernel/qcore_mac_p.h     |  9 ++++++
 4 files changed, 66 insertions(+)
 create mode 100644 src/corelib/kernel/qcore_mac_objc.mm

(limited to 'src/corelib')

diff --git a/src/corelib/corelib.pro b/src/corelib/corelib.pro
index ba741c656c..de2b1006cf 100644
--- a/src/corelib/corelib.pro
+++ b/src/corelib/corelib.pro
@@ -35,6 +35,7 @@ mac|darwin {
     contains(QT_CONFIG, coreservices) {
         LIBS_PRIVATE += -framework ApplicationServices
         LIBS_PRIVATE += -framework CoreServices
+        LIBS_PRIVATE += -framework Foundation
     }
     LIBS_PRIVATE += -framework CoreFoundation
 }
diff --git a/src/corelib/kernel/kernel.pri b/src/corelib/kernel/kernel.pri
index 1139e3074a..6ebc62614b 100644
--- a/src/corelib/kernel/kernel.pri
+++ b/src/corelib/kernel/kernel.pri
@@ -90,6 +90,8 @@ mac {
 mac:!nacl {
        SOURCES += \
                 kernel/qcore_mac.cpp
+       OBJECTIVE_SOURCES += \
+                kernel/qcore_mac_objc.mm
 }
 
 nacl {
diff --git a/src/corelib/kernel/qcore_mac_objc.mm b/src/corelib/kernel/qcore_mac_objc.mm
new file mode 100644
index 0000000000..76705f1c8c
--- /dev/null
+++ b/src/corelib/kernel/qcore_mac_objc.mm
@@ -0,0 +1,54 @@
+/****************************************************************************
+ **
+ ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+ ** Contact: http://www.qt-project.org/
+ **
+ ** This file is part of the QtCore module of the Qt Toolkit.
+ **
+ ** $QT_BEGIN_LICENSE:LGPL$
+ ** GNU Lesser General Public License Usage
+ ** This file may be used under the terms of the GNU Lesser General Public
+ ** License version 2.1 as published by the Free Software Foundation and
+ ** appearing in the file LICENSE.LGPL included in the packaging of this
+ ** file. Please review the following information to ensure the GNU Lesser
+ ** General Public License version 2.1 requirements will be met:
+ ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+ **
+ ** In addition, as a special exception, Nokia gives you certain additional
+ ** rights. These rights are described in the Nokia Qt LGPL Exception
+ ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+ **
+ ** GNU General Public License Usage
+ ** Alternatively, this file may be used under the terms of the GNU General
+ ** Public License version 3.0 as published by the Free Software Foundation
+ ** and appearing in the file LICENSE.GPL included in the packaging of this
+ ** file. Please review the following information to ensure the GNU General
+ ** Public License version 3.0 requirements will be met:
+ ** http://www.gnu.org/copyleft/gpl.html.
+ **
+ ** Other Usage
+ ** Alternatively, this file may be used in accordance with the terms and
+ ** conditions contained in a signed written agreement between you and Nokia.
+ **
+ **
+ **
+ **
+ **
+ **
+ ** $QT_END_LICENSE$
+ **
+ ****************************************************************************/
+
+#include <private/qcore_mac_p.h>
+
+NSString *QCFString::toNSString(const QString &string)
+{
+    // The const cast below is safe: CfStringRef is immutable and so is NSString.
+    return [const_cast<NSString *>(reinterpret_cast<const NSString *>(toCFStringRef(string))) autorelease];
+}
+
+QString QCFString::toQString(const NSString *nsstr)
+{
+    return toQString(reinterpret_cast<CFStringRef>(nsstr));
+}
+
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