Reorder class members

[builder.git] / source / condition.h

diff --git a/source/condition.h b/source/condition.h
index baf718cc43d5755265345235ad7a1bc63d250f30..12157f35a466365d2acb3b39dee81e00fc27d575 100644 (file)
--- a/source/condition.h
+++ b/source/condition.h
@@ -1,7 +1,7 @@
 /* $Id$
 
 This file is part of builder
-Copyright © 2006-2007 Mikko Rasa, Mikkosoft Productions
+Copyright © 2007, 2009  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
@@ -11,34 +11,36 @@ Distributed under the LGPL
 #include <msp/datafile/loader.h>
 #include "buildinfo.h"
 #include "misc.h"
-#include "packageref.h"
 
 class Config;
+class SourcePackage;
 
 class Condition
 {
 public:
        class Loader: public Msp::DataFile::Loader
        {
-       public:
-               Loader(Condition &);
        private:
                Condition &cond;
 
+       public:
+               Loader(Condition &);
+       private:
                void require(const std::string &);
                void build_info();
        };
 
-       Condition(Package &, const std::string &);
-       const PkgRefList &get_requires() const { return requires; }
-       const BuildInfo  &get_build_info() const { return build_info; }
-       void             resolve_refs();
-       bool             eval();
 private:
-       Package    &pkg;
-       StringMap  expression;
-       PkgRefList requires;
-       BuildInfo  build_info;
+       SourcePackage &pkg;
+       StringMap expression;
+       StringList requires;
+       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;