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

Fix missing ivars missing the underscore prefix.

Browse source
This commit is contained in:
Jonathan Schleifer 2013-02-14 00:24:13 +01:00
parent 869b122a15
commit 46f2007247
2 changed files with 96 additions and 96 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/XMPPExceptions.h
View file

@ -71,8 +71,8 @@
@interface XMPPStreamErrorException: XMPPException @interface XMPPStreamErrorException: XMPPException
{ {
/// \cond internal /// \cond internal
OFString *condition; OFString *_condition;
OFString *reason; OFString *_reason;
/// \endcond /// \endcond
} }
@ -122,8 +122,8 @@
@interface XMPPStringPrepFailedException: XMPPException @interface XMPPStringPrepFailedException: XMPPException
{ {
/// \cond internal /// \cond internal
OFString *profile; OFString *_profile;
OFString *string; OFString *_string;
/// \endcond /// \endcond
} }
@ -172,8 +172,8 @@
@interface XMPPIDNATranslationFailedException: XMPPException @interface XMPPIDNATranslationFailedException: XMPPException
{ {
/// \cond internal /// \cond internal
OFString *operation; OFString *_operation;
OFString *string; OFString *_string;
/// \endcond /// \endcond
} }
@ -222,7 +222,7 @@
@interface XMPPAuthFailedException: XMPPException @interface XMPPAuthFailedException: XMPPException
{ {
/// \cond internal /// \cond internal
OFString *reason; OFString *_reason;
/// \endcond /// \endcond
} }

178
src/XMPPExceptions.m
View file

@ -28,14 +28,14 @@
#import "XMPPConnection.h" #import "XMPPConnection.h"
@implementation XMPPException @implementation XMPPException
+ exceptionWithClass: (Class)class_ + exceptionWithClass: (Class)class
connection: (XMPPConnection*)conn connection: (XMPPConnection*)connection
{ {
return [[[self alloc] initWithClass: class_ return [[[self alloc] initWithClass: class
connection: conn] autorelease]; connection: connection] autorelease];
} }
- initWithClass: (Class)class_ - initWithClass: (Class)class
{ {
Class c = [self class]; Class c = [self class];
[self release]; [self release];
@ -43,13 +43,13 @@
selector: _cmd]; selector: _cmd];
} }
- initWithClass: (Class)class_ - initWithClass: (Class)class
connection: (XMPPConnection*)conn connection: (XMPPConnection*)connection
{ {
self = [super initWithClass: class_]; self = [super initWithClass: class];
@try { @try {
_connection = [conn retain]; _connection = [connection retain];
} @catch (id e) { } @catch (id e) {
[self release]; [self release];
@throw e; @throw e;
@ -67,24 +67,24 @@
- (XMPPConnection*)connection - (XMPPConnection*)connection
{ {
return _connection; OF_GETTER(_connection, NO)
} }
@end @end
@implementation XMPPStreamErrorException @implementation XMPPStreamErrorException
+ exceptionWithClass: (Class)class_ + exceptionWithClass: (Class)class
connection: (XMPPConnection*)conn connection: (XMPPConnection*)connection
condition: (OFString*)condition_ condition: (OFString*)condition
reason: (OFString*)reason_; reason: (OFString*)reason;
{ {
return [[[self alloc] initWithClass: class_ return [[[self alloc] initWithClass: class
connection: conn connection: connection
condition: condition_ condition: condition
reason: reason_] autorelease]; reason: reason] autorelease];
} }
- initWithClass: (Class)class_ - initWithClass: (Class)class
connection: (XMPPConnection*)conn connection: (XMPPConnection*)connection
{ {
Class c = [self class]; Class c = [self class];
[self release]; [self release];
@ -92,17 +92,17 @@
selector: _cmd]; selector: _cmd];
} }
- initWithClass: (Class)class_ - initWithClass: (Class)class
connection: (XMPPConnection*)conn connection: (XMPPConnection*)connection
condition: (OFString*)condition_ condition: (OFString*)condition
reason: (OFString*)reason_ reason: (OFString*)reason
{ {
self = [super initWithClass: class_ self = [super initWithClass: class
connection: conn]; connection: connection];
@try { @try {
condition = [condition_ copy]; _condition = [condition copy];
reason = [reason_ copy]; _reason = [reason copy];
} @catch (id e) { } @catch (id e) {
[self release]; [self release];
@throw e; @throw e;
@ -113,8 +113,8 @@
- (void)dealloc - (void)dealloc
{ {
[condition release]; [_condition release];
[reason release]; [_reason release];
[super dealloc]; [super dealloc];
} }
@ -123,34 +123,34 @@
{ {
return [OFString stringWithFormat: return [OFString stringWithFormat:
@"Got stream error in class %@: %@. Reason: %@!", [self inClass], @"Got stream error in class %@: %@. Reason: %@!", [self inClass],
condition, reason]; _condition, _reason];
} }
- (OFString*)condition - (OFString*)condition
{ {
return condition; OF_GETTER(_condition, NO)
} }
- (OFString*)reason - (OFString*)reason
{ {
return reason; OF_GETTER(_reason, NO)
} }
@end @end
@implementation XMPPStringPrepFailedException @implementation XMPPStringPrepFailedException
+ exceptionWithClass: (Class)class_ + exceptionWithClass: (Class)class
connection: (XMPPConnection*)conn connection: (XMPPConnection*)connection
profile: (OFString*)profile profile: (OFString*)profile
string: (OFString*)string string: (OFString*)string
{ {
return [[[self alloc] initWithClass: class_ return [[[self alloc] initWithClass: class
connection: conn connection: connection
profile: profile profile: profile
string: string] autorelease]; string: string] autorelease];
} }
- initWithClass: (Class)class_ - initWithClass: (Class)class
connection: (XMPPConnection*)conn connection: (XMPPConnection*)connection
{ {
Class c = [self class]; Class c = [self class];
[self release]; [self release];
@ -158,17 +158,17 @@
selector: _cmd]; selector: _cmd];
} }
- initWithClass: (Class)class_ - initWithClass: (Class)class
connection: (XMPPConnection*)conn connection: (XMPPConnection*)connection
profile: (OFString*)profile_ profile: (OFString*)profile
string: (OFString*)string_ string: (OFString*)string
{ {
self = [super initWithClass: class_ self = [super initWithClass: class
connection: conn]; connection: connection];
@try { @try {
profile = [profile_ copy]; _profile = [profile copy];
string = [string_ copy]; _string = [string copy];
} @catch (id e) { } @catch (id e) {
[self release]; [self release];
@throw e; @throw e;
@ -179,8 +179,8 @@
- (void)dealloc - (void)dealloc
{ {
[profile release]; [_profile release];
[string release]; [_string release];
[super dealloc]; [super dealloc];
} }
@ -189,34 +189,34 @@
{ {
return [OFString stringWithFormat: return [OFString stringWithFormat:
@"Stringprep with profile %@ failed in class %@ on string '%@'!", @"Stringprep with profile %@ failed in class %@ on string '%@'!",
profile, [self inClass], string]; _profile, [self inClass], _string];
} }
- (OFString*)profile - (OFString*)profile
{ {
return profile; OF_GETTER(_profile, NO)
} }
- (OFString*)string - (OFString*)string
{ {
return string; OF_GETTER(_string, NO)
} }
@end @end
@implementation XMPPIDNATranslationFailedException @implementation XMPPIDNATranslationFailedException
+ exceptionWithClass: (Class)class_ + exceptionWithClass: (Class)class
connection: (XMPPConnection*)conn connection: (XMPPConnection*)connection
operation: (OFString*)operation operation: (OFString*)operation
string: (OFString*)string string: (OFString*)string
{ {
return [[[self alloc] initWithClass: class_ return [[[self alloc] initWithClass: class
connection: conn connection: connection
operation: operation operation: operation
string: string] autorelease]; string: string] autorelease];
} }
- initWithClass: (Class)class_ - initWithClass: (Class)class
connection: (XMPPConnection*)conn connection: (XMPPConnection*)connection
{ {
Class c = [self class]; Class c = [self class];
[self release]; [self release];
@ -224,17 +224,17 @@
selector: _cmd]; selector: _cmd];
} }
- initWithClass: (Class)class_ - initWithClass: (Class)class
connection: (XMPPConnection*)conn connection: (XMPPConnection*)connection
operation: (OFString*)operation_ operation: (OFString*)operation
string: (OFString*)string_ string: (OFString*)string
{ {
self = [super initWithClass: class_ self = [super initWithClass: class
connection: conn]; connection: connection];
@try { @try {
operation = [operation_ copy]; _operation = [operation copy];
string = [string_ copy]; _string = [string copy];
} @catch (id e) { } @catch (id e) {
[self release]; [self release];
@throw e; @throw e;
@ -245,8 +245,8 @@
- (void)dealloc - (void)dealloc
{ {
[operation release]; [_operation release];
[string release]; [_string release];
[super dealloc]; [super dealloc];
} }
@ -254,33 +254,33 @@
- (OFString*)description - (OFString*)description
{ {
return [OFString stringWithFormat: return [OFString stringWithFormat:
@"IDNA operation %@ failed in class %@ on string '%@'!", operation, @"IDNA operation %@ failed in class %@ on string '%@'!", _operation,
[self inClass], string]; [self inClass], _string];
} }
- (OFString*)operation - (OFString*)operation
{ {
return operation; OF_GETTER(_operation, NO)
} }
- (OFString*)string - (OFString*)string
{ {
return string; OF_GETTER(_string, NO)
} }
@end @end
@implementation XMPPAuthFailedException @implementation XMPPAuthFailedException
+ exceptionWithClass: (Class)class_ + exceptionWithClass: (Class)class
connection: (XMPPConnection*)conn connection: (XMPPConnection*)connection
reason: (OFString*)reason_; reason: (OFString*)reason;
{ {
return [[[self alloc] initWithClass: class_ return [[[self alloc] initWithClass: class
connection: conn connection: connection
reason: reason_] autorelease]; reason: reason] autorelease];
} }
- initWithClass: (Class)class_ - initWithClass: (Class)class
connection: (XMPPConnection*)conn connection: (XMPPConnection*)connection
{ {
Class c = [self class]; Class c = [self class];
[self release]; [self release];
@ -288,15 +288,15 @@
selector: _cmd]; selector: _cmd];
} }
- initWithClass: (Class)class_ - initWithClass: (Class)class
connection: (XMPPConnection*)conn connection: (XMPPConnection*)connection
reason: (OFString*)reason_ reason: (OFString*)reason
{ {
self = [super initWithClass: class_ self = [super initWithClass: class
connection: conn]; connection: connection];
@try { @try {
reason = [reason_ copy]; _reason = [reason copy];
} @catch (id e) { } @catch (id e) {
[self release]; [self release];
@throw e; @throw e;
@ -307,7 +307,7 @@
- (void)dealloc - (void)dealloc
{ {
[reason release]; [_reason release];
[super dealloc]; [super dealloc];
} }
@ -316,11 +316,11 @@
{ {
return [OFString stringWithFormat: return [OFString stringWithFormat:
@"Authentication failed in class %@. Reason: %@!", [self inClass], @"Authentication failed in class %@. Reason: %@!", [self inClass],
reason]; _reason];
} }
- (OFString*)reason - (OFString*)reason
{ {
return reason; OF_GETTER(_reason, NO)
} }
@end @end