@@ -23,10 +23,11 @@ #import "OFString.h" #import "OFArray.h" #import "OFXMLElement.h" #import "autorelease.h" +#import "macros.h" static struct { Class isa; } placeholder; @@ -171,43 +172,22 @@ return [super init]; } - initWithSet: (OFSet*)set { - @try { - [self doesNotRecognizeSelector: _cmd]; - } @catch (id e) { - [self release]; - @throw e; - } - - abort(); + OF_INVALID_INIT_METHOD } - initWithArray: (OFArray*)array { - @try { - [self doesNotRecognizeSelector: _cmd]; - } @catch (id e) { - [self release]; - @throw e; - } - - abort(); + OF_INVALID_INIT_METHOD } - initWithObjects: (id const*)objects count: (size_t)count { - @try { - [self doesNotRecognizeSelector: _cmd]; - } @catch (id e) { - [self release]; - @throw e; - } - - abort(); + OF_INVALID_INIT_METHOD } - (id)initWithObjects: (id)firstObject, ... { id ret; @@ -222,30 +202,16 @@ } - initWithObject: (id)firstObject arguments: (va_list)arguments { - @try { - [self doesNotRecognizeSelector: _cmd]; - } @catch (id e) { - [self release]; - @throw e; - } - - abort(); + OF_INVALID_INIT_METHOD } - initWithSerialization: (OFXMLElement*)element { - @try { - [self doesNotRecognizeSelector: _cmd]; - } @catch (id e) { - [self release]; - @throw e; - } - - abort(); + OF_INVALID_INIT_METHOD } - (size_t)count { [self doesNotRecognizeSelector: _cmd];