ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed many 'using namespace' from headers

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@4111 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
auria 2009-10-12 23:43:14 +00:00
parent 62f983c366
commit d7c7861bd1
39 changed files with 147 additions and 163 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/graphics/irr_driver.cpp
View File

@ -40,6 +40,10 @@
#include "karts/kart_properties_manager.hpp" #include "karts/kart_properties_manager.hpp"
#include "modes/world.hpp" #include "modes/world.hpp"
using namespace irr::core;
using namespace irr::scene;
using namespace irr::video;
IrrDriver *irr_driver = NULL; IrrDriver *irr_driver = NULL;
IrrDriver::IrrDriver() IrrDriver::IrrDriver()

5
src/guiengine/engine.cpp
View File

@ -31,6 +31,9 @@
#include "guiengine/widget.hpp" #include "guiengine/widget.hpp"
#include "modes/world.hpp" #include "modes/world.hpp"
using namespace irr::gui;
using namespace irr::video;
namespace GUIEngine namespace GUIEngine
{ {
Widget* g_focus_for_player[MAX_PLAYER_COUNT]; // unused for player 0, player 0's focus is tracked by irrlicht Widget* g_focus_for_player[MAX_PLAYER_COUNT]; // unused for player 0, player 0's focus is tracked by irrlicht
@ -39,7 +42,7 @@ namespace GUIEngine
Skin* g_skin = NULL; Skin* g_skin = NULL;
IGUIFont* g_font; IGUIFont* g_font;
IrrlichtDevice* g_device; IrrlichtDevice* g_device;
irr::video::IVideoDriver* g_driver; IVideoDriver* g_driver;
ptr_vector<Screen, HOLD> g_loaded_screens; ptr_vector<Screen, HOLD> g_loaded_screens;
Screen* g_current_screen = NULL; Screen* g_current_screen = NULL;

14
src/guiengine/engine.hpp
View File

@ -204,14 +204,6 @@ being left, allowing for setup/clean-up.
#include "guiengine/widgets.hpp" #include "guiengine/widgets.hpp"
#include "utils/ptr_vector.hpp" #include "utils/ptr_vector.hpp"
using namespace irr;
using namespace core;
using namespace scene;
using namespace video;
using namespace io;
using namespace gui;
namespace GUIEngine namespace GUIEngine
{ {
extern Widget* g_focus_for_player[MAX_PLAYER_COUNT]; // unused for player 0, player 0's focus is tracked by irrlicht; extern Widget* g_focus_for_player[MAX_PLAYER_COUNT]; // unused for player 0, player 0's focus is tracked by irrlicht;
@ -221,9 +213,9 @@ namespace GUIEngine
class Widget; class Widget;
extern IrrlichtDevice* getDevice(); extern IrrlichtDevice* getDevice();
extern IGUIEnvironment* getGUIEnv(); extern irr::gui::IGUIEnvironment* getGUIEnv();
extern IVideoDriver* getDriver(); extern irr::video::IVideoDriver* getDriver();
extern IGUIFont* getFont(); extern irr::gui::IGUIFont* getFont();
extern AbstractStateManager* getStateManager(); extern AbstractStateManager* getStateManager();
float getLatestDt(); float getLatestDt();

2
src/guiengine/event_handler.cpp
View File

@ -27,6 +27,8 @@
using GUIEngine::EventHandler; using GUIEngine::EventHandler;
using GUIEngine::EventPropagation; using GUIEngine::EventPropagation;
using namespace irr::gui;
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
EventHandler::EventHandler() EventHandler::EventHandler()

13
src/guiengine/event_handler.hpp
View File

@ -21,13 +21,6 @@
#include "irrlicht.h" #include "irrlicht.h"
#include "input/input.hpp" #include "input/input.hpp"
using namespace irr;
using namespace core;
using namespace scene;
using namespace video;
using namespace io;
using namespace gui;
namespace GUIEngine namespace GUIEngine
{ {
@ -48,9 +41,9 @@ namespace GUIEngine
* mainly through AbstractStateManager, and also to widgets (this class is some kind of bridge between * mainly through AbstractStateManager, and also to widgets (this class is some kind of bridge between
* the base irrLicht GUI engine and the STK layer on top of it) * the base irrLicht GUI engine and the STK layer on top of it)
*/ */
class EventHandler : public IEventReceiver class EventHandler : public irr::IEventReceiver
{ {
EventPropagation onGUIEvent(const SEvent& event); EventPropagation onGUIEvent(const irr::SEvent& event);
EventPropagation onWidgetActivated(Widget* w, const int playerID); EventPropagation onWidgetActivated(Widget* w, const int playerID);
void navigateUp(const int playerID, Input::InputType type, const bool pressedDown); void navigateUp(const int playerID, Input::InputType type, const bool pressedDown);
void navigateDown(const int playerID, Input::InputType type, const bool pressedDown); void navigateDown(const int playerID, Input::InputType type, const bool pressedDown);
@ -63,7 +56,7 @@ public:
* All irrLicht events will go through this (input as well GUI; input events are * All irrLicht events will go through this (input as well GUI; input events are
* immediately delegated to the input module, GUI events are processed here) * immediately delegated to the input module, GUI events are processed here)
*/ */
bool OnEvent (const SEvent &event); bool OnEvent (const irr::SEvent &event);
/** /**
* When the input module is done processing an input and mapped it to an action, * When the input module is done processing an input and mapped it to an action,

4
src/guiengine/modaldialog.cpp
View File

@ -52,8 +52,8 @@ ModalDialog::ModalDialog(const float percentWidth, const float percentHeight)
assert(h <= frame_size.Height); assert(h <= frame_size.Height);
#endif #endif
m_area = core::rect< s32 >( position2d< s32 >(frame_size.Width/2 - w/2, frame_size.Height/2 - h/2), m_area = core::rect< s32 >( core::position2d< s32 >(frame_size.Width/2 - w/2, frame_size.Height/2 - h/2),
dimension2d< s32 >(w, h) ); core::dimension2d< s32 >(w, h) );
if (modalWindow != NULL) delete modalWindow; if (modalWindow != NULL) delete modalWindow;
modalWindow = this; modalWindow = this;

2
src/guiengine/modaldialog.hpp
View File

@ -40,7 +40,7 @@ class ModalDialog : public SkinWidgetContainer
{ {
protected: protected:
irr::gui::IGUIWindow* m_irrlicht_window; irr::gui::IGUIWindow* m_irrlicht_window;
core::rect< s32 > m_area; irr::core::rect< irr::s32 > m_area;
/** /**
* Creates a modal dialog with given percentage of screen width and height * Creates a modal dialog with given percentage of screen width and height

9
src/guiengine/screen.hpp
View File

@ -29,15 +29,6 @@
#include "input/input.hpp" #include "input/input.hpp"
#include "utils/ptr_vector.hpp" #include "utils/ptr_vector.hpp"
// FIXME : don't use 'using namespace' in header!!!!
using namespace irr;
using namespace core;
using namespace scene;
using namespace video;
using namespace io;
using namespace gui;
namespace GUIEngine namespace GUIEngine
{ {

161
src/guiengine/skin.hpp
View File

@ -22,13 +22,6 @@
#include "irrlicht.h" #include "irrlicht.h"
#include "utils/ptr_vector.hpp" #include "utils/ptr_vector.hpp"
using namespace irr;
using namespace core;
using namespace scene;
using namespace video;
using namespace io;
using namespace gui;
/** /**
Here lies the skin handling. It loads images and their sizing from a XML file. Here lies the skin handling. It loads images and their sizing from a XML file.
Since the irrLicht way of handling skin is quite "boxy" and results in games Since the irrLicht way of handling skin is quite "boxy" and results in games
@ -116,30 +109,30 @@ namespace GUIEngine
// see comments in Skin::drawBoxFromStretchableTexture for explaination of // see comments in Skin::drawBoxFromStretchableTexture for explaination of
// what these are // what these are
core::rect<s32> dest_area_left; irr::core::rect<irr::s32> dest_area_left;
core::rect<s32> dest_area_center; irr::core::rect<irr::s32> dest_area_center;
core::rect<s32> dest_area_right; irr::core::rect<irr::s32> dest_area_right;
core::rect<s32> dest_area_top; irr::core::rect<irr::s32> dest_area_top;
core::rect<s32> dest_area_bottom; irr::core::rect<irr::s32> dest_area_bottom;
core::rect<s32> dest_area_top_left; irr::core::rect<irr::s32> dest_area_top_left;
core::rect<s32> dest_area_top_right; irr::core::rect<irr::s32> dest_area_top_right;
core::rect<s32> dest_area_bottom_left; irr::core::rect<irr::s32> dest_area_bottom_left;
core::rect<s32> dest_area_bottom_right; irr::core::rect<irr::s32> dest_area_bottom_right;
// y flip // y flip
core::rect<s32> dest_area_left_yflip; irr::core::rect<irr::s32> dest_area_left_yflip;
core::rect<s32> dest_area_center_yflip; irr::core::rect<irr::s32> dest_area_center_yflip;
core::rect<s32> dest_area_right_yflip; irr::core::rect<irr::s32> dest_area_right_yflip;
core::rect<s32> dest_area_top_yflip; irr::core::rect<irr::s32> dest_area_top_yflip;
core::rect<s32> dest_area_bottom_yflip; irr::core::rect<irr::s32> dest_area_bottom_yflip;
core::rect<s32> dest_area_top_left_yflip; irr::core::rect<irr::s32> dest_area_top_left_yflip;
core::rect<s32> dest_area_top_right_yflip; irr::core::rect<irr::s32> dest_area_top_right_yflip;
core::rect<s32> dest_area_bottom_left_yflip; irr::core::rect<irr::s32> dest_area_bottom_left_yflip;
core::rect<s32> dest_area_bottom_right_yflip; irr::core::rect<irr::s32> dest_area_bottom_right_yflip;
short r, g, b; short r, g, b;
@ -162,11 +155,11 @@ namespace GUIEngine
/** class containing render params for the 'drawBoxFromStretchableTexture' function */ /** class containing render params for the 'drawBoxFromStretchableTexture' function */
class BoxRenderParams class BoxRenderParams
{ {
ITexture* image; irr::video::ITexture* image;
bool y_flip_set; bool y_flip_set;
public: public:
ITexture* getImage() { return image; } irr::video::ITexture* getImage() { return image; }
int left_border, right_border, top_border, bottom_border; int left_border, right_border, top_border, bottom_border;
bool preserve_h_aspect_ratios; bool preserve_h_aspect_ratios;
@ -184,62 +177,62 @@ namespace GUIEngine
static const int TOP = 8; static const int TOP = 8;
static const int BOTTOM = 16; static const int BOTTOM = 16;
core::rect<s32> source_area_left; irr::core::rect<irr::s32> source_area_left;
core::rect<s32> source_area_center; irr::core::rect<irr::s32> source_area_center;
core::rect<s32> source_area_right; irr::core::rect<irr::s32> source_area_right;
core::rect<s32> source_area_top; irr::core::rect<irr::s32> source_area_top;
core::rect<s32> source_area_bottom; irr::core::rect<irr::s32> source_area_bottom;
core::rect<s32> source_area_top_left; irr::core::rect<irr::s32> source_area_top_left;
core::rect<s32> source_area_top_right; irr::core::rect<irr::s32> source_area_top_right;
core::rect<s32> source_area_bottom_left; irr::core::rect<irr::s32> source_area_bottom_left;
core::rect<s32> source_area_bottom_right; irr::core::rect<irr::s32> source_area_bottom_right;
// y-flipped coords // y-flipped coords
core::rect<s32> source_area_left_yflip; irr::core::rect<irr::s32> source_area_left_yflip;
core::rect<s32> source_area_center_yflip; irr::core::rect<irr::s32> source_area_center_yflip;
core::rect<s32> source_area_right_yflip; irr::core::rect<irr::s32> source_area_right_yflip;
core::rect<s32> source_area_top_yflip; irr::core::rect<irr::s32> source_area_top_yflip;
core::rect<s32> source_area_bottom_yflip; irr::core::rect<irr::s32> source_area_bottom_yflip;
core::rect<s32> source_area_top_left_yflip; irr::core::rect<irr::s32> source_area_top_left_yflip;
core::rect<s32> source_area_top_right_yflip; irr::core::rect<irr::s32> source_area_top_right_yflip;
core::rect<s32> source_area_bottom_left_yflip; irr::core::rect<irr::s32> source_area_bottom_left_yflip;
core::rect<s32> source_area_bottom_right_yflip; irr::core::rect<irr::s32> source_area_bottom_right_yflip;
BoxRenderParams(); BoxRenderParams();
void setTexture(ITexture* image); void setTexture(irr::video::ITexture* image);
void calculateYFlipIfNeeded(); void calculateYFlipIfNeeded();
}; };
class Skin : public IGUISkin class Skin : public irr::gui::IGUISkin
{ {
IGUISkin* m_fallback_skin; irr::gui::IGUISkin* m_fallback_skin;
ITexture* bg_image; irr::video::ITexture* bg_image;
void drawBoxFromStretchableTexture(SkinWidgetContainer* w, const core::rect< s32 > &dest, BoxRenderParams& params); void drawBoxFromStretchableTexture(SkinWidgetContainer* w, const irr::core::rect< irr::s32 > &dest, BoxRenderParams& params);
// my utility methods, to work around irrlicht's very Windows-95-like-look-enforcing skin system // my utility methods, to work around irrlicht's very Windows-95-like-look-enforcing skin system
void process3DPane(IGUIElement *element, const core::rect< s32 > &rect, const bool pressed); void process3DPane(irr::gui::IGUIElement *element, const irr::core::rect< irr::s32 > &rect, const bool pressed);
void drawButton(Widget* w, const core::rect< s32 > &rect, const bool pressed, const bool focused); void drawButton(Widget* w, const irr::core::rect< irr::s32 > &rect, const bool pressed, const bool focused);
void drawRibbon(const core::rect< s32 > &rect, Widget* widget, const bool pressed, bool focused); void drawRibbon(const irr::core::rect< irr::s32 > &rect, Widget* widget, const bool pressed, bool focused);
void drawRibbonChild(const core::rect< s32 > &rect, Widget* widget, const bool pressed, bool focused); void drawRibbonChild(const irr::core::rect< irr::s32 > &rect, Widget* widget, const bool pressed, bool focused);
void drawSpinnerChild(const core::rect< s32 > &rect, Widget* widget, const bool pressed, bool focused); void drawSpinnerChild(const irr::core::rect< irr::s32 > &rect, Widget* widget, const bool pressed, bool focused);
void drawSpinnerBody(const core::rect< s32 > &rect, Widget* widget, const bool pressed, bool focused); void drawSpinnerBody(const irr::core::rect< irr::s32 > &rect, Widget* widget, const bool pressed, bool focused);
void drawGauge(const core::rect< s32 > &rect, Widget* widget, bool focused); void drawGauge(const irr::core::rect< irr::s32 > &rect, Widget* widget, bool focused);
void drawGaugeFill(const core::rect< s32 > &rect, Widget* widget, bool focused); void drawGaugeFill(const irr::core::rect< irr::s32 > &rect, Widget* widget, bool focused);
void drawCheckBox(const core::rect< s32 > &rect, Widget* widget, bool focused); void drawCheckBox(const irr::core::rect< irr::s32 > &rect, Widget* widget, bool focused);
void drawList(const core::rect< s32 > &rect, Widget* widget, bool focused); void drawList(const irr::core::rect< irr::s32 > &rect, Widget* widget, bool focused);
void drawListSelection(const core::rect< s32 > &rect, Widget* widget, bool focused); void drawListSelection(const irr::core::rect< irr::s32 > &rect, Widget* widget, bool focused);
public: public:
Skin(IGUISkin* fallback_skin); Skin(irr::gui::IGUISkin* fallback_skin);
~Skin(); ~Skin();
void renderSections(ptr_vector<Widget>* within_vector=NULL); void renderSections(ptr_vector<Widget>* within_vector=NULL);
@ -247,29 +240,29 @@ namespace GUIEngine
void drawBGFadeColor(); void drawBGFadeColor();
// irrlicht's callbacks // irrlicht's callbacks
virtual void draw2DRectangle (IGUIElement *element, const video::SColor &color, const core::rect< s32 > &pos, const core::rect< s32 > *clip); virtual void draw2DRectangle (irr::gui::IGUIElement *element, const irr::video::SColor &color, const irr::core::rect< irr::s32 > &pos, const irr::core::rect< irr::s32 > *clip);
virtual void draw3DButtonPanePressed (IGUIElement *element, const core::rect< s32 > &rect, const core::rect< s32 > *clip); virtual void draw3DButtonPanePressed (irr::gui::IGUIElement *element, const irr::core::rect< irr::s32 > &rect, const irr::core::rect< irr::s32 > *clip);
virtual void draw3DButtonPaneStandard (IGUIElement *element, const core::rect< s32 > &rect, const core::rect< s32 > *clip); virtual void draw3DButtonPaneStandard (irr::gui::IGUIElement *element, const irr::core::rect< irr::s32 > &rect, const irr::core::rect< irr::s32 > *clip);
virtual void draw3DMenuPane (IGUIElement *element, const core::rect< s32 > &rect, const core::rect< s32 > *clip); virtual void draw3DMenuPane (irr::gui::IGUIElement *element, const irr::core::rect< irr::s32 > &rect, const irr::core::rect< irr::s32 > *clip);
virtual void draw3DSunkenPane (IGUIElement *element, video::SColor bgcolor, bool flat, bool fillBackGround, const core::rect< s32 > &rect, const core::rect< s32 > *clip); virtual void draw3DSunkenPane (irr::gui::IGUIElement *element, irr::video::SColor bgcolor, bool flat, bool fillBackGround, const irr::core::rect< irr::s32 > &rect, const irr::core::rect< irr::s32 > *clip);
virtual void draw3DTabBody (IGUIElement *element, bool border, bool background, const core::rect< s32 > &rect, const core::rect< s32 > *clip, s32 tabHeight=-1, gui::EGUI_ALIGNMENT alignment=EGUIA_UPPERLEFT); virtual void draw3DTabBody (irr::gui::IGUIElement *element, bool border, bool background, const irr::core::rect< irr::s32 > &rect, const irr::core::rect< irr::s32 > *clip, irr::s32 tabHeight=-1, irr::gui::EGUI_ALIGNMENT alignment=irr::gui::EGUIA_UPPERLEFT);
virtual void draw3DTabButton (IGUIElement *element, bool active, const core::rect< s32 > &rect, const core::rect< s32 > *clip, gui::EGUI_ALIGNMENT alignment=EGUIA_UPPERLEFT); virtual void draw3DTabButton (irr::gui::IGUIElement *element, bool active, const irr::core::rect< irr::s32 > &rect, const irr::core::rect< irr::s32 > *clip, irr::gui::EGUI_ALIGNMENT alignment=irr::gui::EGUIA_UPPERLEFT);
virtual void draw3DToolBar (IGUIElement *element, const core::rect< s32 > &rect, const core::rect< s32 > *clip); virtual void draw3DToolBar (irr::gui::IGUIElement *element, const irr::core::rect< irr::s32 > &rect, const irr::core::rect< irr::s32 > *clip);
virtual core::rect< s32 > draw3DWindowBackground (IGUIElement *element, bool drawTitleBar, video::SColor titleBarColor, const core::rect< s32 > &rect, const core::rect< s32 > *clip); virtual irr::core::rect< irr::s32 > draw3DWindowBackground (irr::gui::IGUIElement *element, bool drawTitleBar, irr::video::SColor titleBarColor, const irr::core::rect< irr::s32 > &rect, const irr::core::rect< irr::s32 > *clip);
virtual void drawIcon (IGUIElement *element, EGUI_DEFAULT_ICON icon, const core::position2di position, u32 starttime, u32 currenttime, bool loop=false, const core::rect< s32 > *clip=NULL); virtual void drawIcon (irr::gui::IGUIElement *element, irr::gui::EGUI_DEFAULT_ICON icon, const irr::core::position2di position, irr::u32 starttime, irr::u32 currenttime, bool loop=false, const irr::core::rect< irr::s32 > *clip=NULL);
virtual video::SColor getColor (EGUI_DEFAULT_COLOR color) const; virtual irr::video::SColor getColor (irr::gui::EGUI_DEFAULT_COLOR color) const;
virtual const wchar_t * getDefaultText (EGUI_DEFAULT_TEXT text) const; virtual const wchar_t* getDefaultText (irr::gui::EGUI_DEFAULT_TEXT text) const;
virtual IGUIFont * getFont (EGUI_DEFAULT_FONT which=EGDF_DEFAULT) const ; virtual irr::gui::IGUIFont* getFont (irr::gui::EGUI_DEFAULT_FONT which=irr::gui::EGDF_DEFAULT) const ;
virtual u32 getIcon (EGUI_DEFAULT_ICON icon) const ; virtual irr::u32 getIcon (irr::gui::EGUI_DEFAULT_ICON icon) const ;
virtual s32 getSize (EGUI_DEFAULT_SIZE size) const ; virtual irr::s32 getSize (irr::gui::EGUI_DEFAULT_SIZE size) const ;
virtual IGUISpriteBank * getSpriteBank () const ; virtual irr::gui::IGUISpriteBank * getSpriteBank () const ;
//virtual EGUI_SKIN_TYPE getType () const; //virtual EGUI_SKIN_TYPE getType () const;
virtual void setColor (EGUI_DEFAULT_COLOR which, video::SColor newColor); virtual void setColor (irr::gui::EGUI_DEFAULT_COLOR which, irr::video::SColor newColor);
virtual void setDefaultText (EGUI_DEFAULT_TEXT which, const wchar_t *newText); virtual void setDefaultText (irr::gui::EGUI_DEFAULT_TEXT which, const wchar_t* newText);
virtual void setFont (IGUIFont *font, EGUI_DEFAULT_FONT which=EGDF_DEFAULT); virtual void setFont (irr::gui::IGUIFont *font, irr::gui::EGUI_DEFAULT_FONT which=irr::gui::EGDF_DEFAULT);
virtual void setIcon (EGUI_DEFAULT_ICON icon, u32 index); virtual void setIcon (irr::gui::EGUI_DEFAULT_ICON icon, irr::u32 index);
virtual void setSize (EGUI_DEFAULT_SIZE which, s32 size); virtual void setSize (irr::gui::EGUI_DEFAULT_SIZE which, irr::s32 size);
virtual void setSpriteBank (IGUISpriteBank *bank); virtual void setSpriteBank (irr::gui::IGUISpriteBank *bank);
}; };
} }

13
src/guiengine/widget.hpp
View File

@ -28,9 +28,6 @@
#include "utils/ptr_vector.hpp" #include "utils/ptr_vector.hpp"
#include "utils/vec3.hpp" #include "utils/vec3.hpp"
using namespace irr;
using namespace gui;
namespace GUIEngine namespace GUIEngine
{ {
@ -135,7 +132,7 @@ namespace GUIEngine
/** /**
* An irrlicht parent (most often used to put widgets in dialogs) * An irrlicht parent (most often used to put widgets in dialogs)
*/ */
IGUIElement* m_parent; irr::gui::IGUIElement* m_parent;
/** /**
* Receives as string the raw property value retrieved from XML file. * Receives as string the raw property value retrieved from XML file.
@ -150,7 +147,7 @@ namespace GUIEngine
/** /**
* IrrLicht widget created to represent this object. * IrrLicht widget created to represent this object.
*/ */
IGUIElement* m_element; irr::gui::IGUIElement* m_element;
// FIXME... i forgot the m_ everywhere ... XD // FIXME... i forgot the m_ everywhere ... XD
@ -225,9 +222,9 @@ namespace GUIEngine
#endif #endif
} }
IGUIElement* getIrrlichtElement() { return m_element; } irr::gui::IGUIElement* getIrrlichtElement() { return m_element; }
void setParent(IGUIElement* parent); void setParent(irr::gui::IGUIElement* parent);
/** /**
* If this widget has any children, they go here. Children can be either * If this widget has any children, they go here. Children can be either
@ -245,7 +242,7 @@ namespace GUIEngine
/** PROP_TEXT is a special case : since it can be transalted it can't go in the map above, which /** PROP_TEXT is a special case : since it can be transalted it can't go in the map above, which
uses narrow strings */ uses narrow strings */
stringw m_text; irr::core::stringw m_text;
static void resetIDCounters(); static void resetIDCounters();

1
src/guiengine/widgets/button_widget.cpp
View File

@ -18,6 +18,7 @@
#include "guiengine/engine.hpp" #include "guiengine/engine.hpp"
#include "guiengine/widgets/button_widget.hpp" #include "guiengine/widgets/button_widget.hpp"
using namespace GUIEngine; using namespace GUIEngine;
using namespace irr::core;
ButtonWidget::ButtonWidget() ButtonWidget::ButtonWidget()
{ {

3
src/guiengine/widgets/button_widget.hpp
View File

@ -25,9 +25,6 @@
#include "guiengine/widget.hpp" #include "guiengine/widget.hpp"
#include "utils/ptr_vector.hpp" #include "utils/ptr_vector.hpp"
using namespace irr;
using namespace gui;
namespace GUIEngine namespace GUIEngine
{ {
/** A text button widget. See guiengine/engine.hpp for a detailed overview */ /** A text button widget. See guiengine/engine.hpp for a detailed overview */

1
src/guiengine/widgets/check_box_widget.cpp
View File

@ -18,6 +18,7 @@
#include "guiengine/engine.hpp" #include "guiengine/engine.hpp"
#include "guiengine/widgets/check_box_widget.hpp" #include "guiengine/widgets/check_box_widget.hpp"
using namespace GUIEngine; using namespace GUIEngine;
using namespace irr::core;
CheckBoxWidget::CheckBoxWidget() CheckBoxWidget::CheckBoxWidget()
{ {

3
src/guiengine/widgets/check_box_widget.hpp
View File

@ -25,9 +25,6 @@
#include "guiengine/widget.hpp" #include "guiengine/widget.hpp"
#include "utils/ptr_vector.hpp" #include "utils/ptr_vector.hpp"
using namespace irr;
using namespace gui;
namespace GUIEngine namespace GUIEngine
{ {
/** A checkbox widget. See guiengine/engine.hpp for a detailed overview */ /** A checkbox widget. See guiengine/engine.hpp for a detailed overview */

2
src/guiengine/widgets/dynamic_ribbon_widget.cpp
View File

@ -22,6 +22,8 @@
#include <sstream> #include <sstream>
using namespace GUIEngine; using namespace GUIEngine;
using namespace irr::core;
using namespace irr::gui;
#ifndef round #ifndef round
# define round(x) (floor(x+0.5f)) # define round(x) (floor(x+0.5f))

5
src/guiengine/widgets/dynamic_ribbon_widget.hpp
View File

@ -26,9 +26,6 @@
#include "guiengine/widgets/ribbon_widget.hpp" #include "guiengine/widgets/ribbon_widget.hpp"
#include "utils/ptr_vector.hpp" #include "utils/ptr_vector.hpp"
using namespace irr;
using namespace gui;
namespace GUIEngine namespace GUIEngine
{ {
/** /**
@ -64,7 +61,7 @@ namespace GUIEngine
/** Used for ribbon grids that have a label at the bottom */ /** Used for ribbon grids that have a label at the bottom */
bool m_has_label; bool m_has_label;
IGUIStaticText* m_label; irr::gui::IGUIStaticText* m_label;
int m_label_height; int m_label_height;
/** Used to keep track of item count changes */ /** Used to keep track of item count changes */

3
src/guiengine/widgets/icon_button_widget.cpp
View File

@ -19,6 +19,9 @@
#include "guiengine/widgets/icon_button_widget.hpp" #include "guiengine/widgets/icon_button_widget.hpp"
#include "io/file_manager.hpp" #include "io/file_manager.hpp"
using namespace GUIEngine; using namespace GUIEngine;
using namespace irr::video;
using namespace irr::core;
using namespace irr::gui;
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
IconButtonWidget::IconButtonWidget(const bool clickable) IconButtonWidget::IconButtonWidget(const bool clickable)

5
src/guiengine/widgets/icon_button_widget.hpp
View File

@ -25,9 +25,6 @@
#include "guiengine/widget.hpp" #include "guiengine/widget.hpp"
#include "utils/ptr_vector.hpp" #include "utils/ptr_vector.hpp"
using namespace irr;
using namespace gui;
namespace GUIEngine namespace GUIEngine
{ {
/** A button widget with an icon and optionnaly a label beneath (from its properties in base class Widget) /** A button widget with an icon and optionnaly a label beneath (from its properties in base class Widget)
@ -35,7 +32,7 @@ namespace GUIEngine
class IconButtonWidget : public Widget class IconButtonWidget : public Widget
{ {
bool clickable; bool clickable;
IGUIStaticText* label; irr::gui::IGUIStaticText* label;
public: public:
IconButtonWidget(const bool clickable=true); IconButtonWidget(const bool clickable=true);
virtual ~IconButtonWidget() {} virtual ~IconButtonWidget() {}

2
src/guiengine/widgets/label_widget.cpp
View File

@ -18,6 +18,8 @@
#include "guiengine/engine.hpp" #include "guiengine/engine.hpp"
#include "guiengine/widgets/label_widget.hpp" #include "guiengine/widgets/label_widget.hpp"
using namespace GUIEngine; using namespace GUIEngine;
using namespace irr::core;
using namespace irr::gui;
LabelWidget::LabelWidget() LabelWidget::LabelWidget()
{ {

5
src/guiengine/widgets/label_widget.hpp
View File

@ -25,9 +25,6 @@
#include "guiengine/widget.hpp" #include "guiengine/widget.hpp"
#include "utils/ptr_vector.hpp" #include "utils/ptr_vector.hpp"
using namespace irr;
using namespace gui;
namespace GUIEngine namespace GUIEngine
{ {
/** A simple label widget. See guiengine/engine.hpp for a detailed overview. */ /** A simple label widget. See guiengine/engine.hpp for a detailed overview. */
@ -40,7 +37,7 @@ namespace GUIEngine
void add(); void add();
/** Change the text in the label */ /** Change the text in the label */
void setText(stringw newText); void setText(irr::core::stringw newText);
}; };
} }

2
src/guiengine/widgets/list_widget.cpp
View File

@ -18,6 +18,8 @@
#include "guiengine/engine.hpp" #include "guiengine/engine.hpp"
#include "guiengine/widgets/list_widget.hpp" #include "guiengine/widgets/list_widget.hpp"
using namespace GUIEngine; using namespace GUIEngine;
using namespace irr::core;
using namespace irr::gui;
ListWidget::ListWidget() ListWidget::ListWidget()
{ {

3
src/guiengine/widgets/list_widget.hpp
View File

@ -25,9 +25,6 @@
#include "guiengine/widget.hpp" #include "guiengine/widget.hpp"
#include "utils/ptr_vector.hpp" #include "utils/ptr_vector.hpp"
using namespace irr;
using namespace gui;
namespace GUIEngine namespace GUIEngine
{ {
/** A vertical list widget with text entries. See guiengine/engine.hpp for a detailed overview */ /** A vertical list widget with text entries. See guiengine/engine.hpp for a detailed overview */

2
src/guiengine/widgets/model_view_widget.cpp
View File

@ -19,6 +19,8 @@
#include "guiengine/engine.hpp" #include "guiengine/engine.hpp"
#include "guiengine/widgets/model_view_widget.hpp" #include "guiengine/widgets/model_view_widget.hpp"
using namespace GUIEngine; using namespace GUIEngine;
using namespace irr::core;
using namespace irr::gui;
ModelViewWidget::ModelViewWidget() ModelViewWidget::ModelViewWidget()
{ {

4
src/guiengine/widgets/model_view_widget.hpp
View File

@ -26,10 +26,6 @@
#include "guiengine/widget.hpp" #include "guiengine/widget.hpp"
#include "utils/ptr_vector.hpp" #include "utils/ptr_vector.hpp"
using namespace irr;
using namespace gui;
namespace GUIEngine namespace GUIEngine
{ {
/** A model view widget. See guiengine/engine.hpp for a detailed overview */ /** A model view widget. See guiengine/engine.hpp for a detailed overview */

2
src/guiengine/widgets/ribbon_widget.cpp
View File

@ -20,6 +20,8 @@
#include "guiengine/engine.hpp" #include "guiengine/engine.hpp"
#include "io/file_manager.hpp" #include "io/file_manager.hpp"
using namespace GUIEngine; using namespace GUIEngine;
using namespace irr::core;
using namespace irr::gui;
#ifndef round #ifndef round
# define round(x) (floor(x+0.5f)) # define round(x) (floor(x+0.5f))

7
src/guiengine/widgets/ribbon_widget.hpp
View File

@ -25,9 +25,6 @@
#include "guiengine/widget.hpp" #include "guiengine/widget.hpp"
#include "utils/ptr_vector.hpp" #include "utils/ptr_vector.hpp"
using namespace irr;
using namespace gui;
namespace GUIEngine namespace GUIEngine
{ {
@ -62,7 +59,7 @@ namespace GUIEngine
EventPropagation transmitEvent(Widget* w, std::string& originator, const int playerID=0); EventPropagation transmitEvent(Widget* w, std::string& originator, const int playerID=0);
EventPropagation focused(const int playerID); EventPropagation focused(const int playerID);
ptr_vector<IGUIStaticText, REF> m_labels; ptr_vector<irr::gui::IGUIStaticText, REF> m_labels;
public: public:
@ -85,7 +82,7 @@ namespace GUIEngine
const std::string& getSelectionIDString(const int playerID); const std::string& getSelectionIDString(const int playerID);
/** Returns the user-visible text of the selection */ /** Returns the user-visible text of the selection */
const stringw& getSelectionText(const int playerID) { return m_children[m_selection[playerID]].m_text; } const irr::core::stringw& getSelectionText(const int playerID) { return m_children[m_selection[playerID]].m_text; }
/** Sets the ID of the selected item within the ribbon */ /** Sets the ID of the selected item within the ribbon */
void setSelection(const int i, const int playerID) { m_selection[playerID] = i; updateSelection(); } void setSelection(const int i, const int playerID) { m_selection[playerID] = i; updateSelection(); }

3
src/guiengine/widgets/spinner_widget.cpp
View File

@ -24,6 +24,9 @@
#include "utils/string_utils.hpp" #include "utils/string_utils.hpp"
#include "utils/translation.hpp" #include "utils/translation.hpp"
using namespace GUIEngine; using namespace GUIEngine;
using namespace irr::core;
using namespace irr::gui;
using namespace irr::video;
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
SpinnerWidget::SpinnerWidget(const bool gauge) SpinnerWidget::SpinnerWidget(const bool gauge)

3
src/guiengine/widgets/spinner_widget.hpp
View File

@ -25,9 +25,6 @@
#include "guiengine/widget.hpp" #include "guiengine/widget.hpp"
#include "utils/ptr_vector.hpp" #include "utils/ptr_vector.hpp"
using namespace irr;
using namespace gui;
namespace GUIEngine namespace GUIEngine
{ {
/** A spinner or gauge widget (to select numbers / percentages). See guiengine/engine.hpp for a detailed overview */ /** A spinner or gauge widget (to select numbers / percentages). See guiengine/engine.hpp for a detailed overview */

2
src/guiengine/widgets/text_box_widget.cpp
View File

@ -18,6 +18,8 @@
#include "guiengine/engine.hpp" #include "guiengine/engine.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::gui;
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
TextBoxWidget::TextBoxWidget() TextBoxWidget::TextBoxWidget()

3
src/guiengine/widgets/text_box_widget.hpp
View File

@ -25,9 +25,6 @@
#include "guiengine/widget.hpp" #include "guiengine/widget.hpp"
#include "utils/ptr_vector.hpp" #include "utils/ptr_vector.hpp"
using namespace irr;
using namespace gui;
namespace GUIEngine namespace GUIEngine
{ {
/** A text field widget. See guiengine/engine.hpp for a detailed overview */ /** A text field widget. See guiengine/engine.hpp for a detailed overview */

3
src/states_screens/dialogs/enter_player_name_dialog.cpp
View File

@ -22,6 +22,9 @@
#include "utils/translation.hpp" #include "utils/translation.hpp"
using namespace GUIEngine; using namespace GUIEngine;
using namespace irr;
using namespace irr::core;
using namespace irr::gui;
EnterPlayerNameDialog::EnterPlayerNameDialog(const float w, const float h) : EnterPlayerNameDialog::EnterPlayerNameDialog(const float w, const float h) :
ModalDialog(w, h) ModalDialog(w, h)

3
src/states_screens/dialogs/player_info_dialog.cpp
View File

@ -25,7 +25,8 @@
#include "utils/translation.hpp" #include "utils/translation.hpp"
using namespace GUIEngine; using namespace GUIEngine;
using namespace irr::gui;
using namespace irr::core;
PlayerInfoDialog::PlayerInfoDialog(PlayerProfile* player, const float w, const float h) : ModalDialog(w, h) PlayerInfoDialog::PlayerInfoDialog(PlayerProfile* player, const float w, const float h) : ModalDialog(w, h)
{ {

1
src/states_screens/dialogs/press_a_key_dialog.cpp
View File

@ -23,6 +23,7 @@
#include "utils/translation.hpp" #include "utils/translation.hpp"
using namespace GUIEngine; using namespace GUIEngine;
using namespace irr::gui;
PressAKeyDialog::PressAKeyDialog(const float w, const float h) : PressAKeyDialog::PressAKeyDialog(const float w, const float h) :
ModalDialog(w, h) ModalDialog(w, h)

3
src/states_screens/dialogs/race_over_dialog.cpp
View File

@ -32,6 +32,9 @@
#include "utils/translation.hpp" #include "utils/translation.hpp"
using namespace GUIEngine; using namespace GUIEngine;
using namespace irr::core;
using namespace irr::gui;
using namespace irr::video;
RaceOverDialog::RaceOverDialog(const float percentWidth, const float percentHeight) : ModalDialog(percentWidth, percentHeight) RaceOverDialog::RaceOverDialog(const float percentWidth, const float percentHeight) : ModalDialog(percentWidth, percentHeight)
{ {

2
src/states_screens/dialogs/race_paused_dialog.cpp
View File

@ -32,6 +32,8 @@
#include <string> #include <string>
using namespace GUIEngine; using namespace GUIEngine;
using namespace irr::core;
using namespace irr::gui;
RacePausedDialog::RacePausedDialog(const float percentWidth, const float percentHeight) : ModalDialog(percentWidth, percentHeight) RacePausedDialog::RacePausedDialog(const float percentWidth, const float percentHeight) : ModalDialog(percentWidth, percentHeight)
{ {

2
src/states_screens/dialogs/track_info_dialog.cpp
View File

@ -34,6 +34,8 @@
#include "irrlicht.h" #include "irrlicht.h"
using namespace irr::gui; using namespace irr::gui;
using namespace irr::video;
using namespace irr::core;
using namespace GUIEngine; using namespace GUIEngine;

4
src/states_screens/feature_unlocked.cpp
View File

@ -10,6 +10,10 @@
#include <SColor.h> #include <SColor.h>
using namespace irr::core;
using namespace irr::gui;
using namespace irr::video;
static const char* CUTSCENE_NAME = "feature_unlocked"; static const char* CUTSCENE_NAME = "feature_unlocked";
/* /*
static FeatureUnlockedCutScene* singleton = NULL; static FeatureUnlockedCutScene* singleton = NULL;

2
src/states_screens/options_screen_players.cpp
View File

@ -34,6 +34,8 @@
#include <sstream> #include <sstream>
using namespace GUIEngine; using namespace GUIEngine;
using namespace irr::core;
using namespace irr::gui;
OptionsScreenPlayers::OptionsScreenPlayers() : Screen("options_players.stkgui") OptionsScreenPlayers::OptionsScreenPlayers() : Screen("options_players.stkgui")
{ {

2
src/states_screens/tracks_screen.cpp
View File

@ -25,6 +25,8 @@
#include "utils/translation.hpp" #include "utils/translation.hpp"
using namespace GUIEngine; using namespace GUIEngine;
using namespace irr::core;
using namespace irr::video;
TracksScreen::TracksScreen() : Screen("tracks.stkgui") TracksScreen::TracksScreen() : Screen("tracks.stkgui")
{ {