@@ -240,18 +240,18 @@ { return [[[self alloc] initWithCString: str] autorelease]; } + stringWithCString: (const char*)str - encoding: (enum of_string_encoding)encoding + encoding: (of_string_encoding_t)encoding { return [[[self alloc] initWithCString: str encoding: encoding] autorelease]; } + stringWithCString: (const char*)str - encoding: (enum of_string_encoding)encoding + encoding: (of_string_encoding_t)encoding length: (size_t)len { return [[[self alloc] initWithCString: str encoding: encoding length: len] autorelease]; @@ -299,11 +299,11 @@ { return [[[self alloc] initWithContentsOfFile: path] autorelease]; } + stringWithContentsOfFile: (OFString*)path - encoding: (enum of_string_encoding)encoding + encoding: (of_string_encoding_t)encoding { return [[[self alloc] initWithContentsOfFile: path encoding: encoding] autorelease]; } @@ -313,19 +313,19 @@ encoding: OF_STRING_ENCODING_UTF_8 length: strlen(str)]; } - initWithCString: (const char*)str - encoding: (enum of_string_encoding)encoding + encoding: (of_string_encoding_t)encoding { return [self initWithCString: str encoding: encoding length: strlen(str)]; } - initWithCString: (const char*)str - encoding: (enum of_string_encoding)encoding + encoding: (of_string_encoding_t)encoding length: (size_t)len { self = [super init]; @try { @@ -617,11 +617,11 @@ return [self initWithContentsOfFile: path encoding: OF_STRING_ENCODING_UTF_8]; } - initWithContentsOfFile: (OFString*)path - encoding: (enum of_string_encoding)encoding + encoding: (of_string_encoding_t)encoding { self = [super init]; @try { OFFile *file;