Reorder class members

[builder.git] / source / buildinfo.h

diff --git a/source/buildinfo.h b/source/buildinfo.h
index 10fd3bec439c3ad6a16379e6453d1e877325f0d1..a967bbd7535aa7b83256856092fb867c2ab1fd6f 100644 (file)
--- a/source/buildinfo.h
+++ b/source/buildinfo.h
@@ -1,9 +1,16 @@
+/* $Id$
+
+This file is part of builder
+Copyright © 2006-2009  Mikko Rasa, Mikkosoft Productions
+Distributed under the LGPL
+*/
+
 #ifndef BUILDINFO_H_
 #define BUILDINFO_H_
 
 #include <list>
 #include <string>
-#include <msp/parser/loader.h>
+#include <msp/datafile/loader.h>
 #include "misc.h"
 
 /**
@@ -13,19 +20,21 @@ form.  Allows combining with other BuildInfos to support package dependencies.
 class BuildInfo
 {
 public:
-       class Loader: public Msp::Parser::Loader
+       class Loader: public Msp::DataFile::Loader
        {
-       public:
-               Loader(BuildInfo &);
        private:
                BuildInfo &binfo;
                
-               void cflag(const std::string &s)   { binfo.cflags.push_back(s); }
-               void incpath(const std::string &s) { binfo.incpath.push_back(s); }
-               void define(const std::string &s)  { binfo.defines.push_back(s); }
-               void ldflag(const std::string &s)  { binfo.ldflags.push_back(s); }
-               void libpath(const std::string &s) { binfo.libpath.push_back(s); }
-               void library(const std::string &s) { binfo.libs.push_back(s); }
+       public:
+               Loader(BuildInfo &);
+       private:
+               void cflag(const std::string &);
+               void incpath(const std::string &);
+               void define(const std::string &);
+               void ldflag(const std::string &);
+               void libpath(const std::string &);
+               void library(const std::string &);
+               void warning(const std::string &);
        };
        
        StringList cflags;
@@ -34,11 +43,14 @@ public:
        StringList ldflags;
        StringList libpath;
        StringList libs;
+       StringList warnings;
 
+       /** Adds another BuildInfo to the end of this one. */
        void add(const BuildInfo &);
+
+       /** Makes sure there are no duplicate entries in the lists.  For warnings,
+       contradicting flags are eliminated and the last one stays in effect. */
        void unique();
-private:
-       void unique(StringList &);
 };
 
 #endif