Archive/openmw
0
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-05-06 19:01:21 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 14

Fixed namespaces, added OEngine:: to everything

Browse source
This commit is contained in:
Nicolay Korslund 2010-07-10 13:41:43 +02:00
parent b9b306cd4c
commit 5333b8e230
17 changed files with 36 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

3
gui/events.cpp
View file

@ -1,8 +1,11 @@
#include <MyGUI.h>
#include <OIS/OIS.h>
#include "events.hpp"
using namespace MyGUI;
using namespace OIS;
using namespace OEngine::GUI;
void EventInjector::event(Type type, int index, const void *p)
{

3
gui/events.hpp
View file

@ -8,6 +8,7 @@ namespace MyGUI
class Gui;
}
namespace OEngine {
namespace GUI
{
/** Event handler that injects OIS events into MyGUI
@ -22,5 +23,5 @@ namespace GUI
EventInjector(MyGUI::Gui *g) : gui(g), enabled(true) {}
void event(Type type, int index, const void *p);
};
}
}}
#endif

3
gui/layout.hpp
View file

@ -4,6 +4,7 @@
#include <assert.h>
#include <MyGUI.h>
namespace OEngine {
namespace GUI
{
/** The Layout class is an utility class used to load MyGUI layouts
@ -114,5 +115,5 @@ namespace GUI
std::string mLayoutName;
MyGUI::VectorWidgetPtr mListWindowRoot;
};
}
}}
#endif

2
gui/manager.cpp
View file

@ -4,7 +4,7 @@
#include "manager.hpp"
using namespace GUI;
using namespace OEngine::GUI;
void MyGUIManager::setup(Ogre::RenderWindow *wnd, Ogre::SceneManager *mgr, bool logging)
{

3
gui/manager.hpp
View file

@ -13,6 +13,7 @@ namespace Ogre
class SceneManager;
}
namespace OEngine {
namespace GUI
{
class MyGUIManager
@ -29,5 +30,5 @@ namespace GUI
void setup(Ogre::RenderWindow *wnd, Ogre::SceneManager *mgr, bool logging=false);
void shutdown();
};
}
}}
#endif