@@ -31,12 +31,11 @@
  * @brief Sets the character at the specified index.
  *
  * @param character The character to set
  * @param index The index where to set the character
  */
-- (void)setCharacter: (of_unichar_t)character
-	     atIndex: (size_t)index;
+- (void)setCharacter: (OFUnichar)character atIndex: (size_t)index;
 
 /**
  * @brief Appends another OFString to the OFMutableString.
  *
  * @param string An OFString to append
@@ -47,12 +46,11 @@
  * @brief Appends the specified characters to the OFMutableString.
  *
  * @param characters An array of characters to append
  * @param length The length of the array of characters
  */
-- (void)appendCharacters: (const of_unichar_t *)characters
-		  length: (size_t)length;
+- (void)appendCharacters: (const OFUnichar *)characters length: (size_t)length;
 
 /**
  * @brief Appends a UTF-8 encoded C string to the OFMutableString.
  *
  * @param UTF8String A UTF-8 encoded C string to append
@@ -74,11 +72,11 @@
  *
  * @param cString A C string to append
  * @param encoding The encoding of the C string
  */
 - (void)appendCString: (const char *)cString
-	     encoding: (of_string_encoding_t)encoding;
+	     encoding: (OFStringEncoding)encoding;
 
 /**
  * @brief Appends a C string with the specified encoding and length to the
  *	  OFMutableString.
  *
@@ -85,36 +83,35 @@
  * @param cString A C string to append
  * @param encoding The encoding of the C string
  * @param cStringLength The length of the UTF-8 encoded C string
  */
 - (void)appendCString: (const char *)cString
-	     encoding: (of_string_encoding_t)encoding
+	     encoding: (OFStringEncoding)encoding
 	       length: (size_t)cStringLength;
 
 /**
  * @brief Appends a formatted string to the OFMutableString.
  *
  * See `printf` for the format syntax. As an addition, `%@` is available as
- * format specifier for objects, `%C` for `of_unichar_t` and `%S` for
- * `const of_unichar_t *`.
+ * format specifier for objects, `%C` for `OFUnichar` and `%S` for
+ * `const OFUnichar *`.
  *
  * @param format A format string which generates the string to append
  */
 - (void)appendFormat: (OFConstantString *)format, ...;
 
 /**
  * @brief Appends a formatted string to the OFMutableString.
  *
  * See printf for the format syntax. As an addition, `%@` is available as
- * format specifier for objects, `%C` for `of_unichar_t` and `%S` for
- * `const of_unichar_t *`.
+ * format specifier for objects, `%C` for `OFUnichar` and `%S` for
+ * `const OFUnichar *`.
  *
  * @param format A format string which generates the string to append
  * @param arguments The arguments used in the format string
  */
-- (void)appendFormat: (OFConstantString *)format
-	   arguments: (va_list)arguments;
+- (void)appendFormat: (OFConstantString *)format arguments: (va_list)arguments;
 
 /**
  * @brief Prepends another OFString to the OFMutableString.
  *
  * @param string An OFString to prepend
@@ -149,27 +146,26 @@
  * @brief Inserts a string at the specified index.
  *
  * @param string The string to insert
  * @param index The index
  */
-- (void)insertString: (OFString *)string
-	     atIndex: (size_t)index;
+- (void)insertString: (OFString *)string atIndex: (size_t)index;
 
 /**
  * @brief Deletes the characters at the specified range.
  *
  * @param range The range of the characters which should be removed
  */
-- (void)deleteCharactersInRange: (of_range_t)range;
+- (void)deleteCharactersInRange: (OFRange)range;
 
 /**
  * @brief Replaces the characters at the specified range.
  *
  * @param range The range of the characters which should be replaced
  * @param replacement The string to the replace the characters with
  */
-- (void)replaceCharactersInRange: (of_range_t)range
+- (void)replaceCharactersInRange: (OFRange)range
 		      withString: (OFString *)replacement;
 
 /**
  * @brief Replaces all occurrences of a string with another string.
  *
@@ -190,11 +186,11 @@
  * @param range The range in which the string should be replaced
  */
 - (void)replaceOccurrencesOfString: (OFString *)string
 			withString: (OFString *)replacement
 			   options: (int)options
-			     range: (of_range_t)range;
+			     range: (OFRange)range;
 
 /**
  * @brief Deletes all whitespaces at the beginning of the string.
  */
 - (void)deleteLeadingWhitespaces;