@@ -267,18 +267,19 @@
 {
 	[self finishInitialization];
 	return [self rangeOfString: string];
 }
 
-- (OFRange)rangeOfString: (OFString *)string options: (int)options
+- (OFRange)rangeOfString: (OFString *)string
+		 options: (OFStringSearchOptions)options
 {
 	[self finishInitialization];
 	return [self rangeOfString: string options: options];
 }
 
 - (OFRange)rangeOfString: (OFString *)string
-		 options: (int)options
+		 options: (OFStringSearchOptions)options
 		   range: (OFRange)range
 {
 	[self finishInitialization];
 	return [self rangeOfString: string options: options range: range];
 }
@@ -288,18 +289,18 @@
 	[self finishInitialization];
 	return [self indexOfCharacterFromSet: characterSet];
 }
 
 - (size_t)indexOfCharacterFromSet: (OFCharacterSet *)characterSet
-			  options: (int)options
+			  options: (OFStringSearchOptions)options
 {
 	[self finishInitialization];
 	return [self indexOfCharacterFromSet: characterSet options: options];
 }
 
 - (size_t)indexOfCharacterFromSet: (OFCharacterSet *)characterSet
-			  options: (int)options
+			  options: (OFStringSearchOptions)options
 			    range: (OFRange)range
 {
 	[self finishInitialization];
 	return [self indexOfCharacterFromSet: characterSet
 				     options: options
@@ -428,11 +429,11 @@
 	[self finishInitialization];
 	return [self componentsSeparatedByString: delimiter];
 }
 
 - (OFArray *)componentsSeparatedByString: (OFString *)delimiter
-				 options: (int)options
+				 options: (OFStringSeparationOptions)options
 {
 	[self finishInitialization];
 	return [self componentsSeparatedByString: delimiter options: options];
 }
 
@@ -443,11 +444,11 @@
 	return [self componentsSeparatedByCharactersInSet: characterSet];
 }
 
 - (OFArray *)
     componentsSeparatedByCharactersInSet: (OFCharacterSet *)characterSet
-				 options: (int)options
+				 options: (OFStringSeparationOptions)options
 {
 	[self finishInitialization];
 	return [self componentsSeparatedByCharactersInSet: characterSet
 						  options: options];
 }