Remove most container typedefs and refactor others

[builder.git] / source / component.h

diff --git a/source/component.h b/source/component.h
index 0e1efad028d5d627b69e6e59f32c5b4d60ce7d34..1db925928a9a88cea2221bf98fbc7736cfd0a412 100644 (file)
--- a/source/component.h
+++ b/source/component.h
@@ -32,14 +32,11 @@ public:
                void source(const std::string &);
        };
 
-       typedef std::list<Msp::FS::Path> SourceList;
-       typedef std::list<std::string> OverlayList;
-
 protected:
        SourcePackage &package;
        std::string name;
-       SourceList sources;
-       OverlayList overlays;
+       std::list<Msp::FS::Path> sources;
+       std::list<std::string> overlays;
        bool install;
        BuildInfo build_info;
        Package::Requirements requires;
@@ -56,13 +53,13 @@ public:
 
        /** Returns a list of sources for the component.  They may refer to
        directories or individual files. */
-       const SourceList &get_sources() const { return sources; }
+       const std::list<Msp::FS::Path> &get_sources() const { return sources; }
 
-       const OverlayList &get_overlays() const { return overlays; }
+       const std::list<std::string> &get_overlays() const { return overlays; }
 
 protected:
        /** Returns a list of all source files for the component. */
-       SourceList collect_source_files() const;
+       std::list<Msp::FS::Path> collect_source_files() const;
 
 public:
        bool get_install() const { return install; }