From 141e0a02a0a0c4bbc4cc2e900560db5048366104 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Wed, 4 Feb 2015 21:10:10 +0100 Subject: SCRATCH move things to the right places --- gui/MainWindow.cpp | 11 ++++------- gui/dialogs/ModEditDialogCommon.h | 2 +- gui/dialogs/NotificationDialog.h | 2 +- gui/pages/InstanceSettingsPage.h | 2 +- gui/pages/LegacyJarModPage.cpp | 4 ++-- gui/pages/LegacyUpgradePage.cpp | 2 +- gui/pages/LegacyUpgradePage.h | 4 ++-- gui/pages/ModFolderPage.cpp | 4 ++-- gui/pages/ModFolderPage.h | 2 +- gui/pages/ScreenshotsPage.h | 1 - gui/pages/VersionPage.cpp | 3 +-- gui/pages/VersionPage.h | 2 +- gui/widgets/MCModInfoFrame.h | 2 +- 13 files changed, 18 insertions(+), 23 deletions(-) (limited to 'gui') diff --git a/gui/MainWindow.cpp b/gui/MainWindow.cpp index 2025a097..7ad93f07 100644 --- a/gui/MainWindow.cpp +++ b/gui/MainWindow.cpp @@ -362,7 +362,7 @@ namespace Ui { #include "logic/InstanceList.h" #include "logic/minecraft/MinecraftVersionList.h" -#include "logic/LwjglVersionList.h" +#include "logic/minecraft/LwjglVersionList.h" #include "logic/icons/IconList.h" #include "logic/java/JavaVersionList.h" @@ -378,18 +378,15 @@ namespace Ui { #include "logic/Env.h" #include "logic/BaseInstance.h" -#include "logic/OneSixInstance.h" #include "logic/BaseProcess.h" -#include "logic/OneSixUpdate.h" #include "logic/java/JavaUtils.h" #include "gui/NagUtils.h" -#include "logic/SkinUtils.h" +#include "logic/minecraft/SkinUtils.h" -#include "logic/LegacyInstance.h" +//#include "logic/minecraft/LegacyInstance.h" -#include "logic/assets/AssetsUtils.h" #include -#include +#include #include #include "logic/net/CacheDownload.h" diff --git a/gui/dialogs/ModEditDialogCommon.h b/gui/dialogs/ModEditDialogCommon.h index 3ccfbf6b..227e638c 100644 --- a/gui/dialogs/ModEditDialogCommon.h +++ b/gui/dialogs/ModEditDialogCommon.h @@ -2,7 +2,7 @@ #include #include #include -#include +#include bool lastfirst(QModelIndexList &list, int &first, int &last); diff --git a/gui/dialogs/NotificationDialog.h b/gui/dialogs/NotificationDialog.h index b7980a98..4717abd8 100644 --- a/gui/dialogs/NotificationDialog.h +++ b/gui/dialogs/NotificationDialog.h @@ -3,7 +3,7 @@ #include -#include "logic/updater/NotificationChecker.h" +#include "logic/notifications/NotificationChecker.h" namespace Ui { class NotificationDialog; diff --git a/gui/pages/InstanceSettingsPage.h b/gui/pages/InstanceSettingsPage.h index b43ce610..8835d02e 100644 --- a/gui/pages/InstanceSettingsPage.h +++ b/gui/pages/InstanceSettingsPage.h @@ -17,9 +17,9 @@ #include -#include "logic/OneSixInstance.h" #include "logic/net/NetJob.h" #include "logic/java/JavaChecker.h" +#include "logic/BaseInstance.h" #include "BasePage.h" #include "MultiMC.h" diff --git a/gui/pages/LegacyJarModPage.cpp b/gui/pages/LegacyJarModPage.cpp index 219e92ef..55a8300f 100644 --- a/gui/pages/LegacyJarModPage.cpp +++ b/gui/pages/LegacyJarModPage.cpp @@ -25,8 +25,8 @@ #include "gui/dialogs/VersionSelectDialog.h" #include "gui/dialogs/ProgressDialog.h" #include "gui/dialogs/ModEditDialogCommon.h" -#include "logic/ModList.h" -#include "logic/LegacyInstance.h" +#include "logic/minecraft/ModList.h" +#include "logic/minecraft/LegacyInstance.h" #include "logic/forge/ForgeVersion.h" #include "logic/forge/ForgeVersionList.h" #include "logic/Env.h" diff --git a/gui/pages/LegacyUpgradePage.cpp b/gui/pages/LegacyUpgradePage.cpp index 79478efb..bb94d82a 100644 --- a/gui/pages/LegacyUpgradePage.cpp +++ b/gui/pages/LegacyUpgradePage.cpp @@ -1,7 +1,7 @@ #include "LegacyUpgradePage.h" #include "ui_LegacyUpgradePage.h" -#include "logic/LegacyInstance.h" +#include "logic/minecraft/LegacyInstance.h" LegacyUpgradePage::LegacyUpgradePage(LegacyInstance *inst, QWidget *parent) : QWidget(parent), ui(new Ui::LegacyUpgradePage), m_inst(inst) diff --git a/gui/pages/LegacyUpgradePage.h b/gui/pages/LegacyUpgradePage.h index 25782aae..b604da19 100644 --- a/gui/pages/LegacyUpgradePage.h +++ b/gui/pages/LegacyUpgradePage.h @@ -17,9 +17,9 @@ #include -#include "logic/OneSixInstance.h" +#include "logic/minecraft/OneSixInstance.h" #include "logic/net/NetJob.h" -#include "BasePage.h" +#include "gui/pages/BasePage.h" #include namespace Ui diff --git a/gui/pages/ModFolderPage.cpp b/gui/pages/ModFolderPage.cpp index 938ec421..167ba471 100644 --- a/gui/pages/ModFolderPage.cpp +++ b/gui/pages/ModFolderPage.cpp @@ -28,8 +28,8 @@ #include "MultiMC.h" #include "gui/dialogs/CustomMessageBox.h" #include "gui/dialogs/ModEditDialogCommon.h" -#include "logic/ModList.h" -#include "logic/Mod.h" +#include "logic/minecraft/ModList.h" +#include "logic/minecraft/Mod.h" #include "logic/minecraft/VersionFilterData.h" ModFolderPage::ModFolderPage(BaseInstance *inst, std::shared_ptr mods, QString id, diff --git a/gui/pages/ModFolderPage.h b/gui/pages/ModFolderPage.h index d2452ff6..bd5156d4 100644 --- a/gui/pages/ModFolderPage.h +++ b/gui/pages/ModFolderPage.h @@ -17,7 +17,7 @@ #include -#include "logic/OneSixInstance.h" +#include "logic/minecraft/OneSixInstance.h" #include "logic/net/NetJob.h" #include "BasePage.h" #include diff --git a/gui/pages/ScreenshotsPage.h b/gui/pages/ScreenshotsPage.h index 08ffbf26..f5700ba8 100644 --- a/gui/pages/ScreenshotsPage.h +++ b/gui/pages/ScreenshotsPage.h @@ -17,7 +17,6 @@ #include -#include "logic/OneSixInstance.h" #include "BasePage.h" #include diff --git a/gui/pages/VersionPage.cpp b/gui/pages/VersionPage.cpp index 7df0b5c1..712b496f 100644 --- a/gui/pages/VersionPage.cpp +++ b/gui/pages/VersionPage.cpp @@ -37,7 +37,6 @@ #include #include -#include "logic/ModList.h" #include "logic/minecraft/MinecraftProfile.h" #include "logic/forge/ForgeVersionList.h" #include "logic/forge/ForgeInstaller.h" @@ -45,7 +44,7 @@ #include "logic/liteloader/LiteLoaderInstaller.h" #include "logic/minecraft/VersionBuilder.h" #include "logic/auth/MojangAccountList.h" -#include "logic/Mod.h" +#include "logic/minecraft/Mod.h" #include "logic/icons/IconList.h" diff --git a/gui/pages/VersionPage.h b/gui/pages/VersionPage.h index 0354c886..3b90d0c6 100644 --- a/gui/pages/VersionPage.h +++ b/gui/pages/VersionPage.h @@ -17,7 +17,7 @@ #include -#include "logic/OneSixInstance.h" +#include "logic/minecraft/OneSixInstance.h" #include "logic/net/NetJob.h" #include "BasePage.h" diff --git a/gui/widgets/MCModInfoFrame.h b/gui/widgets/MCModInfoFrame.h index 3e45b8ce..9e63d29a 100644 --- a/gui/widgets/MCModInfoFrame.h +++ b/gui/widgets/MCModInfoFrame.h @@ -16,7 +16,7 @@ #pragma once #include -#include "logic/Mod.h" +#include "logic/minecraft/Mod.h" namespace Ui { -- cgit v1.2.3