Index: src/OFCString.h ================================================================== --- src/OFCString.h +++ src/OFCString.h @@ -18,13 +18,13 @@ { char *string; size_t length; } -- initWithCString: (char*)str; +- initAsCString: (char*)str; - (char*)cString; - (size_t)length; - (OFString*)clone; - (int)compareTo: (OFString*)str; - (OFString*)append: (OFString*)str; - (OFString*)appendCString: (const char*)str; @end Index: src/OFCString.m ================================================================== --- src/OFCString.m +++ src/OFCString.m @@ -16,11 +16,11 @@ #import "OFCString.h" #import "OFExceptions.h" @implementation OFCString -- initWithCString: (char*)str +- initAsCString: (char*)str { if ((self = [super init])) { if (str == NULL) { length = 0; string = NULL; Index: src/OFConstCString.h ================================================================== --- src/OFConstCString.h +++ src/OFConstCString.h @@ -15,11 +15,11 @@ { const char *string; size_t length; } -- initWithConstCString: (const char*)str; +- initAsConstCString: (const char*)str; - (const char*)cString; - (size_t)length; - (OFString*)clone; - (int)compareTo: (OFString*)str; @end Index: src/OFConstCString.m ================================================================== --- src/OFConstCString.m +++ src/OFConstCString.m @@ -13,11 +13,11 @@ #import #import "OFConstCString.h" @implementation OFConstCString -- initWithConstCString: (const char*)str +- initAsConstCString: (const char*)str { if ((self = [super init])) { if (str == NULL) { length = 0; string = NULL; Index: src/OFConstWideCString.h ================================================================== --- src/OFConstWideCString.h +++ src/OFConstWideCString.h @@ -17,11 +17,11 @@ { const wchar_t *string; size_t length; } -- initWithConstWideCString: (const wchar_t*)wstr; +- initAsConstWideCString: (const wchar_t*)wstr; - (const wchar_t*)wcString; - (size_t)length; - (OFString*)clone; - (int)compareTo: (OFString*)str; @end Index: src/OFConstWideCString.m ================================================================== --- src/OFConstWideCString.m +++ src/OFConstWideCString.m @@ -13,11 +13,11 @@ #import #import "OFConstWideCString.h" @implementation OFConstWideCString -- initWithConstWideCString: (const wchar_t*)str +- initAsConstWideCString: (const wchar_t*)str { if ((self = [super init])) { if (str == NULL) { length = 0; string = NULL; Index: src/OFString.m ================================================================== --- src/OFString.m +++ src/OFString.m @@ -22,26 +22,26 @@ #import "OFExceptions.h" @implementation OFString + newAsConstCString: (const char*)str { - return [[OFConstCString alloc] initWithConstCString: str]; + return [[OFConstCString alloc] initAsConstCString: str]; } + newAsConstWideCString: (const wchar_t*)str { - return [[OFConstWideCString alloc] initWithConstWideCString: str]; + return [[OFConstWideCString alloc] initAsConstWideCString: str]; } + newAsCString: (char*)str { - return [[OFCString alloc] initWithCString: str]; + return [[OFCString alloc] initAsCString: str]; } + newAsWideCString: (wchar_t*)str { - return [[OFWideCString alloc] initWithWideCString: str]; + return [[OFWideCString alloc] initAsWideCString: str]; } - (char*)cString { [[OFNotImplementedException newWithObject: self Index: src/OFWideCString.h ================================================================== --- src/OFWideCString.h +++ src/OFWideCString.h @@ -18,13 +18,13 @@ { wchar_t *string; size_t length; } -- initWithWideCString: (wchar_t*)str; +- initAsWideCString: (wchar_t*)str; - (wchar_t*)wcString; - (size_t)length; - (OFString*)clone; - (int)compareTo: (OFString*)str; - (OFString*)append: (OFString*)str; - (OFString*)appendWideCString: (const wchar_t*)str; @end Index: src/OFWideCString.m ================================================================== --- src/OFWideCString.m +++ src/OFWideCString.m @@ -17,11 +17,11 @@ #import "OFWideCString.h" #import "OFExceptions.h" @implementation OFWideCString -- initWithWideCString: (wchar_t*)str +- initAsWideCString: (wchar_t*)str { if ((self = [super init])) { if (str == NULL) { length = 0; string = NULL;