Avoid a double verb in function name

[builder.git] / source / condition.h

diff --git a/source/condition.h b/source/condition.h
index 12157f35a466365d2acb3b39dee81e00fc27d575..0cdc2bb482723e756dd94abcc32e94f9367045a3 100644 (file)
--- a/source/condition.h
+++ b/source/condition.h
@@ -1,16 +1,8 @@
-/* $Id$
-
-This file is part of builder
-Copyright © 2007, 2009  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #ifndef CONDITION_H_
 #define CONDITION_H_
 
 #include <msp/datafile/loader.h>
 #include "buildinfo.h"
-#include "misc.h"
 
 class Config;
 class SourcePackage;
@@ -18,11 +10,8 @@ class SourcePackage;
 class Condition
 {
 public:
-       class Loader: public Msp::DataFile::Loader
+       class Loader: public Msp::DataFile::ObjectLoader<Condition>
        {
-       private:
-               Condition &cond;
-
        public:
                Loader(Condition &);
        private:
@@ -30,18 +19,21 @@ public:
                void build_info();
        };
 
+       typedef std::list<std::string> RequireList;
+
 private:
+       typedef std::map<std::string, std::string> Expression;
+       
        SourcePackage &pkg;
-       StringMap expression;
-       StringList requires;
+       Expression expression;
+       RequireList requires;
        BuildInfo build_info;
 
 public:
        Condition(SourcePackage &, const std::string &);
-       const StringList &get_requires() const { return requires; }
+       const RequireList &get_requires() const { return requires; }
        const BuildInfo &get_build_info() const { return build_info; }
        bool eval();
 };
-typedef std::list<Condition> ConditionList;
 
 #endif