Rearrange Target members

[builder.git] / source / binarypackage.h

diff --git a/source/binarypackage.h b/source/binarypackage.h
index a0b3d0a66dfc1675e165001b98974ebfb37c97d1..b47d468fe138ccf761c64d88b1f3169c2b3a51f6 100644 (file)
--- a/source/binarypackage.h
+++ b/source/binarypackage.h
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of builder
-Copyright © 2007-2009  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #ifndef BINARYPACKAGE_H_
 #define BINARYPACKAGE_H_
 
@@ -17,11 +10,10 @@ Builder.
 class BinaryPackage: public Package
 {
 public:
-       class Loader: public Package::Loader
+       class Loader: public Msp::DataFile::DerivedObjectLoader<BinaryPackage, Package>
        {
        public:
                Loader(BinaryPackage &);
-               BinaryPackage &get_object() { return static_cast<BinaryPackage &>(pkg); }
        private:
                void build_info();
        };
@@ -41,7 +33,7 @@ public:
 
        bool get_need_path() const { return need_path; }
 
-       static BinaryPackage *from_pkgconfig(Builder &, const std::string &);
+       static BinaryPackage *from_flags(Builder &, const std::string &, const std::vector<std::string> &);
 private:
        virtual void create_build_info();
 };