summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2018-04-06 21:04:34 +0200
committerPetr Mrázek <peterix@gmail.com>2018-04-06 21:04:34 +0200
commit6323aae56ff8bd1fb06da9044f9dd5e0df983bdc (patch)
tree73cbd610cfd5fb3fea1a1fe43d5be44a245409f3
parentc9c6037f50a97084ca60b98514bea047765910e9 (diff)
downloadMultiMC-6323aae56ff8bd1fb06da9044f9dd5e0df983bdc.tar
MultiMC-6323aae56ff8bd1fb06da9044f9dd5e0df983bdc.tar.gz
MultiMC-6323aae56ff8bd1fb06da9044f9dd5e0df983bdc.tar.lz
MultiMC-6323aae56ff8bd1fb06da9044f9dd5e0df983bdc.tar.xz
MultiMC-6323aae56ff8bd1fb06da9044f9dd5e0df983bdc.zip
NOISSUE move FtbListModel to where it is actually used
-rw-r--r--application/CMakeLists.txt4
-rw-r--r--application/pages/modplatform/FTBPage.cpp2
-rw-r--r--application/pages/modplatform/FtbListModel.cpp (renamed from application/FtbListModel.cpp)0
-rw-r--r--application/pages/modplatform/FtbListModel.h (renamed from application/FtbListModel.h)0
4 files changed, 3 insertions, 3 deletions
diff --git a/application/CMakeLists.txt b/application/CMakeLists.txt
index 0ffe9267..d67540b9 100644
--- a/application/CMakeLists.txt
+++ b/application/CMakeLists.txt
@@ -25,8 +25,6 @@ SET(MULTIMC_SOURCES
InstanceProxyModel.cpp
VersionProxyModel.h
VersionProxyModel.cpp
- FtbListModel.h
- FtbListModel.cpp
ColorCache.h
ColorCache.cpp
HoeDown.h
@@ -132,6 +130,8 @@ SET(MULTIMC_SOURCES
pages/modplatform/VanillaPage.h
pages/modplatform/FTBPage.cpp
pages/modplatform/FTBPage.h
+ pages/modplatform/FtbListModel.h
+ pages/modplatform/FtbListModel.cpp
pages/modplatform/TwitchPage.cpp
pages/modplatform/TwitchPage.h
pages/modplatform/TechnicPage.cpp
diff --git a/application/pages/modplatform/FTBPage.cpp b/application/pages/modplatform/FTBPage.cpp
index 2cc8c4fd..bdfd1d8e 100644
--- a/application/pages/modplatform/FTBPage.cpp
+++ b/application/pages/modplatform/FTBPage.cpp
@@ -7,7 +7,7 @@
#include "dialogs/NewInstanceDialog.h"
#include "modplatform/ftb/FtbPackFetchTask.h"
#include "modplatform/ftb/FtbPackInstallTask.h"
-#include <FtbListModel.h>
+#include "FtbListModel.h"
FTBPage::FTBPage(NewInstanceDialog* dialog, QWidget *parent)
: QWidget(parent), dialog(dialog), ui(new Ui::FTBPage)
diff --git a/application/FtbListModel.cpp b/application/pages/modplatform/FtbListModel.cpp
index 8e52f541..8e52f541 100644
--- a/application/FtbListModel.cpp
+++ b/application/pages/modplatform/FtbListModel.cpp
diff --git a/application/FtbListModel.h b/application/pages/modplatform/FtbListModel.h
index 12b26be1..12b26be1 100644
--- a/application/FtbListModel.h
+++ b/application/pages/modplatform/FtbListModel.h