Mark overridden virtual functions as such

[libs/core.git] / source / fs / dir.h

diff --git a/source/fs/dir.h b/source/fs/dir.h
index 89d86ed9383c0f99661d80d1b169d82c87a2a585..bef89c6d72e1e160072be098450c8641bb0ec00a 100644 (file)
--- a/source/fs/dir.h
+++ b/source/fs/dir.h
@@ -1,10 +1,9 @@
 #ifndef MSP_FS_DIR_H_
 #define MSP_FS_DIR_H_
 
-#include <list>
 #include <stdexcept>
 #include <string>
-#include <msp/core/attributes.h>
+#include <vector>
 #include "path.h"
 
 namespace Msp {
@@ -14,7 +13,7 @@ class not_a_directory: public std::runtime_error
 {
 public:
        not_a_directory(const Path &);
-       virtual ~not_a_directory() throw() { }
+       ~not_a_directory() throw() override = default;
 };
 
 /// Creates a directory
@@ -30,10 +29,10 @@ void rmdir(const Path &path);
 void rmpath(const Path &path);
 
 /// Lists the contents of a directory
-std::list<std::string> list_files(const Path &path);
+std::vector<std::string> list_files(const Path &path);
 
 /// Lists the contents of a directory, filtered with a regex
-std::list<std::string> list_filtered(const Path &path, const std::string &filter);
+std::vector<std::string> list_filtered(const Path &path, const std::string &filter);
 
 /// Returns the current working directory
 Path getcwd();
@@ -44,33 +43,21 @@ void chdir(const Path &);
 /// Returns the user's home directory
 Path get_home_dir();
 
-/// Deprecated.  Use the argument-less version instead.
-DEPRECATED Path get_user_data_dir(const std::string &appname);
-
 /// Returns a directory suitable for storing user-specific data.
 Path get_user_data_dir();
 
-/// Deprecated.  Use the argument-less version instead.
-DEPRECATED Path get_sys_conf_dir(const std::string &argv0);
-
 /// Returns a directory containing system-wide configuration.
 Path get_sys_conf_dir();
 
-/// Deprecated.  Use the argument-less version instead.
-DEPRECATED Path get_sys_data_dir(const std::string &argv0, const std::string &appname);
-
 /// Returns a directory containing immutable system-wide data.
 Path get_sys_data_dir();
 
-/// Deprecated.  Use the argument-less version instead.
-DEPRECATED Path get_sys_lib_dir(const std::string &argv0, const std::string &appname);
-
 /// Returns a directory containing system-wide architecture-specific files.
 Path get_sys_lib_dir();
 
 /** Looks for a file in a list of paths.  Returns the absolute path to the
 first existing location, or an empty Path if the file is not found at all. */
-Path path_lookup(const std::string &, const std::list<Path> &);
+Path path_lookup(const std::string &, const std::vector<Path> &);
 
 /** Looks for a file using the PATH environment variable. */
 Path path_lookup(const std::string &);