@@ -7,25 +7,26 @@
  * This file is part of libobjfw. It may be distributed under the terms of the
  * Q Public License 1.0, which can be found in the file LICENSE included in
  * the packaging of this file.
  */
 
+#import <wchar.h>
 #import <stddef.h>
 #import "OFObject.h"
-#import "OFConstString.h"
 
 @interface OFString: OFObject
 {
-	char   *string;
 	size_t length;
 }
 
-+ new: (const char*)str;
-- init;
-- init: (const char*)str;
++ newWithConstCString: (const char*)str;
++ newWithConstWideCString: (const wchar_t*)str;
++ newWithCString: (char*)str;
++ newWithWideCString: (wchar_t*)str;
 - (char*)cString;
+- (wchar_t*)wcString;
 - (size_t)length;
-- (OFString*)setTo: (OFConstString*)str;
+- (OFString*)setTo: (OFString*)str;
 - (OFString*)clone;
-- (OFString*)append: (OFConstString*)str;
-- (int)compare: (OFConstString*)str;
+- (int)compare: (OFString*)str;
+- (OFString*)append: (OFString*)str;
 @end