From ae664f7dc7f5f6aef1a9d92f68974685dbac7e36 Mon Sep 17 00:00:00 2001 From: Morten Johan Sorvig 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 --- src/plugins/platforms/cocoa/qcocoaaccessibilityelement.mm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/plugins/platforms/cocoa/qcocoaaccessibilityelement.mm') diff --git a/src/plugins/platforms/cocoa/qcocoaaccessibilityelement.mm b/src/plugins/platforms/cocoa/qcocoaaccessibilityelement.mm index c5504b68bb..06d75036bf 100644 --- a/src/plugins/platforms/cocoa/qcocoaaccessibilityelement.mm +++ b/src/plugins/platforms/cocoa/qcocoaaccessibilityelement.mm @@ -148,7 +148,7 @@ static QAccessibleInterface *acast(void *ptr) QSize qtSize = acast(accessibleInterface)->rect().size(); return [NSValue valueWithSize: NSMakeSize(qtSize.width(), qtSize.height())]; } else if ([attribute isEqualToString:NSAccessibilityDescriptionAttribute]) { - return qt_mac_QStringToNSString(acast(accessibleInterface)->text(QAccessible::Name)); + return QCFString::toNSString(acast(accessibleInterface)->text(QAccessible::Name)); } return nil; @@ -195,7 +195,7 @@ static QAccessibleInterface *acast(void *ptr) // Return a description from the action interface if this action is not known to the OS. if (qtAction.isEmpty()) { QString description = actionInterface->localizedActionDescription(qtAction); - return qt_mac_QStringToNSString(description); + return QCFString::toNSString(description); } return NSAccessibilityActionDescription(action); -- cgit v1.2.3