diff options
author | Petr Mrázek <peterix@gmail.com> | 2019-11-18 00:38:36 +0100 |
---|---|---|
committer | Petr Mrázek <peterix@gmail.com> | 2019-11-18 00:38:36 +0100 |
commit | af5120c828831dfe41482ebaff79608ba8531ede (patch) | |
tree | 2e308ff3f356f8af94ce9bf7635a2884471ae5db /application/dialogs | |
parent | 47ed2f48d4a118876263f37b9fe2ab8911c2a8fe (diff) | |
download | MultiMC-af5120c828831dfe41482ebaff79608ba8531ede.tar MultiMC-af5120c828831dfe41482ebaff79608ba8531ede.tar.gz MultiMC-af5120c828831dfe41482ebaff79608ba8531ede.tar.lz MultiMC-af5120c828831dfe41482ebaff79608ba8531ede.tar.xz MultiMC-af5120c828831dfe41482ebaff79608ba8531ede.zip |
GH-2859 remove twitch page and modpack import from URL
The functionality was broken, beyond repair and an ongoing maintenance
nightmare.
Diffstat (limited to 'application/dialogs')
-rw-r--r-- | application/dialogs/NewInstanceDialog.cpp | 13 | ||||
-rw-r--r-- | application/dialogs/NewInstanceDialog.h | 2 |
2 files changed, 2 insertions, 13 deletions
diff --git a/application/dialogs/NewInstanceDialog.cpp b/application/dialogs/NewInstanceDialog.cpp index c5936953..804340bc 100644 --- a/application/dialogs/NewInstanceDialog.cpp +++ b/application/dialogs/NewInstanceDialog.cpp @@ -35,7 +35,6 @@ #include "widgets/PageContainer.h" #include <pages/modplatform/VanillaPage.h> #include <pages/modplatform/legacy_ftb/Page.h> -#include <pages/modplatform/TwitchPage.h> #include <pages/modplatform/ImportPage.h> @@ -95,14 +94,8 @@ NewInstanceDialog::NewInstanceDialog(const QString & initialGroup, const QString if(!url.isEmpty()) { QUrl actualUrl(url); - if(actualUrl.host() == "www.curseforge.com") { - m_container->selectPage("twitch"); - twitchPage->setUrl(url); - } - else { - m_container->selectPage("import"); - importPage->setUrl(url); - } + m_container->selectPage("import"); + importPage->setUrl(url); } updateDialogState(); @@ -126,13 +119,11 @@ void NewInstanceDialog::accept() QList<BasePage *> NewInstanceDialog::getPages() { importPage = new ImportPage(this); - twitchPage = new TwitchPage(this); return { new VanillaPage(this), importPage, new LegacyFTB::Page(this), - twitchPage }; } diff --git a/application/dialogs/NewInstanceDialog.h b/application/dialogs/NewInstanceDialog.h index 0b8b2fb8..c86ab73f 100644 --- a/application/dialogs/NewInstanceDialog.h +++ b/application/dialogs/NewInstanceDialog.h @@ -29,7 +29,6 @@ class NewInstanceDialog; class PageContainer; class QDialogButtonBox; class ImportPage; -class TwitchPage; class NewInstanceDialog : public QDialog, public BasePageProvider { @@ -68,7 +67,6 @@ private: QString InstIconKey; ImportPage *importPage = nullptr; - TwitchPage *twitchPage = nullptr; std::unique_ptr<InstanceTask> creationTask; bool importIcon = false; |