diff options
| author | Petr Mrázek <peterix@gmail.com> | 2015-10-05 01:47:27 +0200 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2015-10-05 01:47:27 +0200 |
| commit | f93f867c3da084c6d6c5e3ed23896609cff0e692 (patch) | |
| tree | 3234c54d9aefb5566afc0c8ff52874e20ab35304 /logic/MMCZip.cpp | |
| parent | 7459eb627c97d27ef6e12cdededa48e1ff03d533 (diff) | |
| download | MultiMC-f93f867c3da084c6d6c5e3ed23896609cff0e692.tar MultiMC-f93f867c3da084c6d6c5e3ed23896609cff0e692.tar.gz MultiMC-f93f867c3da084c6d6c5e3ed23896609cff0e692.tar.lz MultiMC-f93f867c3da084c6d6c5e3ed23896609cff0e692.tar.xz MultiMC-f93f867c3da084c6d6c5e3ed23896609cff0e692.zip | |
NOISSUE dissolve util library
Diffstat (limited to 'logic/MMCZip.cpp')
| -rw-r--r-- | logic/MMCZip.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/logic/MMCZip.cpp b/logic/MMCZip.cpp index 62904fa5..0f35bc70 100644 --- a/logic/MMCZip.cpp +++ b/logic/MMCZip.cpp @@ -23,11 +23,11 @@ Original ZIP package is copyrighted by Gilles Vollant and contributors, see quazip/(un)MMCZip.h files for details. Basically it's the zlib license. */ -#include <pathutils.h> #include <quazip.h> #include <JlCompress.h> #include <quazipdir.h> #include "MMCZip.h" +#include "FileSystem.h" #include <QDebug> @@ -111,7 +111,7 @@ bool MMCZip::compressSubDir(QuaZip* zip, QString dir, QString origDir, QSet<QStr if(!blacklist || !blacklist->covers(internalDirName)) { QuaZipFile dirZipFile(zip); - auto dirPrefix = PathCombine(prefix, origDirectory.relativeFilePath(dir)) + "/"; + auto dirPrefix = FS::PathCombine(prefix, origDirectory.relativeFilePath(dir)) + "/"; if (!dirZipFile.open(QIODevice::WriteOnly, QuaZipNewInfo(dirPrefix, dir), 0, 0, 0)) { return false; @@ -153,7 +153,7 @@ bool MMCZip::compressSubDir(QuaZip* zip, QString dir, QString origDir, QSet<QStr } if(prefix.size()) { - filename = PathCombine(prefix, filename); + filename = FS::PathCombine(prefix, filename); } added.insert(filename); if (!compressFile(zip,file.absoluteFilePath(),filename)) |