From 80ce85ecc2d9115a49a172f93183620fe7cfabaa Mon Sep 17 00:00:00 2001 From: cutealien Date: Sun, 13 Aug 2023 20:19:25 +0000 Subject: [PATCH] Clean-up include dependencies in gui and io modules git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@6525 dfc29bdd-3216-0410-991c-e03cc46cb475 --- source/Irrlicht/CAttributeImpl.h | 1 - source/Irrlicht/CFileList.cpp | 3 +-- source/Irrlicht/CGUIColorSelectDialog.cpp | 4 ---- source/Irrlicht/CGUIComboBox.cpp | 2 -- source/Irrlicht/CGUIContextMenu.cpp | 1 - source/Irrlicht/CGUIEditBox.cpp | 1 - source/Irrlicht/CGUIFileOpenDialog.cpp | 4 ---- source/Irrlicht/CGUIListBox.cpp | 1 - source/Irrlicht/CGUIMenu.cpp | 3 --- source/Irrlicht/CGUIMessageBox.cpp | 1 - source/Irrlicht/CGUIMessageBox.h | 1 - source/Irrlicht/CGUIModalScreen.cpp | 1 - source/Irrlicht/CGUIProfiler.cpp | 2 +- source/Irrlicht/CGUIScrollBar.cpp | 4 ---- source/Irrlicht/CGUISpinBox.cpp | 7 +++---- source/Irrlicht/CGUITabControl.cpp | 3 +-- source/Irrlicht/CGUITabControl.h | 1 - source/Irrlicht/CGUITable.cpp | 3 +-- source/Irrlicht/CGUIToolBar.cpp | 1 - source/Irrlicht/CGUITreeView.cpp | 1 - source/Irrlicht/CGUIWindow.cpp | 2 -- source/Irrlicht/CLimitReadFile.cpp | 1 - source/Irrlicht/CLimitReadFile.h | 1 - source/Irrlicht/CMemoryFile.cpp | 1 - source/Irrlicht/CMemoryFile.h | 1 - source/Irrlicht/CMountPointReader.cpp | 1 - source/Irrlicht/CNPKReader.h | 2 -- source/Irrlicht/CPakReader.h | 3 --- source/Irrlicht/CReadFile.h | 1 - source/Irrlicht/CTarReader.cpp | 2 +- source/Irrlicht/CTarReader.h | 3 --- source/Irrlicht/CWADReader.h | 2 -- source/Irrlicht/CWriteFile.cpp | 1 - source/Irrlicht/CWriteFile.h | 1 - source/Irrlicht/CXMLWriter.cpp | 1 - source/Irrlicht/CZipReader.h | 1 - source/Irrlicht/irrXML.cpp | 3 --- 37 files changed, 8 insertions(+), 64 deletions(-) diff --git a/source/Irrlicht/CAttributeImpl.h b/source/Irrlicht/CAttributeImpl.h index 6317a63..5c4ec1d 100644 --- a/source/Irrlicht/CAttributeImpl.h +++ b/source/Irrlicht/CAttributeImpl.h @@ -2,7 +2,6 @@ // This file is part of the "Irrlicht Engine". // For conditions of distribution and use, see copyright notice in irrlicht.h -#include "CAttributes.h" #include "fast_atof.h" #include "ITexture.h" #include "IVideoDriver.h" diff --git a/source/Irrlicht/CFileList.cpp b/source/Irrlicht/CFileList.cpp index 15d5410..d178e0c 100644 --- a/source/Irrlicht/CFileList.cpp +++ b/source/Irrlicht/CFileList.cpp @@ -3,11 +3,10 @@ // For conditions of distribution and use, see copyright notice in irrlicht.h #include "CFileList.h" -#include "IrrCompileConfig.h" #include "irrArray.h" #include "coreutil.h" -#include "os.h" +#include "os.h" // debug logging namespace irr { diff --git a/source/Irrlicht/CGUIColorSelectDialog.cpp b/source/Irrlicht/CGUIColorSelectDialog.cpp index 29c5482..450bc7e 100644 --- a/source/Irrlicht/CGUIColorSelectDialog.cpp +++ b/source/Irrlicht/CGUIColorSelectDialog.cpp @@ -12,10 +12,6 @@ #include "IGUIButton.h" #include "IGUIStaticText.h" #include "IGUIFont.h" -#include "IGUISpriteBank.h" -#include "IFileList.h" -#include "os.h" -#include "fast_atof.h" namespace irr { diff --git a/source/Irrlicht/CGUIComboBox.cpp b/source/Irrlicht/CGUIComboBox.cpp index 1efd345..ef04284 100644 --- a/source/Irrlicht/CGUIComboBox.cpp +++ b/source/Irrlicht/CGUIComboBox.cpp @@ -6,13 +6,11 @@ #ifdef _IRR_COMPILE_WITH_GUI_ #include "IGUIEnvironment.h" -#include "IVideoDriver.h" #include "IGUISkin.h" #include "IGUIEnvironment.h" #include "IGUIFont.h" #include "IGUIButton.h" #include "CGUIListBox.h" -#include "os.h" namespace irr { diff --git a/source/Irrlicht/CGUIContextMenu.cpp b/source/Irrlicht/CGUIContextMenu.cpp index 474d593..53a13fb 100644 --- a/source/Irrlicht/CGUIContextMenu.cpp +++ b/source/Irrlicht/CGUIContextMenu.cpp @@ -8,7 +8,6 @@ #include "IGUISkin.h" #include "IGUIEnvironment.h" -#include "IVideoDriver.h" #include "IGUIFont.h" #include "IGUISpriteBank.h" #include "os.h" diff --git a/source/Irrlicht/CGUIEditBox.cpp b/source/Irrlicht/CGUIEditBox.cpp index a55664e..2ff67d0 100644 --- a/source/Irrlicht/CGUIEditBox.cpp +++ b/source/Irrlicht/CGUIEditBox.cpp @@ -8,7 +8,6 @@ #include "IGUISkin.h" #include "IGUIEnvironment.h" #include "IGUIFont.h" -#include "IVideoDriver.h" #include "rect.h" #include "os.h" #include "Keycodes.h" diff --git a/source/Irrlicht/CGUIFileOpenDialog.cpp b/source/Irrlicht/CGUIFileOpenDialog.cpp index 25da897..dcb6fc9 100644 --- a/source/Irrlicht/CGUIFileOpenDialog.cpp +++ b/source/Irrlicht/CGUIFileOpenDialog.cpp @@ -9,13 +9,9 @@ #include "IGUISkin.h" #include "IGUIEnvironment.h" -#include "IVideoDriver.h" #include "IGUIButton.h" -#include "IGUIStaticText.h" #include "IGUIFont.h" -#include "IGUIFontBitmap.h" #include "IFileList.h" -#include "os.h" namespace irr { diff --git a/source/Irrlicht/CGUIListBox.cpp b/source/Irrlicht/CGUIListBox.cpp index 0670a21..3732047 100644 --- a/source/Irrlicht/CGUIListBox.cpp +++ b/source/Irrlicht/CGUIListBox.cpp @@ -8,7 +8,6 @@ #include "CGUIListBox.h" #include "IGUISkin.h" #include "IGUIEnvironment.h" -#include "IVideoDriver.h" #include "IGUIFont.h" #include "IGUISpriteBank.h" #include "CGUIScrollBar.h" diff --git a/source/Irrlicht/CGUIMenu.cpp b/source/Irrlicht/CGUIMenu.cpp index ce235c7..2e6cd36 100644 --- a/source/Irrlicht/CGUIMenu.cpp +++ b/source/Irrlicht/CGUIMenu.cpp @@ -7,12 +7,9 @@ #include "IGUISkin.h" #include "IGUIEnvironment.h" -#include "IVideoDriver.h" #include "IGUIFont.h" #include "IGUIWindow.h" -#include "os.h" - namespace irr { namespace gui diff --git a/source/Irrlicht/CGUIMessageBox.cpp b/source/Irrlicht/CGUIMessageBox.cpp index 57b383d..8957687 100644 --- a/source/Irrlicht/CGUIMessageBox.cpp +++ b/source/Irrlicht/CGUIMessageBox.cpp @@ -8,7 +8,6 @@ #include "IGUISkin.h" #include "IGUIEnvironment.h" #include "IGUIButton.h" -#include "IGUIFont.h" #include "ITexture.h" namespace irr diff --git a/source/Irrlicht/CGUIMessageBox.h b/source/Irrlicht/CGUIMessageBox.h index 0d17d50..91a5aaf 100644 --- a/source/Irrlicht/CGUIMessageBox.h +++ b/source/Irrlicht/CGUIMessageBox.h @@ -11,7 +11,6 @@ #include "CGUIWindow.h" #include "IGUIStaticText.h" #include "IGUIImage.h" -#include "irrArray.h" namespace irr { diff --git a/source/Irrlicht/CGUIModalScreen.cpp b/source/Irrlicht/CGUIModalScreen.cpp index 66f769e..54147d2 100644 --- a/source/Irrlicht/CGUIModalScreen.cpp +++ b/source/Irrlicht/CGUIModalScreen.cpp @@ -7,7 +7,6 @@ #include "IGUIEnvironment.h" #include "os.h" -#include "IVideoDriver.h" #include "IGUISkin.h" namespace irr diff --git a/source/Irrlicht/CGUIProfiler.cpp b/source/Irrlicht/CGUIProfiler.cpp index 693fc88..b47895b 100644 --- a/source/Irrlicht/CGUIProfiler.cpp +++ b/source/Irrlicht/CGUIProfiler.cpp @@ -8,7 +8,7 @@ #include "IGUITable.h" #include "IGUIScrollBar.h" #include "IGUIEnvironment.h" -#include "CProfiler.h" +#include "IProfiler.h" namespace irr { diff --git a/source/Irrlicht/CGUIScrollBar.cpp b/source/Irrlicht/CGUIScrollBar.cpp index a1779bd..43c26e9 100644 --- a/source/Irrlicht/CGUIScrollBar.cpp +++ b/source/Irrlicht/CGUIScrollBar.cpp @@ -7,11 +7,7 @@ #include "IGUISkin.h" #include "IGUIEnvironment.h" -#include "IVideoDriver.h" #include "CGUIButton.h" -#include "IGUIFont.h" -#include "IGUIFontBitmap.h" -#include "os.h" namespace irr { diff --git a/source/Irrlicht/CGUISpinBox.cpp b/source/Irrlicht/CGUISpinBox.cpp index 453722e..28378bf 100644 --- a/source/Irrlicht/CGUISpinBox.cpp +++ b/source/Irrlicht/CGUISpinBox.cpp @@ -4,12 +4,11 @@ #include "CGUISpinBox.h" #ifdef _IRR_COMPILE_WITH_GUI_ -#include "CGUIEditBox.h" -#include "CGUIButton.h" +#include "IGUIEditBox.h" +#include "IGUIButton.h" #include "IGUIEnvironment.h" #include "IEventReceiver.h" #include "fast_atof.h" -#include namespace irr @@ -131,7 +130,7 @@ void CGUISpinBox::setRange(f32 min, f32 max) RangeMin = min; RangeMax = max; - // we have to round the range - otherwise we can get into an infinte setValue/verifyValueRange cycle. + // we have to round the range - otherwise we can get into an infinite setValue/verifyValueRange cycle. wchar_t str[100]; swprintf_irr(str, 99, FormatString.c_str(), RangeMin); RangeMin = core::fast_atof(core::stringc(str).c_str()); diff --git a/source/Irrlicht/CGUITabControl.cpp b/source/Irrlicht/CGUITabControl.cpp index 998856b..847d846 100644 --- a/source/Irrlicht/CGUITabControl.cpp +++ b/source/Irrlicht/CGUITabControl.cpp @@ -5,13 +5,12 @@ #include "CGUITabControl.h" #ifdef _IRR_COMPILE_WITH_GUI_ -#include "CGUIButton.h" +#include "IGUIButton.h" #include "IGUISkin.h" #include "IGUIEnvironment.h" #include "IGUIFont.h" #include "IVideoDriver.h" #include "rect.h" -#include "os.h" namespace irr { diff --git a/source/Irrlicht/CGUITabControl.h b/source/Irrlicht/CGUITabControl.h index 3c34a15..c9b5e45 100644 --- a/source/Irrlicht/CGUITabControl.h +++ b/source/Irrlicht/CGUITabControl.h @@ -10,7 +10,6 @@ #include "IGUITabControl.h" #include "irrArray.h" -#include "IGUISkin.h" namespace irr { diff --git a/source/Irrlicht/CGUITable.cpp b/source/Irrlicht/CGUITable.cpp index 9c89cf1..ca70521 100644 --- a/source/Irrlicht/CGUITable.cpp +++ b/source/Irrlicht/CGUITable.cpp @@ -12,8 +12,7 @@ #include "IGUIEnvironment.h" #include "IVideoDriver.h" #include "IGUIFont.h" -#include "CGUIScrollBar.h" -#include "os.h" +#include "IGUIScrollBar.h" #define ARROW_PAD 15 diff --git a/source/Irrlicht/CGUIToolBar.cpp b/source/Irrlicht/CGUIToolBar.cpp index 2f4bf4e..7ba0147 100644 --- a/source/Irrlicht/CGUIToolBar.cpp +++ b/source/Irrlicht/CGUIToolBar.cpp @@ -7,7 +7,6 @@ #include "IGUISkin.h" #include "IGUIEnvironment.h" -#include "IVideoDriver.h" #include "IGUIButton.h" #include "IGUIFont.h" #include "CGUIButton.h" diff --git a/source/Irrlicht/CGUITreeView.cpp b/source/Irrlicht/CGUITreeView.cpp index b348a79..816e229 100644 --- a/source/Irrlicht/CGUITreeView.cpp +++ b/source/Irrlicht/CGUITreeView.cpp @@ -13,7 +13,6 @@ #include "IVideoDriver.h" #include "IGUIFont.h" #include "CGUIScrollBar.h" -#include "os.h" namespace irr { diff --git a/source/Irrlicht/CGUIWindow.cpp b/source/Irrlicht/CGUIWindow.cpp index 9769750..c353a12 100644 --- a/source/Irrlicht/CGUIWindow.cpp +++ b/source/Irrlicht/CGUIWindow.cpp @@ -7,10 +7,8 @@ #include "IGUISkin.h" #include "IGUIEnvironment.h" -#include "IVideoDriver.h" #include "IGUIButton.h" #include "IGUIFont.h" -#include "IGUIFontBitmap.h" namespace irr { diff --git a/source/Irrlicht/CLimitReadFile.cpp b/source/Irrlicht/CLimitReadFile.cpp index f65b700..1a80225 100644 --- a/source/Irrlicht/CLimitReadFile.cpp +++ b/source/Irrlicht/CLimitReadFile.cpp @@ -3,7 +3,6 @@ // For conditions of distribution and use, see copyright notice in irrlicht.h #include "CLimitReadFile.h" -#include "irrString.h" namespace irr { diff --git a/source/Irrlicht/CLimitReadFile.h b/source/Irrlicht/CLimitReadFile.h index 817ab2d..7ff52af 100644 --- a/source/Irrlicht/CLimitReadFile.h +++ b/source/Irrlicht/CLimitReadFile.h @@ -6,7 +6,6 @@ #define IRR_C_LIMIT_READ_FILE_H_INCLUDED #include "IReadFile.h" -#include "irrString.h" namespace irr { diff --git a/source/Irrlicht/CMemoryFile.cpp b/source/Irrlicht/CMemoryFile.cpp index a214361..48c477d 100644 --- a/source/Irrlicht/CMemoryFile.cpp +++ b/source/Irrlicht/CMemoryFile.cpp @@ -3,7 +3,6 @@ // For conditions of distribution and use, see copyright notice in irrlicht.h #include "CMemoryFile.h" -#include "irrString.h" namespace irr { diff --git a/source/Irrlicht/CMemoryFile.h b/source/Irrlicht/CMemoryFile.h index fb59170..e30d637 100644 --- a/source/Irrlicht/CMemoryFile.h +++ b/source/Irrlicht/CMemoryFile.h @@ -7,7 +7,6 @@ #include "IMemoryReadFile.h" #include "IWriteFile.h" -#include "irrString.h" namespace irr { diff --git a/source/Irrlicht/CMountPointReader.cpp b/source/Irrlicht/CMountPointReader.cpp index 1f5049d..fb6986a 100644 --- a/source/Irrlicht/CMountPointReader.cpp +++ b/source/Irrlicht/CMountPointReader.cpp @@ -7,7 +7,6 @@ #ifdef __IRR_COMPILE_WITH_MOUNT_ARCHIVE_LOADER_ #include "CReadFile.h" -#include "os.h" namespace irr { diff --git a/source/Irrlicht/CNPKReader.h b/source/Irrlicht/CNPKReader.h index ca6c2e2..2477a3c 100644 --- a/source/Irrlicht/CNPKReader.h +++ b/source/Irrlicht/CNPKReader.h @@ -10,9 +10,7 @@ #ifdef __IRR_COMPILE_WITH_NPK_ARCHIVE_LOADER_ -#include "IReferenceCounted.h" #include "IReadFile.h" -#include "irrArray.h" #include "irrString.h" #include "IFileSystem.h" #include "CFileList.h" diff --git a/source/Irrlicht/CPakReader.h b/source/Irrlicht/CPakReader.h index bb7cc18..c13108e 100644 --- a/source/Irrlicht/CPakReader.h +++ b/source/Irrlicht/CPakReader.h @@ -9,10 +9,7 @@ #ifdef __IRR_COMPILE_WITH_PAK_ARCHIVE_LOADER_ -#include "IReferenceCounted.h" #include "IReadFile.h" -#include "irrArray.h" -#include "irrString.h" #include "IFileSystem.h" #include "CFileList.h" diff --git a/source/Irrlicht/CReadFile.h b/source/Irrlicht/CReadFile.h index 4f7e135..29e5388 100644 --- a/source/Irrlicht/CReadFile.h +++ b/source/Irrlicht/CReadFile.h @@ -7,7 +7,6 @@ #include #include "IReadFile.h" -#include "irrString.h" namespace irr { diff --git a/source/Irrlicht/CTarReader.cpp b/source/Irrlicht/CTarReader.cpp index 6fd5ea7..5df4c40 100644 --- a/source/Irrlicht/CTarReader.cpp +++ b/source/Irrlicht/CTarReader.cpp @@ -7,7 +7,7 @@ #ifdef __IRR_COMPILE_WITH_TAR_ARCHIVE_LOADER_ #include "CFileList.h" -#include "CLimitReadFile.h" +#include "IReadFile.h" #include "os.h" #include "coreutil.h" #include "errno.h" diff --git a/source/Irrlicht/CTarReader.h b/source/Irrlicht/CTarReader.h index a446fcc..0a17a8b 100644 --- a/source/Irrlicht/CTarReader.h +++ b/source/Irrlicht/CTarReader.h @@ -9,10 +9,7 @@ #ifdef __IRR_COMPILE_WITH_TAR_ARCHIVE_LOADER_ -#include "IReferenceCounted.h" #include "IReadFile.h" -#include "irrArray.h" -#include "irrString.h" #include "IFileSystem.h" #include "CFileList.h" diff --git a/source/Irrlicht/CWADReader.h b/source/Irrlicht/CWADReader.h index 8d9a01a..66d18ee 100644 --- a/source/Irrlicht/CWADReader.h +++ b/source/Irrlicht/CWADReader.h @@ -8,9 +8,7 @@ #include "IrrCompileConfig.h" #ifdef __IRR_COMPILE_WITH_WAD_ARCHIVE_LOADER_ -#include "IReferenceCounted.h" #include "IReadFile.h" -#include "irrArray.h" #include "irrString.h" #include "IFileSystem.h" #include "CFileList.h" diff --git a/source/Irrlicht/CWriteFile.cpp b/source/Irrlicht/CWriteFile.cpp index ef816b6..ba551ae 100644 --- a/source/Irrlicht/CWriteFile.cpp +++ b/source/Irrlicht/CWriteFile.cpp @@ -3,7 +3,6 @@ // For conditions of distribution and use, see copyright notice in irrlicht.h #include "CWriteFile.h" -#include namespace irr { diff --git a/source/Irrlicht/CWriteFile.h b/source/Irrlicht/CWriteFile.h index 9f6f450..646f197 100644 --- a/source/Irrlicht/CWriteFile.h +++ b/source/Irrlicht/CWriteFile.h @@ -7,7 +7,6 @@ #include #include "IWriteFile.h" -#include "irrString.h" namespace irr { diff --git a/source/Irrlicht/CXMLWriter.cpp b/source/Irrlicht/CXMLWriter.cpp index 4e9d690..ed42f39 100644 --- a/source/Irrlicht/CXMLWriter.cpp +++ b/source/Irrlicht/CXMLWriter.cpp @@ -6,7 +6,6 @@ #ifdef _IRR_COMPILE_WITH_XML_ -#include #include "irrString.h" #include "IrrCompileConfig.h" diff --git a/source/Irrlicht/CZipReader.h b/source/Irrlicht/CZipReader.h index 80ba644..af6be71 100644 --- a/source/Irrlicht/CZipReader.h +++ b/source/Irrlicht/CZipReader.h @@ -11,7 +11,6 @@ #include "IReadFile.h" #include "irrArray.h" -#include "irrString.h" #include "IFileSystem.h" #include "CFileList.h" diff --git a/source/Irrlicht/irrXML.cpp b/source/Irrlicht/irrXML.cpp index 003b3b2..cc2a96b 100644 --- a/source/Irrlicht/irrXML.cpp +++ b/source/Irrlicht/irrXML.cpp @@ -6,9 +6,6 @@ #ifdef _IRR_COMPILE_WITH_XML_ -#include "irrString.h" -#include "irrArray.h" -#include "fast_atof.h" #include "CXMLReaderImpl.h" namespace irr