diff options
author | Petr Mrázek <peterix@gmail.com> | 2013-01-20 00:26:50 +0100 |
---|---|---|
committer | Petr Mrázek <peterix@gmail.com> | 2013-01-20 00:26:50 +0100 |
commit | 3e0ba1ffd399e4d6e92ba901fc9ea07f589e2af8 (patch) | |
tree | 48e0edfb441c42bfb7c7d80489e358a9a27a59bf /util | |
parent | b1d00fce8da901b31fa52ea59b4bc3c8edb9d9cc (diff) | |
parent | b371ee1de22be6d846aa53ae5574555ca012f1c3 (diff) | |
download | MultiMC-3e0ba1ffd399e4d6e92ba901fc9ea07f589e2af8.tar MultiMC-3e0ba1ffd399e4d6e92ba901fc9ea07f589e2af8.tar.gz MultiMC-3e0ba1ffd399e4d6e92ba901fc9ea07f589e2af8.tar.lz MultiMC-3e0ba1ffd399e4d6e92ba901fc9ea07f589e2af8.tar.xz MultiMC-3e0ba1ffd399e4d6e92ba901fc9ea07f589e2af8.zip |
Merge https://github.com/Forkk/MultiMC5
Diffstat (limited to 'util')
-rw-r--r-- | util/pathutils.cpp | 5 | ||||
-rw-r--r-- | util/pathutils.h | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/util/pathutils.cpp b/util/pathutils.cpp index 809dd6f2..8610b80d 100644 --- a/util/pathutils.cpp +++ b/util/pathutils.cpp @@ -26,6 +26,11 @@ QString PathCombine(QString path1, QString path2) return path1.append(path2); } +QString PathCombine(QString path1, QString path2, QString path3) +{ + return PathCombine(PathCombine(path1, path2), path3); +} + QString AbsolutePath(QString path) { return QFileInfo(path).absolutePath(); diff --git a/util/pathutils.h b/util/pathutils.h index bfd11bea..1922e3a0 100644 --- a/util/pathutils.h +++ b/util/pathutils.h @@ -19,6 +19,7 @@ #include <QString> QString PathCombine(QString path1, QString path2); +QString PathCombine(QString path1, QString path2, QString path3); QString AbsolutePath(QString path); |