AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-08 18:24:55 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into urde-tags

Browse Source
This commit is contained in:
Jack Andersen
2016-03-04 14:03:41 -10:00
parent 8c9eca1858 783fb4c4fe
commit 9ade279902
337 changed files with 2998 additions and 3016 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Editor/InformationCenter.hpp
View File

@@ -4,7 +4,7 @@
#include "Space.hpp"
#include "ViewManager.hpp"
namespace URDE
namespace urde
{
class InformationCenter : public ViewerSpace
{
@@ -16,13 +16,13 @@ class InformationCenter : public ViewerSpace
const Space::State& spaceState() const { return m_state; }
struct View : Specter::View
struct View : specter::View
{
InformationCenter& m_ic;
std::vector<HECL::SystemString> m_log;
std::vector<hecl::SystemString> m_log;
View(InformationCenter& ic, Specter::ViewResources& res)
: Specter::View(res, ic.m_vm.rootView()), m_ic(ic)
View(InformationCenter& ic, specter::ViewResources& res)
: specter::View(res, ic.m_vm.rootView()), m_ic(ic)
{
commitResources(res);
}
@@ -55,7 +55,7 @@ public:
{
}
virtual Specter::View* buildContentView(Specter::ViewResources& res)
virtual specter::View* buildContentView(specter::ViewResources& res)
{
m_view.reset(new View(*this, res));
return m_view.get();