mirror of
https://github.com/gnustep/libs-base.git
synced 2025-04-22 16:33:29 +00:00
Overhaul for new collection class scheme to improve distributed
objects and NeXT-compatibility. Change several methods to return void. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@944 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
b3980320d5
commit
d53ac681bb
1 changed files with 15 additions and 18 deletions
|
@ -103,26 +103,24 @@
|
|||
|
||||
// MANIPULATING COLLECTION OF DELEGATES;
|
||||
|
||||
- delegatePoolAddObject: anObject
|
||||
- (void) delegatePoolAddObject: anObject
|
||||
{
|
||||
[_list addObject: anObject];
|
||||
return self;
|
||||
}
|
||||
|
||||
- delegatePoolAddObjectIfAbsent: anObject
|
||||
- (void) delegatePoolAddObjectIfAbsent: anObject
|
||||
{
|
||||
[_list addObjectIfAbsent: anObject];
|
||||
return self;
|
||||
}
|
||||
|
||||
- delegatePoolRemoveObject: anObject
|
||||
- (void) delegatePoolRemoveObject: anObject
|
||||
{
|
||||
return [_list removeObject:anObject];
|
||||
[_list removeObject:anObject];
|
||||
}
|
||||
|
||||
- (BOOL) delegatePoolIncludesObject: anObject
|
||||
{
|
||||
return [_list includesObject:anObject];
|
||||
return [_list containsObject:anObject];
|
||||
}
|
||||
|
||||
- delegatePoolCollection
|
||||
|
@ -135,10 +133,9 @@
|
|||
return _send_behavior;
|
||||
}
|
||||
|
||||
- delegatePoolSetSendBehavior: (unsigned char)b
|
||||
- (void) delegatePoolSetSendBehavior: (unsigned char)b
|
||||
{
|
||||
_send_behavior = b;
|
||||
return self;
|
||||
}
|
||||
|
||||
- (BOOL) delegatePoolLastMessageHadReceivers
|
||||
|
@ -151,7 +148,7 @@
|
|||
- forward: (SEL)aSel :(arglist_t)argFrame
|
||||
{
|
||||
void *ret = 0;
|
||||
elt delegate;
|
||||
id delegate;
|
||||
|
||||
_last_message_had_receivers = NO;
|
||||
switch (_send_behavior)
|
||||
|
@ -159,9 +156,9 @@
|
|||
case SEND_TO_ALL:
|
||||
FOR_ARRAY(_list, delegate)
|
||||
{
|
||||
if ([delegate.id_u respondsTo:aSel])
|
||||
if ([delegate respondsTo:aSel])
|
||||
{
|
||||
ret = [delegate.id_u performv:aSel :argFrame];
|
||||
ret = [delegate performv:aSel :argFrame];
|
||||
_last_message_had_receivers = YES;
|
||||
}
|
||||
}
|
||||
|
@ -171,10 +168,10 @@
|
|||
case SEND_TO_FIRST_RESPONDER:
|
||||
FOR_ARRAY(_list, delegate)
|
||||
{
|
||||
if ([delegate.id_u respondsTo:aSel])
|
||||
if ([delegate respondsTo:aSel])
|
||||
{
|
||||
_last_message_had_receivers = YES;
|
||||
return [delegate.id_u performv:aSel :argFrame];
|
||||
return [delegate performv:aSel :argFrame];
|
||||
}
|
||||
}
|
||||
FOR_ARRAY_END;
|
||||
|
@ -183,10 +180,10 @@
|
|||
case SEND_UNTIL_YES:
|
||||
FOR_ARRAY(_list, delegate)
|
||||
{
|
||||
if ([delegate.id_u respondsTo:aSel])
|
||||
if ([delegate respondsTo:aSel])
|
||||
{
|
||||
_last_message_had_receivers = YES;
|
||||
if ((ret = [delegate.id_u performv:aSel :argFrame]))
|
||||
if ((ret = [delegate performv:aSel :argFrame]))
|
||||
return ret;
|
||||
}
|
||||
}
|
||||
|
@ -196,10 +193,10 @@
|
|||
case SEND_UNTIL_NO:
|
||||
FOR_ARRAY(_list, delegate)
|
||||
{
|
||||
if ([delegate.id_u respondsTo:aSel])
|
||||
if ([delegate respondsTo:aSel])
|
||||
{
|
||||
_last_message_had_receivers = YES;
|
||||
if (!(ret = [delegate.id_u performv:aSel :argFrame]))
|
||||
if (!(ret = [delegate performv:aSel :argFrame]))
|
||||
return ret;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue