mirror of
https://github.com/gnustep/libs-base.git
synced 2025-05-31 00:30:53 +00:00
Code simplification
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@8275 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
edc67ffd44
commit
24451e5cbc
6 changed files with 20 additions and 59 deletions
|
@ -39,9 +39,6 @@
|
|||
|
||||
#include <base/GSIMap.h>
|
||||
|
||||
@class NSSetNonCore;
|
||||
@class NSMutableSetNonCore;
|
||||
|
||||
@interface GSCountedSet : NSCountedSet
|
||||
{
|
||||
@public
|
||||
|
@ -96,8 +93,6 @@
|
|||
{
|
||||
if (self == [GSCountedSet class])
|
||||
{
|
||||
class_add_behavior(self, [NSSetNonCore class]);
|
||||
class_add_behavior(self, [NSMutableSetNonCore class]);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -39,9 +39,6 @@
|
|||
|
||||
#include <base/GSIMap.h>
|
||||
|
||||
@class NSSetNonCore;
|
||||
@class NSMutableSetNonCore;
|
||||
|
||||
@interface GSSet : NSSet
|
||||
{
|
||||
@public
|
||||
|
@ -107,7 +104,6 @@ static Class mutableSetClass;
|
|||
{
|
||||
if (self == [GSSet class])
|
||||
{
|
||||
class_add_behavior(self, [NSSetNonCore class]);
|
||||
arrayClass = [NSArray class];
|
||||
setClass = [GSSet class];
|
||||
mutableSetClass = [GSMutableSet class];
|
||||
|
@ -424,7 +420,6 @@ static Class mutableSetClass;
|
|||
{
|
||||
if (self == [GSMutableSet class])
|
||||
{
|
||||
class_add_behavior(self, [NSMutableSetNonCore class]);
|
||||
class_add_behavior(self, [GSSet class]);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -33,8 +33,6 @@
|
|||
#include <Foundation/NSThread.h>
|
||||
#include <Foundation/NSObjCRuntime.h>
|
||||
|
||||
@class NSSetNonCore;
|
||||
@class NSMutableSetNonCore;
|
||||
@class GSCountedSet;
|
||||
|
||||
/*
|
||||
|
@ -62,8 +60,6 @@ static Class NSCountedSet_concrete_class;
|
|||
{
|
||||
NSCountedSet_abstract_class = self;
|
||||
NSCountedSet_concrete_class = [GSCountedSet class];
|
||||
behavior_class_add_class(self, [NSMutableSetNonCore class]);
|
||||
behavior_class_add_class(self, [NSSetNonCore class]);
|
||||
if ([NSThread isMultiThreaded])
|
||||
{
|
||||
[self _becomeThreaded: nil];
|
||||
|
|
|
@ -34,11 +34,6 @@
|
|||
@class GSSet;
|
||||
@class GSMutableSet;
|
||||
|
||||
@interface NSSetNonCore : NSSet
|
||||
@end
|
||||
@interface NSMutableSetNonCore: NSMutableSet
|
||||
@end
|
||||
|
||||
@implementation NSSet
|
||||
|
||||
static Class NSSet_abstract_class;
|
||||
|
@ -66,7 +61,6 @@ static Class NSMutableSet_concrete_class;
|
|||
NSMutableSet_abstract_class = [NSMutableSet class];
|
||||
NSSet_concrete_class = [GSSet class];
|
||||
NSMutableSet_concrete_class = [GSMutableSet class];
|
||||
behavior_class_add_class(self, [NSSetNonCore class]);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -195,10 +189,6 @@ static Class NSMutableSet_concrete_class;
|
|||
return [self subclassResponsibility: _cmd];
|
||||
}
|
||||
|
||||
@end
|
||||
|
||||
@implementation NSSetNonCore
|
||||
|
||||
/* Same as NSArray */
|
||||
- (id) initWithObjects: firstObject rest: (va_list)ap
|
||||
{
|
||||
|
@ -462,8 +452,6 @@ static Class NSMutableSet_concrete_class;
|
|||
{
|
||||
if (self == [NSMutableSet class])
|
||||
{
|
||||
behavior_class_add_class(self, [NSMutableSetNonCore class]);
|
||||
behavior_class_add_class(self, [NSSetNonCore class]);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -511,10 +499,6 @@ static Class NSMutableSet_concrete_class;
|
|||
[self subclassResponsibility: _cmd];
|
||||
}
|
||||
|
||||
@end
|
||||
|
||||
@implementation NSMutableSetNonCore
|
||||
|
||||
- (id) initWithObjects: (id*)objects
|
||||
count: (unsigned)count
|
||||
{
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue