From efe94dca7975148a085bdf3b9c3258f89e1a6fdb Mon Sep 17 00:00:00 2001 From: blahpy Date: Thu, 10 Sep 2020 10:35:29 +1200 Subject: [PATCH] Format using clang-format --- common/util/FileUtil.cpp | 28 ++++++++++++++-------------- common/util/FileUtil.h | 9 ++++----- test/test_common_util.cpp | 1 - 3 files changed, 18 insertions(+), 20 deletions(-) diff --git a/common/util/FileUtil.cpp b/common/util/FileUtil.cpp index b4b9640b1a..876f927b3a 100644 --- a/common/util/FileUtil.cpp +++ b/common/util/FileUtil.cpp @@ -1,13 +1,13 @@ #include "FileUtil.h" #include -#include /* defines FILENAME_MAX */ +#include /* defines FILENAME_MAX */ #ifdef _WIN32 - #include - #define GetCurrentDir _getcwd +#include +#define GetCurrentDir _getcwd #else - #include - #define GetCurrentDir getcwd +#include +#define GetCurrentDir getcwd #endif std::string FileUtil::GetCurrentWorkingDir() { @@ -17,20 +17,20 @@ std::string FileUtil::GetCurrentWorkingDir() { return current_working_dir; } -std::string FileUtil::get_file_path(std::vector input) { +std::string FileUtil::get_file_path(const std::vector& input) { std::string currentPath = FileUtil::GetCurrentWorkingDir(); // std::filesystem::current_path(); char dirSeparator; - #ifdef _WIN32 - dirSeparator = '\\'; - #else - dirSeparator = '/'; - #endif +#ifdef _WIN32 + dirSeparator = '\\'; +#else + dirSeparator = '/'; +#endif std::string filePath = currentPath; - for (int i = 0; i < input.size(); i++) { - filePath = filePath + dirSeparator + input[i]; - } + for (int i = 0; i < input.size(); i++) { + filePath = filePath + dirSeparator + input[i]; + } return filePath; } diff --git a/common/util/FileUtil.h b/common/util/FileUtil.h index 46906534d4..7b0517503b 100644 --- a/common/util/FileUtil.h +++ b/common/util/FileUtil.h @@ -2,8 +2,7 @@ #include #include -namespace FileUtil -{ - std::string GetCurrentWorkingDir(); - std::string get_file_path(std::vector input); -} +namespace FileUtil { +std::string GetCurrentWorkingDir(); +std::string get_file_path(std::vector input); +} // namespace FileUtil diff --git a/test/test_common_util.cpp b/test/test_common_util.cpp index e9862573c8..96e1492133 100644 --- a/test/test_common_util.cpp +++ b/test/test_common_util.cpp @@ -4,7 +4,6 @@ #include TEST(FileUtil, valid_path) { - std::vector test = {"cabbage", "banana", "apple"}; std::string sampleString = FileUtil::get_file_path(test); // std::cout << sampleString << std::endl;