@@ -55,23 +55,19 @@
 	mutex = [[OFMutex alloc] init];
 	atexit(releaseMutex);
 #endif
 
 #ifdef OF_HAVE_FILES
-	[self registerClass: [OFFileURLHandler class]
-		  forScheme: @"file"];
+	[self registerClass: [OFFileURLHandler class] forScheme: @"file"];
 #endif
 #if defined(OF_HAVE_SOCKETS) && defined(OF_HAVE_THREADS)
-	[self registerClass: [OFHTTPURLHandler class]
-		  forScheme: @"http"];
-	[self registerClass: [OFHTTPURLHandler class]
-		  forScheme: @"https"];
+	[self registerClass: [OFHTTPURLHandler class] forScheme: @"http"];
+	[self registerClass: [OFHTTPURLHandler class] forScheme: @"https"];
 #endif
 }
 
-+ (bool)registerClass: (Class)class
-	    forScheme: (OFString *)scheme
++ (bool)registerClass: (Class)class forScheme: (OFString *)scheme
 {
 #ifdef OF_HAVE_THREADS
 	[mutex lock];
 	@try {
 #endif
@@ -80,12 +76,11 @@
 		if ([handlers objectForKey: scheme] != nil)
 			return false;
 
 		handler = [[class alloc] initWithScheme: scheme];
 		@try {
-			[handlers setObject: handler
-				     forKey: scheme];
+			[handlers setObject: handler forKey: scheme];
 		} @finally {
 			[handler release];
 		}
 #ifdef OF_HAVE_THREADS
 	} @finally {
@@ -138,23 +133,21 @@
 	[_scheme release];
 
 	[super dealloc];
 }
 
-- (OFStream *)openItemAtURL: (OFURL *)URL
-		       mode: (OFString *)mode
+- (OFStream *)openItemAtURL: (OFURL *)URL mode: (OFString *)mode
 {
 	OF_UNRECOGNIZED_SELECTOR
 }
 
-- (of_file_attributes_t)attributesOfItemAtURL: (OFURL *)URL
+- (OFFileAttributes)attributesOfItemAtURL: (OFURL *)URL
 {
 	OF_UNRECOGNIZED_SELECTOR
 }
 
-- (void)setAttributes: (of_file_attributes_t)attributes
-	  ofItemAtURL: (OFURL *)URL
+- (void)setAttributes: (OFFileAttributes)attributes ofItemAtURL: (OFURL *)URL
 {
 	OF_UNRECOGNIZED_SELECTOR
 }
 
 - (bool)fileExistsAtURL: (OFURL *)URL
@@ -170,22 +163,21 @@
 - (void)createDirectoryAtURL: (OFURL *)URL
 {
 	OF_UNRECOGNIZED_SELECTOR
 }
 
-- (OFArray OF_GENERIC(OFString *) *)contentsOfDirectoryAtURL: (OFURL *)URL
+- (OFArray OF_GENERIC(OFURL *) *)contentsOfDirectoryAtURL: (OFURL *)URL
 {
 	OF_UNRECOGNIZED_SELECTOR
 }
 
 - (void)removeItemAtURL: (OFURL *)URL
 {
 	OF_UNRECOGNIZED_SELECTOR
 }
 
-- (void)linkItemAtURL: (OFURL *)source
-		toURL: (OFURL *)destination
+- (void)linkItemAtURL: (OFURL *)source toURL: (OFURL *)destination
 {
 	OF_UNRECOGNIZED_SELECTOR
 }
 
 - (void)createSymbolicLinkAtURL: (OFURL *)destination
@@ -192,17 +184,15 @@
 	    withDestinationPath: (OFString *)source
 {
 	OF_UNRECOGNIZED_SELECTOR
 }
 
-- (bool)copyItemAtURL: (OFURL *)source
-		toURL: (OFURL *)destination
+- (bool)copyItemAtURL: (OFURL *)source toURL: (OFURL *)destination
 {
 	return false;
 }
 
-- (bool)moveItemAtURL: (OFURL *)source
-		toURL: (OFURL *)destination
+- (bool)moveItemAtURL: (OFURL *)source toURL: (OFURL *)destination
 {
 	return false;
 }
 @end