Use default member initializers and constructor delegation

[builder.git] / source / packagemanager.h

diff --git a/source/packagemanager.h b/source/packagemanager.h
index 48c3c16fd4fcbdb486368fa2dfed5147af7f7b8b..22f1eacfbbe6eaf3eabce855ed69aa2350dc4ceb 100644 (file)
--- a/source/packagemanager.h
+++ b/source/packagemanager.h
@@ -1,9 +1,10 @@
 #ifndef PACKAGEMANAGER_H_
 #define PACKAGEMANAGER_H_
 
-#include <list>
 #include <map>
+#include <set>
 #include <string>
+#include <vector>
 #include <msp/fs/path.h>
 
 class Builder;
@@ -15,22 +16,17 @@ 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;
-       bool no_externals;
-       PackageMap packages;
-       Package *main_pkg;
+       std::vector<Msp::FS::Path> pkg_path;
+       std::vector<Msp::FS::Path> pkg_dirs;
+       std::vector<Msp::FS::Path> binpkg_path;
+       std::vector<Msp::FS::Path> binpkg_files;
+       bool no_externals = false;
+       std::map<std::string, Package *> packages;
+       Package *main_pkg = 0;
        std::set<std::string> not_found;
-       bool env_set;
+       bool env_set = false;
 
 public:
        PackageManager(Builder &);
@@ -49,13 +45,13 @@ public:
        void add_package(Package *);
 
        /** Returns a package from the cache. */
-       Package *get_package(const std::string &);
+       Package *get_package(const std::string &) const;
 
        /** Returns the package that was added first.  This should be considered
        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 &);
@@ -71,6 +67,9 @@ private:
        /** Determines the file containing a binary package.  The file is expected
        to be named after the package. */
        Msp::FS::Path get_binary_package_file(const std::string &);
+
+public:
+       void save_all_caches() const;
 };
 
 #endif