From a320af837daefb0423b7ce5395ae361ae7aa3011 Mon Sep 17 00:00:00 2001 From: Andrey Filipenkov Date: Sun, 18 Sep 2022 15:47:49 +0300 Subject: [PATCH] fix includes in client subdirectories --- client/gui/CAnimation.cpp | 5 +++-- client/mainmenu/CCampaignScreen.cpp | 3 ++- client/mainmenu/CCampaignScreen.h | 2 ++ client/mainmenu/CreditsScreen.cpp | 5 +++-- client/widgets/AdventureMapClasses.cpp | 3 +-- client/widgets/CComponent.cpp | 5 +++-- client/widgets/CGarrisonInt.cpp | 5 +++-- client/windows/CAdvmapInterface.cpp | 4 ++-- client/windows/CCastleInterface.cpp | 2 +- client/windows/CKingdomInterface.cpp | 2 +- client/windows/CWindowObject.cpp | 5 +++-- client/windows/GUIClasses.cpp | 2 +- client/windows/GUIClasses.h | 2 +- client/windows/InfoWindows.cpp | 3 ++- lib/filesystem/Filesystem.cpp | 2 +- 15 files changed, 29 insertions(+), 21 deletions(-) diff --git a/client/gui/CAnimation.cpp b/client/gui/CAnimation.cpp index 3828056fe..be4c357a2 100644 --- a/client/gui/CAnimation.cpp +++ b/client/gui/CAnimation.cpp @@ -10,10 +10,11 @@ #include "StdInc.h" #include "CAnimation.h" +#include "SDL_Extensions.h" +#include "SDL_Pixels.h" + #include "../CBitmapHandler.h" #include "../Graphics.h" -#include "../gui/SDL_Extensions.h" -#include "../gui/SDL_Pixels.h" #include "../lib/filesystem/Filesystem.h" #include "../lib/filesystem/ISimpleResourceLoader.h" diff --git a/client/mainmenu/CCampaignScreen.cpp b/client/mainmenu/CCampaignScreen.cpp index ea79cd775..2fb189ced 100644 --- a/client/mainmenu/CCampaignScreen.cpp +++ b/client/mainmenu/CCampaignScreen.cpp @@ -9,9 +9,10 @@ */ #include "StdInc.h" -#include "../mainmenu/CMainMenu.h" #include "CCampaignScreen.h" +#include "CMainMenu.h" + #include "../CGameInfo.h" #include "../CMessage.h" #include "../CBitmapHandler.h" diff --git a/client/mainmenu/CCampaignScreen.h b/client/mainmenu/CCampaignScreen.h index d990f51bd..b0a1acb85 100644 --- a/client/mainmenu/CCampaignScreen.h +++ b/client/mainmenu/CCampaignScreen.h @@ -9,6 +9,8 @@ */ #pragma once +#include "../windows/CWindowObject.h" + class CLabel; class CPicture; class CButton; diff --git a/client/mainmenu/CreditsScreen.cpp b/client/mainmenu/CreditsScreen.cpp index beda44054..9e754668b 100644 --- a/client/mainmenu/CreditsScreen.cpp +++ b/client/mainmenu/CreditsScreen.cpp @@ -9,9 +9,10 @@ */ #include "StdInc.h" - #include "CreditsScreen.h" -#include "../mainmenu/CMainMenu.h" + +#include "CMainMenu.h" + #include "../gui/CGuiHandler.h" #include "../widgets/TextControls.h" #include "../widgets/ObjectLists.h" diff --git a/client/widgets/AdventureMapClasses.cpp b/client/widgets/AdventureMapClasses.cpp index eac733371..4aead3f7a 100644 --- a/client/widgets/AdventureMapClasses.cpp +++ b/client/widgets/AdventureMapClasses.cpp @@ -14,6 +14,7 @@ #include "MiscWidgets.h" #include "CComponent.h" +#include "Images.h" #include "../CGameInfo.h" #include "../CMusicHandler.h" @@ -26,8 +27,6 @@ #include "../gui/SDL_Pixels.h" #include "../gui/SDL_Compat.h" -#include "../widgets/Images.h" - #include "../windows/InfoWindows.h" #include "../windows/CAdvmapInterface.h" #include "../windows/GUIClasses.h" diff --git a/client/widgets/CComponent.cpp b/client/widgets/CComponent.cpp index e5850d6ca..48b7af3b4 100644 --- a/client/widgets/CComponent.cpp +++ b/client/widgets/CComponent.cpp @@ -10,6 +10,9 @@ #include "StdInc.h" #include "CComponent.h" +#include "CArtifactHolder.h" +#include "Images.h" + #include #include @@ -18,8 +21,6 @@ #include "../CMessage.h" #include "../CGameInfo.h" -#include "../widgets/Images.h" -#include "../widgets/CArtifactHolder.h" #include "../windows/CAdvmapInterface.h" #include "../../lib/CArtHandler.h" diff --git a/client/widgets/CGarrisonInt.cpp b/client/widgets/CGarrisonInt.cpp index 2078429b8..0012f7b17 100644 --- a/client/widgets/CGarrisonInt.cpp +++ b/client/widgets/CGarrisonInt.cpp @@ -10,12 +10,13 @@ #include "StdInc.h" #include "CGarrisonInt.h" +#include "Buttons.h" +#include "TextControls.h" + #include "../gui/CGuiHandler.h" #include "../CGameInfo.h" #include "../CPlayerInterface.h" -#include "../widgets/Buttons.h" -#include "../widgets/TextControls.h" #include "../windows/CCreatureWindow.h" #include "../windows/GUIClasses.h" diff --git a/client/windows/CAdvmapInterface.cpp b/client/windows/CAdvmapInterface.cpp index 0574ee6b0..59c104719 100644 --- a/client/windows/CAdvmapInterface.cpp +++ b/client/windows/CAdvmapInterface.cpp @@ -14,8 +14,9 @@ #include "CHeroWindow.h" #include "CKingdomInterface.h" #include "CSpellWindow.h" -#include "GUIClasses.h" #include "CTradeWindow.h" +#include "GUIClasses.h" +#include "InfoWindows.h" #include "../CBitmapHandler.h" #include "../CGameInfo.h" @@ -35,7 +36,6 @@ #include "../gui/CGuiHandler.h" #include "../gui/SDL_Extensions.h" #include "../widgets/MiscWidgets.h" -#include "../windows/InfoWindows.h" #include "../../CCallback.h" diff --git a/client/windows/CCastleInterface.cpp b/client/windows/CCastleInterface.cpp index 4de14e4b0..3d1550bfa 100644 --- a/client/windows/CCastleInterface.cpp +++ b/client/windows/CCastleInterface.cpp @@ -13,6 +13,7 @@ #include "CAdvmapInterface.h" #include "CHeroWindow.h" #include "CTradeWindow.h" +#include "InfoWindows.h" #include "GUIClasses.h" #include "QuickRecruitmentWindow.h" @@ -24,7 +25,6 @@ #include "../Graphics.h" #include "../gui/CGuiHandler.h" #include "../gui/SDL_Extensions.h" -#include "../windows/InfoWindows.h" #include "../widgets/MiscWidgets.h" #include "../widgets/CComponent.h" diff --git a/client/windows/CKingdomInterface.cpp b/client/windows/CKingdomInterface.cpp index 0957aab22..163cb3966 100644 --- a/client/windows/CKingdomInterface.cpp +++ b/client/windows/CKingdomInterface.cpp @@ -12,6 +12,7 @@ #include "CAdvmapInterface.h" #include "CCastleInterface.h" +#include "InfoWindows.h" #include "../CGameInfo.h" #include "../CMT.h" @@ -19,7 +20,6 @@ #include "../gui/CGuiHandler.h" #include "../widgets/CComponent.h" #include "../widgets/MiscWidgets.h" -#include "../windows/InfoWindows.h" #include "../../CCallback.h" diff --git a/client/windows/CWindowObject.cpp b/client/windows/CWindowObject.cpp index d3e78564b..ee6f0f0b4 100644 --- a/client/windows/CWindowObject.cpp +++ b/client/windows/CWindowObject.cpp @@ -10,6 +10,8 @@ #include "StdInc.h" #include "CWindowObject.h" +#include "CAdvmapInterface.h" + #include "../widgets/MiscWidgets.h" #include "../gui/SDL_Pixels.h" @@ -26,7 +28,6 @@ #include "../CPlayerInterface.h" #include "../CMessage.h" #include "../CMusicHandler.h" -#include "../windows/CAdvmapInterface.h" #include "../../CCallback.h" @@ -251,4 +252,4 @@ void CStatusbarWindow::activate() { CIntObject::activate(); GH.statusbar = statusbar; -} \ No newline at end of file +} diff --git a/client/windows/GUIClasses.cpp b/client/windows/GUIClasses.cpp index 537e454fb..39348eb83 100644 --- a/client/windows/GUIClasses.cpp +++ b/client/windows/GUIClasses.cpp @@ -15,6 +15,7 @@ #include "CCreatureWindow.h" #include "CHeroWindow.h" #include "CreatureCostBox.h" +#include "InfoWindows.h" #include "../CBitmapHandler.h" #include "../CGameInfo.h" @@ -36,7 +37,6 @@ #include "../widgets/CComponent.h" #include "../widgets/MiscWidgets.h" -#include "../windows/InfoWindows.h" #include "../lobby/CSavingScreen.h" diff --git a/client/windows/GUIClasses.h b/client/windows/GUIClasses.h index a87ff932f..dc6bc9980 100644 --- a/client/windows/GUIClasses.h +++ b/client/windows/GUIClasses.h @@ -9,13 +9,13 @@ */ #pragma once +#include "CWindowObject.h" #include "../lib/GameConstants.h" #include "../lib/ResourceSet.h" #include "../lib/CConfigHandler.h" #include "../widgets/CArtifactHolder.h" #include "../widgets/CGarrisonInt.h" #include "../widgets/Images.h" -#include "../windows/CWindowObject.h" class CGDwelling; class CreatureCostBox; diff --git a/client/windows/InfoWindows.cpp b/client/windows/InfoWindows.cpp index 3a68d72bf..7f3ee26d3 100644 --- a/client/windows/InfoWindows.cpp +++ b/client/windows/InfoWindows.cpp @@ -10,6 +10,8 @@ #include "StdInc.h" #include "InfoWindows.h" +#include "CAdvmapInterface.h" + #include "../CBitmapHandler.h" #include "../Graphics.h" #include "../CGameInfo.h" @@ -17,7 +19,6 @@ #include "../CMessage.h" #include "../CMusicHandler.h" -#include "../windows/CAdvmapInterface.h" #include "../widgets/CComponent.h" #include "../widgets/MiscWidgets.h" diff --git a/lib/filesystem/Filesystem.cpp b/lib/filesystem/Filesystem.cpp index a96f3ec87..d478d136e 100644 --- a/lib/filesystem/Filesystem.cpp +++ b/lib/filesystem/Filesystem.cpp @@ -156,7 +156,7 @@ ISimpleResourceLoader * CResourceHandler::createInitial() void CResourceHandler::initialize() { - // Create tree-loke structure that looks like this: + // Create tree-like structure that looks like this: // root // | // |- initial