diff options
| -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); } |