zakarya/puzzles
1
0
Fork 0
mirror of git://git.tartarus.org/simon/puzzles.git synced 2025-04-21 16:05:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

Stop using the deprecated NSString stringWithCString: methods.

Browse Source 
[originally from svn r9495]
This commit is contained in:
Simon Tatham
2012-05-06 11:36:32 +00:00
parent 14da5088e8
commit d0ff371b14
1 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
osx.m
View File

@ -125,7 +125,7 @@ void fatal(char *fmt, ...)
} else { } else {
alert = [[alert init] autorelease]; alert = [[alert init] autorelease];
[alert addButtonWithTitle:@"Oh dear"]; [alert addButtonWithTitle:@"Oh dear"];
[alert setInformativeText:[NSString stringWithCString:errorbuf]]; [alert setInformativeText:[NSString stringWithUTF8String:errorbuf]];
[alert runModal]; [alert runModal];
} }
exit(1); exit(1);
@ -211,7 +211,7 @@ void document_add_puzzle(document *doc, const game *game, game_params *par,
NSMenu *newmenu(const char *title) NSMenu *newmenu(const char *title)
{ {
return [[[NSMenu allocWithZone:[NSMenu menuZone]] return [[[NSMenu allocWithZone:[NSMenu menuZone]]
initWithTitle:[NSString stringWithCString:title]] initWithTitle:[NSString stringWithUTF8String:title]]
autorelease]; autorelease];
} }
@ -221,7 +221,7 @@ NSMenu *newsubmenu(NSMenu *parent, const char *title)
NSMenu *child; NSMenu *child;
item = [[[NSMenuItem allocWithZone:[NSMenu menuZone]] item = [[[NSMenuItem allocWithZone:[NSMenu menuZone]]
initWithTitle:[NSString stringWithCString:title] initWithTitle:[NSString stringWithUTF8String:title]
action:NULL action:NULL
keyEquivalent:@""] keyEquivalent:@""]
autorelease]; autorelease];
@ -251,9 +251,9 @@ id initnewitem(NSMenuItem *item, NSMenu *parent, const char *title,
key++; key++;
} }
item = [[item initWithTitle:[NSString stringWithCString:title] item = [[item initWithTitle:[NSString stringWithUTF8String:title]
action:NULL action:NULL
keyEquivalent:[NSString stringWithCString:key]] keyEquivalent:[NSString stringWithUTF8String:key]]
autorelease]; autorelease];
if (*key) if (*key)
@ -327,7 +327,7 @@ NSMenuItem *newitem(NSMenu *parent, char *title, char *key,
[tf setBordered:NO]; [tf setBordered:NO];
[tf setDrawsBackground:NO]; [tf setDrawsBackground:NO];
[tf setFont:font1]; [tf setFont:font1];
[tf setStringValue:[NSString stringWithCString:ver]]; [tf setStringValue:[NSString stringWithUTF8String:ver]];
[tf sizeToFit]; [tf sizeToFit];
views[nviews++] = tf; views[nviews++] = tf;
@ -578,7 +578,7 @@ struct frontend {
NSClosableWindowMask) NSClosableWindowMask)
backing:NSBackingStoreBuffered backing:NSBackingStoreBuffered
defer:YES]; defer:YES];
[self setTitle:[NSString stringWithCString:ourgame->name]]; [self setTitle:[NSString stringWithUTF8String:ourgame->name]];
{ {
float *colours; float *colours;
@ -710,7 +710,7 @@ struct frontend {
alert = [[[NSAlert alloc] init] autorelease]; alert = [[[NSAlert alloc] init] autorelease];
[alert addButtonWithTitle:@"Bah"]; [alert addButtonWithTitle:@"Bah"];
[alert setInformativeText:[NSString stringWithCString:message]]; [alert setInformativeText:[NSString stringWithUTF8String:message]];
[alert beginSheetModalForWindow:self modalDelegate:nil [alert beginSheetModalForWindow:self modalDelegate:nil
didEndSelector:nil contextInfo:nil]; didEndSelector:nil contextInfo:nil];
} }
@ -789,7 +789,7 @@ struct frontend {
NSPasteboard *pb = [NSPasteboard generalPasteboard]; NSPasteboard *pb = [NSPasteboard generalPasteboard];
NSArray *a = [NSArray arrayWithObject:NSStringPboardType]; NSArray *a = [NSArray arrayWithObject:NSStringPboardType];
[pb declareTypes:a owner:nil]; [pb declareTypes:a owner:nil];
[pb setString:[NSString stringWithCString:text] [pb setString:[NSString stringWithUTF8String:text]
forType:NSStringPboardType]; forType:NSStringPboardType];
} else } else
NSBeep(); NSBeep();
@ -855,7 +855,7 @@ struct frontend {
midend_fetch_preset(me, n, &name, &params); midend_fetch_preset(me, n, &name, &params);
item = [[[DataMenuItem alloc] item = [[[DataMenuItem alloc]
initWithTitle:[NSString stringWithCString:name] initWithTitle:[NSString stringWithUTF8String:name]
action:NULL keyEquivalent:@""] action:NULL keyEquivalent:@""]
autorelease]; autorelease];
@ -1002,7 +1002,7 @@ struct frontend {
[tf setSelectable:NO]; [tf setSelectable:NO];
[tf setBordered:NO]; [tf setBordered:NO];
[tf setDrawsBackground:NO]; [tf setDrawsBackground:NO];
[[tf cell] setTitle:[NSString stringWithCString:i->name]]; [[tf cell] setTitle:[NSString stringWithUTF8String:i->name]];
[tf sizeToFit]; [tf sizeToFit];
rect = [tf frame]; rect = [tf frame];
if (thish < rect.size.height + 1) thish = rect.size.height + 1; if (thish < rect.size.height + 1) thish = rect.size.height + 1;
@ -1013,7 +1013,7 @@ struct frontend {
[tf setEditable:YES]; [tf setEditable:YES];
[tf setSelectable:YES]; [tf setSelectable:YES];
[tf setBordered:YES]; [tf setBordered:YES];
[[tf cell] setTitle:[NSString stringWithCString:i->sval]]; [[tf cell] setTitle:[NSString stringWithUTF8String:i->sval]];
[tf sizeToFit]; [tf sizeToFit];
rect = [tf frame]; rect = [tf frame];
/* /*
@ -1040,7 +1040,7 @@ struct frontend {
b = [[NSButton alloc] initWithFrame:tmprect]; b = [[NSButton alloc] initWithFrame:tmprect];
[b setBezelStyle:NSRoundedBezelStyle]; [b setBezelStyle:NSRoundedBezelStyle];
[b setButtonType:NSSwitchButton]; [b setButtonType:NSSwitchButton];
[b setTitle:[NSString stringWithCString:i->name]]; [b setTitle:[NSString stringWithUTF8String:i->name]];
[b sizeToFit]; [b sizeToFit];
[b setState:(i->ival ? NSOnState : NSOffState)]; [b setState:(i->ival ? NSOnState : NSOffState)];
rect = [b frame]; rect = [b frame];
@ -1061,7 +1061,7 @@ struct frontend {
[tf setSelectable:NO]; [tf setSelectable:NO];
[tf setBordered:NO]; [tf setBordered:NO];
[tf setDrawsBackground:NO]; [tf setDrawsBackground:NO];
[[tf cell] setTitle:[NSString stringWithCString:i->name]]; [[tf cell] setTitle:[NSString stringWithUTF8String:i->name]];
[tf sizeToFit]; [tf sizeToFit];
rect = [tf frame]; rect = [tf frame];
if (thish < rect.size.height + 1) thish = rect.size.height + 1; if (thish < rect.size.height + 1) thish = rect.size.height + 1;
@ -1076,13 +1076,15 @@ struct frontend {
p = i->sval; p = i->sval;
c = *p++; c = *p++;
while (*p) { while (*p) {
char *q; char cc, *q;
q = p; q = p;
while (*p && *p != c) p++; while (*p && *p != c) p++;
[pb addItemWithTitle:[NSString stringWithCString:q cc = *p;
length:p-q]]; *p = '\0';
[pb addItemWithTitle:[NSString stringWithUTF8String:q]];
*p = cc;
if (*p) p++; if (*p) p++;
} }
@ -1230,7 +1232,7 @@ struct frontend {
if (error) { if (error) {
NSAlert *alert = [[[NSAlert alloc] init] autorelease]; NSAlert *alert = [[[NSAlert alloc] init] autorelease];
[alert addButtonWithTitle:@"Bah"]; [alert addButtonWithTitle:@"Bah"];
[alert setInformativeText:[NSString stringWithCString:error]]; [alert setInformativeText:[NSString stringWithUTF8String:error]];
[alert beginSheetModalForWindow:self modalDelegate:nil [alert beginSheetModalForWindow:self modalDelegate:nil
didEndSelector:nil contextInfo:nil]; didEndSelector:nil contextInfo:nil];
} else { } else {
@ -1253,7 +1255,7 @@ struct frontend {
- (void)setStatusLine:(char *)text - (void)setStatusLine:(char *)text
{ {
[[status cell] setTitle:[NSString stringWithCString:text]]; [[status cell] setTitle:[NSString stringWithUTF8String:text]];
} }
@end @end
@ -1344,8 +1346,7 @@ static void osx_draw_text(void *handle, int x, int y, int fonttype,
int fontsize, int align, int colour, char *text) int fontsize, int align, int colour, char *text)
{ {
frontend *fe = (frontend *)handle; frontend *fe = (frontend *)handle;
NSString *string = [NSString stringWithCString:text NSString *string = [NSString stringWithUTF8String:text];
encoding:NSUTF8StringEncoding];
NSDictionary *attr; NSDictionary *attr;
NSFont *font; NSFont *font;
NSSize size; NSSize size;