diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@nokia.com> | 2010-09-08 10:52:18 (GMT) |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@nokia.com> | 2010-10-15 12:10:07 (GMT) |
| commit | 2e2e6e642494dca10b6d101088b8c5237d05f036 (patch) | |
| tree | 71cfe0f2c26a30ba9ad398028dc5ab7c3c95e983 /src/gui/kernel/qt_cocoa_helpers_mac.mm | |
| parent | 133f510ce7e310d3bbd6aeb57de510d491fe6022 (diff) | |
| download | Qt-2e2e6e642494dca10b6d101088b8c5237d05f036.zip Qt-2e2e6e642494dca10b6d101088b8c5237d05f036.tar.gz Qt-2e2e6e642494dca10b6d101088b8c5237d05f036.tar.bz2 | |
Don't assing 'const Foo*' to a 'Foo*'
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
Diffstat (limited to 'src/gui/kernel/qt_cocoa_helpers_mac.mm')
| -rw-r--r-- | src/gui/kernel/qt_cocoa_helpers_mac.mm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/kernel/qt_cocoa_helpers_mac.mm b/src/gui/kernel/qt_cocoa_helpers_mac.mm index cce9daa..5a522f9 100644 --- a/src/gui/kernel/qt_cocoa_helpers_mac.mm +++ b/src/gui/kernel/qt_cocoa_helpers_mac.mm @@ -1365,11 +1365,11 @@ QString qt_mac_get_pasteboardString(OSPasteboardRef paste) QMacCocoaAutoReleasePool pool; NSPasteboard *pb = nil; CFStringRef pbname; - if (PasteboardCopyName (paste, &pbname)) { - pb = [NSPasteboard generalPasteboard]; + if (PasteboardCopyName(paste, &pbname) == noErr) { + pb = [NSPasteboard pasteboardWithName:const_cast<NSString *>(reinterpret_cast<const NSString *>(pbname))]; + CFRelease(pbname); } else { - pb = [NSPasteboard pasteboardWithName:reinterpret_cast<const NSString *>(pbname)]; - CFRelease (pbname); + pb = [NSPasteboard generalPasteboard]; } if (pb) { NSString *text = [pb stringForType:NSStringPboardType]; |