blob: d5547a1a4f5f4768ed18931c2771e9c0b5c57269 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
|
$NetBSD: patch-ce,v 1.1 2011/03/03 05:50:04 adam Exp $
Avoid error when compiling with Clang.
--- src/gui/kernel/qcocoamenuloader_mac.mm.orig 2011-01-12 10:11:02.000000000 +0000
+++ src/gui/kernel/qcocoamenuloader_mac.mm
@@ -70,13 +70,13 @@ QT_USE_NAMESPACE
showAllItem = [[appMenu itemWithTitle:@"Show All"] retain];
// Get the names in the nib to match the app name set by Qt.
- NSString *appName = reinterpret_cast<const NSString*>(QCFString::toCFStringRef(qAppName()));
+ const NSString *appName = reinterpret_cast<const NSString*>(QCFString::toCFStringRef(qAppName()));
[quitItem setTitle:[[quitItem title] stringByReplacingOccurrencesOfString:@"NewApplication"
- withString:appName]];
+ withString:(NSString *)appName]];
[hideItem setTitle:[[hideItem title] stringByReplacingOccurrencesOfString:@"NewApplication"
- withString:appName]];
+ withString:(NSString *)appName]];
[aboutItem setTitle:[[aboutItem title] stringByReplacingOccurrencesOfString:@"NewApplication"
- withString:appName]];
+ withString:(NSString *)appName]];
[appName release];
// Disable the items that don't do anything. If someone associates a QAction with them
// They should get synced back in.
|
