X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Floader.h;h=bb1292cc7b3c2740adc14a6c596bde54c4a59678;hb=2d289d20a9a4aeac7774976e4213a7c72f1dc75b;hp=3ab6d28fcfd194b2029588a03383ddf53adc7194;hpb=9763e39e6e09e747b87940920e778ac269dd8b15;p=libs%2Fdatafile.git

diff --git a/source/loader.h b/source/loader.h
index 3ab6d28..bb1292c 100644
--- a/source/loader.h
+++ b/source/loader.h
@@ -35,17 +35,7 @@ See also classes ObjectLoader and CollectionObjectLoader in objectloader.h.
 class Loader
 {
 private:
-	struct ActionKey
-	{
-		std::string keyword;
-		std::string signature;
-
-		ActionKey(const std::string &, const std::string &);
-
-		bool operator<(const ActionKey &) const;
-	};
-
-	typedef std::map<ActionKey, LoaderAction *> ActionMap;
+	typedef std::map<StatementKey, LoaderAction *> ActionMap;
 
 	ActionMap actions;
 	const Statement *cur_st;
@@ -136,8 +126,8 @@ protected:
 	void add_auxiliary_loader(Loader &);
 
 private:
-	bool has_keyword(const std::string &) const;
-	LoaderAction *find_action(const ActionKey &) const;
+	bool has_action(const StatementKey &) const;
+	LoaderAction *find_action(const StatementKey &) const;
 
 protected:
 	/** Returns the source of the statement being processed.  This can be used