From e4adfefdb9aa8cfcf14d5e8555c78d72d710b67e Mon Sep 17 00:00:00 2001 From: Mark Liversedge Date: Sat, 5 Jan 2013 14:30:26 +0000 Subject: [PATCH] clang 4.1 fixups remove casts to keep clang 4.1 happy on Mac OS X. Now produces a number of warnings on clang 4.0. Fixes #420 --- src/QtMacSegmentedButton.mm | 2 +- src/QtMacVideoWindow.mm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/QtMacSegmentedButton.mm b/src/QtMacSegmentedButton.mm index 2ebc65a77..4b73d8d26 100644 --- a/src/QtMacSegmentedButton.mm +++ b/src/QtMacSegmentedButton.mm @@ -50,7 +50,7 @@ CocoaInitializer::~CocoaInitializer() inline NSString *darwinQStringToNSString (const QString &aString) { - return [reinterpret_cast (CFStringCreateWithCharacters (0, reinterpret_cast (aString.unicode()), aString.length())) autorelease]; + return [(CFStringCreateWithCharacters (0, reinterpret_cast (aString.unicode()), aString.length())) autorelease]; } static NSImage* fromQPixmap(const QPixmap &pixmap) diff --git a/src/QtMacVideoWindow.mm b/src/QtMacVideoWindow.mm index 0da289d0f..3529b3d24 100644 --- a/src/QtMacVideoWindow.mm +++ b/src/QtMacVideoWindow.mm @@ -29,7 +29,7 @@ static inline NSString *darwinQStringToNSString (const QString &aString) { - return [reinterpret_cast (CFStringCreateWithCharacters + return [(CFStringCreateWithCharacters (0, reinterpret_cast (aString.unicode()), aString.length())) autorelease]; }