removed many includes in headers

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

src/guiengine/engine.hpp

@@ -27,8 +27,7 @@
 #include <irrlicht.h>
 #include <string>
 
-#include "guiengine/abstract_state_manager.hpp"
-#include "guiengine/widgets.hpp"
+#include "utils/constants.hpp"
 #include "utils/ptr_vector.hpp"
 
 /**
@@ -42,6 +41,8 @@ namespace GUIEngine
     class Screen;
     class CutScene;
     class Widget;
+    class Skin;
+    class AbstractStateManager;
     
     /** \brief Returns the widget currently focused by given player, or NULL if none.
       * \note Do NOT use irrLicht's GUI focus facilities; it's too limited for our
@@ -76,7 +77,7 @@ namespace GUIEngine
         extern irr::gui::IGUIFont* g_font;
         extern irr::gui::IGUIFont* g_title_font;
 
-        extern IrrlichtDevice* g_device;
+        extern irr::IrrlichtDevice* g_device;
         extern irr::video::IVideoDriver* g_driver;
         extern Screen* g_current_screen;
         extern AbstractStateManager* g_state_manager;
@@ -104,7 +105,7 @@ namespace GUIEngine
     /**
       * \return the irrlicht device object
       */
-    inline IrrlichtDevice*            getDevice()        { return Private::g_device;         }
+    inline irr::IrrlichtDevice*       getDevice()        { return Private::g_device;         }
     
     /**
       * \return the irrlicht GUI environment object

src/guiengine/event_handler.cpp

@@ -22,6 +22,7 @@
 #include "guiengine/modaldialog.hpp"
 #include "guiengine/screen.hpp"
 #include "guiengine/widget.hpp"
+#include "guiengine/widgets/ribbon_widget.hpp"
 #include "input/input_manager.hpp"
 #include "states_screens/state_manager.hpp"
 

src/guiengine/modaldialog.cpp

@@ -15,8 +15,10 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
+#include "graphics/irr_driver.hpp"
 #include "guiengine/engine.hpp"
 #include "guiengine/modaldialog.hpp"
+#include "guiengine/widget.hpp"
 
 using namespace irr;
 

src/guiengine/screen_loader.cpp

@@ -18,7 +18,7 @@
 
 #include "guiengine/screen.hpp"
 #include "guiengine/engine.hpp"
-#include "guiengine/widget.hpp"
+#include "guiengine/widgets.hpp"
 #include "utils/translation.hpp"
 #include <irrlicht.h>
 #include <iostream>

src/guiengine/skin.cpp

@@ -17,11 +17,12 @@
 
 
 #include "config/user_config.hpp"
+#include "graphics/irr_driver.hpp"
 #include "guiengine/skin.hpp"
 #include "guiengine/engine.hpp"
 #include "guiengine/modaldialog.hpp"
 #include "guiengine/screen.hpp"
-#include "guiengine/widget.hpp"
+#include "guiengine/widgets.hpp"
 #include "io/file_manager.hpp"
 #include "states_screens/state_manager.hpp"
 #include <cassert>

src/guiengine/widgets/icon_button_widget.cpp

@@ -15,9 +15,11 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
+#include "graphics/irr_driver.hpp"
 #include "guiengine/engine.hpp"
 #include "guiengine/widgets/icon_button_widget.hpp"
 #include "io/file_manager.hpp"
+
 using namespace GUIEngine;
 using namespace irr::video;
 using namespace irr::core;

src/guiengine/widgets/list_widget.cpp

@@ -15,6 +15,7 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
+#include "graphics/irr_driver.hpp"
 #include "guiengine/engine.hpp"
 #include "guiengine/widgets/list_widget.hpp"
 

src/guiengine/widgets/ribbon_widget.cpp

@@ -17,6 +17,9 @@
 
 #include "guiengine/widgets/ribbon_widget.hpp"
 
+#include "graphics/irr_driver.hpp"
+#include "guiengine/widgets/button_widget.hpp"
+#include "guiengine/widgets/dynamic_ribbon_widget.hpp" //FIXME: needs to be removed
 #include "guiengine/engine.hpp"
 #include "input/input_manager.hpp"
 #include "io/file_manager.hpp"
@@ -326,6 +329,7 @@ EventPropagation RibbonWidget::rightPressed(const int playerID)
     }
     
     // if we reached a filler item, move again
+    // FIXME: why is a constant from DynamicRibbon used here??
     if (getSelectionIDString(playerID) == DynamicRibbonWidget::NO_ITEM_ID) 
     {
         rightPressed(playerID);

src/states_screens/arenas_screen.cpp

@@ -16,7 +16,10 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "challenges/unlock_manager.hpp"
+#include "graphics/irr_driver.hpp"
 #include "guiengine/widget.hpp"
+#include "guiengine/widgets/dynamic_ribbon_widget.hpp"
+#include "guiengine/widgets/icon_button_widget.hpp"
 #include "io/file_manager.hpp"
 #include "states_screens/state_manager.hpp"
 #include "states_screens/arenas_screen.hpp"

src/states_screens/challenges.cpp

@@ -22,6 +22,7 @@
 #include "challenges/unlock_manager.hpp"
 #include "config/user_config.hpp"
 #include "guiengine/engine.hpp"
+#include "guiengine/widgets/dynamic_ribbon_widget.hpp"
 #include "input/device_manager.hpp"
 #include "input/input_manager.hpp"
 #include "io/file_manager.hpp"

src/states_screens/dialogs/add_device_dialog.cpp

@@ -19,6 +19,7 @@
 #include "config/player.hpp"
 #include "guiengine/engine.hpp"
 #include "guiengine/widget.hpp"
+#include "guiengine/widgets/button_widget.hpp"
 #include "input/device_manager.hpp"
 #include "input/input_manager.hpp"
 #include "states_screens/dialogs/add_device_dialog.hpp"

src/states_screens/dialogs/confirm_resolution_dialog.cpp

@@ -17,8 +17,9 @@
 
 
 #include "config/player.hpp"
+#include "graphics/irr_driver.hpp"
 #include "guiengine/engine.hpp"
-#include "guiengine/widget.hpp"
+#include "guiengine/widgets/button_widget.hpp"
 #include "input/device_manager.hpp"
 #include "input/input_manager.hpp"
 #include "states_screens/dialogs/confirm_resolution_dialog.hpp"

src/states_screens/dialogs/enter_player_name_dialog.cpp

@@ -19,7 +19,7 @@
 
 #include "audio/sfx_manager.hpp"
 #include "guiengine/engine.hpp"
-#include "guiengine/widget.hpp"
+#include "guiengine/widgets.hpp"
 #include "states_screens/options_screen_players.hpp"
 #include "states_screens/state_manager.hpp"
 #include "utils/translation.hpp"

src/states_screens/dialogs/gp_info_dialog.cpp

@@ -18,7 +18,9 @@
 
 #include "guiengine/engine.hpp"
 #include "guiengine/screen.hpp"
-#include "guiengine/widget.hpp"
+#include "guiengine/widgets/button_widget.hpp"
+#include "guiengine/widgets/icon_button_widget.hpp"
+#include "guiengine/widgets/label_widget.hpp"
 #include "io/file_manager.hpp"
 #include "network/network_manager.hpp"
 #include "race/grand_prix_manager.hpp"

src/states_screens/dialogs/player_info_dialog.cpp

@@ -18,7 +18,7 @@
 
 #include "config/player.hpp"
 #include "guiengine/engine.hpp"
-#include "guiengine/widget.hpp"
+#include "guiengine/widgets.hpp"
 #include "states_screens/dialogs/player_info_dialog.hpp"
 #include "states_screens/options_screen_players.hpp"
 #include "states_screens/state_manager.hpp"

src/states_screens/dialogs/press_a_key_dialog.cpp

@@ -17,7 +17,7 @@
 
 
 #include "guiengine/engine.hpp"
-#include "guiengine/widget.hpp"
+#include "guiengine/widgets.hpp"
 #include "input/input_manager.hpp"
 #include "states_screens/dialogs/press_a_key_dialog.hpp"
 #include "utils/translation.hpp"

src/states_screens/dialogs/track_info_dialog.cpp

@@ -15,10 +15,10 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-
+#include "graphics/irr_driver.hpp"
 #include "guiengine/engine.hpp"
 #include "guiengine/screen.hpp"
-#include "guiengine/widget.hpp"
+#include "guiengine/widgets.hpp"
 #include "io/file_manager.hpp"
 #include "karts/kart_properties_manager.hpp"
 #include "network/network_manager.hpp"

src/states_screens/feature_unlocked.cpp

@@ -25,6 +25,61 @@ using namespace irr::video;
 DEFINE_SCREEN_SINGLETON( FeatureUnlockedCutScene );
 
 // -------------------------------------------------------------------------------------
+// -------------------------------------------------------------------------------------
+
+#if 0
+#pragma mark FeatureUnlockedCutScene::UnlockedThing
+#endif
+
+FeatureUnlockedCutScene::UnlockedThing::UnlockedThing(KartProperties* kart, irr::core::stringw msg)
+{
+    m_unlocked_kart = kart;
+    m_unlock_message = msg;
+    m_curr_image = -1;
+}
+
+// -------------------------------------------------------------------------------------
+
+
+FeatureUnlockedCutScene::UnlockedThing::UnlockedThing(irr::video::ITexture* pict,
+                                                      float w, float h, irr::core::stringw msg)
+{
+    m_unlocked_kart = NULL;
+    m_pictures.push_back(pict);
+    m_w = w;
+    m_h = h;
+    m_unlock_message = msg;
+    m_curr_image = -1;
+}
+
+// -------------------------------------------------------------------------------------
+
+FeatureUnlockedCutScene::UnlockedThing::UnlockedThing(std::vector<irr::video::ITexture*> picts,
+                                                      float w, float h, irr::core::stringw msg)
+{
+    m_unlocked_kart = NULL;
+    m_pictures = picts;
+    m_w = w;
+    m_h = h;
+    m_unlock_message = msg;
+    m_curr_image = 0;
+}
+
+// -------------------------------------------------------------------------------------
+
+FeatureUnlockedCutScene::UnlockedThing::~UnlockedThing()
+{
+    if (m_root_gift_node != NULL) irr_driver->removeNode(m_root_gift_node);
+    m_root_gift_node = NULL;
+}
+
+// -------------------------------------------------------------------------------------
+// -------------------------------------------------------------------------------------
+
+#if 0
+#pragma mark -
+#pragma mark FeatureUnlockedCutScene
+#endif
 
 FeatureUnlockedCutScene::FeatureUnlockedCutScene() : Screen("feature_unlocked.stkgui")
 {

src/states_screens/feature_unlocked.hpp

@@ -1,6 +1,7 @@
 #ifndef HEADER_FEATURE_UNLOCKED_HPP
 #define HEADER_FEATURE_UNLOCKED_HPP
 
+#include "graphics/irr_driver.hpp"
 #include "guiengine/screen.hpp"
 #include "utils/ptr_vector.hpp"
 
@@ -36,12 +37,7 @@ class FeatureUnlockedCutScene : public GUIEngine::Screen, public GUIEngine::Scre
         
         irr::core::stringw m_unlock_message;
         
-        UnlockedThing(KartProperties* kart, irr::core::stringw msg)
-        {
-            m_unlocked_kart = kart;
-            m_unlock_message = msg;
-            m_curr_image = -1;
-        }
+        UnlockedThing(KartProperties* kart, irr::core::stringw msg);
         
         /**
           * Creates a 'picture' reward.
@@ -49,15 +45,7 @@ class FeatureUnlockedCutScene : public GUIEngine::Screen, public GUIEngine::Scre
           * \param w     width of the picture to display
           * \param y     height of the picture to display
           */
-        UnlockedThing(irr::video::ITexture* pict, float w, float h, irr::core::stringw msg)
-        {
-            m_unlocked_kart = NULL;
-            m_pictures.push_back(pict);
-            m_w = w;
-            m_h = h;
-            m_unlock_message = msg;
-            m_curr_image = -1;
-        }
+        UnlockedThing(irr::video::ITexture* pict, float w, float h, irr::core::stringw msg);
         
         /**
          * Creates a 'picture slideshow' reward.
@@ -65,21 +53,9 @@ class FeatureUnlockedCutScene : public GUIEngine::Screen, public GUIEngine::Scre
          * \param w     width of the pictures to display
          * \param y     height of the pictures to display
          */
-        UnlockedThing(std::vector<irr::video::ITexture*> picts, float w, float h, irr::core::stringw msg)
-        {
-            m_unlocked_kart = NULL;
-            m_pictures = picts;
-            m_w = w;
-            m_h = h;
-            m_unlock_message = msg;
-            m_curr_image = 0;
-        }
+        UnlockedThing(std::vector<irr::video::ITexture*> picts, float w, float h, irr::core::stringw msg);
         
-        ~UnlockedThing()
-        {
-            if (m_root_gift_node != NULL) irr_driver->removeNode(m_root_gift_node);
-            m_root_gift_node = NULL;
-        }
+        ~UnlockedThing();
     };
     ptr_vector<UnlockedThing, HOLD> m_unlocked_stuff;
     

src/states_screens/help_screen_1.cpp

@@ -20,6 +20,7 @@
 #include "states_screens/help_screen_3.hpp"
 
 #include "guiengine/widget.hpp"
+#include "guiengine/widgets/ribbon_widget.hpp"
 #include "states_screens/state_manager.hpp"
 
 using namespace GUIEngine;

src/states_screens/help_screen_2.cpp

@@ -20,6 +20,7 @@
 #include "states_screens/help_screen_3.hpp"
 
 #include "guiengine/widget.hpp"
+#include "guiengine/widgets/ribbon_widget.hpp"
 #include "states_screens/state_manager.hpp"
 
 using namespace GUIEngine;

src/states_screens/help_screen_3.cpp

@@ -20,6 +20,7 @@
 #include "states_screens/help_screen_3.hpp"
 
 #include "guiengine/widget.hpp"
+#include "guiengine/widgets/ribbon_widget.hpp"
 #include "states_screens/state_manager.hpp"
 
 using namespace GUIEngine;

src/states_screens/kart_selection.cpp

@@ -22,9 +22,9 @@
 #include "config/user_config.hpp"
 #include "kart_selection.hpp"
 #include "graphics/irr_driver.hpp"
-#include "guiengine/widget.hpp"
 #include "guiengine/engine.hpp"
 #include "guiengine/screen.hpp"
+#include "guiengine/widgets.hpp"
 #include "input/input.hpp"
 #include "input/input_manager.hpp"
 #include "input/device_manager.hpp"

src/states_screens/main_menu_screen.cpp

@@ -17,7 +17,7 @@
 
 #include "states_screens/main_menu_screen.hpp"
 
-#include "guiengine/widget.hpp"
+#include "guiengine/widgets.hpp"
 #include "karts/kart_properties_manager.hpp"
 #include "main_loop.hpp"
 #include "input/device_manager.hpp"

src/states_screens/options_screen_av.cpp

@@ -22,7 +22,11 @@
 #include "audio/music_manager.hpp"
 #include "audio/sfx_manager.hpp"
 #include "audio/sfx_base.hpp"
+#include "graphics/irr_driver.hpp"
 #include "guiengine/screen.hpp"
+#include "guiengine/widgets/check_box_widget.hpp"
+#include "guiengine/widgets/dynamic_ribbon_widget.hpp"
+#include "guiengine/widgets/spinner_widget.hpp"
 #include "guiengine/widget.hpp"
 #include "io/file_manager.hpp"
 #include "states_screens/state_manager.hpp"

src/states_screens/options_screen_input.cpp

@@ -21,6 +21,9 @@
 
 #include "guiengine/screen.hpp"
 #include "guiengine/widget.hpp"
+#include "guiengine/widgets/button_widget.hpp"
+#include "guiengine/widgets/dynamic_ribbon_widget.hpp"
+#include "guiengine/widgets/ribbon_widget.hpp"
 #include "input/input_manager.hpp"
 #include "input/device_manager.hpp"
 #include "io/file_manager.hpp"

src/states_screens/options_screen_players.cpp

@@ -25,6 +25,8 @@
 #include "guiengine/engine.hpp"
 #include "guiengine/screen.hpp"
 #include "guiengine/widget.hpp"
+#include "guiengine/widgets/list_widget.hpp"
+#include "guiengine/widgets/ribbon_widget.hpp"
 #include "states_screens/dialogs/enter_player_name_dialog.hpp"
 #include "states_screens/dialogs/player_info_dialog.hpp"
 #include "states_screens/state_manager.hpp"

src/states_screens/race_setup_screen.cpp

@@ -18,7 +18,9 @@
 #include <irrlicht.h>
 
 #include "challenges/unlock_manager.hpp"
-#include "guiengine/widget.hpp"
+#include "guiengine/widgets/dynamic_ribbon_widget.hpp"
+#include "guiengine/widgets/ribbon_widget.hpp"
+#include "guiengine/widgets/spinner_widget.hpp"
 #include "io/file_manager.hpp"
 #include "race/race_manager.hpp"
 #include "states_screens/arenas_screen.hpp"

src/states_screens/tracks_screen.cpp

@@ -16,7 +16,10 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "challenges/unlock_manager.hpp"
+#include "graphics/irr_driver.hpp"
 #include "guiengine/widget.hpp"
+#include "guiengine/widgets/dynamic_ribbon_widget.hpp"
+#include "guiengine/widgets/icon_button_widget.hpp"
 #include "io/file_manager.hpp"
 #include "race/grand_prix_data.hpp"
 #include "race/grand_prix_manager.hpp"