Index: src/OFConstantString.m
==================================================================
--- src/OFConstantString.m
+++ src/OFConstantString.m
@@ -130,65 +130,65 @@
 	[self release];
 	@throw [OFNotImplementedException exceptionWithClass: c
 						    selector: _cmd];
 }
 
-- initWithUnicodeString: (of_unichar_t*)string
+- initWithUnicodeString: (const of_unichar_t*)string
 {
 	Class c = isa;
 	[self release];
 	@throw [OFNotImplementedException exceptionWithClass: c
 						    selector: _cmd];
 }
 
-- initWithUnicodeString: (of_unichar_t*)string
+- initWithUnicodeString: (const of_unichar_t*)string
 	      byteOrder: (of_endianess_t)byteOrder
 {
 	Class c = isa;
 	[self release];
 	@throw [OFNotImplementedException exceptionWithClass: c
 						    selector: _cmd];
 }
 
-- initWithUnicodeString: (of_unichar_t*)string
+- initWithUnicodeString: (const of_unichar_t*)string
 		 length: (size_t)length
 {
 	Class c = isa;
 	[self release];
 	@throw [OFNotImplementedException exceptionWithClass: c
 						    selector: _cmd];
 }
 
-- initWithUnicodeString: (of_unichar_t*)string
+- initWithUnicodeString: (const of_unichar_t*)string
 	      byteOrder: (of_endianess_t)byteOrder
 		 length: (size_t)length
 {
 	Class c = isa;
 	[self release];
 	@throw [OFNotImplementedException exceptionWithClass: c
 						    selector: _cmd];
 }
 
-- initWithUTF16String: (uint16_t*)string
+- initWithUTF16String: (const uint16_t*)string
 	    byteOrder: (of_endianess_t)byteOrder
 {
 	Class c = isa;
 	[self release];
 	@throw [OFNotImplementedException exceptionWithClass: c
 						    selector: _cmd];
 }
 
-- initWithUTF16String: (uint16_t*)string
+- initWithUTF16String: (const uint16_t*)string
 	       length: (size_t)length
 {
 	Class c = isa;
 	[self release];
 	@throw [OFNotImplementedException exceptionWithClass: c
 						    selector: _cmd];
 }
 
-- initWithUTF16String: (uint16_t*)string
+- initWithUTF16String: (const uint16_t*)string
 	    byteOrder: (of_endianess_t)byteOrder
 	       length: (size_t)length
 {
 	Class c = isa;
 	[self release];

Index: src/OFString.h
==================================================================
--- src/OFString.h
+++ src/OFString.h
@@ -162,21 +162,21 @@
  * \brief Creates a new OFString from a unicode string.
  *
  * \param string The unicode string
  * \return A new autoreleased OFString
  */
-+ stringWithUnicodeString: (of_unichar_t*)string;
++ stringWithUnicodeString: (const of_unichar_t*)string;
 
 /**
  * \brief Creates a new OFString from a unicode string, assuming the specified
  *	  byte order if no BOM is found.
  *
  * \param string The unicode string
  * \param byteOrder The byte order to assume if there is no BOM
  * \return A new autoreleased OFString
  */
-+ stringWithUnicodeString: (of_unichar_t*)string
++ stringWithUnicodeString: (const of_unichar_t*)string
 		byteOrder: (of_endianess_t)byteOrder;
 
 /**
  * \brief Creates a new OFString from a unicode string with the specified
  *	  length.
@@ -183,11 +183,11 @@
  *
  * \param string The unicode string
  * \param length The length of the unicode string
  * \return A new autoreleased OFString
  */
-+ stringWithUnicodeString: (of_unichar_t*)string
++ stringWithUnicodeString: (const of_unichar_t*)string
 		   length: (size_t)length;
 
 /**
  * \brief Creates a new OFString from a unicode string with the specified
  *	  length, assuming the specified byte order if no BOM is found.
@@ -195,31 +195,31 @@
  * \param string The unicode string
  * \param byteOrder The byte order to assume if there is no BOM
  * \param length The length of the unicode string
  * \return A new autoreleased OFString
  */
-+ stringWithUnicodeString: (of_unichar_t*)string
++ stringWithUnicodeString: (const of_unichar_t*)string
 		byteOrder: (of_endianess_t)byteOrder
 		   length: (size_t)length;
 
 /**
  * \brief Creates a new OFString from a UTF-16 encoded string.
  *
  * \param string The UTF-16 string
  * \return A new autoreleased OFString
  */
-+ stringWithUTF16String: (uint16_t*)string;
++ stringWithUTF16String: (const uint16_t*)string;
 
 /**
  * \brief Creates a new OFString from a UTF-16 encoded string, assuming the
  *	  specified byte order if no BOM is found.
  *
  * \param string The UTF-16 string
  * \param byteOrder The byte order to assume if there is no BOM
  * \return A new autoreleased OFString
  */
-+ stringWithUTF16String: (uint16_t*)string
++ stringWithUTF16String: (const uint16_t*)string
 	      byteOrder: (of_endianess_t)byteOrder;
 
 /**
  * \brief Creates a new OFString from a UTF-16 encoded string with the specified
  *	  length.
@@ -226,11 +226,11 @@
  *
  * \param string The UTF-16 string
  * \param length The length of the unicode string
  * \return A new autoreleased OFString
  */
-+ stringWithUTF16String: (uint16_t*)string
++ stringWithUTF16String: (const uint16_t*)string
 		 length: (size_t)length;
 
 /**
  * \brief Creates a new OFString from a UTF-16 encoded string with the
  *	  specified length, assuming the specified byte order if no BOM is
@@ -239,11 +239,11 @@
  * \param string The UTF-16 string
  * \param byteOrder The byte order to assume if there is no BOM
  * \param length The length of the unicode string
  * \return A new autoreleased OFString
  */
-+ stringWithUTF16String: (uint16_t*)string
++ stringWithUTF16String: (const uint16_t*)string
 	      byteOrder: (of_endianess_t)byteOrder
 		 length: (size_t)length;
 
 /**
  * \brief Creates a new OFString from a format string.
@@ -365,21 +365,21 @@
  * \brief Initializes an already allocated OFString with a unicode string.
  *
  * \param string The unicode string
  * \return An initialized OFString
  */
-- initWithUnicodeString: (of_unichar_t*)string;
+- initWithUnicodeString: (const of_unichar_t*)string;
 
 /**
  * \brief Initializes an already allocated OFString with a unicode string,
  *	  assuming the specified byte order if no BOM is found.
  *
  * \param string The unicode string
  * \param byteOrder The byte order to assume if there is no BOM
  * \return An initialized OFString
  */
-- initWithUnicodeString: (of_unichar_t*)string
+- initWithUnicodeString: (const of_unichar_t*)string
 	      byteOrder: (of_endianess_t)byteOrder;
 
 /**
  * \brief Initializes an already allocated OFString with a unicode string with
  *	  the specified length.
@@ -386,11 +386,11 @@
  *
  * \param string The unicode string
  * \param length The length of the unicode string
  * \return An initialized OFString
  */
-- initWithUnicodeString: (of_unichar_t*)string
+- initWithUnicodeString: (const of_unichar_t*)string
 		 length: (size_t)length;
 
 /**
  * \brief Initializes an already allocated OFString with a unicode string with
  *	  the specified length, assuming the specified byte order if no BOM is
@@ -399,31 +399,31 @@
  * \param string The unicode string
  * \param byteOrder The byte order to assume if there is no BOM
  * \param length The length of the unicode string
  * \return An initialized OFString
  */
-- initWithUnicodeString: (of_unichar_t*)string
+- initWithUnicodeString: (const of_unichar_t*)string
 	      byteOrder: (of_endianess_t)byteOrder
 		 length: (size_t)length;
 
 /**
  * \brief Initializes an already allocated OFString with a UTF-16 string.
  *
  * \param string The UTF-16 string
  * \return An initialized OFString
  */
-- initWithUTF16String: (uint16_t*)string;
+- initWithUTF16String: (const uint16_t*)string;
 
 /**
  * \brief Initializes an already allocated OFString with a UTF-16 string,
  *	  assuming the specified byte order if no BOM is found.
  *
  * \param string The UTF-16 string
  * \param byteOrder The byte order to assume if there is no BOM
  * \return An initialized OFString
  */
-- initWithUTF16String: (uint16_t*)string
+- initWithUTF16String: (const uint16_t*)string
 	    byteOrder: (of_endianess_t)byteOrder;
 
 /**
  * \brief Initializes an already allocated OFString with a UTF-16 string with
  *	  the specified length.
@@ -430,11 +430,11 @@
  *
  * \param string The UTF-16 string
  * \param length The length of the UTF-16 string
  * \return An initialized OFString
  */
-- initWithUTF16String: (uint16_t*)string
+- initWithUTF16String: (const uint16_t*)string
 	       length: (size_t)length;
 
 /**
  * \brief Initializes an already allocated OFString with a UTF-16 string with
  *	  the specified length, assuming the specified byte order if no BOM is
@@ -443,11 +443,11 @@
  * \param string The UTF-16 string
  * \param byteOrder The byte order to assume if there is no BOM
  * \param length The length of the UTF-16 string
  * \return An initialized OFString
  */
-- initWithUTF16String: (uint16_t*)string
+- initWithUTF16String: (const uint16_t*)string
 	    byteOrder: (of_endianess_t)byteOrder
 	       length: (size_t)length;
 
 /**
  * \brief Initializes an already allocated OFString with a format string.

Index: src/OFString.m
==================================================================
--- src/OFString.m
+++ src/OFString.m
@@ -299,58 +299,58 @@
 + stringWithString: (OFString*)string
 {
 	return [[[self alloc] initWithString: string] autorelease];
 }
 
-+ stringWithUnicodeString: (of_unichar_t*)string
++ stringWithUnicodeString: (const of_unichar_t*)string
 {
 	return [[[self alloc] initWithUnicodeString: string] autorelease];
 }
 
-+ stringWithUnicodeString: (of_unichar_t*)string
++ stringWithUnicodeString: (const of_unichar_t*)string
 		byteOrder: (of_endianess_t)byteOrder
 {
 	return [[[self alloc] initWithUnicodeString: string
 					  byteOrder: byteOrder] autorelease];
 }
 
-+ stringWithUnicodeString: (of_unichar_t*)string
++ stringWithUnicodeString: (const of_unichar_t*)string
 		   length: (size_t)length
 {
 	return [[[self alloc] initWithUnicodeString: string
 					     length: length] autorelease];
 }
 
-+ stringWithUnicodeString: (of_unichar_t*)string
++ stringWithUnicodeString: (const of_unichar_t*)string
 		byteOrder: (of_endianess_t)byteOrder
 		   length: (size_t)length
 {
 	return [[[self alloc] initWithUnicodeString: string
 					  byteOrder: byteOrder
 					     length: length] autorelease];
 }
 
-+ stringWithUTF16String: (uint16_t*)string
++ stringWithUTF16String: (const uint16_t*)string
 {
 	return [[[self alloc] initWithUTF16String: string] autorelease];
 }
 
-+ stringWithUTF16String: (uint16_t*)string
++ stringWithUTF16String: (const uint16_t*)string
 	      byteOrder: (of_endianess_t)byteOrder
 {
 	return [[[self alloc] initWithUTF16String: string
 					byteOrder: byteOrder] autorelease];
 }
 
-+ stringWithUTF16String: (uint16_t*)string
++ stringWithUTF16String: (const uint16_t*)string
 		 length: (size_t)length
 {
 	return [[[self alloc] initWithUTF16String: string
 					   length: length] autorelease];
 }
 
-+ stringWithUTF16String: (uint16_t*)string
++ stringWithUTF16String: (const uint16_t*)string
 	      byteOrder: (of_endianess_t)byteOrder
 		 length: (size_t)length
 {
 	return [[[self alloc] initWithUTF16String: string
 					byteOrder: byteOrder
@@ -604,34 +604,34 @@
 	}
 
 	return self;
 }
 
-- initWithUnicodeString: (of_unichar_t*)string
+- initWithUnicodeString: (const of_unichar_t*)string
 {
 	return [self initWithUnicodeString: string
 				 byteOrder: OF_ENDIANESS_NATIVE
 				    length: of_unicode_string_length(string)];
 }
 
-- initWithUnicodeString: (of_unichar_t*)string
+- initWithUnicodeString: (const of_unichar_t*)string
 	      byteOrder: (of_endianess_t)byteOrder
 {
 	return [self initWithUnicodeString: string
 				 byteOrder: byteOrder
 				    length: of_unicode_string_length(string)];
 }
 
-- initWithUnicodeString: (of_unichar_t*)string
+- initWithUnicodeString: (const of_unichar_t*)string
 		 length: (size_t)length
 {
 	return [self initWithUnicodeString: string
 				 byteOrder: OF_ENDIANESS_NATIVE
 				    length: length];
 }
 
-- initWithUnicodeString: (of_unichar_t*)string
+- initWithUnicodeString: (const of_unichar_t*)string
 	      byteOrder: (of_endianess_t)byteOrder
 		 length: (size_t)length
 {
 	self = [super init];
 
@@ -710,34 +710,34 @@
 	}
 
 	return self;
 }
 
-- initWithUTF16String: (uint16_t*)string
+- initWithUTF16String: (const uint16_t*)string
 {
 	return [self initWithUTF16String: string
 			       byteOrder: OF_ENDIANESS_NATIVE
 				  length: of_utf16_string_length(string)];
 }
 
-- initWithUTF16String: (uint16_t*)string
+- initWithUTF16String: (const uint16_t*)string
 	    byteOrder: (of_endianess_t)byteOrder
 {
 	return [self initWithUTF16String: string
 			       byteOrder: byteOrder
 				  length: of_utf16_string_length(string)];
 }
 
-- initWithUTF16String: (uint16_t*)string
+- initWithUTF16String: (const uint16_t*)string
 	       length: (size_t)length
 {
 	return [self initWithUTF16String: string
 			       byteOrder: OF_ENDIANESS_NATIVE
 				  length: length];
 }
 
-- initWithUTF16String: (uint16_t*)string
+- initWithUTF16String: (const uint16_t*)string
 	    byteOrder: (of_endianess_t)byteOrder
 	       length: (size_t)length
 {
 	self = [super init];