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
|
|
@ -28,48 +28,48 @@
|
|||
|
||||
@protocol IRCConnectionDelegate <OFObject>
|
||||
@optional
|
||||
- (void)connection: (IRCConnection*)connection
|
||||
didCreateSocket: (OF_KINDOF(OFTCPSocket)*)socket;
|
||||
- (void)connection: (IRCConnection*)connection
|
||||
didReceiveLine: (OFString*)line;
|
||||
- (void)connection: (IRCConnection*)connection
|
||||
didSendLine: (OFString*)line;
|
||||
- (void)connectionWasEstablished: (IRCConnection*)connection;
|
||||
- (void)connection: (IRCConnection*)connection
|
||||
didSeeUser: (IRCUser*)user
|
||||
joinChannel: (OFString*)channel;
|
||||
- (void)connection: (IRCConnection*)connection
|
||||
didSeeUser: (IRCUser*)user
|
||||
leaveChannel: (OFString*)channel
|
||||
reason: (OFString*)reason;
|
||||
- (void)connection: (IRCConnection*)connection
|
||||
didSeeUser: (IRCUser*)user
|
||||
changeNicknameTo: (OFString*)nickname;
|
||||
- (void)connection: (IRCConnection*)connection
|
||||
didSeeUser: (IRCUser*)user
|
||||
kickUser: (OFString*)kickedUser
|
||||
channel: (OFString*)channel
|
||||
reason: (OFString*)reason;
|
||||
- (void)connection: (IRCConnection*)connection
|
||||
didSeeUserQuit: (IRCUser*)user
|
||||
reason: (OFString*)reason;
|
||||
- (void)connection: (IRCConnection*)connection
|
||||
didReceiveMessage: (OFString*)msg
|
||||
channel: (OFString*)channel
|
||||
user: (IRCUser*)user;
|
||||
- (void)connection: (IRCConnection*)connection
|
||||
didReceivePrivateMessage: (OFString*)msg
|
||||
user: (IRCUser*)user;
|
||||
- (void)connection: (IRCConnection*)connection
|
||||
didReceiveNotice: (OFString*)notice
|
||||
user: (IRCUser*)user;
|
||||
- (void)connection: (IRCConnection*)connection
|
||||
didReceiveNotice: (OFString*)notice
|
||||
channel: (OFString*)channel
|
||||
user: (IRCUser*)user;
|
||||
- (void)connection: (IRCConnection*)connection
|
||||
didReceiveNamesForChannel: (OFString*)channel;
|
||||
- (void)connectionWasClosed: (IRCConnection*)connection;
|
||||
- (void)connection: (IRCConnection *)connection
|
||||
didCreateSocket: (OF_KINDOF(OFTCPSocket) *)socket;
|
||||
- (void)connection: (IRCConnection *)connection
|
||||
didReceiveLine: (OFString *)line;
|
||||
- (void)connection: (IRCConnection *)connection
|
||||
didSendLine: (OFString *)line;
|
||||
- (void)connectionWasEstablished: (IRCConnection *)connection;
|
||||
- (void)connection: (IRCConnection *)connection
|
||||
didSeeUser: (IRCUser *)user
|
||||
joinChannel: (OFString *)channel;
|
||||
- (void)connection: (IRCConnection *)connection
|
||||
didSeeUser: (IRCUser *)user
|
||||
leaveChannel: (OFString *)channel
|
||||
reason: (OFString *)reason;
|
||||
- (void)connection: (IRCConnection *)connection
|
||||
didSeeUser: (IRCUser *)user
|
||||
changeNicknameTo: (OFString *)nickname;
|
||||
- (void)connection: (IRCConnection *)connection
|
||||
didSeeUser: (IRCUser *)user
|
||||
kickUser: (OFString *)kickedUser
|
||||
channel: (OFString *)channel
|
||||
reason: (OFString *)reason;
|
||||
- (void)connection: (IRCConnection *)connection
|
||||
didSeeUserQuit: (IRCUser *)user
|
||||
reason: (OFString *)reason;
|
||||
- (void)connection: (IRCConnection *)connection
|
||||
didReceiveMessage: (OFString *)msg
|
||||
channel: (OFString *)channel
|
||||
user: (IRCUser *)user;
|
||||
- (void)connection: (IRCConnection *)connection
|
||||
didReceivePrivateMessage: (OFString *)msg
|
||||
user: (IRCUser *)user;
|
||||
- (void)connection: (IRCConnection *)connection
|
||||
didReceiveNotice: (OFString *)notice
|
||||
user: (IRCUser *)user;
|
||||
- (void)connection: (IRCConnection *)connection
|
||||
didReceiveNotice: (OFString *)notice
|
||||
channel: (OFString *)channel
|
||||
user: (IRCUser *)user;
|
||||
- (void)connection: (IRCConnection *)connection
|
||||
didReceiveNamesForChannel: (OFString *)channel;
|
||||
- (void)connectionWasClosed: (IRCConnection *)connection;
|
||||
@end
|
||||
|
||||
@interface IRCConnection: OFObject
|
||||
|
|
@ -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,33 +88,33 @@
|
|||
}
|
||||
|
||||
@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;
|
||||
|
||||
+ (instancetype)connection;
|
||||
- (void)sendLine: (OFString*)line;
|
||||
- (void)sendLineWithFormat: (OFConstantString*)line, ...;
|
||||
- (void)sendLine: (OFString *)line;
|
||||
- (void)sendLineWithFormat: (OFConstantString *)line, ...;
|
||||
- (void)connect;
|
||||
- (void)disconnect;
|
||||
- (void)disconnectWithReason: (OFString*)reason;
|
||||
- (void)joinChannel: (OFString*)channelName;
|
||||
- (void)leaveChannel: (OFString*)channel;
|
||||
- (void)leaveChannel: (OFString*)channel
|
||||
reason: (OFString*)reason;
|
||||
- (void)sendMessage: (OFString*)msg
|
||||
to: (OFString*)to;
|
||||
- (void)sendNotice: (OFString*)notice
|
||||
to: (OFString*)to;
|
||||
- (void)kickUser: (OFString*)user
|
||||
channel: (OFString*)channel
|
||||
reason: (OFString*)reason;
|
||||
- (void)changeNicknameTo: (OFString*)nickname;
|
||||
- (void)processLine: (OFString*)line;
|
||||
- (void)disconnectWithReason: (OFString *)reason;
|
||||
- (void)joinChannel: (OFString *)channelName;
|
||||
- (void)leaveChannel: (OFString *)channel;
|
||||
- (void)leaveChannel: (OFString *)channel
|
||||
reason: (OFString *)reason;
|
||||
- (void)sendMessage: (OFString *)msg
|
||||
to: (OFString *)to;
|
||||
- (void)sendNotice: (OFString *)notice
|
||||
to: (OFString *)to;
|
||||
- (void)kickUser: (OFString *)user
|
||||
channel: (OFString *)channel
|
||||
reason: (OFString *)reason;
|
||||
- (void)changeNicknameTo: (OFString *)nickname;
|
||||
- (void)processLine: (OFString *)line;
|
||||
- (void)handleConnection;
|
||||
- (OFSet*)usersInChannel: (OFString*)channel;
|
||||
- (OFSet OF_GENERIC(OFString *) *)usersInChannel: (OFString *)channel;
|
||||
@end
|
||||
|
|
|
|||
|
|
@ -110,7 +110,7 @@
|
|||
[self disconnectWithReason: nil];
|
||||
}
|
||||
|
||||
- (void)disconnectWithReason: (OFString*)reason
|
||||
- (void)disconnectWithReason: (OFString *)reason
|
||||
{
|
||||
void *pool = objc_autoreleasePoolPush();
|
||||
|
||||
|
|
@ -124,7 +124,7 @@
|
|||
objc_autoreleasePoolPop(pool);
|
||||
}
|
||||
|
||||
- (void)joinChannel: (OFString*)channel
|
||||
- (void)joinChannel: (OFString *)channel
|
||||
{
|
||||
void *pool = objc_autoreleasePoolPush();
|
||||
|
||||
|
|
@ -135,14 +135,14 @@
|
|||
objc_autoreleasePoolPop(pool);
|
||||
}
|
||||
|
||||
- (void)leaveChannel: (OFString*)channel
|
||||
- (void)leaveChannel: (OFString *)channel
|
||||
{
|
||||
[self leaveChannel: channel
|
||||
reason: nil];
|
||||
}
|
||||
|
||||
- (void)leaveChannel: (OFString*)channel
|
||||
reason: (OFString*)reason
|
||||
- (void)leaveChannel: (OFString *)channel
|
||||
reason: (OFString *)reason
|
||||
{
|
||||
void *pool = objc_autoreleasePoolPush();
|
||||
|
||||
|
|
@ -159,7 +159,7 @@
|
|||
objc_autoreleasePoolPop(pool);
|
||||
}
|
||||
|
||||
- (void)sendLine: (OFString*)line
|
||||
- (void)sendLine: (OFString *)line
|
||||
{
|
||||
if ([_delegate respondsToSelector: @selector(connection:didSendLine:)])
|
||||
[_delegate connection: self
|
||||
|
|
@ -168,7 +168,7 @@
|
|||
[_socket writeLine: line];
|
||||
}
|
||||
|
||||
- (void)sendLineWithFormat: (OFConstantString*)format, ...
|
||||
- (void)sendLineWithFormat: (OFConstantString *)format, ...
|
||||
{
|
||||
void *pool = objc_autoreleasePoolPush();
|
||||
OFString *line;
|
||||
|
|
@ -184,8 +184,8 @@
|
|||
objc_autoreleasePoolPop(pool);
|
||||
}
|
||||
|
||||
- (void)sendMessage: (OFString*)msg
|
||||
to: (OFString*)to
|
||||
- (void)sendMessage: (OFString *)msg
|
||||
to: (OFString *)to
|
||||
{
|
||||
void *pool = objc_autoreleasePoolPush();
|
||||
|
||||
|
|
@ -195,8 +195,8 @@
|
|||
objc_autoreleasePoolPop(pool);
|
||||
}
|
||||
|
||||
- (void)sendNotice: (OFString*)notice
|
||||
to: (OFString*)to
|
||||
- (void)sendNotice: (OFString *)notice
|
||||
to: (OFString *)to
|
||||
{
|
||||
void *pool = objc_autoreleasePoolPush();
|
||||
|
||||
|
|
@ -206,9 +206,9 @@
|
|||
objc_autoreleasePoolPop(pool);
|
||||
}
|
||||
|
||||
- (void)kickUser: (OFString*)user
|
||||
channel: (OFString*)channel
|
||||
reason: (OFString*)reason
|
||||
- (void)kickUser: (OFString *)user
|
||||
channel: (OFString *)channel
|
||||
reason: (OFString *)reason
|
||||
{
|
||||
void *pool = objc_autoreleasePoolPush();
|
||||
|
||||
|
|
@ -219,7 +219,7 @@
|
|||
objc_autoreleasePoolPop(pool);
|
||||
}
|
||||
|
||||
- (void)changeNicknameTo: (OFString*)nickname
|
||||
- (void)changeNicknameTo: (OFString *)nickname
|
||||
{
|
||||
void *pool = objc_autoreleasePoolPush();
|
||||
|
||||
|
|
@ -231,7 +231,7 @@
|
|||
objc_autoreleasePoolPop(pool);
|
||||
}
|
||||
|
||||
- (void)IRC_processLine: (OFString*)line
|
||||
- (void)IRC_processLine: (OFString *)line
|
||||
{
|
||||
OFArray *components;
|
||||
OFString *action = nil;
|
||||
|
|
@ -575,7 +575,7 @@
|
|||
_socket = nil;
|
||||
}
|
||||
|
||||
- (void)processLine: (OFString*)line
|
||||
- (void)processLine: (OFString *)line
|
||||
{
|
||||
void *pool = objc_autoreleasePoolPush();
|
||||
|
||||
|
|
@ -584,9 +584,9 @@
|
|||
objc_autoreleasePoolPop(pool);
|
||||
}
|
||||
|
||||
- (bool)socket: (OFTCPSocket*)socket
|
||||
didReceiveWronglyEncodedLine: (OFString*)line
|
||||
exception: (OFException*)exception
|
||||
- (bool)socket: (OFTCPSocket *)socket
|
||||
didReceiveWronglyEncodedLine: (OFString *)line
|
||||
exception: (OFException *)exception
|
||||
{
|
||||
if (line != nil) {
|
||||
[self IRC_processLine: line];
|
||||
|
|
@ -599,9 +599,9 @@
|
|||
return false;
|
||||
}
|
||||
|
||||
- (bool)socket: (OFTCPSocket*)socket
|
||||
didReceiveLine: (OFString*)line
|
||||
exception: (OFException*)exception
|
||||
- (bool)socket: (OFTCPSocket *)socket
|
||||
didReceiveLine: (OFString *)line
|
||||
exception: (OFException *)exception
|
||||
{
|
||||
if (line != nil) {
|
||||
[self IRC_processLine: line];
|
||||
|
|
@ -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,8 +28,8 @@
|
|||
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;
|
||||
+ (instancetype)IRCUserWithString: (OFString *)string;
|
||||
- initWithString: (OFString *)string;
|
||||
@end
|
||||
|
|
|
|||
|
|
@ -36,12 +36,12 @@
|
|||
@implementation IRCUser
|
||||
@synthesize username = _username, nickname = _nickname, hostname = _hostname;
|
||||
|
||||
+ (instancetype)IRCUserWithString: (OFString*)string
|
||||
+ (instancetype)IRCUserWithString: (OFString *)string
|
||||
{
|
||||
return [[[self alloc] initWithString: string] autorelease];
|
||||
}
|
||||
|
||||
- initWithString: (OFString*)string
|
||||
- initWithString: (OFString *)string
|
||||
{
|
||||
char *tmp2 = NULL;
|
||||
|
||||
|
|
@ -93,7 +93,7 @@
|
|||
return [self retain];
|
||||
}
|
||||
|
||||
- (OFString*)description
|
||||
- (OFString *)description
|
||||
{
|
||||
return [OFString stringWithFormat: @"%@!%@@%@",
|
||||
_nickname, _username, _hostname];
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue