@@ -255,31 +255,31 @@
 {
 	[self finishInitialization];
 	return [self characterAtIndex: idx];
 }
 
-- (void)getCharacters: (of_unichar_t *)buffer inRange: (of_range_t)range
+- (void)getCharacters: (of_unichar_t *)buffer inRange: (OFRange)range
 {
 	[self finishInitialization];
 	[self getCharacters: buffer inRange: range];
 }
 
-- (of_range_t)rangeOfString: (OFString *)string
+- (OFRange)rangeOfString: (OFString *)string
 {
 	[self finishInitialization];
 	return [self rangeOfString: string];
 }
 
-- (of_range_t)rangeOfString: (OFString *)string options: (int)options
+- (OFRange)rangeOfString: (OFString *)string options: (int)options
 {
 	[self finishInitialization];
 	return [self rangeOfString: string options: options];
 }
 
-- (of_range_t)rangeOfString: (OFString *)string
-		    options: (int)options
-		      range: (of_range_t)range
+- (OFRange)rangeOfString: (OFString *)string
+		 options: (int)options
+		   range: (OFRange)range
 {
 	[self finishInitialization];
 	return [self rangeOfString: string options: options range: range];
 }
 
@@ -296,11 +296,11 @@
 	return [self indexOfCharacterFromSet: characterSet options: options];
 }
 
 - (size_t)indexOfCharacterFromSet: (OFCharacterSet *)characterSet
 			  options: (int)options
-			    range: (of_range_t)range
+			    range: (OFRange)range
 {
 	[self finishInitialization];
 	return [self indexOfCharacterFromSet: characterSet
 				     options: options
 				       range: range];
@@ -322,11 +322,11 @@
 {
 	[self finishInitialization];
 	return [self substringToIndex: idx];
 }
 
-- (OFString *)substringWithRange: (of_range_t)range
+- (OFString *)substringWithRange: (OFRange)range
 {
 	[self finishInitialization];
 	return [self substringWithRange: range];
 }
 
@@ -364,11 +364,11 @@
 }
 
 - (OFString *)stringByReplacingOccurrencesOfString: (OFString *)string
 					withString: (OFString *)replacement
 					   options: (int)options
-					     range: (of_range_t)range
+					     range: (OFRange)range
 {
 	[self finishInitialization];
 	return [self stringByReplacingOccurrencesOfString: string
 					       withString: replacement
 						  options: options