diff --git a/cli/filelister.h b/cli/filelister.h index 9ba296eedce..6cdd99c7e43 100644 --- a/cli/filelister.h +++ b/cli/filelister.h @@ -32,21 +32,6 @@ class FileWithDetails; /** @brief Cross-platform FileLister */ class FileLister { public: - /** - * @brief Recursively add source files to a map. - * Add source files from given directory and all subdirectries to the - * given map. Only files with accepted extensions - * (*.c;*.cpp;*.cxx;*.c++;*.cc;*.txx) are added. - * @param files output list that associates the size of each file with its name - * @param path root path - * @param ignored ignored paths - * @return On success, an empty string is returned. On error, a error message is returned. - */ - static std::string recursiveAddFiles(std::list &files, const std::string &path, const PathMatch& ignored) { - const std::set extra; - return recursiveAddFiles(files, path, extra, ignored); - } - /** * @brief Recursively add source files to a map. * Add source files from given directory and all subdirectries to the diff --git a/test/testfilelister.cpp b/test/testfilelister.cpp index 873055a782f..b4926d5c9b9 100644 --- a/test/testfilelister.cpp +++ b/test/testfilelister.cpp @@ -62,7 +62,7 @@ class TestFileLister : public TestFixture { std::list files; std::vector masks; PathMatch matcher(std::move(masks)); - std::string err = FileLister::recursiveAddFiles(files, adddir, matcher); + std::string err = FileLister::recursiveAddFiles(files, adddir, {}, matcher); ASSERT_EQUALS("", err); ASSERT(!files.empty()); @@ -108,7 +108,7 @@ class TestFileLister : public TestFixture { void recursiveAddFilesEmptyPath() const { std::list files; - const std::string err = FileLister::recursiveAddFiles(files, "", PathMatch({})); + const std::string err = FileLister::recursiveAddFiles(files, "", {}, PathMatch({})); ASSERT_EQUALS("no path specified", err); } @@ -118,7 +118,7 @@ class TestFileLister : public TestFixture { std::list files; std::vector ignored{"lib/token.cpp"}; PathMatch matcher(ignored); - std::string err = FileLister::recursiveAddFiles(files, basedir + "lib/token.cpp", matcher); + std::string err = FileLister::recursiveAddFiles(files, basedir + "lib/token.cpp", {}, matcher); ASSERT_EQUALS("", err); ASSERT(files.empty()); } @@ -129,7 +129,7 @@ class TestFileLister : public TestFixture { std::list files; std::vector ignored; PathMatch matcher(ignored); - std::string err = FileLister::recursiveAddFiles(files, basedir + "lib/token.cpp", matcher); + std::string err = FileLister::recursiveAddFiles(files, basedir + "lib/token.cpp", {}, matcher); ASSERT_EQUALS("", err); ASSERT_EQUALS(1, files.size()); ASSERT_EQUALS(basedir + "lib/token.cpp", files.begin()->path());