@@ -54,11 +54,11 @@
 		pspDebugScreenSetTextColor(0x0000FF);
 		break;
 	}
 
 	pspDebugScreenSetXY(0, y);
-	pspDebugScreenPrintData([str cString], [str cStringLength]);
+	pspDebugScreenPrintData([str UTF8String], [str UTF8StringLength]);
 #elif defined(STDOUT)
 	switch (color) {
 	case 0:
 		[of_stdout writeString: @"\r\033[K\033[1;33m"];
 		break;
@@ -79,35 +79,32 @@
 
 - (void)outputTesting: (OFString*)test
 	     inModule: (OFString*)module
 {
 	OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init];
-	[self outputString: [OFString stringWithFormat: @"[%s] %s: testing...",
-							[module cString],
-							[test cString]]
+	[self outputString: [OFString stringWithFormat: @"[%@] %@: testing...",
+							module, test]
 		 withColor: 0];
 	[pool release];
 }
 
 - (void)outputSuccess: (OFString*)test
 	     inModule: (OFString*)module
 {
 	OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init];
-	[self outputString: [OFString stringWithFormat: @"[%s] %s: ok\n",
-							[module cString],
-							[test cString]]
+	[self outputString: [OFString stringWithFormat: @"[%@] %@: ok\n",
+							module, test]
 		 withColor: 1];
 	[pool release];
 }
 
 - (void)outputFailure: (OFString*)test
 	     inModule: (OFString*)module
 {
 	OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init];
-	[self outputString: [OFString stringWithFormat: @"[%s] %s: failed\n",
-							[module cString],
-							[test cString]]
+	[self outputString: [OFString stringWithFormat: @"[%@] %@: failed\n",
+							module, test]
 		 withColor: 2];
 	[pool release];
 }
 
 - (void)applicationDidFinishLaunching