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

* Source/GSNibLoading.m: Remove method [NSKeyedUnarchiver

Browse source 
-replaceObject:withObject:] which was moved to base.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@36619 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Fred Kiefer 2013-05-13 21:01:47 +00:00
parent 5f248d6a39
commit 66ffc52ca2
2 changed files with 5 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2013-05-13 Fred Kiefer <FredKiefer@gmx.de>
* Source/GSNibLoading.m: Remove method [NSKeyedUnarchiver
-replaceObject:withObject:] which was moved to base.
2013-05-11 Fred Kiefer <FredKiefer@gmx.de>
* Source/NSColorPanel.m (-_magnify:): Use a local auto release

44
Source/GSNibLoading.m
View file

@ -49,15 +49,6 @@
#import <Foundation/NSSet.h>
#import <Foundation/NSString.h>
// FIXME: Used for NSKeyedArchiver access. All this should be moved into base.
/*
* Setup for inline operation of arrays.
*/
#define GSI_ARRAY_RETAIN(A, X) RETAIN((X).obj)
#define GSI_ARRAY_RELEASE(A, X) RELEASE((X).obj)
#define GSI_ARRAY_TYPES GSUNION_OBJ
#include <GNUstepBase/GSIArray.h>
#import "GNUstepGUI/GSNibLoading.h"
#import "AppKit/NSApplication.h"
#import "AppKit/NSImage.h"
@ -73,8 +64,6 @@
static BOOL _isInInterfaceBuilder = NO;
@interface NSKeyedUnarchiver (NSClassSwapperPrivate)
- (BOOL) replaceObject: (id)oldObj withObject: (id)newObj;
- (NSDictionary *)keyMap;
- (Class) replacementClassForClassName: (NSString *)className;
@end
@ -1290,38 +1279,6 @@ static BOOL _isInInterfaceBuilder = NO;
* nib reading.
*/
@implementation NSKeyedUnarchiver (NSClassSwapperPrivate)
/**
* This method is used to replace oldObj with newObj
* in the map that is maintained in NSKeyedUnarchiver.
*/
- (BOOL) replaceObject: (id)oldObj withObject: (id)newObj
{
unsigned int i = 0;
unsigned int count = GSIArrayCount(_objMap);
for (i = 0; i < count; i++)
{
id obj = GSIArrayItemAtIndex(_objMap, i).obj;
if (obj == oldObj)
break;
}
if (i < count)
{
GSIArraySetItemAtIndex(_objMap, (GSIArrayItem)newObj, i);
return YES;
}
return NO;
}
/**
* This method is private and is purely for debugging purposes.
*/
- (NSDictionary *)keyMap
{
return _keyMap;
}
/**
* This method returns the class which replaces the class named
* by className. It uses the classes map to do this.
@ -2378,7 +2335,6 @@ static BOOL _isInInterfaceBuilder = NO;
- (id) initWithCoder: (NSCoder *)coder
{
// NSLog(@"NSPSMatrix = %@",[(NSKeyedUnarchiver *)coder keyMap]);
return self;
}
@end