X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Fcollection.h;h=8b4eba01b0fb5b83f4a1fdc936d6d327ba4bc971;hb=57dc9929879076398467ae16d349cd0d453737fe;hp=82339d8859902f725308b347f9f3de3fd39ff244;hpb=73fe535bd9eb26bc1f9fc8c6f232031d8245daf2;p=libs%2Fdatafile.git diff --git a/source/collection.h b/source/collection.h index 82339d8..8b4eba0 100644 --- a/source/collection.h +++ b/source/collection.h @@ -292,17 +292,17 @@ private: { Collection::Loader::Add::add(loader, kwd); } }; - CreatorBase *creator; + CreatorBase *creat; StoreBase *store; public: CollectionItemType(): - creator(0), store(new Store) + creat(0), store(new Store) { tag = new Tag; } ~CollectionItemType() { - delete creator; + delete creat; delete store; } @@ -313,10 +313,10 @@ public: } template - CollectionItemType &create(T *(C::*func)(const std::string &)) + CollectionItemType &creator(T *(C::*func)(const std::string &)) { - delete creator; - creator = new Creator(func); + delete creat; + creat = new Creator(func); return *this; } @@ -334,13 +334,13 @@ public: { store->add_to_loader(loader, kwd); } virtual bool can_create() const - { return creator!=0; } + { return creat!=0; } virtual void create_item(Collection &coll, const std::string &name) const { - if(!creator) + if(!creat) throw std::runtime_error("no creator"); - T *obj = creator->create(coll, name); + T *obj = creat->create(coll, name); store->store(coll, name, obj); } };