--- a/garglk/fontmac.m +++ b/garglk/fontmac.m @@ -167,7 +167,7 @@ static void propfont(char *file, int style) } } -static NSMutableArray * gli_registered_fonts = nil; +static NSMutableArray * gli_registered_fonts = nil; static NSDistributedLock * gli_font_lock = nil; void fontreplace(char *font, int type) @@ -181,7 +181,7 @@ void fontreplace(char *font, int type) NSFontDescriptor * fontFamilyDescriptor = [[NSFontDescriptor fontDescriptorWithFontAttributes: nil] fontDescriptorWithFamily: fontFamily]; - NSArray * fontMatches = + NSArray * fontMatches = [fontFamilyDescriptor matchingFontDescriptorsWithMandatoryKeys: nil]; for (NSFontDescriptor * sysfont in fontMatches) @@ -259,7 +259,7 @@ void fontload(void) // obtain a list of all files in the Fonts directory NSString * fontFolder = [[NSString stringWithUTF8String: env] stringByAppendingPathComponent: @"Fonts"]; - NSArray * fontFiles = [[NSFileManager defaultManager] contentsOfDirectoryAtPath: fontFolder error: nil]; + NSArray * fontFiles = [[NSFileManager defaultManager] contentsOfDirectoryAtPath: fontFolder error: nil]; // create a collection to hold the registered font URLs gli_registered_fonts = [NSMutableArray new]; --- a/garglk/launchmac.m +++ b/garglk/launchmac.m @@ -556,7 +556,7 @@ static BOOL isTextbufferEvent(NSEvent * evt) { BOOL openedFirstGame; - NSMutableDictionary * windows; + NSMutableDictionary * windows; NSConnection * link; } - (BOOL) launchFile: (NSString *) file; --- a/garglk/ttsmac.m +++ b/garglk/ttsmac.m @@ -30,7 +30,7 @@ #import "sysmac.h" // a queue of phrases to feed to the speech synthesizer -static NSMutableArray * phraseQueue = nil; +static NSMutableArray * phraseQueue = nil; static NSRange purgeRange; @interface SpeechDelegate : NSObject @@ -96,10 +96,10 @@ void gli_initialize_tts(void) NSString * lang = [NSString stringWithCString: gli_conf_speak_language encoding: NSUTF8StringEncoding]; - NSArray * voices = [NSSpeechSynthesizer availableVoices]; + NSArray * voices = [NSSpeechSynthesizer availableVoices]; for (NSString * voice in voices) { - NSDictionary * attr = [NSSpeechSynthesizer attributesForVoice: voice]; + NSDictionary * attr = [NSSpeechSynthesizer attributesForVoice: voice]; if ([lang isEqualToString: [attr objectForKey: NSVoiceLocaleIdentifier]]) { [synth setVoice: voice];