gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-04-24 18:31:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Source/GSXibKeyedUnarchiver.m:

Browse source 
Merge some of the changes from the testplant branch.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@40406 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
fredkiefer 2017-03-20 23:04:27 +00:00
parent 0a1fa4b05a
commit d081365b28
2 changed files with 46 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2017-03-20 Fred Kiefer <FredKiefer@gmx.de>
* Source/GSXibKeyedUnarchiver.m:
Merge some of the changes from the testplant branch.
2017-03-19 Fred Kiefer <FredKiefer@gmx.de>
* Source/NSBrowser.m: Add encoding of NSColumnsAutosaveName.

47
Source/GSXibKeyedUnarchiver.m
View file

@ -620,6 +620,36 @@ didStartElement: (NSString*)elementName
NSString *value = [element attributeForKey: @"value"];
id new = [NSNumber numberWithBool: [value boolValue]];
if (objID != nil)
[decoded setObject: new forKey: objID];
return new;
}
else if ([@"point" isEqualToString: elementName])
{
NSPoint point = [self decodePointForKey: [element attributeForKey: @"key"]];
id new = [NSValue valueWithPoint: point];
if (objID != nil)
[decoded setObject: new forKey: objID];
return new;
}
else if ([@"size" isEqualToString: elementName])
{
NSSize size = [self decodeSizeForKey: [element attributeForKey: @"key"]];
id new = [NSValue valueWithSize: size];
if (objID != nil)
[decoded setObject: new forKey: objID];
return new;
}
else if ([@"rect" isEqualToString: elementName])
{
NSRect rect = [self decodeRectForKey: [element attributeForKey: @"key"]];
id new = [NSValue valueWithRect: rect];
if (objID != nil)
[decoded setObject: new forKey: objID];
@ -668,7 +698,7 @@ didStartElement: (NSString*)elementName
else if ([@"bytes" isEqualToString: elementName])
{
id new = AUTORELEASE([[NSData alloc] initWithBase64EncodedString: [element value]
options: 0]);
options: NSDataBase64DecodingIgnoreUnknownCharacters]);
if (objID != nil)
[decoded setObject: new forKey: objID];
@ -802,7 +832,8 @@ didStartElement: (NSString*)elementName
if (o != nil)
{
if ([o isKindOfClass: [NSNumber class]] == YES)
if (([o isKindOfClass: [NSNumber class]] == YES) ||
([o isKindOfClass: [NSString class]] == YES))
{
return [o boolValue];
}
@ -847,7 +878,8 @@ didStartElement: (NSString*)elementName
if (o != nil)
{
if ([o isKindOfClass: [NSNumber class]] == YES)
if (([o isKindOfClass: [NSNumber class]] == YES) ||
([o isKindOfClass: [NSString class]] == YES))
{
return [o doubleValue];
}
@ -868,7 +900,8 @@ didStartElement: (NSString*)elementName
if (o != nil)
{
if ([o isKindOfClass: [NSNumber class]] == YES)
if (([o isKindOfClass: [NSNumber class]] == YES) ||
([o isKindOfClass: [NSString class]] == YES))
{
return [o floatValue];
}
@ -889,7 +922,8 @@ didStartElement: (NSString*)elementName
if (o != nil)
{
if ([o isKindOfClass: [NSNumber class]] == YES)
if (([o isKindOfClass: [NSNumber class]] == YES) ||
([o isKindOfClass: [NSString class]] == YES))
{
long long l = [o longLongValue];
@ -912,7 +946,8 @@ didStartElement: (NSString*)elementName
if (o != nil)
{
if ([o isKindOfClass: [NSNumber class]] == YES)
if (([o isKindOfClass: [NSNumber class]] == YES) ||
([o isKindOfClass: [NSString class]] == YES))
{
long long l = [o longLongValue];