diff options
| author | Petr Mrázek <peterix@gmail.com> | 2015-10-05 01:53:09 +0200 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2015-10-05 01:53:09 +0200 |
| commit | 4a900a58d424c1130f0c8b931699a7cf4232a5ca (patch) | |
| tree | 5e70f0d14368e4c2cd8d7166b11f268a284fcd8b /logic | |
| parent | f93f867c3da084c6d6c5e3ed23896609cff0e692 (diff) | |
| download | MultiMC-4a900a58d424c1130f0c8b931699a7cf4232a5ca.tar MultiMC-4a900a58d424c1130f0c8b931699a7cf4232a5ca.tar.gz MultiMC-4a900a58d424c1130f0c8b931699a7cf4232a5ca.tar.lz MultiMC-4a900a58d424c1130f0c8b931699a7cf4232a5ca.tar.xz MultiMC-4a900a58d424c1130f0c8b931699a7cf4232a5ca.zip | |
NOISSUE missed a few places...
Diffstat (limited to 'logic')
| -rw-r--r-- | logic/ftb/FTBPlugin.cpp | 4 | ||||
| -rw-r--r-- | logic/java/JavaUtils.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/logic/ftb/FTBPlugin.cpp b/logic/ftb/FTBPlugin.cpp index 201b5d3b..8a08f916 100644 --- a/logic/ftb/FTBPlugin.cpp +++ b/logic/ftb/FTBPlugin.cpp @@ -314,7 +314,7 @@ static QString getLocalCacheStorageLocation() " If you are on windows, this means your system is broken."; } #elif defined(Q_OS_MAC) - ftbDefault = PathCombine(QDir::homePath(), "Library/Application Support/ftblauncher"); + ftbDefault = FS::PathCombine(QDir::homePath(), "Library/Application Support/ftblauncher"); #else ftbDefault = QDir::home().absoluteFilePath(".ftblauncher"); #endif @@ -337,7 +337,7 @@ static QString getRoamingStorageLocation() qCritical() << "Your APPDATA folder is missing! If you are on windows, this means your system is broken."; } #elif defined(Q_OS_MAC) - ftbDefault = PathCombine(QDir::homePath(), "Library/Application Support/ftblauncher"); + ftbDefault = FS::PathCombine(QDir::homePath(), "Library/Application Support/ftblauncher"); #else ftbDefault = QDir::home().absoluteFilePath(".ftblauncher"); #endif diff --git a/logic/java/JavaUtils.cpp b/logic/java/JavaUtils.cpp index 80ded3ee..7c3cc2a1 100644 --- a/logic/java/JavaUtils.cpp +++ b/logic/java/JavaUtils.cpp @@ -119,7 +119,7 @@ QList<JavaVersionPtr> JavaUtils::FindJavaFromRegistryKey(DWORD keyType, QString javaVersion->id = subKeyName; javaVersion->arch = archType; javaVersion->path = - QDir(PathCombine(value, "bin")).absoluteFilePath("javaw.exe"); + QDir(FS::PathCombine(value, "bin")).absoluteFilePath("javaw.exe"); javas.append(javaVersion); } |