Use default member initializers and constructor delegation

[builder.git] / source / target.h

diff --git a/source/target.h b/source/target.h
index 114a51ec35ae934faf1ed89acdf9b99a749c9382..6ef6457a0f5fe73d70ddc31d7f66b561e878b63b 100644 (file)
--- a/source/target.h
+++ b/source/target.h
@@ -1,14 +1,15 @@
 #ifndef TARGET_H_
 #define TARGET_H_
 
-#include <list>
 #include <map>
 #include <set>
 #include <string>
+#include <vector>
 #include <sigc++/signal.h>
 #include <msp/time/timestamp.h>
 
 class Builder;
+class BuildInfo;
 class Component;
 class SourcePackage;
 class Task;
@@ -26,7 +27,7 @@ dependencies can be used by other targets further down the chain.
 class Target
 {
 public:
-       typedef std::list<Target *> Dependencies;
+       using Dependencies = std::vector<Target *>;
 
 protected:
        enum State
@@ -45,19 +46,19 @@ public:
 
 protected:
        Builder &builder;
-       const SourcePackage *package;
-       const Component *component;
+       const SourcePackage *package = 0;
+       const Component *component = 0;
        std::string name;
 
-       Tool *tool;
-       State state;
+       Tool *tool = 0;
+       State state = INIT;
        std::string rebuild_reason;
-       std::list<std::string> problems;
+       std::vector<std::string> problems;
 
        Dependencies depends;
        Dependencies trans_depends;
        Dependencies side_effects;
-       Target *primary_target;
+       Target *primary_target = 0;
 
        Target(Builder &, const std::string &);
 public:
@@ -114,6 +115,8 @@ public:
        the build() function. */
        const Tool *get_tool() const { return tool; }
 
+       virtual void collect_build_info(BuildInfo &) const;
+
        /** Indicates if it's possible to build this target. */
        bool is_buildable() const { return tool!=0; }
 
@@ -138,7 +141,7 @@ protected:
 public:
        bool is_broken() const { return state==BROKEN; }
 
-       const std::list<std::string> &get_problems() const { return problems; }
+       const std::vector<std::string> &get_problems() const { return problems; }
 
        /** Prepares the target by finding dependencies, recursively preparing them
        and then checking whether rebuilding is needed. */