Clean up irrlicht includes; avoiding including the huge irrlicht.h when we only need one specific class, especially in header files; use forwards when possible

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@8660 178a84e3-b1eb-0310-8ba1-8eac791a3b58

src/addons/addon.cpp

@@ -113,4 +113,4 @@ std::string Addon::getDateAsString() const
     char s[16];
     strftime(s, 128, "%d.%m.%Y", t);
     return s;
-}   // getDateAsString
+}   // getDateAsString

src/addons/request.cpp

@@ -60,4 +60,4 @@ void  Request::notifyAddon()
 {
     if(m_icon_addon)
         m_icon_addon->setIconReady();
-}   // notifyAddon
+}   // notifyAddon

src/config/device_config.cpp

@@ -20,6 +20,7 @@
 #include <assert.h>
 
 #include "config/device_config.hpp"
+#include <keycodes.h>
 
 //==== D E V I C E C O N F I G =================================================
 

src/graphics/material_manager.cpp

@@ -227,7 +227,7 @@ Material *MaterialManager::getMaterial(const std::string& fname,
     m_materials.push_back(m);
     if(make_permanent) 
     {
-        assert(m_shared_material_index==m_materials.size()-1);
+        assert(m_shared_material_index==(int)m_materials.size()-1);
         m_shared_material_index = (int)m_materials.size();
     }
     return m ;

src/guiengine/engine.cpp

@@ -587,7 +587,6 @@
 
 #include <iostream>
 #include <assert.h>
-
 #include "io/file_manager.hpp"
 #include "input/input_manager.hpp"
 #include "guiengine/event_handler.hpp"

src/guiengine/engine.hpp

@@ -23,19 +23,17 @@
  * \defgroup guiengine
  */
 
+namespace irr
+{
+    class IrrlichtDevice;
+    namespace gui   { class IGUIEnvironment; class ScalableFont; }
+    namespace video { class IVideoDriver; class ITexture;        }
+}
 
-#include <irrlicht.h>
 #include <string>
 
 #include "utils/constants.hpp"
 #include "utils/ptr_vector.hpp"
-namespace irr
-{
-    namespace gui
-    {
-        class ScalableFont;
-    }
-}
 
 /**
  * \ingroup guiengine

src/guiengine/event_handler.hpp

@@ -18,7 +18,7 @@
 #ifndef HEADER_EVENT_HANDLER_HPP
 #define HEADER_EVENT_HANDLER_HPP
 
-#include "irrlicht.h"
+#include <IEventReceiver.h>
 #include "input/input.hpp"
 
 /**

src/guiengine/modaldialog.hpp

@@ -18,7 +18,11 @@
 #ifndef HEADER_MODAL_DIALOG_HPP
 #define HEADER_MODAL_DIALOG_HPP
 
-#include "irrlicht.h"
+namespace irr
+{
+    namespace gui { class IGUIWindow; }
+}
+
 #include "utils/ptr_vector.hpp"
 #include "guiengine/abstract_top_level_container.hpp"
 //#include "guiengine/event_handler.hpp"

src/guiengine/scalable_font.cpp

@@ -5,12 +5,12 @@
 #include "guiengine/scalable_font.hpp"
 
 #include <iostream>
+#include <IGUIEnvironment.h>
+#include <IXMLReader.h>
+#include <IReadFile.h>
+#include <IVideoDriver.h>
+#include <IGUISpriteBank.h>
 
-#include "IGUIEnvironment.h"
-#include "IXMLReader.h"
-#include "IReadFile.h"
-#include "IVideoDriver.h"
-#include "IGUISpriteBank.h"
 #include "guiengine/engine.hpp"
 #include "io/file_manager.hpp"
 #include "utils/translation.hpp"

src/guiengine/screen.hpp

@@ -23,7 +23,12 @@
 #include <string>
 #include <typeinfo>
 
-#include "irrlicht.h"
+#include <irrString.h>
+namespace irr
+{
+    namespace gui { class IGUIElement; }
+}
+using namespace irr;
 
 #include "config/stk_config.hpp"
 #include "guiengine/abstract_top_level_container.hpp"

src/guiengine/widget.hpp

@@ -19,7 +19,11 @@
 #ifndef HEADER_WIDGET_HPP
 #define HEADER_WIDGET_HPP
 
-#include <irrlicht.h>
+#include <irrString.h>
+namespace irr
+{
+    namespace gui { class IGUIElement; }
+}
 #include <map>
 
 #include "guiengine/event_handler.hpp"

src/guiengine/widgets/bubble_widget.hpp

@@ -18,7 +18,9 @@
 #ifndef __BUBBLE_WIDGET_HPP__
 #define __BUBBLE_WIDGET_HPP__
 
-#include <irrlicht.h>
+#include <rect.h>
+#include <irrString.h>
+
 #include "guiengine/widget.hpp"
 
 namespace GUIEngine

src/guiengine/widgets/button_widget.hpp

@@ -24,7 +24,7 @@
   * \defgroup widgets Guiengine/Widgets
   */
 
-#include <irrlicht.h>
+#include <irrString.h>
 
 #include "guiengine/widget.hpp"
 #include "utils/ptr_vector.hpp"

src/guiengine/widgets/check_box_widget.hpp

@@ -20,8 +20,6 @@
 #ifndef HEADER_CHECKBOX_HPP
 #define HEADER_CHECKBOX_HPP
 
-#include <irrlicht.h>
-
 #include "guiengine/widget.hpp"
 #include "utils/ptr_vector.hpp"
 

src/guiengine/widgets/dynamic_ribbon_widget.hpp

@@ -20,7 +20,7 @@
 #ifndef HEADER_RIBBONGRID_HPP
 #define HEADER_RIBBONGRID_HPP
 
-#include <irrlicht.h>
+#include <irrString.h>
 
 #include "guiengine/widget.hpp"
 #include "guiengine/widgets/ribbon_widget.hpp"

src/guiengine/widgets/icon_button_widget.hpp

@@ -20,7 +20,12 @@
 #ifndef HEADER_IBTN_HPP
 #define HEADER_IBTN_HPP
 
-#include <irrlicht.h>
+#include <irrString.h>
+namespace irr
+{
+    namespace gui   { class IGUIStaticText; }
+    namespace video { class ITexture;       }
+}
 
 #include "guiengine/widget.hpp"
 #include "utils/ptr_vector.hpp"

src/guiengine/widgets/label_widget.hpp

@@ -20,7 +20,8 @@
 #ifndef HEADER_LABEL_HPP
 #define HEADER_LABEL_HPP
 
-#include <irrlicht.h>
+#include <irrString.h>
+#include <SColor.h>
 
 #include "guiengine/widget.hpp"
 #include "utils/ptr_vector.hpp"

src/guiengine/widgets/list_widget.hpp

@@ -20,7 +20,7 @@
 #ifndef HEADER_LISTWIDGET_HPP
 #define HEADER_LISTWIDGET_HPP
 
-#include <irrlicht.h>
+#include <irrString.h>
 
 #include "guiengine/widget.hpp"
 #include "guiengine/widgets/button_widget.hpp"

src/guiengine/widgets/progress_bar_widget.hpp

@@ -24,7 +24,7 @@
   * \defgroup widgets Guiengine/Widgets
   */
 
-#include <irrlicht.h>
+#include <irrString.h>
 
 #include "guiengine/widget.hpp"
 #include "utils/ptr_vector.hpp"

src/guiengine/widgets/ribbon_widget.hpp

@@ -20,7 +20,7 @@
 #ifndef HEADER_RIBBON_HPP
 #define HEADER_RIBBON_HPP
 
-#include <irrlicht.h>
+#include <irrString.h>
 
 #include "guiengine/widget.hpp"
 #include "guiengine/widgets/icon_button_widget.hpp"

src/guiengine/widgets/spinner_widget.hpp

@@ -20,7 +20,11 @@
 #ifndef HEADER_SPINNER_HPP
 #define HEADER_SPINNER_HPP
 
-#include <irrlicht.h>
+#include <irrString.h>
+namespace irr
+{
+    namespace video { class ITexture; }
+}
 
 #include "guiengine/widget.hpp"
 #include "utils/ptr_vector.hpp"

src/guiengine/widgets/text_box_widget.hpp

@@ -20,7 +20,7 @@
 #ifndef HEADER_TEXTBOX_HPP
 #define HEADER_TEXTBOX_HPP
 
-#include <irrlicht.h>
+#include <irrString.h>
 
 #include "guiengine/widget.hpp"
 #include "utils/ptr_vector.hpp"

src/input/binding.hpp

@@ -23,9 +23,10 @@
 
 #include <fstream>
 
-#include "irrlicht.h"
+#include <irrString.h>
 #include "input/input.hpp"
 #include "utils/no_copy.hpp"
+#include <irrXML.h>
 
 /**
   * \ingroup config

src/io/file_manager.hpp

@@ -28,7 +28,9 @@
 #include <vector>
 #include <set>
 
-#include "irrlicht.h"
+#include <irrString.h>
+#include <IFileSystem.h>
+namespace irr { class IrrlichtDevice; }
 using namespace irr;
 
 #include "io/xml_node.hpp"

src/io/xml_node.hpp

@@ -23,7 +23,13 @@
 #include <string>
 #include <map>
 #include <vector>
-#include "irrlicht.h"
+
+#include <irrString.h>
+#include <IXMLReader.h>
+#include <SColor.h>
+#include <vector2d.h>
+#include <vector3d.h>
+#include <path.h>
 using namespace irr;
 
 #include "utils/no_copy.hpp"

src/io/xml_writer.hpp

@@ -21,7 +21,7 @@
 #define HEADER_XML_WRITER_HPP
 
 #include <fstream>
-#include <irrlicht.h>
+#include <irrString.h>
 
 /**
  * \brief utility class used to write wide (UTF-16 or UTF-32, depending of size of wchar_t) XML files

src/items/attachment_manager.hpp

@@ -19,7 +19,11 @@
 #ifndef HEADER_ATTACHMENT_MANAGER_HPP
 #define HEADER_ATTACHMENT_MANAGER_HPP
 
-#include "irrlicht.h"
+namespace irr
+{
+    namespace scene { class IAnimatedMesh; }
+}
+
 #include "items/attachment.hpp"
 #include "utils/no_copy.hpp"
 

src/items/bowling.hpp

@@ -20,7 +20,10 @@
 #ifndef HEADER_BOWLING_HPP
 #define HEADER_BOWLING_HPP
 
-#include "irrlicht.h"
+namespace irr
+{
+    namespace scene { class IMesh; }
+}
 using namespace irr;
 
 #include "items/flyable.hpp"

src/items/cake.hpp

@@ -23,7 +23,10 @@
 #ifndef HEADER_CAKE_HPP
 #define HEADER_CAKE_HPP
 
-#include "irrlicht.h"
+namespace irr
+{
+    namespace scene { class IMesh; }
+}
 
 #include "items/flyable.hpp"
 

src/items/flyable.hpp

@@ -23,7 +23,10 @@
 #ifndef HEADER_FLYABLE_HPP
 #define HEADER_FLYABLE_HPP
 
-#include "irrlicht.h"
+namespace irr
+{
+    namespace scene { class IMesh; }
+}
 using namespace irr;
 
 #include "audio/sfx_manager.hpp"

src/items/item.hpp

@@ -24,7 +24,10 @@
   * \defgroup items
   */
 
-#include "irrlicht.h"
+namespace irr
+{
+    namespace scene { class IMesh; }
+}
 using namespace irr;
 
 #include "karts/kart.hpp"

src/items/plunger.hpp

@@ -23,9 +23,6 @@
 #ifndef HEADER_MISSILE_HPP
 #define HEADER_MISSILE_HPP
 
-#include "irrlicht.h"
-using namespace irr;
-
 #include "items/flyable.hpp"
 
 class Kart;

src/items/powerup_manager.hpp

@@ -20,7 +20,10 @@
 #ifndef HEADER_POWERUPMANAGER_HPP
 #define HEADER_POWERUPMANAGER_HPP
 
-#include "irrlicht.h"
+namespace irr
+{
+    namespace scene { class IMesh; }
+}
 
 #include <string>
 #include <vector>

src/items/projectile_manager.hpp

@@ -21,7 +21,11 @@
 #define HEADER_PROJECTILEMANAGER_HPP
 
 #include <vector>
-#include "irrlicht.h"
+
+namespace irr
+{
+    namespace scene { class IMesh; }
+}
 
 #include "audio/sfx_manager.hpp"
 #include "items/powerup_manager.hpp"

src/karts/moveable.hpp

@@ -21,7 +21,10 @@
 #ifndef HEADER_MOVEABLE_HPP
 #define HEADER_MOVEABLE_HPP
 
-#include "irrlicht.h"
+namespace irr
+{
+    namespace scene { class IMesh; class IMeshSceneNode; }
+}
 using namespace irr;
 #include "btBulletDynamicsCommon.h"
 

src/main.cpp

@@ -40,7 +40,7 @@
 #include <sstream>
 #include <algorithm>
 
-#include "IEventReceiver.h"
+#include <IEventReceiver.h>
 
 #include "main_loop.hpp"
 #include "addons/addons_manager.hpp"

src/race/grand_prix_manager.cpp

@@ -20,7 +20,6 @@
 #include "race/grand_prix_manager.hpp"
 
 #include <set>
-
 #include "io/file_manager.hpp"
 #include "utils/string_utils.hpp"
 

src/race/highscores.hpp

@@ -25,7 +25,7 @@
 
 #include "race/race_manager.hpp"
 
-#include "irrlicht.h"
+#include <irrString.h>
 
 class XMLNode;
 class XMLWriter;

src/states_screens/challenges.hpp

@@ -19,10 +19,14 @@
 #ifndef HEADER_CHALLENGES_HPP
 #define HEADER_CHALLENGES_HPP
 
-#include "irrlicht.h"
 #include "guiengine/screen.hpp"
 #include "utils/ptr_vector.hpp"
 
+namespace irr
+{
+    namespace video { class IVideoDriver; }
+}
+
  
 /**
   * \brief Handles the screen where the player is shown active and solved challenges

src/states_screens/minimal_race_gui.hpp

@@ -24,7 +24,13 @@
 #include <string>
 #include <vector>
 
-#include "irrlicht.h"
+#include <vector2d.h>
+#include <irrString.h>
+#include <dimension2d.h>
+namespace irr
+{
+    namespace video { class ITexture; }
+}
 using namespace irr;
 
 #include "config/player.hpp"

src/states_screens/options_screen_audio.hpp

@@ -20,7 +20,6 @@
 #define __HEADER_OPTIONS_SCREEN_AUDIO_HPP__
 
 #include <string>
-#include "irrlicht.h"
 
 #include "guiengine/screen.hpp"
 

src/states_screens/options_screen_input.hpp

@@ -20,14 +20,11 @@
 #define __HEADER_OPTIONS_SCREEN_INPUT_HPP__
 
 #include <string>
-//#include <map>
-#include "irrlicht.h"
-
 #include "guiengine/screen.hpp"
 
 namespace GUIEngine { class Widget; }
 class DeviceConfig;
-namespace irr { namespace gui { class STKModifiedSpriteBank; } }
+namespace irr { namespace gui { class STKModifiedSpriteBank; } namespace video { class IVideoDriver; } }
 
 
 struct Input;

src/states_screens/options_screen_input2.hpp

@@ -20,7 +20,7 @@
 #define __HEADER_OPTIONS_SCREEN_INPUT2_HPP__
 
 #include <string>
-#include "irrlicht.h"
+#include <irrString.h>
 
 #include "guiengine/screen.hpp"
 #include "states_screens/dialogs/message_dialog.hpp"

src/states_screens/options_screen_ui.hpp

@@ -20,7 +20,6 @@
 #define __HEADER_OPTIONS_SCREEN_UI_HPP__
 
 #include <string>
-#include "irrlicht.h"
 
 #include "guiengine/screen.hpp"
 

src/states_screens/options_screen_video.hpp

@@ -20,7 +20,6 @@
 #define __HEADER_OPTIONS_SCREEN_VIDEO_HPP__
 
 #include <string>
-#include "irrlicht.h"
 
 #include "guiengine/screen.hpp"
 

src/tracks/check_lap.hpp

@@ -20,9 +20,6 @@
 #ifndef HEADER_CHECK_LAP_HPP
 #define HEADER_CHECK_LAP_HPP
 
-#include "irrlicht.h"
-using namespace irr;
-
 #include "tracks/check_structure.hpp"
 
 class XMLNode;

src/tracks/check_line.hpp

@@ -20,7 +20,8 @@
 #ifndef HEADER_CHECK_LINE_HPP
 #define HEADER_CHECK_LINE_HPP
 
-#include "irrlicht.h"
+#include <line2d.h>
+#include <IMeshSceneNode.h>
 using namespace irr;
 
 #include "tracks/check_structure.hpp"

src/tracks/graph_node.hpp

@@ -22,7 +22,9 @@
 
 #include <vector>
 
-#include "irrlicht.h"
+#include <vector2d.h>
+#include <dimension2d.h>
+#include <line2d.h>
 
 #include "tracks/quad.hpp"
 #include "tracks/quad_set.hpp"

src/tracks/quad.cpp

@@ -20,6 +20,7 @@
 #include "tracks/quad.hpp"
 
 #include "irrlicht.h"
+#include <algorithm>
 
 #include "LinearMath/btTransform.h"
 

src/tracks/quad.hpp

@@ -20,10 +20,7 @@
 #ifndef HEADER_QUAD_HPP
 #define HEADER_QUAD_HPP
 
-#include <vector>
-
-#include "irrlicht.h"
-
+#include <SColor.h>
 #include "utils/vec3.hpp"
 
 class btTransform;

src/tracks/track.hpp

@@ -23,7 +23,11 @@
 #include <string>
 #include <vector>
 
-#include "irrlicht.h"
+namespace irr
+{
+    namespace video { class ITexture; class SColor; }
+    namespace scene { class IMesh;                  }
+}
 using namespace irr;
 
 #include "LinearMath/btTransform.h"

src/utils/translation.cpp

@@ -35,8 +35,6 @@
 #include <iostream>
 #include <vector>
 
-#include "irrlicht.h"
-
 #include "io/file_manager.hpp"
 #include "utils/constants.hpp"