nmelone/GoldenCheetah
1
0
Fork 0
mirror of https://github.com/GoldenCheetah/GoldenCheetah.git synced 2026-02-13 16:18:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Code Cleanup: Last Xcode semantic warnings

Browse Source 
.. unused NSString to QString
.. autorelease not valid in CFStringCreateWithCharacters
This commit is contained in:
Mark Liversedge
2013-02-13 11:32:50 +00:00
parent 80b3d12465
commit 78f624a393
2 changed files with 5 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/QtMacSegmentedButton.mm
View File

@@ -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)

19
src/QtMacVideoWindow.mm
View File

@@ -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)
{