summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2020-08-21 02:40:19 +0200
committerPetr Mrázek <peterix@gmail.com>2020-08-21 02:40:19 +0200
commitc6c9feb3a2006f0b37736799f003a0fb87f68b18 (patch)
tree23f7b58f2dfc7e9d3a3d15f171c02d6f7ffbd813
parentb0f5f4cb13d7d0f983b7813377405298de718b2e (diff)
downloadMultiMC-c6c9feb3a2006f0b37736799f003a0fb87f68b18.tar
MultiMC-c6c9feb3a2006f0b37736799f003a0fb87f68b18.tar.gz
MultiMC-c6c9feb3a2006f0b37736799f003a0fb87f68b18.tar.lz
MultiMC-c6c9feb3a2006f0b37736799f003a0fb87f68b18.tar.xz
MultiMC-c6c9feb3a2006f0b37736799f003a0fb87f68b18.zip
NOISSUE attempt to fix build on macOS
-rw-r--r--api/logic/CMakeLists.txt8
-rw-r--r--api/logic/modplatform/modpacksch/FTBPackInstallTask.cpp (renamed from api/logic/modplatform/modpacksch/PackInstallTask.cpp)2
-rw-r--r--api/logic/modplatform/modpacksch/FTBPackInstallTask.h (renamed from api/logic/modplatform/modpacksch/PackInstallTask.h)2
-rw-r--r--api/logic/modplatform/modpacksch/FTBPackManifest.cpp (renamed from api/logic/modplatform/modpacksch/PackManifest.cpp)2
-rw-r--r--api/logic/modplatform/modpacksch/FTBPackManifest.h (renamed from api/logic/modplatform/modpacksch/PackManifest.h)0
-rw-r--r--application/pages/modplatform/ftb/FtbModel.h2
-rw-r--r--application/pages/modplatform/ftb/FtbPage.cpp2
7 files changed, 9 insertions, 9 deletions
diff --git a/api/logic/CMakeLists.txt b/api/logic/CMakeLists.txt
index 2a1e51fc..740cd886 100644
--- a/api/logic/CMakeLists.txt
+++ b/api/logic/CMakeLists.txt
@@ -452,10 +452,10 @@ set(FLAME_SOURCES
)
set(MODPACKSCH_SOURCES
- modplatform/modpacksch/PackInstallTask.h
- modplatform/modpacksch/PackInstallTask.cpp
- modplatform/modpacksch/PackManifest.h
- modplatform/modpacksch/PackManifest.cpp
+ modplatform/modpacksch/FTBPackInstallTask.h
+ modplatform/modpacksch/FTBPackInstallTask.cpp
+ modplatform/modpacksch/FTBPackManifest.h
+ modplatform/modpacksch/FTBPackManifest.cpp
)
add_unit_test(Index
diff --git a/api/logic/modplatform/modpacksch/PackInstallTask.cpp b/api/logic/modplatform/modpacksch/FTBPackInstallTask.cpp
index f8572a4d..fdfe560a 100644
--- a/api/logic/modplatform/modpacksch/PackInstallTask.cpp
+++ b/api/logic/modplatform/modpacksch/FTBPackInstallTask.cpp
@@ -1,4 +1,4 @@
-#include "PackInstallTask.h"
+#include "FTBPackInstallTask.h"
#include "BuildConfig.h"
#include "FileSystem.h"
diff --git a/api/logic/modplatform/modpacksch/PackInstallTask.h b/api/logic/modplatform/modpacksch/FTBPackInstallTask.h
index e5969dc8..c5a80751 100644
--- a/api/logic/modplatform/modpacksch/PackInstallTask.h
+++ b/api/logic/modplatform/modpacksch/FTBPackInstallTask.h
@@ -1,6 +1,6 @@
#pragma once
-#include "PackManifest.h"
+#include "FTBPackManifest.h"
#include "InstanceTask.h"
#include "multimc_logic_export.h"
diff --git a/api/logic/modplatform/modpacksch/PackManifest.cpp b/api/logic/modplatform/modpacksch/FTBPackManifest.cpp
index 5ffd18de..35626cb8 100644
--- a/api/logic/modplatform/modpacksch/PackManifest.cpp
+++ b/api/logic/modplatform/modpacksch/FTBPackManifest.cpp
@@ -1,4 +1,4 @@
-#include "PackManifest.h"
+#include "FTBPackManifest.h"
#include "Json.h"
diff --git a/api/logic/modplatform/modpacksch/PackManifest.h b/api/logic/modplatform/modpacksch/FTBPackManifest.h
index 518fffbf..518fffbf 100644
--- a/api/logic/modplatform/modpacksch/PackManifest.h
+++ b/api/logic/modplatform/modpacksch/FTBPackManifest.h
diff --git a/application/pages/modplatform/ftb/FtbModel.h b/application/pages/modplatform/ftb/FtbModel.h
index b480797f..9c057d73 100644
--- a/application/pages/modplatform/ftb/FtbModel.h
+++ b/application/pages/modplatform/ftb/FtbModel.h
@@ -2,7 +2,7 @@
#include <QAbstractListModel>
-#include "modplatform/modpacksch/PackManifest.h"
+#include "modplatform/modpacksch/FTBPackManifest.h"
#include "net/NetJob.h"
#include <QIcon>
diff --git a/application/pages/modplatform/ftb/FtbPage.cpp b/application/pages/modplatform/ftb/FtbPage.cpp
index 3a09780e..c82508b3 100644
--- a/application/pages/modplatform/ftb/FtbPage.cpp
+++ b/application/pages/modplatform/ftb/FtbPage.cpp
@@ -4,7 +4,7 @@
#include <QKeyEvent>
#include "dialogs/NewInstanceDialog.h"
-#include "modplatform/modpacksch/PackInstallTask.h"
+#include "modplatform/modpacksch/FTBPackInstallTask.h"
FtbPage::FtbPage(NewInstanceDialog* dialog, QWidget *parent)
: QWidget(parent), ui(new Ui::FtbPage), dialog(dialog)