From bdda29451c84fed569d209dd80b0cd5a4944edba Mon Sep 17 00:00:00 2001 From: Fred Kiefer Date: Fri, 24 Sep 2010 18:58:57 +0000 Subject: [PATCH] Fix small bugs found by static analyser. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@31410 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 8 ++++++++ Source/NSButton.m | 6 ------ Source/NSColor.m | 5 +++-- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index d9ca1a85e..9f08b7fab 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2010-09-24 Fred Kiefer + + * Source/NSButton.m (-keyDown:): Remove unused code found by + static analyser. + * Source/NSColor.m (-colorUsingColorSpace:): Add missing break + statements. + * Source/NSColor.m (initSystemColors): Remove unused variable. + 2010-09-24 Fred Kiefer * Source/NSView.m (-_viewWillMoveToWindow:): When calling diff --git a/Source/NSButton.m b/Source/NSButton.m index fccccde6b..f1286b62f 100644 --- a/Source/NSButton.m +++ b/Source/NSButton.m @@ -477,12 +477,6 @@ static id buttonCellClass = nil; if ([self isEnabled]) { NSString *characters = [theEvent characters]; - unichar character = 0; - - if ([characters length] > 0) - { - character = [characters characterAtIndex: 0]; - } /* Handle SPACE to perform a click */ if ([characters isEqualToString: @" "]) diff --git a/Source/NSColor.m b/Source/NSColor.m index 12415dcbf..b78d54864 100644 --- a/Source/NSColor.m +++ b/Source/NSColor.m @@ -250,7 +250,6 @@ void initSystemColors(void) { NSEnumerator *enumerator; NSString *key; - BOOL changed = NO; // Set up default system colors @@ -269,7 +268,6 @@ void initSystemColors(void) NSCAssert1(color, @"couldn't get default system color %@", key); [systemColors setColor: color forKey: key]; - changed = YES; } if (defaultSystemColors != systemColors) { @@ -1250,10 +1248,13 @@ systemColorWithName(NSString *name) return nil; case NSGrayColorSpaceModel: colorSpaceName = NSDeviceWhiteColorSpace; + break; case NSRGBColorSpaceModel: colorSpaceName = NSDeviceRGBColorSpace; + break; case NSCMYKColorSpaceModel: colorSpaceName = NSDeviceCMYKColorSpace; + break; case NSLABColorSpaceModel: return nil; case NSDeviceNColorSpaceModel: