Remove most container typedefs and refactor others

[builder.git] / source / tool.h

diff --git a/source/tool.h b/source/tool.h
index ee1fa7a1d4be81bce006281adc1b9dfb3a40314a..fa18ba8dca338d57c5e37c2c8fe42269f61ef1b1 100644 (file)
--- a/source/tool.h
+++ b/source/tool.h
@@ -5,6 +5,7 @@
 #include <string>
 #include <msp/fs/path.h>
 #include "buildinfo.h"
+#include "virtualfilesystem.h"
 
 class Architecture;
 class Builder;
@@ -28,19 +29,16 @@ public:
                COMPONENT
        };
 
-       typedef std::list<Msp::FS::Path> SearchPath;
-       typedef std::list<std::string> SuffixList;
-
 protected:
        Builder &builder;
        const Architecture *architecture;
        std::string tag;
        std::string command;
        FileTarget *executable;
-       SuffixList input_suffixes;
-       SuffixList aux_suffixes;
+       std::list<std::string> input_suffixes;
+       std::list<std::string> aux_suffixes;
        ProcessingUnit processing_unit;
-       SearchPath system_path;
+       VirtualFileSystem::SearchPath system_path;
        BuildInfo build_info;
        bool prepared;
        std::list<std::string> problems;
@@ -68,11 +66,11 @@ public:
        FileTarget *get_executable() const { return executable; }
 
        /// Returns a list of suffixes that can be processed with this tool.
-       const SuffixList &get_input_suffixes() const { return input_suffixes; }
+       const std::list<std::string> &get_input_suffixes() const { return input_suffixes; }
 
        /** Returns a list of suffixes that are associated with this tool, but can't
        be processed directly.  For example C and C++ headers. */
-       const SuffixList &get_auxiliary_suffixes() const { return aux_suffixes; }
+       const std::list<std::string> &get_auxiliary_suffixes() const { return aux_suffixes; }
 
        /** Indicates whether the tool can accept a suffix.  If aux is true,
        auxiliary suffixes are considered as well */
@@ -82,7 +80,7 @@ public:
        ProcessingUnit get_processing_unit() const { return processing_unit; }
 
        /// Returns the systemwide search path for source files.
-       const SearchPath &get_system_path() const { return system_path; }
+       const VirtualFileSystem::SearchPath &get_system_path() const { return system_path; }
 
        /** Returns tool-specific build info.  This can be used by other tools down
        the chain. */