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
This commit is contained in:
parent
3b6940f2a3
commit
963516e2fb
@ -46,7 +46,6 @@ namespace irr
|
|||||||
namespace GUIEngine
|
namespace GUIEngine
|
||||||
{
|
{
|
||||||
class Screen;
|
class Screen;
|
||||||
class CutScene;
|
|
||||||
class Widget;
|
class Widget;
|
||||||
class Skin;
|
class Skin;
|
||||||
class AbstractStateManager;
|
class AbstractStateManager;
|
||||||
|
@ -21,8 +21,6 @@
|
|||||||
#include <cstring> // for NULL
|
#include <cstring> // for NULL
|
||||||
#include "utils/ptr_vector.hpp"
|
#include "utils/ptr_vector.hpp"
|
||||||
|
|
||||||
#include "guiengine/widget.hpp"
|
|
||||||
|
|
||||||
namespace GUIEngine
|
namespace GUIEngine
|
||||||
{
|
{
|
||||||
class Widget;
|
class Widget;
|
||||||
|
@ -21,12 +21,12 @@
|
|||||||
#include "irrlicht.h"
|
#include "irrlicht.h"
|
||||||
#include "utils/ptr_vector.hpp"
|
#include "utils/ptr_vector.hpp"
|
||||||
#include "guiengine/abstract_top_level_container.hpp"
|
#include "guiengine/abstract_top_level_container.hpp"
|
||||||
#include "guiengine/event_handler.hpp"
|
//#include "guiengine/event_handler.hpp"
|
||||||
#include "guiengine/layout_manager.hpp"
|
//#include "guiengine/layout_manager.hpp"
|
||||||
#include "guiengine/skin.hpp"
|
#include "guiengine/skin.hpp"
|
||||||
#include "input/input_manager.hpp"
|
#include "input/input_manager.hpp"
|
||||||
|
|
||||||
class PlayerProfile;
|
//class PlayerProfile;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* \ingroup guiengine
|
* \ingroup guiengine
|
||||||
|
@ -29,7 +29,7 @@
|
|||||||
#include "guiengine/abstract_top_level_container.hpp"
|
#include "guiengine/abstract_top_level_container.hpp"
|
||||||
#include "guiengine/engine.hpp"
|
#include "guiengine/engine.hpp"
|
||||||
#include "guiengine/event_handler.hpp"
|
#include "guiengine/event_handler.hpp"
|
||||||
#include "guiengine/layout_manager.hpp"
|
//#include "guiengine/layout_manager.hpp"
|
||||||
#include "guiengine/widget.hpp"
|
#include "guiengine/widget.hpp"
|
||||||
#include "input/input.hpp"
|
#include "input/input.hpp"
|
||||||
#include "utils/ptr_vector.hpp"
|
#include "utils/ptr_vector.hpp"
|
||||||
|
@ -26,7 +26,7 @@
|
|||||||
#include "guiengine/skin.hpp"
|
#include "guiengine/skin.hpp"
|
||||||
#include "utils/constants.hpp"
|
#include "utils/constants.hpp"
|
||||||
#include "utils/ptr_vector.hpp"
|
#include "utils/ptr_vector.hpp"
|
||||||
#include "utils/vec3.hpp"
|
//#include "utils/vec3.hpp"
|
||||||
|
|
||||||
namespace GUIEngine
|
namespace GUIEngine
|
||||||
{
|
{
|
||||||
|
@ -20,6 +20,7 @@
|
|||||||
#include <irrlicht.h>
|
#include <irrlicht.h>
|
||||||
using namespace irr::core;
|
using namespace irr::core;
|
||||||
using namespace irr::gui;
|
using namespace irr::gui;
|
||||||
|
using namespace irr;
|
||||||
|
|
||||||
using namespace GUIEngine;
|
using namespace GUIEngine;
|
||||||
|
|
||||||
|
@ -32,12 +32,12 @@ namespace GUIEngine
|
|||||||
/** shrinked size of this widget (size allowed in layout; internal text may be bigger than that).
|
/** 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.
|
* If the text all fits in the allowed layout space, m_shrinked_size == m_expanded_size.
|
||||||
*/
|
*/
|
||||||
irr::core::rect<s32> m_shrinked_size;
|
irr::core::rect<irr::s32> m_shrinked_size;
|
||||||
|
|
||||||
/** Expanded size of this widget (size to see all text inside the bubble).
|
/** 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.
|
* If the text all fits in the allowed layout space, m_shrinked_size == m_expanded_size.
|
||||||
*/
|
*/
|
||||||
irr::core::rect<s32> m_expanded_size;
|
irr::core::rect<irr::s32> m_expanded_size;
|
||||||
|
|
||||||
/** Text shrinked to fit into the allowed layout space (will be same as m_text if all text fits) */
|
/** 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;
|
irr::core::stringw m_shrinked_text;
|
||||||
|
@ -19,6 +19,7 @@
|
|||||||
#include "guiengine/widgets/button_widget.hpp"
|
#include "guiengine/widgets/button_widget.hpp"
|
||||||
using namespace GUIEngine;
|
using namespace GUIEngine;
|
||||||
using namespace irr::core;
|
using namespace irr::core;
|
||||||
|
using namespace irr;
|
||||||
|
|
||||||
// -----------------------------------------------------------------------------
|
// -----------------------------------------------------------------------------
|
||||||
|
|
||||||
|
@ -19,6 +19,7 @@
|
|||||||
#include "guiengine/widgets/check_box_widget.hpp"
|
#include "guiengine/widgets/check_box_widget.hpp"
|
||||||
using namespace GUIEngine;
|
using namespace GUIEngine;
|
||||||
using namespace irr::core;
|
using namespace irr::core;
|
||||||
|
using namespace irr;
|
||||||
|
|
||||||
// -----------------------------------------------------------------------------
|
// -----------------------------------------------------------------------------
|
||||||
|
|
||||||
|
@ -26,6 +26,7 @@
|
|||||||
using namespace GUIEngine;
|
using namespace GUIEngine;
|
||||||
using namespace irr::core;
|
using namespace irr::core;
|
||||||
using namespace irr::gui;
|
using namespace irr::gui;
|
||||||
|
using namespace irr;
|
||||||
|
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
/** Constructs the label widget. Parameter:
|
/** Constructs the label widget. Parameter:
|
||||||
|
@ -21,6 +21,7 @@
|
|||||||
#include <string.h>
|
#include <string.h>
|
||||||
using namespace GUIEngine;
|
using namespace GUIEngine;
|
||||||
using namespace irr::core;
|
using namespace irr::core;
|
||||||
|
using namespace irr;
|
||||||
|
|
||||||
// -----------------------------------------------------------------------------
|
// -----------------------------------------------------------------------------
|
||||||
|
|
||||||
|
@ -18,9 +18,11 @@
|
|||||||
#include "guiengine/engine.hpp"
|
#include "guiengine/engine.hpp"
|
||||||
#include "guiengine/modaldialog.hpp"
|
#include "guiengine/modaldialog.hpp"
|
||||||
#include "guiengine/widgets/text_box_widget.hpp"
|
#include "guiengine/widgets/text_box_widget.hpp"
|
||||||
|
|
||||||
using namespace GUIEngine;
|
using namespace GUIEngine;
|
||||||
using namespace irr::core;
|
using namespace irr::core;
|
||||||
using namespace irr::gui;
|
using namespace irr::gui;
|
||||||
|
using namespace irr;
|
||||||
|
|
||||||
// -----------------------------------------------------------------------------
|
// -----------------------------------------------------------------------------
|
||||||
|
|
||||||
|
@ -53,7 +53,7 @@ namespace GUIEngine
|
|||||||
virtual EventPropagation focused(const int playerID);
|
virtual EventPropagation focused(const int playerID);
|
||||||
virtual void unfocused(const int playerID);
|
virtual void unfocused(const int playerID);
|
||||||
|
|
||||||
core::stringw getText() const;
|
irr::core::stringw getText() const;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user