diff options
| author | Petr Mrázek <peterix@gmail.com> | 2018-03-16 23:33:58 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2018-03-16 23:33:58 +0100 |
| commit | 106155dd627d8e333260e2460d4c9c558b49b21f (patch) | |
| tree | d0678445ccb0881bb10e4bd1b13a3e03eda13d7b /application | |
| parent | 303842a19e4893e4ac6784d60aca990b4276d0ec (diff) | |
| download | MultiMC-106155dd627d8e333260e2460d4c9c558b49b21f.tar MultiMC-106155dd627d8e333260e2460d4c9c558b49b21f.tar.gz MultiMC-106155dd627d8e333260e2460d4c9c558b49b21f.tar.lz MultiMC-106155dd627d8e333260e2460d4c9c558b49b21f.tar.xz MultiMC-106155dd627d8e333260e2460d4c9c558b49b21f.zip | |
NOISSUE move modpack platform related files to 'modplatform' subfolders
Diffstat (limited to 'application')
| -rw-r--r-- | application/FtbListModel.h | 2 | ||||
| -rw-r--r-- | application/MainWindow.cpp | 3 | ||||
| -rw-r--r-- | application/MainWindow.h | 2 | ||||
| -rw-r--r-- | application/dialogs/ChooseFtbPackDialog.h | 3 | ||||
| -rw-r--r-- | application/dialogs/NewInstanceDialog.h | 4 |
5 files changed, 7 insertions, 7 deletions
diff --git a/application/FtbListModel.h b/application/FtbListModel.h index e41e9b62..41fc3ccd 100644 --- a/application/FtbListModel.h +++ b/application/FtbListModel.h @@ -2,7 +2,7 @@ #include <QAbstractListModel> #include <QSortFilterProxyModel> -#include <modplatform/PackHelpers.h> +#include <modplatform/ftb/PackHelpers.h> class FtbFilterModel : public QSortFilterProxyModel { diff --git a/application/MainWindow.cpp b/application/MainWindow.cpp index e690e1b7..542d1da6 100644 --- a/application/MainWindow.cpp +++ b/application/MainWindow.cpp @@ -1368,7 +1368,8 @@ void MainWindow::addInstance(QString url) const QUrl modpackUrl = newInstDlg.modpackUrl(); - if(newInstDlg.isFtbModpackRequested()) { + if(newInstDlg.isFtbModpackRequested()) + { instanceFromFtbPack(newInstDlg.getFtbPackDownloader(), newInstDlg.instName(), newInstDlg.instGroup(), newInstDlg.iconKey()); } else if (modpackUrl.isValid()) diff --git a/application/MainWindow.h b/application/MainWindow.h index 25dc36ed..e9897606 100644 --- a/application/MainWindow.h +++ b/application/MainWindow.h @@ -25,7 +25,7 @@ #include "minecraft/auth/MojangAccount.h" #include "net/NetJob.h" #include "updater/GoUpdate.h" -#include <modplatform/FtbPackDownloader.h> +#include <modplatform/ftb/FtbPackDownloader.h> class LaunchController; class NewsChecker; diff --git a/application/dialogs/ChooseFtbPackDialog.h b/application/dialogs/ChooseFtbPackDialog.h index 0b021138..f9f3dd08 100644 --- a/application/dialogs/ChooseFtbPackDialog.h +++ b/application/dialogs/ChooseFtbPackDialog.h @@ -2,9 +2,8 @@ #include <QDialog> #include <net/NetJob.h> -#include <modplatform/PackHelpers.h> +#include <modplatform/ftb/PackHelpers.h> #include "ui_ChooseFtbPackDialog.h" -#include <modplatform/PackHelpers.h> #include "FtbListModel.h" namespace Ui { diff --git a/application/dialogs/NewInstanceDialog.h b/application/dialogs/NewInstanceDialog.h index 9b0f7f53..f1fe26f4 100644 --- a/application/dialogs/NewInstanceDialog.h +++ b/application/dialogs/NewInstanceDialog.h @@ -18,8 +18,8 @@ #include <QDialog> #include "BaseVersion.h" -#include "modplatform/FtbPackDownloader.h" -#include "modplatform/PackHelpers.h" +#include "modplatform/ftb/FtbPackDownloader.h" +#include "modplatform/ftb/PackHelpers.h" namespace Ui { |