From 17ad1e64f824fba6d8f153191effdb2af7d387c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Sat, 27 Feb 2016 19:58:40 +0100 Subject: NOISSUE move files into paths that make more sense --- application/InstancePageProvider.h | 4 ++-- application/LaunchInteraction.cpp | 4 ++-- application/MainWindow.cpp | 4 +--- application/MainWindow.h | 2 +- application/MultiMC.cpp | 12 ++++++------ application/dialogs/AccountSelectDialog.h | 2 +- application/dialogs/LoginDialog.cpp | 2 +- application/dialogs/LoginDialog.h | 2 +- application/pages/LegacyJarModPage.cpp | 2 +- application/pages/LegacyUpgradePage.cpp | 2 +- application/pages/LegacyUpgradePage.h | 2 +- application/pages/ModFolderPage.h | 2 +- application/pages/VersionPage.cpp | 14 +++++++------- application/pages/VersionPage.h | 2 +- application/pages/WorldListPage.h | 2 +- application/pages/global/AccountListPage.cpp | 2 +- application/pages/global/AccountListPage.h | 2 +- 17 files changed, 30 insertions(+), 32 deletions(-) (limited to 'application') diff --git a/application/InstancePageProvider.h b/application/InstancePageProvider.h index 1b283896..bfc60291 100644 --- a/application/InstancePageProvider.h +++ b/application/InstancePageProvider.h @@ -1,6 +1,6 @@ #pragma once -#include "minecraft/OneSixInstance.h" -#include "minecraft/LegacyInstance.h" +#include "minecraft/onesix/OneSixInstance.h" +#include "minecraft/legacy/LegacyInstance.h" #include #include "pages/BasePage.h" #include "pages/VersionPage.h" diff --git a/application/LaunchInteraction.cpp b/application/LaunchInteraction.cpp index 4033d87c..1caa054a 100644 --- a/application/LaunchInteraction.cpp +++ b/application/LaunchInteraction.cpp @@ -1,5 +1,5 @@ #include "LaunchInteraction.h" -#include +#include #include "MultiMC.h" #include "dialogs/CustomMessageBox.h" #include "dialogs/AccountSelectDialog.h" @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include diff --git a/application/MainWindow.cpp b/application/MainWindow.cpp index a9d8d1e9..1345835f 100644 --- a/application/MainWindow.cpp +++ b/application/MainWindow.cpp @@ -50,14 +50,12 @@ #include #include #include -#include -#include #include #include #include #include #include -#include +#include #include #include #include diff --git a/application/MainWindow.h b/application/MainWindow.h index 17de6966..363d163e 100644 --- a/application/MainWindow.h +++ b/application/MainWindow.h @@ -22,7 +22,7 @@ #include #include "BaseInstance.h" -#include "auth/MojangAccount.h" +#include "minecraft/auth/MojangAccount.h" #include "net/NetJob.h" #include "updater/GoUpdate.h" diff --git a/application/MultiMC.cpp b/application/MultiMC.cpp index d5779321..63a3b40b 100644 --- a/application/MultiMC.cpp +++ b/application/MultiMC.cpp @@ -20,13 +20,13 @@ #include #include "InstanceList.h" -#include "auth/MojangAccountList.h" +#include #include "icons/IconList.h" -#include "minecraft/LwjglVersionList.h" +//FIXME: get rid of this +#include "minecraft/legacy/LwjglVersionList.h" #include "minecraft/MinecraftVersionList.h" -#include "liteloader/LiteLoaderVersionList.h" - -#include "forge/ForgeVersionList.h" +#include "minecraft/liteloader/LiteLoaderVersionList.h" +#include "minecraft/forge/ForgeVersionList.h" #include "net/HttpMetaCache.h" #include "net/URLConstants.h" @@ -49,7 +49,7 @@ #include "handlers/IconResourceHandler.h" #include "handlers/WebResourceHandler.h" -#include "ftb/FTBPlugin.h" +#include "minecraft/ftb/FTBPlugin.h" #include #include diff --git a/application/dialogs/AccountSelectDialog.h b/application/dialogs/AccountSelectDialog.h index 21784032..7ae79314 100644 --- a/application/dialogs/AccountSelectDialog.h +++ b/application/dialogs/AccountSelectDialog.h @@ -19,7 +19,7 @@ #include -#include "auth/MojangAccountList.h" +#include "minecraft/auth/MojangAccountList.h" namespace Ui { diff --git a/application/dialogs/LoginDialog.cpp b/application/dialogs/LoginDialog.cpp index 7e0f7df8..d7a655fc 100644 --- a/application/dialogs/LoginDialog.cpp +++ b/application/dialogs/LoginDialog.cpp @@ -16,7 +16,7 @@ #include "LoginDialog.h" #include "ui_LoginDialog.h" -#include "auth/YggdrasilTask.h" +#include "minecraft/auth/YggdrasilTask.h" #include diff --git a/application/dialogs/LoginDialog.h b/application/dialogs/LoginDialog.h index 63c95fb8..74efeb77 100644 --- a/application/dialogs/LoginDialog.h +++ b/application/dialogs/LoginDialog.h @@ -18,7 +18,7 @@ #include #include -#include "auth/MojangAccount.h" +#include "minecraft/auth/MojangAccount.h" namespace Ui { diff --git a/application/pages/LegacyJarModPage.cpp b/application/pages/LegacyJarModPage.cpp index b329ba70..174176fb 100644 --- a/application/pages/LegacyJarModPage.cpp +++ b/application/pages/LegacyJarModPage.cpp @@ -23,7 +23,7 @@ #include "dialogs/ProgressDialog.h" #include "dialogs/ModEditDialogCommon.h" #include "minecraft/ModList.h" -#include "minecraft/LegacyInstance.h" +#include "minecraft/legacy/LegacyInstance.h" #include "Env.h" #include #include "MultiMC.h" diff --git a/application/pages/LegacyUpgradePage.cpp b/application/pages/LegacyUpgradePage.cpp index 49998c50..14cb916d 100644 --- a/application/pages/LegacyUpgradePage.cpp +++ b/application/pages/LegacyUpgradePage.cpp @@ -1,7 +1,7 @@ #include "LegacyUpgradePage.h" #include "ui_LegacyUpgradePage.h" -#include "minecraft/LegacyInstance.h" +#include "minecraft/legacy/LegacyInstance.h" LegacyUpgradePage::LegacyUpgradePage(LegacyInstance *inst, QWidget *parent) : QWidget(parent), ui(new Ui::LegacyUpgradePage), m_inst(inst) diff --git a/application/pages/LegacyUpgradePage.h b/application/pages/LegacyUpgradePage.h index 8d1131c8..ff9965f1 100644 --- a/application/pages/LegacyUpgradePage.h +++ b/application/pages/LegacyUpgradePage.h @@ -17,7 +17,7 @@ #include -#include "minecraft/OneSixInstance.h" +#include "minecraft/legacy/LegacyInstance.h" #include "pages/BasePage.h" #include diff --git a/application/pages/ModFolderPage.h b/application/pages/ModFolderPage.h index 0870aa64..23b2f67d 100644 --- a/application/pages/ModFolderPage.h +++ b/application/pages/ModFolderPage.h @@ -17,7 +17,7 @@ #include -#include "minecraft/OneSixInstance.h" +#include "minecraft/onesix/OneSixInstance.h" #include "BasePage.h" #include diff --git a/application/pages/VersionPage.cpp b/application/pages/VersionPage.cpp index f01a2d62..42e4a9bf 100644 --- a/application/pages/VersionPage.cpp +++ b/application/pages/VersionPage.cpp @@ -36,14 +36,14 @@ #include #include "minecraft/MinecraftProfile.h" -#include "forge/ForgeVersionList.h" -#include "forge/ForgeInstaller.h" -#include "liteloader/LiteLoaderVersionList.h" -#include "liteloader/LiteLoaderInstaller.h" -#include "auth/MojangAccountList.h" +#include "minecraft/forge/ForgeVersionList.h" +#include "minecraft/forge/ForgeInstaller.h" +#include "minecraft/liteloader/LiteLoaderVersionList.h" +#include "minecraft/liteloader/LiteLoaderInstaller.h" +#include "minecraft/auth/MojangAccountList.h" #include "minecraft/Mod.h" -#include -#include +#include "minecraft/MinecraftVersion.h" +#include "minecraft/MinecraftVersionList.h" #include "icons/IconList.h" #include "Exception.h" diff --git a/application/pages/VersionPage.h b/application/pages/VersionPage.h index 216bc30e..e7b07ac3 100644 --- a/application/pages/VersionPage.h +++ b/application/pages/VersionPage.h @@ -17,7 +17,7 @@ #include -#include "minecraft/OneSixInstance.h" +#include "minecraft/onesix/OneSixInstance.h" #include "BasePage.h" namespace Ui diff --git a/application/pages/WorldListPage.h b/application/pages/WorldListPage.h index 7a7cf591..8a9fc16f 100644 --- a/application/pages/WorldListPage.h +++ b/application/pages/WorldListPage.h @@ -17,7 +17,7 @@ #include -#include "minecraft/OneSixInstance.h" +#include "minecraft/onesix/OneSixInstance.h" #include "BasePage.h" #include diff --git a/application/pages/global/AccountListPage.cpp b/application/pages/global/AccountListPage.cpp index 62267f13..84d317c1 100644 --- a/application/pages/global/AccountListPage.cpp +++ b/application/pages/global/AccountListPage.cpp @@ -29,7 +29,7 @@ #include "dialogs/LoginDialog.h" #include "dialogs/CustomMessageBox.h" #include "tasks/Task.h" -#include "auth/YggdrasilTask.h" +#include "minecraft/auth/YggdrasilTask.h" #include "MultiMC.h" diff --git a/application/pages/global/AccountListPage.h b/application/pages/global/AccountListPage.h index 7803e044..5701dfcb 100644 --- a/application/pages/global/AccountListPage.h +++ b/application/pages/global/AccountListPage.h @@ -20,7 +20,7 @@ #include "pages/BasePage.h" -#include "auth/MojangAccountList.h" +#include "minecraft/auth/MojangAccountList.h" #include "MultiMC.h" namespace Ui -- cgit v1.2.3