summaryrefslogtreecommitdiffstats
path: root/logic/updater
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2015-10-05 01:47:27 +0200
committerPetr Mrázek <peterix@gmail.com>2015-10-05 01:47:27 +0200
commitf93f867c3da084c6d6c5e3ed23896609cff0e692 (patch)
tree3234c54d9aefb5566afc0c8ff52874e20ab35304 /logic/updater
parent7459eb627c97d27ef6e12cdededa48e1ff03d533 (diff)
downloadMultiMC-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/updater')
-rw-r--r--logic/updater/DownloadTask.cpp1
-rw-r--r--logic/updater/GoUpdate.cpp8
2 files changed, 4 insertions, 5 deletions
diff --git a/logic/updater/DownloadTask.cpp b/logic/updater/DownloadTask.cpp
index 1bbb0edf..6947e8bf 100644
--- a/logic/updater/DownloadTask.cpp
+++ b/logic/updater/DownloadTask.cpp
@@ -18,7 +18,6 @@
#include "updater/UpdateChecker.h"
#include "GoUpdate.h"
#include "net/NetJob.h"
-#include "pathutils.h"
#include <QFile>
#include <QTemporaryDir>
diff --git a/logic/updater/GoUpdate.cpp b/logic/updater/GoUpdate.cpp
index a43c5e7c..60d50e04 100644
--- a/logic/updater/GoUpdate.cpp
+++ b/logic/updater/GoUpdate.cpp
@@ -1,9 +1,9 @@
#include "GoUpdate.h"
-#include <pathutils.h>
#include <QDebug>
#include <QDomDocument>
#include <QFile>
#include <Env.h>
+#include <FileSystem.h>
namespace GoUpdate
{
@@ -80,7 +80,7 @@ bool processFileLists
// delete anything in the current one version's list that isn't in the new version's list.
for (VersionFileEntry entry : currentVersion)
{
- QFileInfo toDelete(PathCombine(rootPath, entry.path));
+ QFileInfo toDelete(FS::PathCombine(rootPath, entry.path));
if (!toDelete.exists())
{
qCritical() << "Expected file " << toDelete.absoluteFilePath()
@@ -114,7 +114,7 @@ bool processFileLists
// TODO: Let's not MD5sum a ton of files on the GUI thread. We should probably find a
// way to do this in the background.
QString fileMD5;
- QString realEntryPath = PathCombine(rootPath, entry.path);
+ QString realEntryPath = FS::PathCombine(rootPath, entry.path);
QFile entryFile(realEntryPath);
QFileInfo entryInfo(realEntryPath);
@@ -186,7 +186,7 @@ bool processFileLists
// Download it to updatedir/<filepath>-<md5> where filepath is the file's
// path with slashes replaced by underscores.
- QString dlPath = PathCombine(tempPath, QString(entry.path).replace("/", "_"));
+ QString dlPath = FS::PathCombine(tempPath, QString(entry.path).replace("/", "_"));
// We need to download the file to the updatefiles folder and add a task
// to copy it to its install path.