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

@@ -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"

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
 {

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
 {

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
 {

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"

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"

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
 {

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"

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

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

source/Irrlicht/CGUIMessageBox.h

@@ -11,7 +11,6 @@
 #include "CGUIWindow.h"
 #include "IGUIStaticText.h"
 #include "IGUIImage.h"
-#include "irrArray.h"
 
 namespace irr
 {

source/Irrlicht/CGUIModalScreen.cpp

@@ -7,7 +7,6 @@
 
 #include "IGUIEnvironment.h"
 #include "os.h"
-#include "IVideoDriver.h"
 #include "IGUISkin.h"
 
 namespace irr

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
 {

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
 {

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 <wchar.h>
 
 
 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());

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
 {

source/Irrlicht/CGUITabControl.h

@@ -10,7 +10,6 @@
 
 #include "IGUITabControl.h"
 #include "irrArray.h"
-#include "IGUISkin.h"
 
 namespace irr
 {

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
 

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"

source/Irrlicht/CGUITreeView.cpp

@@ -13,7 +13,6 @@
 #include "IVideoDriver.h"
 #include "IGUIFont.h"
 #include "CGUIScrollBar.h"
-#include "os.h"
 
 namespace irr
 {

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
 {

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
 {

source/Irrlicht/CLimitReadFile.h

@@ -6,7 +6,6 @@
 #define IRR_C_LIMIT_READ_FILE_H_INCLUDED
 
 #include "IReadFile.h"
-#include "irrString.h"
 
 namespace irr
 {

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
 {

source/Irrlicht/CMemoryFile.h

@@ -7,7 +7,6 @@
 
 #include "IMemoryReadFile.h"
 #include "IWriteFile.h"
-#include "irrString.h"
 
 namespace irr
 {

source/Irrlicht/CMountPointReader.cpp

@@ -7,7 +7,6 @@
 #ifdef __IRR_COMPILE_WITH_MOUNT_ARCHIVE_LOADER_
 
 #include "CReadFile.h"
-#include "os.h"
 
 namespace irr
 {

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"

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"
 

source/Irrlicht/CReadFile.h

@@ -7,7 +7,6 @@
 
 #include <stdio.h>
 #include "IReadFile.h"
-#include "irrString.h"
 
 namespace irr
 {

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"

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"
 

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"

source/Irrlicht/CWriteFile.cpp

@@ -3,7 +3,6 @@
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
 #include "CWriteFile.h"
-#include <stdio.h>
 
 namespace irr
 {

source/Irrlicht/CWriteFile.h

@@ -7,7 +7,6 @@
 
 #include <stdio.h>
 #include "IWriteFile.h"
-#include "irrString.h"
 
 namespace irr
 {

source/Irrlicht/CXMLWriter.cpp

@@ -6,7 +6,6 @@
 
 #ifdef _IRR_COMPILE_WITH_XML_
 
-#include <wchar.h>
 #include "irrString.h"
 #include "IrrCompileConfig.h"
 

source/Irrlicht/CZipReader.h

@@ -11,7 +11,6 @@
 
 #include "IReadFile.h"
 #include "irrArray.h"
-#include "irrString.h"
 #include "IFileSystem.h"
 #include "CFileList.h"
 

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