Adjust to recent ObjFW changes
FossilOrigin-Name: 5dbb32c6338070feb8da288258a105e7182ea60fb9a4ec6c693593f659baa048
This commit is contained in:
parent
a145344ad2
commit
8e0b20e7b4
4 changed files with 95 additions and 94 deletions
|
@ -79,7 +79,7 @@
|
|||
OFString *_server;
|
||||
uint16_t _port;
|
||||
OFString *_nickname, *_username, *_realname;
|
||||
OFMutableDictionary *_channels;
|
||||
OFMutableDictionary OF_GENERIC(OFString *, OFMutableSet *) *_channels;
|
||||
id <IRCConnectionDelegate> _delegate;
|
||||
of_string_encoding_t _fallbackEncoding;
|
||||
of_time_interval_t _pingInterval, _pingTimeout;
|
||||
|
@ -88,11 +88,11 @@
|
|||
}
|
||||
|
||||
@property (assign) Class socketClass;
|
||||
@property (copy) OFString *server;
|
||||
@property (nonatomic, copy) OFString *server;
|
||||
@property uint16_t port;
|
||||
@property (copy) OFString *nickname, *username, *realname;
|
||||
@property (nonatomic, copy) OFString *nickname, *username, *realname;
|
||||
@property (assign) id <IRCConnectionDelegate> delegate;
|
||||
@property (readonly, retain) OFTCPSocket *socket;
|
||||
@property (readonly, nonatomic) OFTCPSocket *socket;
|
||||
@property of_string_encoding_t fallbackEncoding;
|
||||
@property of_time_interval_t pingInterval, pingTimeout;
|
||||
|
||||
|
@ -116,5 +116,5 @@
|
|||
- (void)changeNicknameTo: (OFString *)nickname;
|
||||
- (void)processLine: (OFString *)line;
|
||||
- (void)handleConnection;
|
||||
- (OFSet*)usersInChannel: (OFString*)channel;
|
||||
- (OFSet OF_GENERIC(OFString *) *)usersInChannel: (OFString *)channel;
|
||||
@end
|
||||
|
|
|
@ -623,7 +623,8 @@
|
|||
|
||||
[_pingTimer invalidate];
|
||||
|
||||
[_socket cancelAsyncRequests];
|
||||
[_socket performSelector: @selector(cancelAsyncRequests)
|
||||
afterDelay: 0];
|
||||
[_socket release];
|
||||
_socket = nil;
|
||||
|
||||
|
@ -637,7 +638,7 @@
|
|||
exception:)];
|
||||
}
|
||||
|
||||
- (OFSet*)usersInChannel: (OFString*)channel
|
||||
- (OFSet OF_GENERIC(OFString *) *)usersInChannel: (OFString *)channel
|
||||
{
|
||||
return [[[_channels objectForKey: channel] copy] autorelease];
|
||||
}
|
||||
|
|
|
@ -28,7 +28,7 @@
|
|||
OFString *_nickname, *_username, *_hostname;
|
||||
}
|
||||
|
||||
@property (copy, readonly) OFString *nickname, *username, *hostname;
|
||||
@property (readonly, nonatomic) OFString *nickname, *username, *hostname;
|
||||
|
||||
+ (instancetype)IRCUserWithString: (OFString *)string;
|
||||
- initWithString: (OFString *)string;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue