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

Retain/release fixes

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/branches/gnustep_testplant_branch@40410 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Marcian Lytwyn 2017-03-23 16:49:23 +00:00
parent 17fa46cdef
commit 632e1bf15a
1 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
Source/GSXib5KeyedUnarchiver.m
View file

@ -111,7 +111,7 @@ static NSString *ApplicationClass = nil;
{
@synchronized([self class])
{
ASSIGN(ApplicationClass, _className);
ASSIGNCOPY(ApplicationClass, _className);
}
}
}
@ -195,9 +195,12 @@ static NSString *ApplicationClass = nil;
{
if ([coder allowsKeyedCoding])
{
// label and source string tags have changed for XIB5...
ASSIGN(label, [coder decodeObjectForKey: @"selector"]);
ASSIGN(source, [coder decodeObjectForKey: @"target"]);
ASSIGN(destination, [coder decodeObjectForKey: @"destination"]);
// destination string tag is still the same (so far) and loaded
// by base class...
//ASSIGN(destination, [coder decodeObjectForKey: @"destination"]);
}
else
{
@ -224,9 +227,12 @@ static NSString *ApplicationClass = nil;
{
if ([coder allowsKeyedCoding])
{
// label and source string tags have changed for XIB5...
ASSIGN(label, [coder decodeObjectForKey: @"property"]);
ASSIGN(source, [coder decodeObjectForKey: @"target"]);
ASSIGN(destination, [coder decodeObjectForKey: @"destination"]);
// destination string tag is still the same (so far) and loaded
// by base class...
//ASSIGN(destination, [coder decodeObjectForKey: @"destination"]);
}
else
{
@ -238,11 +244,14 @@ static NSString *ApplicationClass = nil;
return self;
}
#if 0
- (void) establishConnection
{
[super establishConnection];
// For some reason I needed this originally - but not now...
RETAIN(destination);
}
#endif
@end
@ -585,6 +594,9 @@ static NSArray *XmlConnectionRecordTags = nil;
[objectRecord setElement: element forKey: @"object"];
[objectRecord setElement: parent forKey: @"parent"];
[objectRecord setElement: children forKey: @"children"];
RELEASE(parent);
RELEASE(children);
return AUTORELEASE(objectRecord);
}
@ -659,8 +671,8 @@ static NSArray *XmlConnectionRecordTags = nil;
[_objectRecords setElement: _orderedObjects forKey: @"orderedObjects"];
// flattenedProperties...
[_flattenedProperties setElement: _runtimeAttributes forKey: [NSString stringWithFormat: @"%@.IBAttributePlaceholdersKey",
[[NSUUID UUID] UUIDString]]];
NSString *runtimeAttributesKey = [NSString stringWithFormat: @"%@.IBAttributePlaceholdersKey", [[NSUUID UUID] UUIDString]];
[_flattenedProperties setElement: _runtimeAttributes forKey: runtimeAttributesKey];
}
- (void)dealloc
@ -670,6 +682,7 @@ static NSArray *XmlConnectionRecordTags = nil;
RELEASE(_objectRecords);
RELEASE(_flattenedProperties);
RELEASE(_runtimeAttributes);
RELEASE(_orderedObjects);
[super dealloc];
}
@ -2792,7 +2805,6 @@ didStartElement: (NSString*)elementName
{
id object = [super decodeObjectForXib: element forClassName: classname withID: objID];
// Create an ordered object for this element...
// This probably needs to be qualified but I have yet to determine
// what that should be right now...