Move QString <-> NSString conversion to QtCore
authorMorten Johan Sorvig <morten.sorvig@nokia.com>
Mon, 30 Jan 2012 13:14:04 +0000 (14:14 +0100)
committerQt by Nokia <qt-info@nokia.com>
Thu, 2 Feb 2012 13:18:36 +0000 (14:18 +0100)
commitae664f7dc7f5f6aef1a9d92f68974685dbac7e36
treeee383d7ed8516694fcac5c803eadbfa2ee9dbf36
parent319ba95c763c5e323e338119750651ef7e0cd897
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>
13 files changed:
src/corelib/corelib.pro
src/corelib/kernel/kernel.pri
src/corelib/kernel/qcore_mac_objc.mm [new file with mode: 0644]
src/corelib/kernel/qcore_mac_p.h
src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm
src/plugins/bearer/corewlan/qcorewlanengine.mm
src/plugins/platforms/cocoa/qcocoaaccessibilityelement.mm
src/plugins/platforms/cocoa/qcocoaapplicationdelegate.mm
src/plugins/platforms/cocoa/qcocoafiledialoghelper.mm
src/plugins/platforms/cocoa/qcocoahelpers.h
src/plugins/platforms/cocoa/qcocoahelpers.mm
src/plugins/platforms/cocoa/qcocoamenuloader.mm
src/plugins/platforms/cocoa/qmenu_mac.mm