ObjFW/ObjIRC
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Adjust to recent ObjFW changes

Browse source 
FossilOrigin-Name: 5dbb32c6338070feb8da288258a105e7182ea60fb9a4ec6c693593f659baa048
This commit is contained in:
Jonathan Schleifer 2017-05-08 00:54:30 +00:00
parent a145344ad2
commit 8e0b20e7b4
4 changed files with 95 additions and 94 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/IRCConnection.h
View file

@ -79,7 +79,7 @@
OFString *_server; OFString *_server;
uint16_t _port; uint16_t _port;
OFString *_nickname, *_username, *_realname; OFString *_nickname, *_username, *_realname;
OFMutableDictionary *_channels; OFMutableDictionary OF_GENERIC(OFString *, OFMutableSet *) *_channels;
id <IRCConnectionDelegate> _delegate; id <IRCConnectionDelegate> _delegate;
of_string_encoding_t _fallbackEncoding; of_string_encoding_t _fallbackEncoding;
of_time_interval_t _pingInterval, _pingTimeout; of_time_interval_t _pingInterval, _pingTimeout;
@ -88,11 +88,11 @@
} }
@property (assign) Class socketClass; @property (assign) Class socketClass;
@property (copy) OFString *server; @property (nonatomic, copy) OFString *server;
@property uint16_t port; @property uint16_t port;
@property (copy) OFString *nickname, *username, *realname; @property (nonatomic, copy) OFString *nickname, *username, *realname;
@property (assign) id <IRCConnectionDelegate> delegate; @property (assign) id <IRCConnectionDelegate> delegate;
@property (readonly, retain) OFTCPSocket *socket; @property (readonly, nonatomic) OFTCPSocket *socket;
@property of_string_encoding_t fallbackEncoding; @property of_string_encoding_t fallbackEncoding;
@property of_time_interval_t pingInterval, pingTimeout; @property of_time_interval_t pingInterval, pingTimeout;
@ -116,5 +116,5 @@
- (void)changeNicknameTo: (OFString *)nickname; - (void)changeNicknameTo: (OFString *)nickname;
- (void)processLine: (OFString *)line; - (void)processLine: (OFString *)line;
- (void)handleConnection; - (void)handleConnection;
- (OFSet*)usersInChannel: (OFString*)channel; - (OFSet OF_GENERIC(OFString *) *)usersInChannel: (OFString *)channel;
@end @end

5
src/IRCConnection.m
View file

@ -623,7 +623,8 @@
[_pingTimer invalidate]; [_pingTimer invalidate];
[_socket cancelAsyncRequests]; [_socket performSelector: @selector(cancelAsyncRequests)
afterDelay: 0];
[_socket release]; [_socket release];
_socket = nil; _socket = nil;
@ -637,7 +638,7 @@
exception:)]; exception:)];
} }
- (OFSet*)usersInChannel: (OFString*)channel - (OFSet OF_GENERIC(OFString *) *)usersInChannel: (OFString *)channel
{ {
return [[[_channels objectForKey: channel] copy] autorelease]; return [[[_channels objectForKey: channel] copy] autorelease];
} }

2
src/IRCUser.h
View file

@ -28,7 +28,7 @@
OFString *_nickname, *_username, *_hostname; OFString *_nickname, *_username, *_hostname;
} }
@property (copy, readonly) OFString *nickname, *username, *hostname; @property (readonly, nonatomic) OFString *nickname, *username, *hostname;
+ (instancetype)IRCUserWithString: (OFString *)string; + (instancetype)IRCUserWithString: (OFString *)string;
- initWithString: (OFString *)string; - initWithString: (OFString *)string;