From b26bf7aaa782b9ba66db500963f8199e7302691f Mon Sep 17 00:00:00 2001 From: Rui Carmo Date: Sat, 11 May 2013 23:03:15 +0100 Subject: [PATCH 1/5] removed mis-formatted signing key spec --- Cord.xcodeproj/project.pbxproj | 2 -- 1 file changed, 2 deletions(-) diff --git a/Cord.xcodeproj/project.pbxproj b/Cord.xcodeproj/project.pbxproj index 0fb706b8..14430f92 100644 --- a/Cord.xcodeproj/project.pbxproj +++ b/Cord.xcodeproj/project.pbxproj @@ -894,7 +894,6 @@ buildSettings = { ARCHS = "$(ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1)"; ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1 = "ppc i386 ppc64 x86_64"; - CODE_SIGN_IDENTITY = "ѣ"; GCC_VERSION = ""; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; @@ -909,7 +908,6 @@ buildSettings = { ARCHS = "$(ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1)"; ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1 = "ppc i386 ppc64 x86_64"; - CODE_SIGN_IDENTITY = "ѣ"; GCC_VERSION = ""; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; From 08a6b1450ca5420a2023f03e8483b1f4e64fcab5 Mon Sep 17 00:00:00 2001 From: Rui Carmo Date: Sat, 11 May 2013 23:04:14 +0100 Subject: [PATCH 2/5] added NSInteger -> int casts to remove Xcode 4 warnings --- Source/AppController.m | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/AppController.m b/Source/AppController.m index 3e52b1a8..1a2406c5 100644 --- a/Source/AppController.m +++ b/Source/AppController.m @@ -1885,7 +1885,7 @@ - (void)listUpdated for (inst in connectedServers) { - menuItem = [[NSMenuItem alloc] initWithTitle:[inst label] action:@selector(performServerMenuItem:) keyEquivalent:[NSString stringWithFormat:@"%i", [inst hotkey]]]; + menuItem = [[NSMenuItem alloc] initWithTitle:[inst label] action:@selector(performServerMenuItem:) keyEquivalent:[NSString stringWithFormat:@"%i", (int)[inst hotkey]]]; [menuItem setKeyEquivalentModifierMask:NSCommandKeyMask]; [menuItem setRepresentedObject:inst]; [gui_serversMenu addItem:menuItem]; @@ -1897,7 +1897,7 @@ - (void)listUpdated for (inst in savedServers) { - menuItem = [[NSMenuItem alloc] initWithTitle:[inst label] action:@selector(performServerMenuItem:) keyEquivalent:[NSString stringWithFormat:@"%i", [inst hotkey]]]; + menuItem = [[NSMenuItem alloc] initWithTitle:[inst label] action:@selector(performServerMenuItem:) keyEquivalent:[NSString stringWithFormat:@"%i", (int)[inst hotkey]]]; [menuItem setKeyEquivalentModifierMask:NSCommandKeyMask]; [menuItem setRepresentedObject:inst]; [gui_serversMenu addItem:menuItem]; @@ -2126,7 +2126,7 @@ - (void)setInspectorSettings:(CRDSession *)newSettings screenHeight = CRDDefaultScreenHeight; } // If the user opens an .rdc file with a resolution that the user doesn't have, nothing will be selected. We're not adding it to the array controller, because we don't want resolutions from .rdc files to be persistent in CoRD prefs - NSString *resolutionLabel = [NSString stringWithFormat:@"%dx%d", screenWidth, screenHeight]; + NSString *resolutionLabel = [NSString stringWithFormat:@"%ix%i", (int)screenWidth, (int)screenHeight]; [gui_screenResolution selectItemWithTitle:resolutionLabel]; } From 1a179b522920aa70b5bafc5334da64ab2adc0c25 Mon Sep 17 00:00:00 2001 From: Rui Carmo Date: Sat, 11 May 2013 23:05:29 +0100 Subject: [PATCH 3/5] added NSInteger -> int casts to remove Xcode 4 warnings --- Source/CRDSession.m | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Source/CRDSession.m b/Source/CRDSession.m index 9f00c687..de680632 100644 --- a/Source/CRDSession.m +++ b/Source/CRDSession.m @@ -605,15 +605,15 @@ - (BOOL)writeToFile:(NSString *)path atomically:(BOOL)atomicFlag updateFilenames write_int(@"disable menu anims", !windowAnimation); write_int(@"disable themes", !themes); write_int(@"disable font smoothing", !fontSmoothing); - write_int(@"audiomode", forwardAudio); - write_int(@"desktopwidth", screenWidth); - write_int(@"desktopheight", screenHeight); - write_int(@"session bpp", screenDepth); + write_int(@"audiomode", (int)forwardAudio); + write_int(@"desktopwidth", (int)screenWidth); + write_int(@"desktopheight", (int)screenHeight); + write_int(@"session bpp", (int)screenDepth); write_int(@"cord save password", savePassword); write_int(@"cord fullscreen", fullscreen); - write_int(@"cord row index", preferredRowIndex); - write_int(@"cord hotkey", hotkey); - write_int(@"cord displayMode", displayMode); + write_int(@"cord row index", (int)preferredRowIndex); + write_int(@"cord hotkey", (int)hotkey); + write_int(@"cord displayMode", (int)displayMode); write_string(@"full address", CRDJoinHostNameAndPort(hostName, port)); write_string(@"username", username); @@ -625,7 +625,7 @@ - (BOOL)writeToFile:(NSString *)path atomically:(BOOL)atomicFlag updateFilenames { id value = [otherAttributes objectForKey:key]; if ([value isKindOfClass:[NSNumber class]]) - write_int(key, [value integerValue]); + write_int(key, (int)[value integerValue]); else write_string(key, value); } @@ -672,7 +672,7 @@ - (void)updateCellData return [self performSelectorOnMainThread:@selector(updateCellData) withObject:nil waitUntilDone:NO]; // Update the text - NSString *fullHost = (port && port != CRDDefaultPort) ? [NSString stringWithFormat:@"%@:%d", hostName, port] : hostName; + NSString *fullHost = (port && port != CRDDefaultPort) ? [NSString stringWithFormat:@"%@:%i", hostName, (int)port] : hostName; [cellRepresentation setDisplayedText:label username:username address:fullHost]; // Update the image From e3243f7ab69003ddeef9d6beb4ce3795e1cee946 Mon Sep 17 00:00:00 2001 From: Rui Carmo Date: Sat, 11 May 2013 23:05:59 +0100 Subject: [PATCH 4/5] added NSInteger -> int casts to remove Xcode 4 warnings --- Source/CRDServerCell.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/CRDServerCell.m b/Source/CRDServerCell.m index ebf71b81..70868bde 100644 --- a/Source/CRDServerCell.m +++ b/Source/CRDServerCell.m @@ -202,7 +202,7 @@ - (void)drawWithFrame:(NSRect)frame inView:(NSView *)controlView if ([inst hotkey] > -1) { // Set up badge string and size. - NSString *badge = [NSString stringWithFormat:@"%@%d", [NSString stringWithUTF8String:"\xE2\x8C\x98"], [inst hotkey]]; + NSString *badge = [NSString stringWithFormat:@"%@%i", [NSString stringWithUTF8String:"\xE2\x8C\x98"], (int)[inst hotkey]]; NSSize badgeNumSize = [badge sizeWithAttributes:nil]; // Calculate the badge's coordinates. From 3d0de0db96e5e06b1ef1fb4d3e4c1a5de793185d Mon Sep 17 00:00:00 2001 From: Rui Carmo Date: Sat, 11 May 2013 23:07:24 +0100 Subject: [PATCH 5/5] added NSInteger -> int casts to remove Xcode 4 warnings --- Source/CRDShared.m | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/CRDShared.m b/Source/CRDShared.m index f53cead9..0d999190 100644 --- a/Source/CRDShared.m +++ b/Source/CRDShared.m @@ -73,7 +73,7 @@ inline NSString * CRDJoinHostNameAndPort(NSString *host, NSInteger port) { - return (port && port != CRDDefaultPort) ? [NSString stringWithFormat:@"%@:%d", host, port] : [[host copy] autorelease]; + return (port && port != CRDDefaultPort) ? [NSString stringWithFormat:@"%@:%i", host, (int)port] : [[host copy] autorelease]; } void CRDSplitHostNameAndPort(NSString *address, NSString **host, NSInteger *port) @@ -284,7 +284,7 @@ inline CRDInputEvent CRDMakeInputEvent(unsigned int time, unsigned short type, u if (baseDir == nil) baseDir = @"/tmp"; - return [baseDir stringByAppendingPathComponent:[NSString stringWithFormat:@"CoRD-TemporaryFile-%u-%u", time(NULL), rand()]]; + return [baseDir stringByAppendingPathComponent:[NSString stringWithFormat:@"CoRD-TemporaryFile-%lu-%u", time(NULL), rand()]]; } BOOL CRDPathIsHidden(NSString *path)