Index: src/OFDictionary.m ================================================================== --- src/OFDictionary.m +++ src/OFDictionary.m @@ -32,12 +32,10 @@ static struct { Class isa; } placeholder; -static OFCharacterSet *IRIQueryPartAllowedCharacterSet = nil; - @interface OFDictionary () - (OFString *) of_JSONRepresentationWithOptions: (OFJSONRepresentationOptions)options depth: (size_t)depth; @end @@ -53,15 +51,10 @@ } - (instancetype)initWithDictionary: (OFDictionary *)dictionary; @end -OF_DIRECT_MEMBERS -@interface OFIRIQueryPartAllowedCharacterSet: OFCharacterSet -+ (OFCharacterSet *)IRIQueryPartAllowedCharacterSet; -@end - @implementation OFDictionaryPlaceholder - (instancetype)init { return (id)[[OFMapTableDictionary alloc] init]; } @@ -135,70 +128,10 @@ - (void)dealloc { OF_DEALLOC_UNSUPPORTED } -@end - -@implementation OFIRIQueryPartAllowedCharacterSet -+ (void)initialize -{ - if (self != [OFIRIQueryPartAllowedCharacterSet class]) - return; - - IRIQueryPartAllowedCharacterSet = - [[OFIRIQueryPartAllowedCharacterSet alloc] init]; -} - -+ (OFCharacterSet *)IRIQueryPartAllowedCharacterSet -{ - return IRIQueryPartAllowedCharacterSet; -} - -- (instancetype)autorelease -{ - return self; -} - -- (instancetype)retain -{ - return self; -} - -- (void)release -{ -} - -- (unsigned int)retainCount -{ - return OFMaxRetainCount; -} - -- (bool)characterIsMember: (OFUnichar)character -{ - if (character < CHAR_MAX && OFASCIIIsAlnum(character)) - return true; - - switch (character) { - case '-': - case '.': - case '_': - case '~': - case '!': - case '$': - case '\'': - case '(': - case ')': - case '*': - case '+': - case ',': - case ';': - return true; - default: - return false; - } -} @end @implementation OFDictionary + (void)initialize {