@@ -43,114 +43,114 @@
 - init
 {
 	return (id)[[OFMutableString_UTF8 alloc] init];
 }
 
-- initWithUTF8String: (const char*)UTF8String
+- initWithUTF8String: (const char *)UTF8String
 {
 	return (id)[[OFMutableString_UTF8 alloc]
 	    initWithUTF8String: UTF8String];
 }
 
-- initWithUTF8String: (const char*)UTF8String
+- initWithUTF8String: (const char *)UTF8String
 	      length: (size_t)UTF8StringLength
 {
 	return (id)[[OFMutableString_UTF8 alloc]
 	    initWithUTF8String: UTF8String
 			length: UTF8StringLength];
 }
 
-- initWithCString: (const char*)cString
+- initWithCString: (const char *)cString
 	 encoding: (of_string_encoding_t)encoding
 {
 	return (id)[[OFMutableString_UTF8 alloc] initWithCString: cString
 							encoding: encoding];
 }
 
-- initWithCString: (const char*)cString
+- initWithCString: (const char *)cString
 	 encoding: (of_string_encoding_t)encoding
 	   length: (size_t)cStringLength
 {
 	return (id)[[OFMutableString_UTF8 alloc]
 	    initWithCString: cString
 		   encoding: encoding
 		     length: cStringLength];
 }
 
-- initWithString: (OFString*)string
+- initWithString: (OFString *)string
 {
 	return (id)[[OFMutableString_UTF8 alloc] initWithString: string];
 }
 
-- initWithCharacters: (const of_unichar_t*)characters
+- initWithCharacters: (const of_unichar_t *)characters
 	      length: (size_t)length
 {
 	return (id)[[OFMutableString_UTF8 alloc] initWithCharacters: characters
 							     length: length];
 }
 
-- initWithUTF16String: (const of_char16_t*)string
+- initWithUTF16String: (const of_char16_t *)string
 {
 	return (id)[[OFMutableString_UTF8 alloc] initWithUTF16String: string];
 }
 
-- initWithUTF16String: (const of_char16_t*)string
+- initWithUTF16String: (const of_char16_t *)string
 	       length: (size_t)length
 {
 	return (id)[[OFMutableString_UTF8 alloc] initWithUTF16String: string
 							      length: length];
 }
 
-- initWithUTF16String: (const of_char16_t*)string
+- initWithUTF16String: (const of_char16_t *)string
 	    byteOrder: (of_byte_order_t)byteOrder
 {
 	return (id)[[OFMutableString_UTF8 alloc]
 	    initWithUTF16String: string
 		      byteOrder: byteOrder];
 }
 
-- initWithUTF16String: (const of_char16_t*)string
+- initWithUTF16String: (const of_char16_t *)string
 	       length: (size_t)length
 	    byteOrder: (of_byte_order_t)byteOrder
 {
 	return (id)[[OFMutableString_UTF8 alloc]
 	    initWithUTF16String: string
 			 length: length
 		      byteOrder: byteOrder];
 }
 
-- initWithUTF32String: (const of_char32_t*)string
+- initWithUTF32String: (const of_char32_t *)string
 {
 	return (id)[[OFMutableString_UTF8 alloc] initWithUTF32String: string];
 }
 
-- initWithUTF32String: (const of_char32_t*)string
+- initWithUTF32String: (const of_char32_t *)string
 	       length: (size_t)length
 {
 	return (id)[[OFMutableString_UTF8 alloc] initWithUTF32String: string
 							      length: length];
 }
 
-- initWithUTF32String: (const of_char32_t*)string
+- initWithUTF32String: (const of_char32_t *)string
 	    byteOrder: (of_byte_order_t)byteOrder
 {
 	return (id)[[OFMutableString_UTF8 alloc]
 	    initWithUTF32String: string
 		      byteOrder: byteOrder];
 }
 
-- initWithUTF32String: (const of_char32_t*)string
+- initWithUTF32String: (const of_char32_t *)string
 	       length: (size_t)length
 	    byteOrder: (of_byte_order_t)byteOrder
 {
 	return (id)[[OFMutableString_UTF8 alloc]
 	    initWithUTF32String: string
 			 length: length
 		      byteOrder: byteOrder];
 }
 
-- initWithFormat: (OFConstantString*)format, ...
+- initWithFormat: (OFConstantString *)format, ...
 {
 	id ret;
 	va_list arguments;
 
 	va_start(arguments, format);
@@ -159,48 +159,48 @@
 	va_end(arguments);
 
 	return ret;
 }
 
-- initWithFormat: (OFConstantString*)format
+- initWithFormat: (OFConstantString *)format
        arguments: (va_list)arguments
 {
 	return (id)[[OFMutableString_UTF8 alloc] initWithFormat: format
 						      arguments: arguments];
 }
 
 #ifdef OF_HAVE_FILES
-- initWithContentsOfFile: (OFString*)path
+- initWithContentsOfFile: (OFString *)path
 {
 	return (id)[[OFMutableString_UTF8 alloc] initWithContentsOfFile: path];
 }
 
-- initWithContentsOfFile: (OFString*)path
+- initWithContentsOfFile: (OFString *)path
 		encoding: (of_string_encoding_t)encoding
 {
 	return (id)[[OFMutableString_UTF8 alloc]
 	    initWithContentsOfFile: path
 			  encoding: encoding];
 }
 #endif
 
 #if defined(OF_HAVE_FILES) || defined(OF_HAVE_SOCKETS)
-- initWithContentsOfURL: (OFURL*)URL
+- initWithContentsOfURL: (OFURL *)URL
 {
 	return (id)[[OFMutableString_UTF8 alloc] initWithContentsOfURL: URL];
 }
 
-- initWithContentsOfURL: (OFURL*)URL
+- initWithContentsOfURL: (OFURL *)URL
 	       encoding: (of_string_encoding_t)encoding
 {
 	return (id)[[OFMutableString_UTF8 alloc]
 	    initWithContentsOfURL: URL
 			 encoding: encoding];
 }
 #endif
 
-- initWithSerialization: (OFXMLElement*)element
+- initWithSerialization: (OFXMLElement *)element
 {
 	return (id)[[OFMutableString_UTF8 alloc]
 	    initWithSerialization: element];
 }
 
@@ -330,17 +330,17 @@
 			    withString: string];
 
 	objc_autoreleasePoolPop(pool);
 }
 
-- (void)appendString: (OFString*)string
+- (void)appendString: (OFString *)string
 {
 	[self insertString: string
 		   atIndex: [self length]];
 }
 
-- (void)appendCharacters: (const of_unichar_t*)characters
+- (void)appendCharacters: (const of_unichar_t *)characters
 		  length: (size_t)length
 {
 	void *pool = objc_autoreleasePoolPush();
 
 	[self appendString: [OFString stringWithCharacters: characters
@@ -347,20 +347,20 @@
 						    length: length]];
 
 	objc_autoreleasePoolPop(pool);
 }
 
-- (void)appendUTF8String: (const char*)UTF8String
+- (void)appendUTF8String: (const char *)UTF8String
 {
 	void *pool = objc_autoreleasePoolPush();
 
 	[self appendString: [OFString stringWithUTF8String: UTF8String]];
 
 	objc_autoreleasePoolPop(pool);
 }
 
-- (void)appendUTF8String: (const char*)UTF8String
+- (void)appendUTF8String: (const char *)UTF8String
 		  length: (size_t)UTF8StringLength
 {
 	void *pool = objc_autoreleasePoolPush();
 
 	[self appendString: [OFString stringWithUTF8String: UTF8String
@@ -367,11 +367,11 @@
 						    length: UTF8StringLength]];
 
 	objc_autoreleasePoolPop(pool);
 }
 
-- (void)appendCString: (const char*)cString
+- (void)appendCString: (const char *)cString
 	     encoding: (of_string_encoding_t)encoding
 {
 	void *pool = objc_autoreleasePoolPush();
 
 	[self appendString: [OFString stringWithCString: cString
@@ -378,11 +378,11 @@
 					       encoding: encoding]];
 
 	objc_autoreleasePoolPop(pool);
 }
 
-- (void)appendCString: (const char*)cString
+- (void)appendCString: (const char *)cString
 	     encoding: (of_string_encoding_t)encoding
 	       length: (size_t)cStringLength
 {
 	void *pool = objc_autoreleasePoolPush();
 
@@ -391,21 +391,21 @@
 						 length: cStringLength]];
 
 	objc_autoreleasePoolPop(pool);
 }
 
-- (void)appendFormat: (OFConstantString*)format, ...
+- (void)appendFormat: (OFConstantString *)format, ...
 {
 	va_list arguments;
 
 	va_start(arguments, format);
 	[self appendFormat: format
 		 arguments: arguments];
 	va_end(arguments);
 }
 
-- (void)appendFormat: (OFConstantString*)format
+- (void)appendFormat: (OFConstantString *)format
 	   arguments: (va_list)arguments
 {
 	char *UTF8String;
 	int UTF8StringLength;
 
@@ -422,11 +422,11 @@
 	} @finally {
 		free(UTF8String);
 	}
 }
 
-- (void)prependString: (OFString*)string
+- (void)prependString: (OFString *)string
 {
 	[self insertString: string
 		   atIndex: 0];
 }
 
@@ -485,11 +485,11 @@
 	[self OF_convertWithWordStartFunction: of_ascii_toupper
 			   wordMiddleFunction: of_ascii_tolower];
 }
 #endif
 
-- (void)insertString: (OFString*)string
+- (void)insertString: (OFString *)string
 	     atIndex: (size_t)index
 {
 	[self replaceCharactersInRange: of_range(index, 0)
 			    withString: string];
 }
@@ -499,26 +499,26 @@
 	[self replaceCharactersInRange: range
 			    withString: @""];
 }
 
 - (void)replaceCharactersInRange: (of_range_t)range
-		      withString: (OFString*)replacement
+		      withString: (OFString *)replacement
 {
 	OF_UNRECOGNIZED_SELECTOR
 }
 
-- (void)replaceOccurrencesOfString: (OFString*)string
-			withString: (OFString*)replacement
+- (void)replaceOccurrencesOfString: (OFString *)string
+			withString: (OFString *)replacement
 {
 	[self replaceOccurrencesOfString: string
 			      withString: replacement
 				 options: 0
 				   range: of_range(0, [self length])];
 }
 
-- (void)replaceOccurrencesOfString: (OFString*)string
-			withString: (OFString*)replacement
+- (void)replaceOccurrencesOfString: (OFString *)string
+			withString: (OFString *)replacement
 			   options: (int)options
 			     range: (of_range_t)range
 {
 	void *pool = objc_autoreleasePoolPush(), *pool2;
 	const of_unichar_t *characters;