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/minecraft/MinecraftInstance.cpp | |
| parent | 7459eb627c97d27ef6e12cdededa48e1ff03d533 (diff) | |
| download | PrismLauncher-f93f867c3da084c6d6c5e3ed23896609cff0e692.tar.gz PrismLauncher-f93f867c3da084c6d6c5e3ed23896609cff0e692.tar.bz2 PrismLauncher-f93f867c3da084c6d6c5e3ed23896609cff0e692.zip | |
NOISSUE dissolve util library
Diffstat (limited to 'logic/minecraft/MinecraftInstance.cpp')
| -rw-r--r-- | logic/minecraft/MinecraftInstance.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/logic/minecraft/MinecraftInstance.cpp b/logic/minecraft/MinecraftInstance.cpp index 8fd65d50..0dab4dfe 100644 --- a/logic/minecraft/MinecraftInstance.cpp +++ b/logic/minecraft/MinecraftInstance.cpp @@ -1,12 +1,12 @@ #include "MinecraftInstance.h" #include <settings/Setting.h> #include "settings/SettingsObject.h" -#include <pathutils.h> #include "Env.h" #include "minecraft/MinecraftVersionList.h" #include <MMCStrings.h> #include <pathmatcher/RegexpMatcher.h> #include <pathmatcher/MultiMatcher.h> +#include <FileSystem.h> #define IBUS "@im=ibus" @@ -67,8 +67,8 @@ MinecraftInstance::MinecraftInstance(SettingsObjectPtr globalSettings, SettingsO QString MinecraftInstance::minecraftRoot() const { - QFileInfo mcDir(PathCombine(instanceRoot(), "minecraft")); - QFileInfo dotMCDir(PathCombine(instanceRoot(), ".minecraft")); + QFileInfo mcDir(FS::PathCombine(instanceRoot(), "minecraft")); + QFileInfo dotMCDir(FS::PathCombine(instanceRoot(), ".minecraft")); if (dotMCDir.exists() && !mcDir.exists()) return dotMCDir.filePath(); @@ -115,7 +115,7 @@ QStringList MinecraftInstance::javaArguments() const } args << "-Duser.language=en"; - args << "-jar" << PathCombine(QCoreApplication::applicationDirPath(), "jars", "NewLaunch.jar"); + args << "-jar" << FS::PathCombine(QCoreApplication::applicationDirPath(), "jars", "NewLaunch.jar"); return args; } |