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/ftb/FTBProfileStrategy.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'logic/ftb/FTBProfileStrategy.cpp') diff --git a/logic/ftb/FTBProfileStrategy.cpp b/logic/ftb/FTBProfileStrategy.cpp index 293d0fdc..ac55bbe7 100644 --- a/logic/ftb/FTBProfileStrategy.cpp +++ b/logic/ftb/FTBProfileStrategy.cpp @@ -2,8 +2,8 @@ #include "minecraft/VersionBuildError.h" #include "ftb/OneSixFTBInstance.h" #include "minecraft/MinecraftVersionList.h" +#include -#include #include #include #include @@ -67,7 +67,7 @@ void FTBProfileStrategy::loadDefaultBuiltinPatches() if(file->version.isEmpty()) { file->version = QObject::tr("Unknown"); - QFile versionFile (PathCombine(m_instance->instanceRoot(), "version")); + QFile versionFile (FS::PathCombine(m_instance->instanceRoot(), "version")); if(versionFile.exists()) { if(versionFile.open(QIODevice::ReadOnly)) @@ -94,8 +94,8 @@ void FTBProfileStrategy::loadUserPatches() { // load all patches, put into map for ordering, apply in the right order ProfileUtils::PatchOrder userOrder; - ProfileUtils::readOverrideOrders(PathCombine(m_instance->instanceRoot(), "order.json"), userOrder); - QDir patches(PathCombine(m_instance->instanceRoot(),"patches")); + ProfileUtils::readOverrideOrders(FS::PathCombine(m_instance->instanceRoot(), "order.json"), userOrder); + QDir patches(FS::PathCombine(m_instance->instanceRoot(),"patches")); // first, load things by sort order. for (auto id : userOrder) -- cgit v1.2.3