Put everything in namespace Msp::DemoScene

[libs/demoscene.git] / source / demo.h

diff --git a/source/demo.h b/source/demo.h
index e2dfd6e9e6d926455827b9232036568bc68c795b..b4adb371f1c1d65ce2a152a0121cd07d08b4d901 100644 (file)
--- a/source/demo.h
+++ b/source/demo.h
@@ -13,6 +13,9 @@
 #include "action.h"
 #include "sequencer.h"
 
+namespace Msp {
+namespace DemoScene {
+
 class Stage;
 
 class Demo
@@ -32,6 +35,8 @@ private:
        };
 
 public:
+       typedef std::map<std::string, Msp::Variant> ThingMap;
+
        sigc::signal<void> signal_finished;
 
 protected:
@@ -48,7 +53,7 @@ protected:
        Msp::Time::TimeStamp last_tick;
        Msp::Time::TimeStamp next_frame;
 
-       std::map<std::string, Msp::Variant> things;
+       ThingMap things;
 
        Demo(Msp::Graphics::Window &, Msp::Graphics::GLContext &, Msp::DataFile::Collection &);
 public:
@@ -77,4 +82,7 @@ T &Demo::get_thing(const std::string &name)
        return *get_item(things, name).value<T *>();
 }
 
+} // namespace DemoScene
+} // namespace Msp
+
 #endif