From d4345a40b87d104762f189988cfd1870bb05d5b2 Mon Sep 17 00:00:00 2001 From: Mitchell Livingston Date: Mon, 30 Jun 2008 23:28:17 +0000 Subject: [PATCH] fix 2 invalid return types; don't show notices when compiling the xib's --- Transmission.xcodeproj/project.pbxproj | 15 +++++++++++++++ macosx/BlocklistDownloader.h | 2 +- macosx/BlocklistDownloader.m | 2 +- macosx/GroupsController.h | 2 +- macosx/GroupsController.m | 2 +- 5 files changed, 19 insertions(+), 4 deletions(-) diff --git a/Transmission.xcodeproj/project.pbxproj b/Transmission.xcodeproj/project.pbxproj index 75634d923..f2626511a 100644 --- a/Transmission.xcodeproj/project.pbxproj +++ b/Transmission.xcodeproj/project.pbxproj @@ -2291,6 +2291,10 @@ GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; GCC_OPTIMIZATION_LEVEL = 0; + GCC_UNROLL_LOOPS = NO; + GCC_WARN_ABOUT_MISSING_NEWLINE = NO; + GCC_WARN_ABOUT_RETURN_TYPE = NO; + GCC_WARN_PROTOTYPE_CONVERSION = NO; GCC_WARN_SHADOW = NO; GCC_WARN_SIGN_COMPARE = NO; GCC_WARN_UNUSED_FUNCTION = NO; @@ -2299,6 +2303,7 @@ GCC_WARN_UNUSED_VALUE = NO; GCC_WARN_UNUSED_VARIABLE = NO; IBC_FLATTEN_NIBS = YES; + IBC_NOTICES = NO; MACOSX_DEPLOYMENT_TARGET = 10.4; OTHER_CFLAGS = "$(inherited)"; OTHER_LDFLAGS = ""; @@ -2408,9 +2413,14 @@ DEBUG_INFORMATION_FORMAT = dwarf; GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; + GCC_UNROLL_LOOPS = NO; + GCC_WARN_ABOUT_MISSING_NEWLINE = NO; + GCC_WARN_ABOUT_RETURN_TYPE = NO; + GCC_WARN_PROTOTYPE_CONVERSION = NO; GCC_WARN_UNUSED_FUNCTION = NO; GCC_WARN_UNUSED_PARAMETER = NO; GCC_WARN_UNUSED_VARIABLE = NO; + IBC_NOTICES = NO; MACOSX_DEPLOYMENT_TARGET = 10.4; OTHER_LDFLAGS = ""; PREBINDING = NO; @@ -2428,9 +2438,14 @@ DEBUG_INFORMATION_FORMAT = dwarf; GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; + GCC_UNROLL_LOOPS = NO; + GCC_WARN_ABOUT_MISSING_NEWLINE = NO; + GCC_WARN_ABOUT_RETURN_TYPE = NO; + GCC_WARN_PROTOTYPE_CONVERSION = NO; GCC_WARN_UNUSED_FUNCTION = NO; GCC_WARN_UNUSED_PARAMETER = NO; GCC_WARN_UNUSED_VARIABLE = NO; + IBC_NOTICES = NO; MACOSX_DEPLOYMENT_TARGET = 10.4; OTHER_LDFLAGS = ""; PREBINDING = NO; diff --git a/macosx/BlocklistDownloader.h b/macosx/BlocklistDownloader.h index e33302bd9..b5036ef64 100644 --- a/macosx/BlocklistDownloader.h +++ b/macosx/BlocklistDownloader.h @@ -42,7 +42,7 @@ long long fExpectedSize; } -+ (id) downloadWithPrefsController: (PrefsController *) prefsController; ++ (void) downloadWithPrefsController: (PrefsController *) prefsController; //only use when no other blocklist downloads - (void) cancelDownload: (id) sender; diff --git a/macosx/BlocklistDownloader.m b/macosx/BlocklistDownloader.m index 7d400b9c4..8d6a6f30b 100644 --- a/macosx/BlocklistDownloader.m +++ b/macosx/BlocklistDownloader.m @@ -42,7 +42,7 @@ @implementation BlocklistDownloader -+ (id) downloadWithPrefsController: (PrefsController *) prefsController ++ (void) downloadWithPrefsController: (PrefsController *) prefsController { BlocklistDownloader * downloader = [[BlocklistDownloader alloc] initWithPrefsController: prefsController]; [downloader startDownload]; diff --git a/macosx/GroupsController.h b/macosx/GroupsController.h index 03b5e13ca..503b986bf 100644 --- a/macosx/GroupsController.h +++ b/macosx/GroupsController.h @@ -42,7 +42,7 @@ - (NSImage *) imageForIndex: (int) index; - (NSColor *) colorForIndex: (int) index; -- (NSColor *) setColor: (NSColor *) color forIndex: (int) index; +- (void) setColor: (NSColor *) color forIndex: (int) index; - (void) addNewGroup; - (void) removeGroupWithRowIndexes: (NSIndexSet *) rowIndexes; diff --git a/macosx/GroupsController.m b/macosx/GroupsController.m index c7b485ab9..9fc8d18d9 100644 --- a/macosx/GroupsController.m +++ b/macosx/GroupsController.m @@ -156,7 +156,7 @@ GroupsController * fGroupsInstance = nil; return orderIndex != -1 ? [[fGroups objectAtIndex: orderIndex] objectForKey: @"Color"] : nil; } -- (NSColor *) setColor: (NSColor *) color forIndex: (int) index +- (void) setColor: (NSColor *) color forIndex: (int) index { NSMutableDictionary * dict = [fGroups objectAtIndex: [self rowValueForIndex: index]]; [dict removeObjectForKey: @"Icon"];