Reorder class members

[builder.git] / source / component.h

diff --git a/source/component.h b/source/component.h
index 6fb231d1d247899103172aaab1720c06377cdbd8..ce4a821c822e5d6dcf99485fed93e0ee51e42c58 100644 (file)
--- a/source/component.h
+++ b/source/component.h
@@ -1,7 +1,7 @@
 /* $Id$
 
 This file is part of builder
-Copyright © 2006-2007 Mikko Rasa, Mikkosoft Productions
+Copyright © 2006-2009  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
@@ -26,15 +26,15 @@ their own.
 class Component
 {
 public:
-       /// Loads a Component from file.  Used from Package::Loader.
        class Loader: public Msp::DataFile::Loader
        {
+       private:
+               Component ∁
+
        public:
                Loader(Component &);
                Component &get_object() { return comp; }
        private:
-               Component ∁
-
                void source(const std::string &);
                void require(const std::string &);
                void modular();
@@ -50,34 +50,43 @@ public:
                HEADERS
        };
 
-       Component(SourcePackage &, Type, const std::string &);
-       const SourcePackage &get_package() const       { return pkg; }
-       Type              get_type() const             { return type; }
-       const std::string &get_name() const            { return name; }
-       const PathList    &get_sources() const         { return sources; }
-       const BuildInfo   &get_build_info() const      { return build_info; }
-       bool              get_install() const          { return install; }
-       const std::string &get_install_headers() const { return install_headers; }
-       bool              get_modular() const          { return modular; }
-       const PackageList &get_requires() const        { return requires; }
-       bool              get_default() const          { return deflt; }
-       void              create_build_info();
-       void              create_targets() const;
 protected:
        SourcePackage &pkg;
-       Type        type;
+       Type type;
        std::string name;
-       PathList    sources;
-       bool        install;
+       PathList sources;
+       bool install;
        std::string install_headers;
        const Component *module_host;
-       bool        modular;
-       BuildInfo   build_info;
+       bool modular;
+       BuildInfo build_info;
        PackageList requires;
-       bool        deflt;
+       bool deflt;
 
-       PathList    collect_source_files() const;
+public:
+       Component(SourcePackage &, Type, const std::string &);
+       const SourcePackage &get_package() const { return pkg; }
+       Type get_type() const { return type; }
+       const std::string &get_name() const { return name; }
+       const PathList &get_sources() const { return sources; }
+       const BuildInfo &get_build_info() const { return build_info; }
+       bool get_install() const { return install; }
+       const std::string &get_install_headers() const { return install_headers; }
+       bool get_modular() const { return modular; }
+       const PackageList &get_requires() const { return requires; }
+       bool get_default() const { return deflt; }
+
+       /** Prepares the build information for building.  Pulls build info from the
+       parent and dependency packages, and adds any component-specific flags. */
+       void create_build_info();
+
+       void create_targets() const;
+
+protected:
+       /** Returns a list of all source files for the component. */
+       PathList collect_source_files() const;
 };
+
 typedef std::list<Component> ComponentList;
 
 #endif