Remove most container typedefs and refactor others

[builder.git] / source / packagemanager.h

diff --git a/source/packagemanager.h b/source/packagemanager.h
index b168d723e174739c3c652f376f7f1cefe407cda2..9da4af33e3a557851c7dc7f9d23c54e235412edf 100644 (file)
--- a/source/packagemanager.h
+++ b/source/packagemanager.h
@@ -15,19 +15,14 @@ packages by name.
 */
 class PackageManager
 {
-public:
-       typedef std::map<std::string, Package *> PackageMap;
-
 private:
-       typedef std::list<Msp::FS::Path> SearchPath;
-
        Builder &builder;
-       SearchPath pkg_path;
-       SearchPath pkg_dirs;
-       SearchPath binpkg_path;
-       SearchPath binpkg_files;
+       std::list<Msp::FS::Path> pkg_path;
+       std::list<Msp::FS::Path> pkg_dirs;
+       std::list<Msp::FS::Path> binpkg_path;
+       std::list<Msp::FS::Path> binpkg_files;
        bool no_externals;
-       PackageMap packages;
+       std::map<std::string, Package *> packages;
        Package *main_pkg;
        std::set<std::string> not_found;
        bool env_set;
@@ -55,7 +50,7 @@ public:
        the primary build target. */
        Package &get_main_package() const;
 
-       const PackageMap &get_packages() const { return packages; }
+       const std::map<std::string, Package *> &get_packages() const { return packages; }
 
        /** Locates a package and loads it if necessary. */
        Package *find_package(const std::string &);