Reorder class members

[builder.git] / source / condition.h

diff --git a/source/condition.h b/source/condition.h
index 2f3a5ef9888a67a0f978f0944eb956d5261620b9..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
 */
 
@@ -20,24 +20,27 @@ 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(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;