From fca1106249850718b46d278feb579ccadbdae05f Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Sun, 1 Nov 2015 15:44:48 +1100 Subject: [PATCH] Clean up some stuff that upsets GCC5 --- .../modules/debugger/osx/debugwindowhandler.m | 1 + src/osd/modules/debugger/osx/devicesviewer.m | 2 +- src/osd/sdl/aueffectutil.m | 4 +- src/osd/sdl/sdlos_macosx.c | 121 ++++++++---------- 4 files changed, 54 insertions(+), 74 deletions(-) diff --git a/src/osd/modules/debugger/osx/debugwindowhandler.m b/src/osd/modules/debugger/osx/debugwindowhandler.m index a8e92bd6f5f..d99a9ec9961 100644 --- a/src/osd/modules/debugger/osx/debugwindowhandler.m +++ b/src/osd/modules/debugger/osx/debugwindowhandler.m @@ -8,6 +8,7 @@ #import "debugwindowhandler.h" +#import "debugconsole.h" #import "debugcommandhistory.h" #import "debugview.h" diff --git a/src/osd/modules/debugger/osx/devicesviewer.m b/src/osd/modules/debugger/osx/devicesviewer.m index 01d49c14da6..ddf08602bc6 100644 --- a/src/osd/modules/debugger/osx/devicesviewer.m +++ b/src/osd/modules/debugger/osx/devicesviewer.m @@ -153,7 +153,7 @@ // set default state [devicesView expandItem:root expandChildren:YES]; [window makeFirstResponder:devicesView]; - [window setTitle:[NSString stringWithFormat:@"All Devices"]]; + [window setTitle:@"All Devices"]; // calculate the optimal size for everything NSSize const desired = [NSScrollView frameSizeForContentSize:NSMakeSize(480, 320) diff --git a/src/osd/sdl/aueffectutil.m b/src/osd/sdl/aueffectutil.m index 397fb640c68..45ca18d178e 100644 --- a/src/osd/sdl/aueffectutil.m +++ b/src/osd/sdl/aueffectutil.m @@ -793,13 +793,13 @@ static void UpdateChangeCountCallback(void *userData, newEffectMenu = [[NSMenu allocWithZone:[NSMenu zone]] initWithTitle:@"New"]; [menu setSubmenu:newEffectMenu forItem:item]; [newEffectMenu release]; - item = [menu addItemWithTitle:@"Open…" action:@selector(openDocument:) keyEquivalent:@"o"]; + item = [menu addItemWithTitle:[NSString stringWithFormat:@"Open%C", (unichar)0x2026] action:@selector(openDocument:) keyEquivalent:@"o"]; [menu addItem:[NSMenuItem separatorItem]]; item = [menu addItemWithTitle:@"Close" action:@selector(performClose:) keyEquivalent:@"w"]; item = [menu addItemWithTitle:@"Save" action:@selector(saveDocument:) keyEquivalent:@"s"]; - item = [menu addItemWithTitle:@"Save As…" action:@selector(saveDocumentAs:) keyEquivalent:@"S"]; + item = [menu addItemWithTitle:[NSString stringWithFormat:@"Save As%C", (unichar)0x2026] action:@selector(saveDocumentAs:) keyEquivalent:@"S"]; item = [menu addItemWithTitle:@"Save All" action:@selector(saveAllDocuments:) keyEquivalent:@""]; item = [menu addItemWithTitle:@"Revert to Saved" action:@selector(revertDocumentToSaved:) keyEquivalent:@"u"]; } diff --git a/src/osd/sdl/sdlos_macosx.c b/src/osd/sdl/sdlos_macosx.c index a252cf95d6a..5afcfdc54eb 100644 --- a/src/osd/sdl/sdlos_macosx.c +++ b/src/osd/sdl/sdlos_macosx.c @@ -28,95 +28,74 @@ char *osd_get_clipboard_text(void) { - char *result = NULL; /* core expects a malloced C string of uft8 data */ + OSStatus err; PasteboardRef pasteboard_ref; - OSStatus err; - PasteboardSyncFlags sync_flags; - PasteboardItemID item_id; - CFIndex flavor_count; - CFArrayRef flavor_type_array; - CFIndex flavor_index; - ItemCount item_count; - UInt32 item_index; - Boolean success = false; - err = PasteboardCreate(kPasteboardClipboard, &pasteboard_ref); + if (err) + return NULL; - if (!err) + PasteboardSynchronize(pasteboard_ref); + + ItemCount item_count; + err = PasteboardGetItemCount(pasteboard_ref, &item_count); + + char *result = NULL; // core expects a malloced C string of uft8 data + for (UInt32 item_index = 1; (item_index <= item_count) && !result; item_index++) { - sync_flags = PasteboardSynchronize( pasteboard_ref ); + PasteboardItemID item_id; + err = PasteboardGetItemIdentifier(pasteboard_ref, item_index, &item_id); + if (err) + continue; - err = PasteboardGetItemCount(pasteboard_ref, &item_count ); + CFArrayRef flavor_type_array; + err = PasteboardCopyItemFlavors(pasteboard_ref, item_id, &flavor_type_array); + if (err) + continue; - for (item_index=1; item_index<=item_count; item_index++) + CFIndex const flavor_count = CFArrayGetCount(flavor_type_array); + for (CFIndex flavor_index = 0; (flavor_index < flavor_count) && !result; flavor_index++) { - err = PasteboardGetItemIdentifier(pasteboard_ref, item_index, &item_id); + CFStringRef const flavor_type = (CFStringRef)CFArrayGetValueAtIndex(flavor_type_array, flavor_index); + + CFStringEncoding encoding; + if (UTTypeConformsTo(flavor_type, kUTTypeUTF16PlainText)) + encoding = kCFStringEncodingUTF16; + else if (UTTypeConformsTo (flavor_type, kUTTypeUTF8PlainText)) + encoding = kCFStringEncodingUTF8; + else if (UTTypeConformsTo (flavor_type, kUTTypePlainText)) + encoding = kCFStringEncodingMacRoman; + else + continue; + + CFDataRef flavor_data; + err = PasteboardCopyItemFlavorData(pasteboard_ref, item_id, flavor_type, &flavor_data); if (!err) { - err = PasteboardCopyItemFlavors(pasteboard_ref, item_id, &flavor_type_array); + CFStringRef string_ref = CFStringCreateFromExternalRepresentation(kCFAllocatorDefault, flavor_data, encoding); + CFDataRef data_ref = CFStringCreateExternalRepresentation (kCFAllocatorDefault, string_ref, kCFStringEncodingUTF8, '?'); + CFRelease(string_ref); + CFRelease(flavor_data); - if (!err) + CFIndex const length = CFDataGetLength(data_ref); + CFRange const range = CFRangeMake(0, length); + + result = reinterpret_cast(osd_malloc_array(length + 1)); + if (result) { - flavor_count = CFArrayGetCount(flavor_type_array); - - for (flavor_index = 0; flavor_index < flavor_count; flavor_index++) - { - CFStringRef flavor_type; - CFDataRef flavor_data; - CFStringEncoding encoding; - CFStringRef string_ref; - CFDataRef data_ref; - CFIndex length; - CFRange range; - - flavor_type = (CFStringRef)CFArrayGetValueAtIndex(flavor_type_array, flavor_index); - - if (UTTypeConformsTo (flavor_type, kUTTypeUTF16PlainText)) - encoding = kCFStringEncodingUTF16; - else if (UTTypeConformsTo (flavor_type, kUTTypeUTF8PlainText)) - encoding = kCFStringEncodingUTF8; - else if (UTTypeConformsTo (flavor_type, kUTTypePlainText)) - encoding = kCFStringEncodingMacRoman; - else - continue; - - err = PasteboardCopyItemFlavorData(pasteboard_ref, item_id, flavor_type, &flavor_data); - - if( !err ) - { - string_ref = CFStringCreateFromExternalRepresentation (kCFAllocatorDefault, flavor_data, encoding); - data_ref = CFStringCreateExternalRepresentation (kCFAllocatorDefault, string_ref, kCFStringEncodingUTF8, '?'); - - length = CFDataGetLength (data_ref); - range = CFRangeMake (0,length); - - result = (char *)osd_malloc_array (length+1); - if (result != NULL) - { - CFDataGetBytes (data_ref, range, (unsigned char *)result); - result[length] = 0; - success = true; - break; - } - - CFRelease(data_ref); - CFRelease(string_ref); - CFRelease(flavor_data); - } - } - - CFRelease(flavor_type_array); + CFDataGetBytes(data_ref, range, reinterpret_cast(result)); + result[length] = 0; } - } - if (success) - break; + CFRelease(data_ref); + } } - CFRelease(pasteboard_ref); + CFRelease(flavor_type_array); } + CFRelease(pasteboard_ref); + return result; }