Use constructor delegation instead of init functions when possible

[libs/gl.git] / source / render / scene.h

diff --git a/source/render/scene.h b/source/render/scene.h
index fcf5d33e8eb9645caccdbc9bff5f7d34a3427f27..e4f5ecdfd070ff81b499696a8f643a5ce61adb00 100644 (file)
--- a/source/render/scene.h
+++ b/source/render/scene.h
@@ -1,12 +1,11 @@
 #ifndef MSP_GL_SCENE_H_
 #define MSP_GL_SCENE_H_
 
-#include <vector>
+#include <map>
 #include <msp/core/typeregistry.h>
 #include <msp/datafile/objectloader.h>
 #include "matrix.h"
 #include "renderable.h"
-#include "vector.h"
 
 namespace Msp {
 namespace GL {
@@ -29,10 +28,10 @@ protected:
                unsigned inst_counter;
 
        public:
-               Loader(Scene &, Collection &);
-               Loader(Scene &, Collection &, ContentMap &);
+               Loader(Scene &s, Collection &c): Loader(s, c, 0) { }
+               Loader(Scene &s, Collection &c, ContentMap &m) : Loader(s, c, &m) { }
        private:
-               void init();
+               Loader(Scene &, Collection &, ContentMap *);
 
                void object(const std::string &);
                void object_tagged(const std::string &, const std::string &);