@@ -48,27 +48,27 @@
 - (size_t)length
 {
 	return length;
 }
 
-- (OFString*)setTo: (const char*)str
+- (OFString*)setTo: (OFConstString*)str
 {
 	char *newstr;
 	size_t newlen;
 	
-	if (str == NULL) {
+	if ([str cString] == NULL) {
 		[self freeMem: string];
 
 		length = 0;
 		string = NULL;
 
 		return self;
 	}
 
-	newlen = strlen(str);
+	newlen = [str length];
 	newstr = [self getMem: newlen + 1];
-	memcpy(newstr, str, newlen + 1);
+	memcpy(newstr, [str cString], newlen + 1);
 
 	if (string != NULL)
 		[self freeMem: string];
 
 	length = newlen;
@@ -80,32 +80,32 @@
 - (OFString*)clone
 {
 	return [OFString new: string];
 }
 
-- (OFString*)append: (const char*)str
+- (OFString*)append: (OFConstString*)str
 {
 	char   *newstr;
 	size_t newlen, strlength;
 
 	if (str == NULL)
-		return [self setTo:str];
+		return [self setTo: str];
 
-	strlength = strlen(str);
+	strlength = [str length];
 	newlen = length + strlength;
 
 	newstr = [self resizeMem: string
 			  toSize: newlen + 1];
 
-	memcpy(newstr + length, str, strlength + 1);
+	memcpy(newstr + length, [str cString], strlength + 1);
 
 	length = newlen;
 	string = newstr;
 
 	return self;
 }
 
-- (int)compare: (OFString*)str
+- (int)compare: (OFConstString*)str
 {
 	return strcmp(string, [str cString]);
 }
 @end