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/plugins/platforms/cocoa/qcocoaapplicationdelegate.mm | |
| 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/plugins/platforms/cocoa/qcocoaapplicationdelegate.mm')
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoaapplicationdelegate.mm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoaapplicationdelegate.mm b/src/plugins/platforms/cocoa/qcocoaapplicationdelegate.mm index 59281ffb80..fc600ebddd 100644 --- a/src/plugins/platforms/cocoa/qcocoaapplicationdelegate.mm +++ b/src/plugins/platforms/cocoa/qcocoaapplicationdelegate.mm @@ -219,7 +219,7 @@ static void cleanupCocoaApplicationDelegate() Q_UNUSED(sender); /* for (NSString *fileName in filenames) { - QString qtFileName = qt_mac_NSStringToQString(fileName); + QString qtFileName = QCFString::toQString(fileName); if (inLaunch) { // We need to be careful because Cocoa will be nice enough to take // command line arguments and send them to us as events. Given the history @@ -336,7 +336,7 @@ static void cleanupCocoaApplicationDelegate() Q_UNUSED(replyEvent); /* NSString *urlString = [[event paramDescriptorForKeyword:keyDirectObject] stringValue]; - QUrl url(qt_mac_NSStringToQString(urlString)); + QUrl url(QCFString::toQString(urlString)); QFileOpenEvent qtEvent(url); qt_sendSpontaneousEvent(qAppInstance(), &qtEvent); */ |