Changeset 60151 in vbox for trunk

Timestamp:

Mar 23, 2016 11:08:54 AM (9 years ago)

Author:

vboxsync

Message:

FE/Qt/darwin: make Parfait happy

File:

• trunk/src/VBox/Frontends/VirtualBox/src/platform/darwin/VBoxCocoaHelper.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/platform/darwin/VBoxCocoaHelper.h

@@ -33 +33 @@
 #include <QVarLengthArray>
 
-inline NSString *darwinQStringToNSString (const QString &aString)
+inline NSString *darwinQStringToNSString(const QString &aString)
 {
-    return [reinterpret_cast<const NSString *>(CFStringCreateWithCharacters (0, reinterpret_cast<const UniChar *> (aString.unicode()),
-                                                                             aString.length())) autorelease];
+    const UniChar *chars = reinterpret_cast<const UniChar *>(aString.unicode());
+    CFStringRef str = CFStringCreateWithCharacters(0, chars, aString.length());
+    return [(NSString*)CFStringCreateMutableCopy(0, 0, str) autorelease];
 }
 
-inline QString darwinNSStringToQString (const NSString *aString)
+inline QString darwinNSStringToQString(const NSString *aString)
 {
-    CFStringRef str = reinterpret_cast<const CFStringRef> (aString);
+    CFStringRef str = reinterpret_cast<const CFStringRef>(aString);
     if(!str)
         return QString();
-    CFIndex length = CFStringGetLength (str);
-    const UniChar *chars = CFStringGetCharactersPtr (str);
+    CFIndex length = CFStringGetLength(str);
+    const UniChar *chars = CFStringGetCharactersPtr(str);
     if (chars)
-        return QString (reinterpret_cast<const QChar *> (chars), length);
+        return QString(reinterpret_cast<const QChar *>(chars), length);
 
-    QVarLengthArray<UniChar> buffer (length);
-    CFStringGetCharacters (str, CFRangeMake (0, length), buffer.data());
-    return QString (reinterpret_cast<const QChar *> (buffer.constData()), length);
+    QVarLengthArray<UniChar> buffer(length);
+    CFStringGetCharacters(str, CFRangeMake(0, length), buffer.data());
+    return QString(reinterpret_cast<const QChar *>(buffer.constData()), length);
 }