@@ -37,16 +37,16 @@ @class OFArray OF_GENERIC(ObjectType); @class OFConstantString; @class OFDate; @class OFString; -@class OFURL; +@class OFURI; /** * @brief A key for a file attribute in the file attributes dictionary. * - * Possible keys for file URLs are: + * Possible keys for file URIs are: * * * @ref OFFileSize * * @ref OFFileType * * @ref OFFilePOSIXPermissions * * @ref OFFileOwnerAccountID @@ -57,18 +57,18 @@ * * @ref OFFileModificationDate * * @ref OFFileStatusChangeDate * * @ref OFFileCreationDate * * @ref OFFileSymbolicLinkDestination * - * Other URL schemes might not have all keys and might have keys not listed. + * Other URI schemes might not have all keys and might have keys not listed. */ typedef OFConstantString *OFFileAttributeKey; /** * @brief The type of a file. * - * Possibles values for file URLs are: + * Possibles values for file URIs are: * * * @ref OFFileTypeRegular * * @ref OFFileTypeDirectory * * @ref OFFileTypeSymbolicLink * * @ref OFFileTypeFIFO @@ -75,11 +75,11 @@ * * @ref OFFileTypeCharacterSpecial * * @ref OFFileTypeBlockSpecial * * @ref OFFileTypeSocket * * @ref OFFileTypeUnknown * - * Other URL schemes might not have all types and might have types not listed. + * Other URI schemes might not have all types and might have types not listed. */ typedef OFConstantString *OFFileAttributeType; /** * @brief A dictionary mapping keys of type @ref OFFileAttributeKey to their @@ -263,15 +263,15 @@ * @throw OFGetCurrentDirectoryFailedException Couldn't get current directory */ @property (readonly, nonatomic) OFString *currentDirectoryPath; /** - * @brief The URL of the current working directory. + * @brief The URI of the current working directory. * * @throw OFGetCurrentDirectoryFailedException Couldn't get current directory */ -@property (readonly, nonatomic) OFURL *currentDirectoryURL; +@property (readonly, nonatomic) OFURI *currentDirectoryURI; #endif /** * @brief Returns the default file manager. */ @@ -289,21 +289,21 @@ */ - (OFFileAttributes)attributesOfItemAtPath: (OFString *)path; #endif /** - * @brief Returns the attributes for the item at the specified URL. + * @brief Returns the attributes for the item at the specified URI. * - * @param URL The URL to return the attributes for - * @return A dictionary of attributes for the specified URL, with the keys of + * @param URI The URI to return the attributes for + * @return A dictionary of attributes for the specified URI, with the keys of * type @ref OFFileAttributeKey * @throw OFGetItemAttributesFailedException Failed to get the attributes of * the item - * @throw OFUnsupportedProtocolException No handler is registered for the URL's + * @throw OFUnsupportedProtocolException No handler is registered for the URI's * scheme */ -- (OFFileAttributes)attributesOfItemAtURL: (OFURL *)URL; +- (OFFileAttributes)attributesOfItemAtURI: (OFURI *)URI; #ifdef OF_HAVE_FILES /** * @brief Sets the attributes for the item at the specified path. * @@ -320,25 +320,25 @@ - (void)setAttributes: (OFFileAttributes)attributes ofItemAtPath: (OFString *)path; #endif /** - * @brief Sets the attributes for the item at the specified URL. + * @brief Sets the attributes for the item at the specified URI. * * 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 + * @param attributes The attributes to set for the specified URI + * @param URI The URI of the item to set the attributes for * @throw OFSetItemAttributesFailedException Failed to set the attributes of * the item - * @throw OFUnsupportedProtocolException No handler is registered for the URL's + * @throw OFUnsupportedProtocolException No handler is registered for the URI's * scheme * @throw OFNotImplementedException Setting one or more of the specified * attributes is not implemented for the * specified item */ -- (void)setAttributes: (OFFileAttributes)attributes ofItemAtURL: (OFURL *)URL; +- (void)setAttributes: (OFFileAttributes)attributes ofItemAtURI: (OFURI *)URI; #ifdef OF_HAVE_FILES /** * @brief Checks whether a file exists at the specified path. * @@ -347,18 +347,18 @@ */ - (bool)fileExistsAtPath: (OFString *)path; #endif /** - * @brief Checks whether a file exists at the specified URL. + * @brief Checks whether a file exists at the specified URI. * - * @param URL The URL to check - * @return A boolean whether there is a file at the specified URL - * @throw OFUnsupportedProtocolException No handler is registered for the URL's + * @param URI The URI to check + * @return A boolean whether there is a file at the specified URI + * @throw OFUnsupportedProtocolException No handler is registered for the URI's * scheme */ -- (bool)fileExistsAtURL: (OFURL *)URL; +- (bool)fileExistsAtURI: (OFURI *)URI; #ifdef OF_HAVE_FILES /** * @brief Checks whether a directory exists at the specified path. * @@ -367,18 +367,18 @@ */ - (bool)directoryExistsAtPath: (OFString *)path; #endif /** - * @brief Checks whether a directory exists at the specified URL. + * @brief Checks whether a directory exists at the specified URI. * - * @param URL The URL to check - * @return A boolean whether there is a directory at the specified URL - * @throw OFUnsupportedProtocolException No handler is registered for the URL's + * @param URI The URI to check + * @return A boolean whether there is a directory at the specified URI + * @throw OFUnsupportedProtocolException No handler is registered for the URI's * scheme */ -- (bool)directoryExistsAtURL: (OFURL *)URL; +- (bool)directoryExistsAtURI: (OFURI *)URI; #ifdef OF_HAVE_FILES /** * @brief Creates a directory at the specified path. * @@ -398,30 +398,30 @@ - (void)createDirectoryAtPath: (OFString *)path createParents: (bool)createParents; #endif /** - * @brief Creates a directory at the specified URL. + * @brief Creates a directory at the specified URI. * - * @param URL The URL of the directory to create + * @param URI The URI of the directory to create * @throw OFCreateDirectoryFailedException Creating the directory failed - * @throw OFUnsupportedProtocolException No handler is registered for the URL's + * @throw OFUnsupportedProtocolException No handler is registered for the URI's * scheme */ -- (void)createDirectoryAtURL: (OFURL *)URL; +- (void)createDirectoryAtURI: (OFURI *)URI; /** - * @brief Creates a directory at the specified URL. + * @brief Creates a directory at the specified URI. * - * @param URL The URL of the directory to create + * @param URI The URI of the directory to create * @param createParents Whether to create the parents of the directory * @throw OFCreateDirectoryFailedException Creating the directory or one of its * parents failed - * @throw OFUnsupportedProtocolException No handler is registered for the URL's + * @throw OFUnsupportedProtocolException No handler is registered for the URI's * scheme */ -- (void)createDirectoryAtURL: (OFURL *)URL createParents: (bool)createParents; +- (void)createDirectoryAtURI: (OFURI *)URI createParents: (bool)createParents; #ifdef OF_HAVE_FILES /** * @brief Returns an array with the items in the specified directory. * @@ -434,23 +434,23 @@ */ - (OFArray OF_GENERIC(OFString *) *)contentsOfDirectoryAtPath: (OFString *)path; #endif /** - * @brief Returns an array with the URLs of the items in the specified + * @brief Returns an array with the URIs 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 with the URLs of the items in the specified directory + * @param URI The URI to the directory whose items should be returned + * @return An array with the URIs of the items in the specified directory * @throw OFOpenItemFailedException Opening the directory failed * @throw OFReadFailedException Reading from the directory failed - * @throw OFUnsupportedProtocolException No handler is registered for the URL's + * @throw OFUnsupportedProtocolException No handler is registered for the URI's * scheme */ -- (OFArray OF_GENERIC(OFURL *) *)contentsOfDirectoryAtURL: (OFURL *)URL; +- (OFArray OF_GENERIC(OFURI *) *)contentsOfDirectoryAtURI: (OFURI *)URI; #ifdef OF_HAVE_FILES /** * @brief Returns an array with all subpaths of the specified directory. * @@ -472,15 +472,15 @@ - (void)changeCurrentDirectoryPath: (OFString *)path; /** * @brief Changes the current working directory. * - * @param URL The new directory to change to + * @param URI The new directory to change to * @throw OFChangeCurrentDirectoryFailedException Changing the current working * directory failed */ -- (void)changeCurrentDirectoryURL: (OFURL *)URL; +- (void)changeCurrentDirectoryURI: (OFURI *)URI; /** * @brief Copies a file, directory or symbolic link (if supported by the OS). * * The destination path must be a full path, which means it must include the @@ -500,26 +500,26 @@ #endif /** * @brief Copies a file, directory or symbolic link (if supported by the OS). * - * The destination URL must have a full path, which means it must include the + * The destination URI must have a full path, which means it must include the * name of the item. * * If an item already exists, the copy operation fails. This is also the case * if a directory is copied and an item already exists in the destination * directory. * * @param source The file, directory or symbolic link to copy - * @param destination The destination URL + * @param destination The destination URI * @throw OFCopyItemFailedException Copying failed * @throw OFCreateDirectoryFailedException Creating a destination directory * failed * @throw OFUnsupportedProtocolException No handler is registered for either of - * the URL's scheme + * the URI's scheme */ -- (void)copyItemAtURL: (OFURL *)source toURL: (OFURL *)destination; +- (void)copyItemAtURI: (OFURI *)source toURI: (OFURI *)destination; #ifdef OF_HAVE_FILES /** * @brief Moves an item. * @@ -545,16 +545,16 @@ #endif /** * @brief Moves an item. * - * The destination URL must have a full path, which means it must include the + * The destination URI must have a full path, which means it must include the * name of the item. * * If the destination is on a different logical device or uses a different * scheme, the source will be copied to the destination using - * @ref copyItemAtURL:toURL: and the source removed using @ref removeItemAtURL:. + * @ref copyItemAtURI:toURI: and the source removed using @ref removeItemAtURI:. * * @param source The item to rename * @param destination The new name for the item * @throw OFMoveItemFailedException Moving failed * @throw OFCopyItemFailedException Copying (to move between different devices) @@ -563,13 +563,13 @@ * destination (to move between different * devices) failed * @throw OFCreateDirectoryFailedException Creating a destination directory * failed * @throw OFUnsupportedProtocolException No handler is registered for either of - * the URL's scheme + * the URI's scheme */ -- (void)moveItemAtURL: (OFURL *)source toURL: (OFURL *)destination; +- (void)moveItemAtURI: (OFURI *)source toURI: (OFURI *)destination; #ifdef OF_HAVE_FILES /** * @brief Removes the item at the specified path. * @@ -580,20 +580,20 @@ */ - (void)removeItemAtPath: (OFString *)path; #endif /** - * @brief Removes the item at the specified URL. + * @brief Removes the item at the specified URI. * - * If the item at the specified URL is a directory, it is removed recursively. + * If the item at the specified URI is a directory, it is removed recursively. * - * @param URL The URL to the item which should be removed + * @param URI The URI to the item which should be removed * @throw OFRemoveItemFailedException Removing the item failed - * @throw OFUnsupportedProtocolException No handler is registered for the URL's + * @throw OFUnsupportedProtocolException No handler is registered for the URI's * scheme */ -- (void)removeItemAtURL: (OFURL *)URL; +- (void)removeItemAtURI: (OFURI *)URI; #ifdef OF_FILE_MANAGER_SUPPORTS_LINKS /** * @brief Creates a hard link for the specified item. * @@ -604,32 +604,32 @@ * * @param source The path to the item for which a link should be created * @param destination The path to the item which should link to the source * @throw OFLinkItemFailedException Linking the item failed * @throw OFNotImplementedException Hardlinks are not implemented for the - * specified URL + * specified URI */ - (void)linkItemAtPath: (OFString *)source toPath: (OFString *)destination; #endif /** * @brief Creates a hard link for the specified item. * - * The destination URL must have a full path, which means it must include the + * The destination URI must have a full path, which means it must include the * name of the item. * - * This method is not available for all URLs. + * This method is not available for all URIs. * - * @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 + * @param source The URI to the item for which a link should be created + * @param destination The URI to the item which should link to the source * @throw OFLinkItemFailedException Linking the item failed - * @throw OFUnsupportedProtocolException No handler is registered for the URL's + * @throw OFUnsupportedProtocolException No handler is registered for the URI's * scheme * @throw OFNotImplementedException Hardlinks are not implemented for the - * specified URL + * specified URI */ -- (void)linkItemAtURL: (OFURL *)source toURL: (OFURL *)destination; +- (void)linkItemAtURI: (OFURI *)source toURI: (OFURI *)destination; #ifdef OF_FILE_MANAGER_SUPPORTS_SYMLINKS /** * @brief Creates a symbolic link for an item. * @@ -643,11 +643,11 @@ * * @param path The path to the item which should symbolically link to the target * @param target The target of the symbolic link * @throw OFCreateSymbolicLinkFailedException Creating the symbolic link failed * @throw OFNotImplementedException Symbolic links are not implemented for the - * specified URL + * specified URI */ - (void)createSymbolicLinkAtPath: (OFString *)path withDestinationPath: (OFString *)target; #endif @@ -655,21 +655,21 @@ * @brief Creates a symbolic link for an item. * * The destination uRL must have a full path, which means it must include the * name of the item. * - * This method is not available for all URLs. + * This method is not available for all URIs. * * @note On Windows, this requires at least Windows Vista and administrator * privileges! * - * @param URL The URL to the item which should symbolically link to the target + * @param URI The URI to the item which should symbolically link to the target * @param target The target of the symbolic link - * @throw OFUnsupportedProtocolException No handler is registered for the URL's + * @throw OFUnsupportedProtocolException No handler is registered for the URI's * scheme */ -- (void)createSymbolicLinkAtURL: (OFURL *)URL +- (void)createSymbolicLinkAtURI: (OFURI *)URI withDestinationPath: (OFString *)target; @end @interface OFDictionary (FileAttributes) /**