@@ -49,12 +49,11 @@
  * @param class_ The class to register as the handler for the specified scheme
  * @param scheme The scheme for which to register the handler
  * @return Whether the class was successfully registered. If a handler for the
  *	   same scheme is already registered, registration fails.
  */
-+ (bool)registerClass: (Class)class_
-	    forScheme: (OFString *)scheme;
++ (bool)registerClass: (Class)class_ forScheme: (OFString *)scheme;
 
 /**
  * @brief Returns the handler for the specified URL.
  *
  * @return The handler for the specified URL.
@@ -90,32 +89,30 @@
  *	       `a+`           | Read-write, create or append
  *	       @n
  *	       The handler is allowed to not implement all modes and is also
  *	       allowed to implement additional, scheme-specific modes.
  */
-- (OFStream *)openItemAtURL: (OFURL *)URL
-		       mode: (OFString *)mode;
+- (OFStream *)openItemAtURL: (OFURL *)URL mode: (OFString *)mode;
 
 /**
  * @brief Returns the attributes for the item at the specified URL.
  *
  * @param URL The URL to return the attributes for
  * @return A dictionary of attributes for the specified URL, with the keys of
- *	   type @ref of_file_attribute_key_t
+ *	   type @ref OFFileAttributeKey
  */
-- (of_file_attributes_t)attributesOfItemAtURL: (OFURL *)URL;
+- (OFFileAttributes)attributesOfItemAtURL: (OFURL *)URL;
 
 /**
  * @brief Sets the attributes for the item at the specified URL.
  *
  * All attributes not part of the dictionary are left unchanged.
  *
  * @param attributes The attributes to set for the specified URL
  * @param URL The URL of the item to set the attributes for
  */
-- (void)setAttributes: (of_file_attributes_t)attributes
-	  ofItemAtURL: (OFURL *)URL;
+- (void)setAttributes: (OFFileAttributes)attributes ofItemAtURL: (OFURL *)URL;
 
 /**
  * @brief Checks whether a file exists at the specified URL.
  *
  * @param URL The URL to check
@@ -137,18 +134,19 @@
  * @param URL The URL of the directory to create
  */
 - (void)createDirectoryAtURL: (OFURL *)URL;
 
 /**
- * @brief Returns an array with the items in the specified directory.
+ * @brief Returns an array with the URLs of the items in the specified
+ *	  directory.
  *
  * @note `.` and `..` are not part of the returned array.
  *
  * @param URL The URL to the directory whose items should be returned
- * @return An array of OFString with the items in the specified directory
+ * @return An array with the URLs of the items in the specified directory
  */
-- (OFArray OF_GENERIC(OFString *) *)contentsOfDirectoryAtURL: (OFURL *)URL;
+- (OFArray OF_GENERIC(OFURL *) *)contentsOfDirectoryAtURL: (OFURL *)URL;
 
 /**
  * @brief Removes the item at the specified URL.
  *
  * If the item at the specified URL is a directory, it is removed recursively.
@@ -166,12 +164,11 @@
  * This method is not available for all URLs.
  *
  * @param source The URL to the item for which a link should be created
  * @param destination The URL to the item which should link to the source
  */
-- (void)linkItemAtURL: (OFURL *)source
-		toURL: (OFURL *)destination;
+- (void)linkItemAtURL: (OFURL *)source toURL: (OFURL *)destination;
 
 /**
  * @brief Creates a symbolic link for an item.
  *
  * The destination uRL must have a full path, which means it must include the
@@ -203,12 +200,11 @@
  * @param destination The destination URL
  * @return True if an efficient copy was performed, false if an efficient copy
  *	   was not possible. Note that errors while performing a copy are
  *	   reported via exceptions and not by returning false!
  */
-- (bool)copyItemAtURL: (OFURL *)source
-		toURL: (OFURL *)destination;
+- (bool)copyItemAtURL: (OFURL *)source toURL: (OFURL *)destination;
 
 /**
  * @brief Tries to efficiently move an item. If a move would only be possible
  *	  by copying the source and deleting it, it returns false.
  *
@@ -222,10 +218,9 @@
  * @param destination The new name for the item
  * @return True if an efficient move was performed, false if an efficient move
  *	   was not possible. Note that errors while performing a move are
  *	   reported via exceptions and not by returning false!
  */
-- (bool)moveItemAtURL: (OFURL *)source
-		toURL: (OFURL *)destination;
+- (bool)moveItemAtURL: (OFURL *)source toURL: (OFURL *)destination;
 @end
 
 OF_ASSUME_NONNULL_END