From 963516e2fb1c9f45ddb2be2d46312c79b8d272e7 Mon Sep 17 00:00:00 2001 From: auria Date: Fri, 10 Sep 2010 00:05:56 +0000 Subject: [PATCH] Removed/fixed bogus/unneeded includes or forwards git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5952 178a84e3-b1eb-0310-8ba1-8eac791a3b58 --- src/guiengine/engine.hpp | 1 - src/guiengine/layout_manager.hpp | 2 -- src/guiengine/modaldialog.hpp | 6 +++--- src/guiengine/screen.hpp | 2 +- src/guiengine/widget.hpp | 2 +- src/guiengine/widgets/bubble_widget.cpp | 1 + src/guiengine/widgets/bubble_widget.hpp | 4 ++-- src/guiengine/widgets/button_widget.cpp | 1 + src/guiengine/widgets/check_box_widget.cpp | 1 + src/guiengine/widgets/label_widget.cpp | 1 + src/guiengine/widgets/progress_bar_widget.cpp | 1 + src/guiengine/widgets/text_box_widget.cpp | 2 ++ src/guiengine/widgets/text_box_widget.hpp | 2 +- 13 files changed, 15 insertions(+), 11 deletions(-) diff --git a/src/guiengine/engine.hpp b/src/guiengine/engine.hpp index f2e37a241..056be430e 100644 --- a/src/guiengine/engine.hpp +++ b/src/guiengine/engine.hpp @@ -46,7 +46,6 @@ namespace irr namespace GUIEngine { class Screen; - class CutScene; class Widget; class Skin; class AbstractStateManager; diff --git a/src/guiengine/layout_manager.hpp b/src/guiengine/layout_manager.hpp index 959ecbef0..9b7f7fd74 100644 --- a/src/guiengine/layout_manager.hpp +++ b/src/guiengine/layout_manager.hpp @@ -21,8 +21,6 @@ #include // for NULL #include "utils/ptr_vector.hpp" -#include "guiengine/widget.hpp" - namespace GUIEngine { class Widget; diff --git a/src/guiengine/modaldialog.hpp b/src/guiengine/modaldialog.hpp index ad722cd44..84297c764 100644 --- a/src/guiengine/modaldialog.hpp +++ b/src/guiengine/modaldialog.hpp @@ -21,12 +21,12 @@ #include "irrlicht.h" #include "utils/ptr_vector.hpp" #include "guiengine/abstract_top_level_container.hpp" -#include "guiengine/event_handler.hpp" -#include "guiengine/layout_manager.hpp" +//#include "guiengine/event_handler.hpp" +//#include "guiengine/layout_manager.hpp" #include "guiengine/skin.hpp" #include "input/input_manager.hpp" -class PlayerProfile; +//class PlayerProfile; /** * \ingroup guiengine diff --git a/src/guiengine/screen.hpp b/src/guiengine/screen.hpp index 24414fe45..9145088ea 100644 --- a/src/guiengine/screen.hpp +++ b/src/guiengine/screen.hpp @@ -29,7 +29,7 @@ #include "guiengine/abstract_top_level_container.hpp" #include "guiengine/engine.hpp" #include "guiengine/event_handler.hpp" -#include "guiengine/layout_manager.hpp" +//#include "guiengine/layout_manager.hpp" #include "guiengine/widget.hpp" #include "input/input.hpp" #include "utils/ptr_vector.hpp" diff --git a/src/guiengine/widget.hpp b/src/guiengine/widget.hpp index 205e50363..ca8d29232 100644 --- a/src/guiengine/widget.hpp +++ b/src/guiengine/widget.hpp @@ -26,7 +26,7 @@ #include "guiengine/skin.hpp" #include "utils/constants.hpp" #include "utils/ptr_vector.hpp" -#include "utils/vec3.hpp" +//#include "utils/vec3.hpp" namespace GUIEngine { diff --git a/src/guiengine/widgets/bubble_widget.cpp b/src/guiengine/widgets/bubble_widget.cpp index 0c4ff780b..1b3440ca5 100644 --- a/src/guiengine/widgets/bubble_widget.cpp +++ b/src/guiengine/widgets/bubble_widget.cpp @@ -20,6 +20,7 @@ #include using namespace irr::core; using namespace irr::gui; +using namespace irr; using namespace GUIEngine; diff --git a/src/guiengine/widgets/bubble_widget.hpp b/src/guiengine/widgets/bubble_widget.hpp index f2ba71947..d2200ba0b 100644 --- a/src/guiengine/widgets/bubble_widget.hpp +++ b/src/guiengine/widgets/bubble_widget.hpp @@ -32,12 +32,12 @@ namespace GUIEngine /** shrinked size of this widget (size allowed in layout; internal text may be bigger than that). * If the text all fits in the allowed layout space, m_shrinked_size == m_expanded_size. */ - irr::core::rect m_shrinked_size; + irr::core::rect m_shrinked_size; /** Expanded size of this widget (size to see all text inside the bubble). * If the text all fits in the allowed layout space, m_shrinked_size == m_expanded_size. */ - irr::core::rect m_expanded_size; + irr::core::rect m_expanded_size; /** Text shrinked to fit into the allowed layout space (will be same as m_text if all text fits) */ irr::core::stringw m_shrinked_text; diff --git a/src/guiengine/widgets/button_widget.cpp b/src/guiengine/widgets/button_widget.cpp index 77b9669ad..76c18e4df 100644 --- a/src/guiengine/widgets/button_widget.cpp +++ b/src/guiengine/widgets/button_widget.cpp @@ -19,6 +19,7 @@ #include "guiengine/widgets/button_widget.hpp" using namespace GUIEngine; using namespace irr::core; +using namespace irr; // ----------------------------------------------------------------------------- diff --git a/src/guiengine/widgets/check_box_widget.cpp b/src/guiengine/widgets/check_box_widget.cpp index 314a3af9e..cb4cca920 100644 --- a/src/guiengine/widgets/check_box_widget.cpp +++ b/src/guiengine/widgets/check_box_widget.cpp @@ -19,6 +19,7 @@ #include "guiengine/widgets/check_box_widget.hpp" using namespace GUIEngine; using namespace irr::core; +using namespace irr; // ----------------------------------------------------------------------------- diff --git a/src/guiengine/widgets/label_widget.cpp b/src/guiengine/widgets/label_widget.cpp index a23abc086..c519e1128 100644 --- a/src/guiengine/widgets/label_widget.cpp +++ b/src/guiengine/widgets/label_widget.cpp @@ -26,6 +26,7 @@ using namespace GUIEngine; using namespace irr::core; using namespace irr::gui; +using namespace irr; // ---------------------------------------------------------------------------- /** Constructs the label widget. Parameter: diff --git a/src/guiengine/widgets/progress_bar_widget.cpp b/src/guiengine/widgets/progress_bar_widget.cpp index 305909a58..28fb6bb13 100644 --- a/src/guiengine/widgets/progress_bar_widget.cpp +++ b/src/guiengine/widgets/progress_bar_widget.cpp @@ -21,6 +21,7 @@ #include using namespace GUIEngine; using namespace irr::core; +using namespace irr; // ----------------------------------------------------------------------------- diff --git a/src/guiengine/widgets/text_box_widget.cpp b/src/guiengine/widgets/text_box_widget.cpp index d21b835dc..e8b9ccca8 100644 --- a/src/guiengine/widgets/text_box_widget.cpp +++ b/src/guiengine/widgets/text_box_widget.cpp @@ -18,9 +18,11 @@ #include "guiengine/engine.hpp" #include "guiengine/modaldialog.hpp" #include "guiengine/widgets/text_box_widget.hpp" + using namespace GUIEngine; using namespace irr::core; using namespace irr::gui; +using namespace irr; // ----------------------------------------------------------------------------- diff --git a/src/guiengine/widgets/text_box_widget.hpp b/src/guiengine/widgets/text_box_widget.hpp index 7f6f62584..d3b014ef4 100644 --- a/src/guiengine/widgets/text_box_widget.hpp +++ b/src/guiengine/widgets/text_box_widget.hpp @@ -53,7 +53,7 @@ namespace GUIEngine virtual EventPropagation focused(const int playerID); virtual void unfocused(const int playerID); - core::stringw getText() const; + irr::core::stringw getText() const; }; }