Merge pull request #3682 from kb-1000/rename-twitch-curseforge

NOISSUE rename Twitch to flame internally for consistency and to CurseForge for user displayed strings

2 files changed, 6 insertions, 6 deletions

diff --git a/application/dialogs/NewInstanceDialog.cpp b/application/dialogs/NewInstanceDialog.cpp
index d70cbffe..112e46ff 100644
--- a/application/dialogs/NewInstanceDialog.cpp
+++ b/application/dialogs/NewInstanceDialog.cpp
@@ -37,7 +37,7 @@
 #include <pages/modplatform/atlauncher/AtlPage.h>
 #include <pages/modplatform/ftb/FtbPage.h>
 #include <pages/modplatform/legacy_ftb/Page.h>
-#include <pages/modplatform/twitch/TwitchPage.h>
+#include <pages/modplatform/flame/FlamePage.h>
 #include <pages/modplatform/ImportPage.h>
 #include <pages/modplatform/technic/TechnicPage.h>
 
@@ -124,17 +124,17 @@ void NewInstanceDialog::accept()
 QList<BasePage *> NewInstanceDialog::getPages()
 {
     importPage = new ImportPage(this);
-    twitchPage = new TwitchPage(this);
+    flamePage = new FlamePage(this);
     auto technicPage = new TechnicPage(this);
     return
     {
         new VanillaPage(this),
         importPage,
         new AtlPage(this),
+        flamePage,
         new FtbPage(this),
         new LegacyFTB::Page(this),
-        technicPage,
-        twitchPage
+        technicPage
     };
 }
 
diff --git a/application/dialogs/NewInstanceDialog.h b/application/dialogs/NewInstanceDialog.h
index 88ed00e5..f8d96dbf 100644
--- a/application/dialogs/NewInstanceDialog.h
+++ b/application/dialogs/NewInstanceDialog.h
@@ -29,7 +29,7 @@ class NewInstanceDialog;
 class PageContainer;
 class QDialogButtonBox;
 class ImportPage;
-class TwitchPage;
+class FlamePage;
 
 class NewInstanceDialog : public QDialog, public BasePageProvider
 {
@@ -68,7 +68,7 @@ private:
 
     QString InstIconKey;
     ImportPage *importPage = nullptr;
-    TwitchPage *twitchPage = nullptr;
+    FlamePage *flamePage = nullptr;
     std::unique_ptr<InstanceTask> creationTask;
 
     bool importIcon = false;