gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-04-23 10:01:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remoce call to decodeIntegerForKey: and remove superfluous implementation.

Browse source
This commit is contained in:
Gregory John Casamento 2020-12-07 09:01:49 -05:00
parent 84cca3fbca
commit 9fba8e5af6
2 changed files with 7 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
Source/GSXib5KeyedUnarchiver.m
View file

@ -3290,42 +3290,6 @@ didStartElement: (NSString*)elementName
return flag;
}
- (NSInteger) decodeIntegerForKey: (NSString *)key
{
NSInteger num = 0;
if ([super containsValueForKey: key])
{
num = [super decodeIntegerForKey: key];
}
else if ([currentElement attributeForKey: key])
{
num = [[currentElement attributeForKey: key] integerValue];
}
else if ([XmlKeyMapTable objectForKey: key])
{
num = [self decodeIntegerForKey: [XmlKeyMapTable objectForKey: key]];
}
else if ([XmlKeyToDecoderSelectorMap objectForKey: key])
{
SEL selector = NSSelectorFromString([XmlKeyToDecoderSelectorMap objectForKey: key]);
num = [[self performSelector: selector withObject: currentElement] integerValue];
}
else if ([key hasPrefix:@"NS"])
{
NSString *newKey = [self alternateName: key];
num = [self decodeIntegerForKey: newKey];
}
#if DEBUG_XIB5
else
{
NSWarnMLog(@"no NSInteger for key: %@", key);
}
#endif
return num;
}
- (NSPoint) decodePointForKey: (NSString *)key
{
NSPoint point = NSZeroPoint;

14
Source/NSGridView.m
View file

@ -236,7 +236,7 @@
{
if ([coder containsValueForKey: @"NSGrid_alignment"])
{
_rowAlignment = [coder decodeIntegerForKey: @"NSGrid_alignment"];
_rowAlignment = [coder decodeIntForKey: @"NSGrid_alignment"];
}
if ([coder containsValueForKey: @"NSGrid_columnSpacing"])
{
@ -256,11 +256,11 @@
}
if ([coder containsValueForKey: @"NSGrid_xPlacement"])
{
_xPlacement = [coder decodeIntegerForKey: @"NSGrid_xPlacement"];
_xPlacement = [coder decodeIntForKey: @"NSGrid_xPlacement"];
}
if ([coder containsValueForKey: @"NSGrid_yPlacement"])
{
_yPlacement = [coder decodeIntegerForKey: @"NSGrid_yPlacement"];
_yPlacement = [coder decodeIntForKey: @"NSGrid_yPlacement"];
}
}
else
@ -392,15 +392,15 @@
}
if ([coder containsValueForKey: @"NSGrid_xPlacement"])
{
_xPlacement = [coder decodeIntegerForKey: @"NSGrid_xPlacement"];
_xPlacement = [coder decodeIntForKey: @"NSGrid_xPlacement"];
}
if ([coder containsValueForKey: @"NSGrid_yPlacement"])
{
_yPlacement = [coder decodeIntegerForKey: @"NSGrid_yPlacement"];
_yPlacement = [coder decodeIntForKey: @"NSGrid_yPlacement"];
}
if ([coder containsValueForKey: @"NSGrid_alignment"])
{
_rowAlignment = [coder decodeIntegerForKey: @"NSGrid_alignment"];
_rowAlignment = [coder decodeIntForKey: @"NSGrid_alignment"];
}
}
else
@ -523,7 +523,7 @@
}
if ([coder containsValueForKey: @"NSGrid_xPlacement"])
{
_xPlacement = [coder decodeIntegerForKey: @"NSGrid_xPlacement"];
_xPlacement = [coder decodeIntForKey: @"NSGrid_xPlacement"];
}
}
else