diff options
author | Andrei Karas <akaras@inbox.ru> | 2017-04-03 02:12:42 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2017-04-03 18:44:58 +0300 |
commit | 9e72886ee15acc39cbb6075ce32a60a5391ea9f3 (patch) | |
tree | fd7d0b05eeaed5ab0016cad58772cab7456f36b4 /src/fs/paths.cpp | |
parent | 49631972db5b965413d4bbe36983a8d5bd203183 (diff) | |
download | plus-9e72886ee15acc39cbb6075ce32a60a5391ea9f3.tar.gz plus-9e72886ee15acc39cbb6075ce32a60a5391ea9f3.tar.bz2 plus-9e72886ee15acc39cbb6075ce32a60a5391ea9f3.tar.xz plus-9e72886ee15acc39cbb6075ce32a60a5391ea9f3.zip |
Replace string::append with pathJoin.
Diffstat (limited to 'src/fs/paths.cpp')
-rw-r--r-- | src/fs/paths.cpp | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/src/fs/paths.cpp b/src/fs/paths.cpp index a5941f084..e5fcdd7d3 100644 --- a/src/fs/paths.cpp +++ b/src/fs/paths.cpp @@ -191,12 +191,12 @@ std::string getPicturesDir() std::string file; if (!xdg) { - file = std::string(VirtFs::getUserDir()).append( - "/.config/user-dirs.dirs"); + file = pathJoin(VirtFs::getUserDir(), + ".config/user-dirs.dirs"); } else { - file = std::string(xdg).append("/user-dirs.dirs"); + file = pathJoin(xdg, "user-dirs.dirs"); } StringVect arr; @@ -212,16 +212,13 @@ std::string getPicturesDir() replaceAll(str, "$HOME/", VirtFs::getUserDir()); str = getRealPath(str); if (str.empty()) - str = std::string(VirtFs::getUserDir()).append("Desktop"); + str = pathJoin(VirtFs::getUserDir(), "Desktop"); return str; } } - - return std::string(VirtFs::getUserDir()).append("Desktop"); -#else // WIN32 - - return std::string(VirtFs::getUserDir()).append("Desktop"); #endif // WIN32 + + return pathJoin(VirtFs::getUserDir(), "Desktop"); } std::string getHomePath() |