From f93f867c3da084c6d6c5e3ed23896609cff0e692 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Mon, 5 Oct 2015 01:47:27 +0200 Subject: NOISSUE dissolve util library --- logic/updater/GoUpdate.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'logic/updater/GoUpdate.cpp') 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 #include #include #include #include +#include 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/- 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. -- cgit v1.2.3