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

126
src/IRCConnection.h
View file

@ -28,48 +28,48 @@
@protocol IRCConnectionDelegate <OFObject> @protocol IRCConnectionDelegate <OFObject>
@optional @optional
- (void)connection: (IRCConnection*)connection - (void)connection: (IRCConnection *)connection
didCreateSocket: (OF_KINDOF(OFTCPSocket)*)socket; didCreateSocket: (OF_KINDOF(OFTCPSocket) *)socket;
- (void)connection: (IRCConnection*)connection - (void)connection: (IRCConnection *)connection
didReceiveLine: (OFString*)line; didReceiveLine: (OFString *)line;
- (void)connection: (IRCConnection*)connection - (void)connection: (IRCConnection *)connection
didSendLine: (OFString*)line; didSendLine: (OFString *)line;
- (void)connectionWasEstablished: (IRCConnection*)connection; - (void)connectionWasEstablished: (IRCConnection *)connection;
- (void)connection: (IRCConnection*)connection - (void)connection: (IRCConnection *)connection
didSeeUser: (IRCUser*)user didSeeUser: (IRCUser *)user
joinChannel: (OFString*)channel; joinChannel: (OFString *)channel;
- (void)connection: (IRCConnection*)connection - (void)connection: (IRCConnection *)connection
didSeeUser: (IRCUser*)user didSeeUser: (IRCUser *)user
leaveChannel: (OFString*)channel leaveChannel: (OFString *)channel
reason: (OFString*)reason; reason: (OFString *)reason;
- (void)connection: (IRCConnection*)connection - (void)connection: (IRCConnection *)connection
didSeeUser: (IRCUser*)user didSeeUser: (IRCUser *)user
changeNicknameTo: (OFString*)nickname; changeNicknameTo: (OFString *)nickname;
- (void)connection: (IRCConnection*)connection - (void)connection: (IRCConnection *)connection
didSeeUser: (IRCUser*)user didSeeUser: (IRCUser *)user
kickUser: (OFString*)kickedUser kickUser: (OFString *)kickedUser
channel: (OFString*)channel channel: (OFString *)channel
reason: (OFString*)reason; reason: (OFString *)reason;
- (void)connection: (IRCConnection*)connection - (void)connection: (IRCConnection *)connection
didSeeUserQuit: (IRCUser*)user didSeeUserQuit: (IRCUser *)user
reason: (OFString*)reason; reason: (OFString *)reason;
- (void)connection: (IRCConnection*)connection - (void)connection: (IRCConnection *)connection
didReceiveMessage: (OFString*)msg didReceiveMessage: (OFString *)msg
channel: (OFString*)channel channel: (OFString *)channel
user: (IRCUser*)user; user: (IRCUser *)user;
- (void)connection: (IRCConnection*)connection - (void)connection: (IRCConnection *)connection
didReceivePrivateMessage: (OFString*)msg didReceivePrivateMessage: (OFString *)msg
user: (IRCUser*)user; user: (IRCUser *)user;
- (void)connection: (IRCConnection*)connection - (void)connection: (IRCConnection *)connection
didReceiveNotice: (OFString*)notice didReceiveNotice: (OFString *)notice
user: (IRCUser*)user; user: (IRCUser *)user;
- (void)connection: (IRCConnection*)connection - (void)connection: (IRCConnection *)connection
didReceiveNotice: (OFString*)notice didReceiveNotice: (OFString *)notice
channel: (OFString*)channel channel: (OFString *)channel
user: (IRCUser*)user; user: (IRCUser *)user;
- (void)connection: (IRCConnection*)connection - (void)connection: (IRCConnection *)connection
didReceiveNamesForChannel: (OFString*)channel; didReceiveNamesForChannel: (OFString *)channel;
- (void)connectionWasClosed: (IRCConnection*)connection; - (void)connectionWasClosed: (IRCConnection *)connection;
@end @end
@interface IRCConnection: OFObject @interface IRCConnection: OFObject
@ -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,33 +88,33 @@
} }
@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;
+ (instancetype)connection; + (instancetype)connection;
- (void)sendLine: (OFString*)line; - (void)sendLine: (OFString *)line;
- (void)sendLineWithFormat: (OFConstantString*)line, ...; - (void)sendLineWithFormat: (OFConstantString *)line, ...;
- (void)connect; - (void)connect;
- (void)disconnect; - (void)disconnect;
- (void)disconnectWithReason: (OFString*)reason; - (void)disconnectWithReason: (OFString *)reason;
- (void)joinChannel: (OFString*)channelName; - (void)joinChannel: (OFString *)channelName;
- (void)leaveChannel: (OFString*)channel; - (void)leaveChannel: (OFString *)channel;
- (void)leaveChannel: (OFString*)channel - (void)leaveChannel: (OFString *)channel
reason: (OFString*)reason; reason: (OFString *)reason;
- (void)sendMessage: (OFString*)msg - (void)sendMessage: (OFString *)msg
to: (OFString*)to; to: (OFString *)to;
- (void)sendNotice: (OFString*)notice - (void)sendNotice: (OFString *)notice
to: (OFString*)to; to: (OFString *)to;
- (void)kickUser: (OFString*)user - (void)kickUser: (OFString *)user
channel: (OFString*)channel channel: (OFString *)channel
reason: (OFString*)reason; reason: (OFString *)reason;
- (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

51
src/IRCConnection.m
View file

@ -110,7 +110,7 @@
[self disconnectWithReason: nil]; [self disconnectWithReason: nil];
} }
- (void)disconnectWithReason: (OFString*)reason - (void)disconnectWithReason: (OFString *)reason
{ {
void *pool = objc_autoreleasePoolPush(); void *pool = objc_autoreleasePoolPush();
@ -124,7 +124,7 @@
objc_autoreleasePoolPop(pool); objc_autoreleasePoolPop(pool);
} }
- (void)joinChannel: (OFString*)channel - (void)joinChannel: (OFString *)channel
{ {
void *pool = objc_autoreleasePoolPush(); void *pool = objc_autoreleasePoolPush();
@ -135,14 +135,14 @@
objc_autoreleasePoolPop(pool); objc_autoreleasePoolPop(pool);
} }
- (void)leaveChannel: (OFString*)channel - (void)leaveChannel: (OFString *)channel
{ {
[self leaveChannel: channel [self leaveChannel: channel
reason: nil]; reason: nil];
} }
- (void)leaveChannel: (OFString*)channel - (void)leaveChannel: (OFString *)channel
reason: (OFString*)reason reason: (OFString *)reason
{ {
void *pool = objc_autoreleasePoolPush(); void *pool = objc_autoreleasePoolPush();
@ -159,7 +159,7 @@
objc_autoreleasePoolPop(pool); objc_autoreleasePoolPop(pool);
} }
- (void)sendLine: (OFString*)line - (void)sendLine: (OFString *)line
{ {
if ([_delegate respondsToSelector: @selector(connection:didSendLine:)]) if ([_delegate respondsToSelector: @selector(connection:didSendLine:)])
[_delegate connection: self [_delegate connection: self
@ -168,7 +168,7 @@
[_socket writeLine: line]; [_socket writeLine: line];
} }
- (void)sendLineWithFormat: (OFConstantString*)format, ... - (void)sendLineWithFormat: (OFConstantString *)format, ...
{ {
void *pool = objc_autoreleasePoolPush(); void *pool = objc_autoreleasePoolPush();
OFString *line; OFString *line;
@ -184,8 +184,8 @@
objc_autoreleasePoolPop(pool); objc_autoreleasePoolPop(pool);
} }
- (void)sendMessage: (OFString*)msg - (void)sendMessage: (OFString *)msg
to: (OFString*)to to: (OFString *)to
{ {
void *pool = objc_autoreleasePoolPush(); void *pool = objc_autoreleasePoolPush();
@ -195,8 +195,8 @@
objc_autoreleasePoolPop(pool); objc_autoreleasePoolPop(pool);
} }
- (void)sendNotice: (OFString*)notice - (void)sendNotice: (OFString *)notice
to: (OFString*)to to: (OFString *)to
{ {
void *pool = objc_autoreleasePoolPush(); void *pool = objc_autoreleasePoolPush();
@ -206,9 +206,9 @@
objc_autoreleasePoolPop(pool); objc_autoreleasePoolPop(pool);
} }
- (void)kickUser: (OFString*)user - (void)kickUser: (OFString *)user
channel: (OFString*)channel channel: (OFString *)channel
reason: (OFString*)reason reason: (OFString *)reason
{ {
void *pool = objc_autoreleasePoolPush(); void *pool = objc_autoreleasePoolPush();
@ -219,7 +219,7 @@
objc_autoreleasePoolPop(pool); objc_autoreleasePoolPop(pool);
} }
- (void)changeNicknameTo: (OFString*)nickname - (void)changeNicknameTo: (OFString *)nickname
{ {
void *pool = objc_autoreleasePoolPush(); void *pool = objc_autoreleasePoolPush();
@ -231,7 +231,7 @@
objc_autoreleasePoolPop(pool); objc_autoreleasePoolPop(pool);
} }
- (void)IRC_processLine: (OFString*)line - (void)IRC_processLine: (OFString *)line
{ {
OFArray *components; OFArray *components;
OFString *action = nil; OFString *action = nil;
@ -575,7 +575,7 @@
_socket = nil; _socket = nil;
} }
- (void)processLine: (OFString*)line - (void)processLine: (OFString *)line
{ {
void *pool = objc_autoreleasePoolPush(); void *pool = objc_autoreleasePoolPush();
@ -584,9 +584,9 @@
objc_autoreleasePoolPop(pool); objc_autoreleasePoolPop(pool);
} }
- (bool)socket: (OFTCPSocket*)socket - (bool)socket: (OFTCPSocket *)socket
didReceiveWronglyEncodedLine: (OFString*)line didReceiveWronglyEncodedLine: (OFString *)line
exception: (OFException*)exception exception: (OFException *)exception
{ {
if (line != nil) { if (line != nil) {
[self IRC_processLine: line]; [self IRC_processLine: line];
@ -599,9 +599,9 @@
return false; return false;
} }
- (bool)socket: (OFTCPSocket*)socket - (bool)socket: (OFTCPSocket *)socket
didReceiveLine: (OFString*)line didReceiveLine: (OFString *)line
exception: (OFException*)exception exception: (OFException *)exception
{ {
if (line != nil) { if (line != nil) {
[self IRC_processLine: line]; [self IRC_processLine: line];
@ -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];
} }

6
src/IRCUser.h
View file

@ -28,8 +28,8 @@
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;
@end @end

6
src/IRCUser.m
View file

@ -36,12 +36,12 @@
@implementation IRCUser @implementation IRCUser
@synthesize username = _username, nickname = _nickname, hostname = _hostname; @synthesize username = _username, nickname = _nickname, hostname = _hostname;
+ (instancetype)IRCUserWithString: (OFString*)string + (instancetype)IRCUserWithString: (OFString *)string
{ {
return [[[self alloc] initWithString: string] autorelease]; return [[[self alloc] initWithString: string] autorelease];
} }
- initWithString: (OFString*)string - initWithString: (OFString *)string
{ {
char *tmp2 = NULL; char *tmp2 = NULL;
@ -93,7 +93,7 @@
return [self retain]; return [self retain];
} }
- (OFString*)description - (OFString *)description
{ {
return [OFString stringWithFormat: @"%@!%@@%@", return [OFString stringWithFormat: @"%@!%@@%@",
_nickname, _username, _hostname]; _nickname, _username, _hostname];