Eliminate all global typedefs, making misc.h finally unnecessary

[builder.git] / source / condition.h

diff --git a/source/condition.h b/source/condition.h
index 2f3a5ef9888a67a0f978f0944eb956d5261620b9..0cdc2bb482723e756dd94abcc32e94f9367045a3 100644 (file)
--- a/source/condition.h
+++ b/source/condition.h
@@ -1,16 +1,8 @@
-/* $Id$
-
-This file is part of builder
-Copyright © 2006-2007 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,27 +10,30 @@ class SourcePackage;
 class Condition
 {
 public:
-       class Loader: public Msp::DataFile::Loader
+       class Loader: public Msp::DataFile::ObjectLoader<Condition>
        {
        public:
                Loader(Condition &);
        private:
-               Condition &cond;
-
                void require(const std::string &);
                void build_info();
        };
 
-       Condition(SourcePackage &, const std::string &);
-       const StringList &get_requires() const { return requires; }
-       const BuildInfo  &get_build_info() const { return build_info; }
-       bool             eval();
+       typedef std::list<std::string> RequireList;
+
 private:
+       typedef std::map<std::string, std::string> Expression;
+       
        SourcePackage &pkg;
-       StringMap  expression;
-       StringList requires;
-       BuildInfo  build_info;
+       Expression expression;
+       RequireList requires;
+       BuildInfo build_info;
+
+public:
+       Condition(SourcePackage &, const std::string &);
+       const RequireList &get_requires() const { return requires; }
+       const BuildInfo &get_build_info() const { return build_info; }
+       bool eval();
 };
-typedef std::list<Condition> ConditionList;
 
 #endif