From 78f624a3935e9fdc49b1c71ec38155ea468a6124 Mon Sep 17 00:00:00 2001
From: Mark Liversedge <liversedge@gmail.com>
Date: Wed, 13 Feb 2013 11:32:50 +0000
Subject: [PATCH] Code Cleanup: Last Xcode semantic warnings

.. unused NSString to QString
.. autorelease not valid in CFStringCreateWithCharacters
---
 src/QtMacSegmentedButton.mm |  6 +++---
 src/QtMacVideoWindow.mm     | 19 ++-----------------
 2 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/src/QtMacSegmentedButton.mm b/src/QtMacSegmentedButton.mm
index 336a752e1..b18d75c9e 100644
--- a/src/QtMacSegmentedButton.mm
+++ b/src/QtMacSegmentedButton.mm
@@ -36,10 +36,10 @@ CocoaInitializer::~CocoaInitializer()
     [pool release];
 }
 
-
-inline NSString *darwinQStringToNSString (const QString &aString)
+static inline NSString *darwinQStringToNSString (const QString &aString)
 {
-    return [(CFStringCreateWithCharacters (0, reinterpret_cast<const UniChar *> (aString.unicode()), aString.length())) autorelease];
+    return (NSString*)CFStringCreateWithCharacters
+    (0, reinterpret_cast<const UniChar *> (aString.unicode()), aString.length());
 }
 
 static NSImage *fromQPixmap(const QPixmap *pixmap)
diff --git a/src/QtMacVideoWindow.mm b/src/QtMacVideoWindow.mm
index 3529b3d24..daf787e65 100644
--- a/src/QtMacVideoWindow.mm
+++ b/src/QtMacVideoWindow.mm
@@ -29,25 +29,10 @@
 
 static inline NSString *darwinQStringToNSString (const QString &aString)
 {
-    return [(CFStringCreateWithCharacters
-            (0, reinterpret_cast<const UniChar *> (aString.unicode()), aString.length())) autorelease];
+    return (NSString*)CFStringCreateWithCharacters
+    (0, reinterpret_cast<const UniChar *> (aString.unicode()), aString.length());
 }
 
-static QString qt_mac_NSStringToQString(const NSString *nsstr)
-{
-    NSRange range;
-    range.location = 0;
-    range.length = [nsstr length];
-    QString result(range.length, QChar(0));
- 
-    unichar *chars = new unichar[range.length];
-    [nsstr getCharacters:chars range:range];
-    result = QString::fromUtf16(chars, range.length);
-    delete[] chars;
-    return result;
-}
-
-
 VideoWindow::VideoWindow(MainWindow *parent, const QDir &home)  :
 GcWindow(parent), home(home), main(parent), hasMovie(false)
 {