diff options
author | Petr Mrázek <peterix@gmail.com> | 2017-09-08 09:02:27 +0200 |
---|---|---|
committer | Petr Mrázek <peterix@gmail.com> | 2017-09-08 09:02:27 +0200 |
commit | 3fb4ce713fb7fdef2753009967fa58103fa69974 (patch) | |
tree | e1d9b9db3168a631100fb37fde4359d9d857e52a /api/logic/FileSystem.cpp | |
parent | 32a2cb5a0dabbe19eef04f378824af8a10487d97 (diff) | |
download | MultiMC-3fb4ce713fb7fdef2753009967fa58103fa69974.tar MultiMC-3fb4ce713fb7fdef2753009967fa58103fa69974.tar.gz MultiMC-3fb4ce713fb7fdef2753009967fa58103fa69974.tar.lz MultiMC-3fb4ce713fb7fdef2753009967fa58103fa69974.tar.xz MultiMC-3fb4ce713fb7fdef2753009967fa58103fa69974.zip |
NOISSUE add support for Flame packs with resource packs
And a bunch of undefined things we don't handle intentionally just yet...
Diffstat (limited to 'api/logic/FileSystem.cpp')
-rw-r--r-- | api/logic/FileSystem.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/api/logic/FileSystem.cpp b/api/logic/FileSystem.cpp index b3115988..1f9f0e43 100644 --- a/api/logic/FileSystem.cpp +++ b/api/logic/FileSystem.cpp @@ -225,7 +225,7 @@ bool deletePath(QString path) } -QString PathCombine(QString path1, QString path2) +QString PathCombine(const QString & path1, const QString & path2) { if(!path1.size()) return path2; @@ -234,11 +234,16 @@ QString PathCombine(QString path1, QString path2) return QDir::cleanPath(path1 + QDir::separator() + path2); } -QString PathCombine(QString path1, QString path2, QString path3) +QString PathCombine(const QString & path1, const QString & path2, const QString & path3) { return PathCombine(PathCombine(path1, path2), path3); } +QString PathCombine(const QString & path1, const QString & path2, const QString & path3, const QString & path4) +{ + return PathCombine(PathCombine(path1, path2, path3), path4); +} + QString AbsolutePath(QString path) { return QFileInfo(path).absolutePath(); |