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

More consistent naming

Browse source 
FossilOrigin-Name: 58b8dc229fd4e0d8b3038b5a2d8c575783b107664f76aaf6db219b20e3f8d06d
This commit is contained in:
Jonathan Schleifer 2024-08-17 00:20:17 +00:00
parent a881575bf3
commit 854e63554c
3 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/IRCConnection.m
View file

@ -296,7 +296,7 @@
OFMutableSet *channel; OFMutableSet *channel;
who = [who substringFromIndex: 1]; who = [who substringFromIndex: 1];
user = [IRCUser IRCUserWithString: who]; user = [IRCUser userWithString: who];
if ([who hasPrefix: if ([who hasPrefix:
[_nickname stringByAppendingString: @"!"]]) { [_nickname stringByAppendingString: @"!"]]) {
@ -367,7 +367,7 @@
[[components objectAtIndex: 1] length] + 1 + where.length; [[components objectAtIndex: 1] length] + 1 + where.length;
who = [who substringFromIndex: 1]; who = [who substringFromIndex: 1];
user = [IRCUser IRCUserWithString: who]; user = [IRCUser userWithString: who];
channel = [_channels objectForKey: where]; channel = [_channels objectForKey: where];
if (components.count > 3) if (components.count > 3)
@ -398,7 +398,7 @@
where.length + 1 + whom.length; where.length + 1 + whom.length;
who = [who substringFromIndex: 1]; who = [who substringFromIndex: 1];
user = [IRCUser IRCUserWithString: who]; user = [IRCUser userWithString: who];
channel = [_channels objectForKey: where]; channel = [_channels objectForKey: where];
if (components.count > 4) if (components.count > 4)
@ -426,7 +426,7 @@
[[components objectAtIndex: 1] length]; [[components objectAtIndex: 1] length];
who = [who substringFromIndex: 1]; who = [who substringFromIndex: 1];
user = [IRCUser IRCUserWithString: who]; user = [IRCUser userWithString: who];
if ([components count] > 2) if ([components count] > 2)
reason = [line substringFromIndex: pos + 2]; reason = [line substringFromIndex: pos + 2];
@ -453,7 +453,7 @@
who = [who substringFromIndex: 1]; who = [who substringFromIndex: 1];
nickname = [nickname substringFromIndex: 1]; nickname = [nickname substringFromIndex: 1];
user = [IRCUser IRCUserWithString: who]; user = [IRCUser userWithString: who];
if ([user.nickname isEqual: _nickname]) { if ([user.nickname isEqual: _nickname]) {
[_nickname release]; [_nickname release];
@ -487,7 +487,7 @@
from = [from substringFromIndex: 1]; from = [from substringFromIndex: 1];
message = [line substringFromIndex: pos + 2]; message = [line substringFromIndex: pos + 2];
user = [IRCUser IRCUserWithString: from]; user = [IRCUser userWithString: from];
if (![to isEqual: _nickname]) { if (![to isEqual: _nickname]) {
if ([_delegate respondsToSelector: @selector(connection: if ([_delegate respondsToSelector: @selector(connection:
@ -524,7 +524,7 @@
return; return;
} }
user = [IRCUser IRCUserWithString: from]; user = [IRCUser userWithString: from];
if (![to isEqual: _nickname]) { if (![to isEqual: _nickname]) {
if ([_delegate respondsToSelector: @selector(connection: if ([_delegate respondsToSelector: @selector(connection:

2
src/IRCUser.h
View file

@ -32,7 +32,7 @@ OF_ASSUME_NONNULL_BEGIN
@property (readonly, nonatomic) OFString *nickname, *username, *hostname; @property (readonly, nonatomic) OFString *nickname, *username, *hostname;
+ (instancetype)IRCUserWithString: (OFString *)string; + (instancetype)userWithString: (OFString *)string;
- (instancetype)initWithString: (OFString *)string OF_DESIGNATED_INITIALIZER; - (instancetype)initWithString: (OFString *)string OF_DESIGNATED_INITIALIZER;
@end @end

2
src/IRCUser.m
View file

@ -36,7 +36,7 @@
@implementation IRCUser @implementation IRCUser
@synthesize username = _username, nickname = _nickname, hostname = _hostname; @synthesize username = _username, nickname = _nickname, hostname = _hostname;
+ (instancetype)IRCUserWithString: (OFString *)string + (instancetype)userWithString: (OFString *)string
{ {
return [[[self alloc] initWithString: string] autorelease]; return [[[self alloc] initWithString: string] autorelease];
} }