Target::prepare shouldn't be virtual

[builder.git] / source / condition.h

diff --git a/source/condition.h b/source/condition.h
index 2f3a5ef9888a67a0f978f0944eb956d5261620b9..c1bf7a3f3da6423e1f8d64e148a6d63e43328afb 100644 (file)
--- a/source/condition.h
+++ b/source/condition.h
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of builder
-Copyright © 2006-2007 Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #ifndef CONDITION_H_
 #define CONDITION_H_
 
@@ -18,26 +11,26 @@ 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();
 private:
        SourcePackage &pkg;
-       StringMap  expression;
+       StringMap expression;
        StringList requires;
-       BuildInfo  build_info;
+       BuildInfo build_info;
+
+public:
+       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<Condition> ConditionList;