diff options
| author | Takumi ASAKI <takumi.asaki@nokia.com> | 2011-09-09 12:56:23 +0200 |
|---|---|---|
| committer | Morten Johan Sørvig <morten.sorvig@nokia.com> | 2011-09-09 14:56:11 +0200 |
| commit | 78fd8653914c11b78506fae5d5e77947785f57de (patch) | |
| tree | 06a1260d56aa6a2e5708e3f6a584ce014039c69a /src/plugins/platforms | |
| parent | 2cca7e0884a45c3a022609b2cb4efd381ee8d5a1 (diff) | |
Clang Build Fix: Cocoa platform plugin
Fix some assignment from const values to non-const without cast.
Move #import to avoid compile error.
Fix type mismatch.
Change-Id: I93ae5cd07827b92a91093df979992616b26b14af
Reviewed-on: http://codereview.qt-project.org/4536
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
Diffstat (limited to 'src/plugins/platforms')
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoahelpers.h | 2 | ||||
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoamenuloader.h | 2 | ||||
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoamenuloader.mm | 2 | ||||
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoawindow.mm | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoahelpers.h b/src/plugins/platforms/cocoa/qcocoahelpers.h index 62930ac076..8e807cc288 100644 --- a/src/plugins/platforms/cocoa/qcocoahelpers.h +++ b/src/plugins/platforms/cocoa/qcocoahelpers.h @@ -69,7 +69,7 @@ inline QString qt_mac_NSStringToQString(const NSString *nsstr) { return QCFString::toQString(reinterpret_cast<const CFStringRef>(nsstr)); } inline NSString *qt_mac_QStringToNSString(const QString &qstr) -{ return [reinterpret_cast<const NSString *>(QCFString::toCFStringRef(qstr)) autorelease]; } +{ return [const_cast<NSString *>(reinterpret_cast<const NSString *>(QCFString::toCFStringRef(qstr))) autorelease]; } CGImageRef qt_mac_image_to_cgimage(const QImage &image); NSImage *qt_mac_cgimage_to_nsimage(CGImageRef iamge); diff --git a/src/plugins/platforms/cocoa/qcocoamenuloader.h b/src/plugins/platforms/cocoa/qcocoamenuloader.h index 9f3a31e3bc..2fcda512f0 100644 --- a/src/plugins/platforms/cocoa/qcocoamenuloader.h +++ b/src/plugins/platforms/cocoa/qcocoamenuloader.h @@ -53,8 +53,8 @@ // We mean it. // -#include <QtCore/private/qcore_mac_p.h> #import <Cocoa/Cocoa.h> +#include <QtCore/private/qcore_mac_p.h> @interface QT_MANGLE_NAMESPACE(QCocoaMenuLoader) : NSResponder { diff --git a/src/plugins/platforms/cocoa/qcocoamenuloader.mm b/src/plugins/platforms/cocoa/qcocoamenuloader.mm index 52aefcb9bf..353808655f 100644 --- a/src/plugins/platforms/cocoa/qcocoamenuloader.mm +++ b/src/plugins/platforms/cocoa/qcocoamenuloader.mm @@ -92,7 +92,7 @@ void qt_mac_loadMenuNib(QT_MANGLE_NAMESPACE(QCocoaMenuLoader) *qtMenuLoader) } // Load and instantiate nib file from temp - NSURL *nibUrl = [NSURL fileURLWithPath : reinterpret_cast<const NSString *>(QCFString::toCFStringRef(nibDir))]; + NSURL *nibUrl = [NSURL fileURLWithPath : const_cast<NSString *>(reinterpret_cast<const NSString *>(QCFString::toCFStringRef(nibDir)))]; [nibUrl autorelease]; NSNib *nib = [[NSNib alloc] initWithContentsOfURL : nibUrl]; [nib autorelease]; diff --git a/src/plugins/platforms/cocoa/qcocoawindow.mm b/src/plugins/platforms/cocoa/qcocoawindow.mm index ef04fc4238..7e4d4217ef 100644 --- a/src/plugins/platforms/cocoa/qcocoawindow.mm +++ b/src/plugins/platforms/cocoa/qcocoawindow.mm @@ -133,7 +133,7 @@ void QCocoaWindow::setVisible(bool visible) void QCocoaWindow::setWindowTitle(const QString &title) { CFStringRef windowTitle = QCFString::toCFStringRef(title); - [m_nsWindow setTitle: reinterpret_cast<const NSString *>(windowTitle)]; + [m_nsWindow setTitle: const_cast<NSString *>(reinterpret_cast<const NSString *>(windowTitle))]; CFRelease(windowTitle); } @@ -325,7 +325,7 @@ QNSWindow * QCocoaWindow::createWindow() // ### crashes // [panel setFloatingPanel:needFloating]; // [panel setWorksWhenModal:worksWhenModal]; - window = panel; + window = static_cast<NSWindow *>(panel); break; } default: |