From f93f867c3da084c6d6c5e3ed23896609cff0e692 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= <peterix@gmail.com>
Date: Mon, 5 Oct 2015 01:47:27 +0200
Subject: NOISSUE dissolve util library

---
 logic/forge/ForgeInstaller.cpp  | 8 ++++----
 logic/forge/ForgeXzDownload.cpp | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'logic/forge')

diff --git a/logic/forge/ForgeInstaller.cpp b/logic/forge/ForgeInstaller.cpp
index 60dce822..cdbb5f18 100644
--- a/logic/forge/ForgeInstaller.cpp
+++ b/logic/forge/ForgeInstaller.cpp
@@ -23,10 +23,10 @@
 #include "minecraft/VersionFilterData.h"
 #include "Env.h"
 #include "Exception.h"
+#include <FileSystem.h>
 
 #include <quazip.h>
 #include <quazipfile.h>
-#include <pathutils.h>
 #include <QStringList>
 #include <QRegularExpression>
 #include <QRegularExpressionMatch>
@@ -90,7 +90,7 @@ void ForgeInstaller::prepare(const QString &filename, const QString &universalUr
 
 	auto cacheentry = ENV.metacache()->resolveEntry("libraries", lib.storageSuffix());
 	finalPath = "libraries/" + lib.storageSuffix();
-	if (!ensureFilePathExists(finalPath))
+	if (!FS::ensureFilePathExists(finalPath))
 		return;
 
 	if (!zip.setCurrentFile(internalPath))
@@ -278,8 +278,8 @@ bool ForgeInstaller::addLegacy(OneSixInstance *to)
 		return false;
 	}
 	auto entry = ENV.metacache()->resolveEntry("minecraftforge", m_forge_version->filename());
-	finalPath = PathCombine(to->jarModsDir(), m_forge_version->filename());
-	if (!ensureFilePathExists(finalPath))
+	finalPath = FS::PathCombine(to->jarModsDir(), m_forge_version->filename());
+	if (!FS::ensureFilePathExists(finalPath))
 	{
 		return false;
 	}
diff --git a/logic/forge/ForgeXzDownload.cpp b/logic/forge/ForgeXzDownload.cpp
index 56320ced..6009e31e 100644
--- a/logic/forge/ForgeXzDownload.cpp
+++ b/logic/forge/ForgeXzDownload.cpp
@@ -15,7 +15,7 @@
 
 #include "Env.h"
 #include "ForgeXzDownload.h"
-#include <pathutils.h>
+#include <FileSystem.h>
 
 #include <QCryptographicHash>
 #include <QFileInfo>
@@ -49,7 +49,7 @@ void ForgeXzDownload::start()
 		return;
 	}
 	// can we actually create the real, final file?
-	if (!ensureFilePathExists(m_target_path))
+	if (!FS::ensureFilePathExists(m_target_path))
 	{
 		m_status = Job_Failed;
 		emit failed(m_index_within_job);
-- 
cgit v1.2.3