considerable refactoring

[chaz/yoink] / src / Moof / Tilemap.cc

diff --git a/src/Moof/Tilemap.cc b/src/Moof/Tilemap.cc
index 17642c723c9fccda03ee36325b14ff917f8b9218..4fe5e974597d19e2baacb1eb97c788be6f66df9f 100644 (file)
--- a/src/Moof/Tilemap.cc
+++ b/src/Moof/Tilemap.cc
@@ -91,15 +91,15 @@ public:
        {
                Deserializer deserializer(Tilemap::getPath(getName()));
 
-               SerializablePtr root = deserializer.deserialize();
+               SerializableP root = deserializer.deserialize();
 
                if (root)
                {
-                       std::map<std::string,SerializablePtr> rootObj;
+                       Serializable::Map rootObj;
 
                        if (root->get(rootObj))
                        {
-                               std::map<std::string,SerializablePtr>::iterator it;
+                               Serializable::Map::iterator it;
 
                                if ((it = rootObj.find("tiles_s")) != rootObj.end())
                                {
@@ -164,7 +164,7 @@ public:
 
 Tilemap::Tilemap(const std::string& name) :
        Texture(name),
-       impl_(Tilemap::Impl::retain(name), &Tilemap::Impl::release)
+       impl_(Tilemap::Impl::getInstance(name))
 {
        setMinFilter(impl_->minFilter_);
        setMagFilter(impl_->magFilter_);