diff options
| author | Morten Johan Sorvig <morten.sorvig@nokia.com> | 2012-01-30 14:14:04 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-02 14:18:36 +0100 |
| commit | ae664f7dc7f5f6aef1a9d92f68974685dbac7e36 (patch) | |
| tree | ee383d7ed8516694fcac5c803eadbfa2ee9dbf36 /src/corelib/kernel/qcore_mac_p.h | |
| parent | 319ba95c763c5e323e338119750651ef7e0cd897 (diff) | |
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>
Diffstat (limited to 'src/corelib/kernel/qcore_mac_p.h')
| -rw-r--r-- | src/corelib/kernel/qcore_mac_p.h | 9 |
1 files changed, 9 insertions, 0 deletions
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; }; |