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

Make observer type consistent

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@27154 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2008-11-27 15:34:01 +00:00
parent 983cb4e634
commit 3f1d51dcd0
4 changed files with 25 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2008-11-27 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSDistributedNotificationCenter.m:
* Tools/gdnc.h:
* Tools/gdnc.m:
Use NSUInteger for the observer ID.
2008-11-27 Richard Frith-Macdonald <rfm@gnu.org>
* Documentation/GNUmakefile:

16
Source/NSDistributedNotificationCenter.m
View file

@ -54,7 +54,7 @@
object: (NSString*)object
userInfo: (NSData*)info
selector: (NSString*)aSelector
to: (size_t)observer;
to: (NSUInteger)observer;
@end
/**
@ -338,7 +338,7 @@ static NSDistributedNotificationCenter *netCenter = nil;
NS_DURING
{
[self _connect];
[(id<GDNCProtocol>)_remote addObserver: (size_t)anObserver
[(id<GDNCProtocol>)_remote addObserver: (NSUInteger)anObserver
selector: NSStringFromSelector(aSelector)
name: notificationName
object: anObject
@ -464,7 +464,7 @@ static NSDistributedNotificationCenter *netCenter = nil;
NS_DURING
{
[self _connect];
[(id<GDNCProtocol>)_remote removeObserver: (size_t)anObserver
[(id<GDNCProtocol>)_remote removeObserver: (NSUInteger)anObserver
name: notificationName
object: anObject
for: (id<GDNCClient>)self];
@ -518,7 +518,7 @@ static NSDistributedNotificationCenter *netCenter = nil;
* in the source where the '@protocol()' directive is used.
*/
@interface NSDistributedNotificationCenterDummy : NSObject <GDNCProtocol>
- (void) addObserver: (size_t)anObserver
- (void) addObserver: (NSUInteger)anObserver
selector: (NSString*)aSelector
name: (NSString*)notificationname
object: (NSString*)anObject
@ -530,7 +530,7 @@ static NSDistributedNotificationCenter *netCenter = nil;
deliverImmediately: (BOOL)deliverImmediately
for: (id<GDNCClient>)client;
- (void) registerClient: (id<GDNCClient>)client;
- (void) removeObserver: (size_t)anObserver
- (void) removeObserver: (NSUInteger)anObserver
name: (NSString*)notificationname
object: (NSString*)anObject
for: (id<GDNCClient>)client;
@ -540,7 +540,7 @@ static NSDistributedNotificationCenter *netCenter = nil;
@end
@implementation NSDistributedNotificationCenterDummy
- (void) addObserver: (size_t)anObserver
- (void) addObserver: (NSUInteger)anObserver
selector: (NSString*)aSelector
name: (NSString*)notificationname
object: (NSString*)anObject
@ -558,7 +558,7 @@ static NSDistributedNotificationCenter *netCenter = nil;
- (void) registerClient: (id<GDNCClient>)client
{
}
- (void) removeObserver: (size_t)anObserver
- (void) removeObserver: (NSUInteger)anObserver
name: (NSString*)notificationname
object: (NSString*)anObject
for: (id<GDNCClient>)client
@ -815,7 +815,7 @@ static NSDistributedNotificationCenter *netCenter = nil;
object: (NSString*)object
userInfo: (NSData*)info
selector: (NSString*)aSelector
to: (size_t)observer
to: (NSUInteger)observer
{
id userInfo;
NSNotification *notification;

6
Tools/gdnc.h
View file

@ -26,11 +26,11 @@
object: (NSString*)object
userInfo: (NSData*)info
selector: (NSString*)aSelector
to: (unsigned long)observer;
to: (NSUInteger)observer;
@end
@protocol GDNCProtocol
- (void) addObserver: (unsigned long)anObserver
- (void) addObserver: (NSUInteger)anObserver
selector: (NSString*)aSelector
name: (NSString*)notificationname
object: (NSString*)anObject
@ -45,7 +45,7 @@
- (void) registerClient: (id<GDNCClient>)client;
- (void) removeObserver: (unsigned long)anObserver
- (void) removeObserver: (NSUInteger)anObserver
name: (NSString*)notificationname
object: (NSString*)anObject
for: (id<GDNCClient>)client;

14
Tools/gdnc.m
View file

@ -161,14 +161,14 @@ ihandler(int sig)
object: (NSString*)object
userInfo: (NSData*)info
selector: (NSString*)aSelector
to: (unsigned long)observer;
to: (NSUInteger)observer;
@end
@implementation NSDistributedNotificationCenterGDNCDummy
- (oneway void) postNotificationName: (NSString*)name
object: (NSString*)object
userInfo: (NSData*)info
selector: (NSString*)aSelector
to: (unsigned long)observer
to: (NSUInteger)observer
{
return;
}
@ -251,7 +251,7 @@ ihandler(int sig)
@interface GDNCObserver : NSObject
{
@public
unsigned long observer;
NSUInteger observer;
NSString *notificationName;
NSString *notificationObject;
NSString *selector;
@ -289,7 +289,7 @@ ihandler(int sig)
NSMutableDictionary *observersForObjects;
}
- (void) addObserver: (unsigned long)anObserver
- (void) addObserver: (NSUInteger)anObserver
selector: (NSString*)aSelector
name: (NSString*)notificationName
object: (NSString*)anObject
@ -311,7 +311,7 @@ ihandler(int sig)
- (void) removeObserversForClients: (NSMapTable*)clients;
- (void) removeObserver: (unsigned long)anObserver
- (void) removeObserver: (NSUInteger)anObserver
name: (NSString*)notificationName
object: (NSString*)notificationObject
for: (id<GDNCClient>)client;
@ -518,7 +518,7 @@ ihandler(int sig)
return self;
}
- (void) addObserver: (unsigned long)anObserver
- (void) addObserver: (NSUInteger)anObserver
selector: (NSString*)aSelector
name: (NSString*)notificationName
object: (NSString*)anObject
@ -880,7 +880,7 @@ ihandler(int sig)
}
}
- (void) removeObserver: (unsigned long)anObserver
- (void) removeObserver: (NSUInteger)anObserver
name: (NSString*)notificationName
object: (NSString*)notificationObject
for: (id<GDNCClient>)client