X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcondition.h;h=954adeece62cffe4d45578f4a060c87d78775ce0;hb=e0c863681c8a5fad5918bb7730ecbc65fbdfbc64;hp=2f3a5ef9888a67a0f978f0944eb956d5261620b9;hpb=c679a9dd1a97ae3b1ffa568143d42d02c2ca9e74;p=builder.git

diff --git a/source/condition.h b/source/condition.h
index 2f3a5ef..954adee 100644
--- 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_
 
@@ -20,24 +13,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;