Inline simple constructors

diff --git a/source/analyzer.cpp b/source/analyzer.cpp
index b3b1f217667951ec9df9e739bf8de20eb14f5cd9..f91c298825cc8a8039a0c1d1bc63a7036ec75120 100644 (file)
--- a/source/analyzer.cpp
+++ b/source/analyzer.cpp
@@ -13,10 +13,6 @@
 using namespace std;
 using namespace Msp;
 
-Analyzer::Analyzer(Builder &b):
-       builder(b)
-{ }
-
 void Analyzer::analyze()
 {
        if(mode==RDEPS)

diff --git a/source/analyzer.h b/source/analyzer.h
index 5827480cdd913765a7353e73a97068d20b6f4f27..d30de049bab557ed7c0195be8a9471b4d378f9ff 100644 (file)
--- a/source/analyzer.h
+++ b/source/analyzer.h
@@ -34,7 +34,7 @@ private:
        std::map<const Target *, std::set<Target *> > rdepends;
 
 public:
-       Analyzer(Builder &);
+       Analyzer(Builder &b): builder(b) { }
 
        void set_mode(Mode m) { mode = m; }
        void set_max_depth(unsigned m) { max_depth = m; }

diff --git a/source/androidapplicationcomponent.cpp b/source/androidapplicationcomponent.cpp
index 1aab7355009444a8e98c6c136b9232e633a9c90c..e4feaa2c2c29195560ab20d2acd7169246bbaf0e 100644 (file)
--- a/source/androidapplicationcomponent.cpp
+++ b/source/androidapplicationcomponent.cpp
@@ -14,10 +14,6 @@
 using namespace std;
 using namespace Msp;
 
-AndroidApplicationComponent::AndroidApplicationComponent(SourcePackage &p, const string &n):
-       Component(p, n)
-{ }
-
 void AndroidApplicationComponent::create_targets() const
 {
        Builder &builder = package.get_builder();

diff --git a/source/androidapplicationcomponent.h b/source/androidapplicationcomponent.h
index c791a74861b6b992fb8d86483ea4aea0cb63039a..9e19b6d8ab5aa1d8daa6111bbd0c4575cb328a29 100644 (file)
--- a/source/androidapplicationcomponent.h
+++ b/source/androidapplicationcomponent.h
@@ -20,7 +20,7 @@ private:
        std::vector<std::string> permissions;
 
 public:
-       AndroidApplicationComponent(SourcePackage &, const std::string &);
+       AndroidApplicationComponent(SourcePackage &p, const std::string &n): Component(p, n) { }
 
        void create_targets() const override;
 };

diff --git a/source/androidmanifestgenerator.cpp b/source/androidmanifestgenerator.cpp
index b9d67dfb3201dc83317e9fa0cd83e71c4aac86c2..8268bb80984d0ff075f89d2a6539b86803357315 100644 (file)
--- a/source/androidmanifestgenerator.cpp
+++ b/source/androidmanifestgenerator.cpp
@@ -9,10 +9,6 @@
 using namespace std;
 using namespace Msp;
 
-AndroidManifestGenerator::AndroidManifestGenerator(Builder &b):
-       Tool(b, "AMG")
-{ }
-
 Target *AndroidManifestGenerator::create_target(const vector<Target *> &, const string &)
 {
        throw logic_error("not implemented");
@@ -26,10 +22,6 @@ Task *AndroidManifestGenerator::run(const Target &target) const
 }
 
 
-AndroidManifestGenerator::Worker::Worker(const AndroidManifestFile &m):
-       manifest(m)
-{ }
-
 void AndroidManifestGenerator::Worker::main()
 {
        const Component &comp = *manifest.get_component();

diff --git a/source/androidmanifestgenerator.h b/source/androidmanifestgenerator.h
index 7c6e44c3647958a19f05ca7bdbb5c88b313b3019..630eb7ce17624327a9a3c712f1873bfdc7bc5dfb 100644 (file)
--- a/source/androidmanifestgenerator.h
+++ b/source/androidmanifestgenerator.h
@@ -15,14 +15,14 @@ private:
                const AndroidManifestFile &manifest;
 
        public:
-               Worker(const AndroidManifestFile &);
+               Worker(const AndroidManifestFile &m): manifest(m) { }
 
        private:
                void main() override;
        };
 
 public:
-       AndroidManifestGenerator(Builder &);
+       AndroidManifestGenerator(Builder &b): Tool(b, "AMG") { }
 
        Target *create_target(const std::vector<Target *> &, const std::string &) override;
        Task *run(const Target &) const override;

diff --git a/source/binary.cpp b/source/binary.cpp
index ffffaa56feed8a1ad15f9472c86f47d3f748f834..f245037b6b24abe35662b46ab04219dad5de7e7f 100644 (file)
--- a/source/binary.cpp
+++ b/source/binary.cpp
@@ -14,10 +14,6 @@
 using namespace std;
 using namespace Msp;
 
-Binary::Binary(Builder &b, const FS::Path &p):
-       FileTarget(b, p)
-{ }
-
 Binary::Binary(Builder &b, const Component &c, const string &p, const vector<ObjectFile *> &objs):
        FileTarget(b, c.get_package(), c.get_package().get_output_directory()/p),
        objects(objs)

diff --git a/source/binary.h b/source/binary.h
index 16ed1ecf95148b6c028a727dbb40d0af49946216..ac5a855a8d2c54cf178edba7850879db58d08ab1 100644 (file)
--- a/source/binary.h
+++ b/source/binary.h
@@ -19,7 +19,7 @@ private:
 protected:
        std::vector<ObjectFile *> objects;
 
-       Binary(Builder &, const Msp::FS::Path &);
+       Binary(Builder &b, const Msp::FS::Path &p): FileTarget(b, p) { }
        Binary(Builder &, const Component &, const std::string &, const std::vector<ObjectFile *> &);
 
 public:

diff --git a/source/binarycomponent.cpp b/source/binarycomponent.cpp
index 608ed3f6596b51b13522333358f2214cf6f093c1..3209ccc185438f721d0892053564724c17fb87fa 100644 (file)
--- a/source/binarycomponent.cpp
+++ b/source/binarycomponent.cpp
@@ -8,11 +8,6 @@
 using namespace std;
 using namespace Msp;
 
-BinaryComponent::BinaryComponent(SourcePackage &p, const string &n, Type t):
-       Component(p, n),
-       type(t)
-{ }
-
 void BinaryComponent::create_build_info()
 {
        Component::create_build_info();

diff --git a/source/binarycomponent.h b/source/binarycomponent.h
index eca9508fd26da06b3fdfbe87486131d7fc2f9e02..ef145da49da7b6bdea0649412b6782318641d182 100644 (file)
--- a/source/binarycomponent.h
+++ b/source/binarycomponent.h
@@ -26,7 +26,7 @@ private:
        std::vector<const Component *> uses;
 
 public:
-       BinaryComponent(SourcePackage &, const std::string &, Type);
+       BinaryComponent(SourcePackage &p, const std::string &n, Type t): Component(p, n), type(t) { }
 
        Type get_type() const { return type; }
 

diff --git a/source/buildtype.cpp b/source/buildtype.cpp
index fbfe6a0ce1da92428661af2762430471b81c5b80..2485ca53633c2aa99edd61a776b01bad07958e95 100644 (file)
--- a/source/buildtype.cpp
+++ b/source/buildtype.cpp
@@ -3,11 +3,6 @@
 using namespace std;
 using namespace Msp;
 
-BuildType::BuildType(const string &n):
-       name(n)
-{ }
-
-
 BuildType::Loader::Loader(BuildType &b):
        DataFile::ObjectLoader<BuildType>(b)
 {

diff --git a/source/buildtype.h b/source/buildtype.h
index 8fcd6a2db86e478bf50281171c8879e1b427582f..c16e8f9f24bb5434bcb8a9a8acd192583ccf8ef0 100644 (file)
--- a/source/buildtype.h
+++ b/source/buildtype.h
@@ -22,7 +22,7 @@ private:
        BuildInfo build_info;
 
 public:
-       BuildType(const std::string &);
+       BuildType(const std::string &n): name(n) { }
 
        const std::string &get_name() const { return name; }
        const BuildInfo &get_build_info() const { return build_info; }

diff --git a/source/chainedtask.cpp b/source/chainedtask.cpp
index 4e0decb67a8f2b25aad18d92baa8f1357cd6ba0d..a232ef84d4e61afada838540c4dc630d97b214d0 100644 (file)
--- a/source/chainedtask.cpp
+++ b/source/chainedtask.cpp
@@ -4,11 +4,6 @@
 using namespace std;
 using namespace Msp;
 
-ChainedTask::ChainedTask(Task *t)
-{
-       add_task(t);
-}
-
 ChainedTask::~ChainedTask()
 {
        for(Task *t: tasks)

diff --git a/source/chainedtask.h b/source/chainedtask.h
index 2986e8eae35ec62a28ce7453a652d0ea6e59d61a..30a3b3e020020197608b0f05c02223c58db907a9 100644 (file)
--- a/source/chainedtask.h
+++ b/source/chainedtask.h
@@ -16,7 +16,7 @@ private:
        Status final_status = RUNNING;
 
 public:
-       ChainedTask(Task *);
+       ChainedTask(Task *t) { add_task(t); }
        ~ChainedTask();
 
        void add_task(Task *);

diff --git a/source/compilecommandsgenerator.cpp b/source/compilecommandsgenerator.cpp
index 82221e7a1c3d37950bd3d70dc7d6973ddcf933dc..8e3947d7816a119916097b7bd7079b819759dd96 100644 (file)
--- a/source/compilecommandsgenerator.cpp
+++ b/source/compilecommandsgenerator.cpp
@@ -10,10 +10,6 @@
 using namespace std;
 using namespace Msp;
 
-CompileCommandsGenerator::CompileCommandsGenerator(Builder &b):
-       Tool(b, "CCJG")
-{ }
-
 Target *CompileCommandsGenerator::create_target(const vector<Target *> &, const string &)
 {
        throw logic_error("Not implemented");
@@ -27,10 +23,6 @@ Task *CompileCommandsGenerator::run(const Target &target) const
 }
 
 
-CompileCommandsGenerator::Worker::Worker(const CompileCommandsJson &t):
-       target(t)
-{ }
-
 void CompileCommandsGenerator::Worker::main()
 {
        Builder &builder = target.get_package()->get_builder();

diff --git a/source/compilecommandsgenerator.h b/source/compilecommandsgenerator.h
index 519cad03e7f58f8ebbf479b0910f6e24c9bea5d7..a655d944161366a92eec881e015c7e28a94ea2fc 100644 (file)
--- a/source/compilecommandsgenerator.h
+++ b/source/compilecommandsgenerator.h
@@ -15,14 +15,14 @@ private:
                const CompileCommandsJson ⌖
 
        public:
-               Worker(const CompileCommandsJson &);
+               Worker(const CompileCommandsJson &t): target(t) { }
 
        private:
                void main() override;
        };
 
 public:
-       CompileCommandsGenerator(Builder &);
+       CompileCommandsGenerator(Builder &b): Tool(b, "CCJG") { }
 
        Target *create_target(const std::vector<Target *> &, const std::string &) override;
        Task *run(const Target &) const override;

diff --git a/source/component.cpp b/source/component.cpp
index 0186f3e394c3debe464a1d888ad12594fb941f0b..4fddcef79de59a9ca0ca6cf05e8a5b71ec565a79 100644 (file)
--- a/source/component.cpp
+++ b/source/component.cpp
@@ -11,11 +11,6 @@
 using namespace std;
 using namespace Msp;
 
-Component::Component(SourcePackage &p, const string &n):
-       package(p),
-       name(n)
-{ }
-
 void Component::prepare()
 {
        for(Package *r: requires)

diff --git a/source/component.h b/source/component.h
index 5479cc5a1aa71d86ed163f73ec8e6a5c3c4bfb3b..7ddd97297f267b96e865b82c5ef3f24b1390aa18 100644 (file)
--- a/source/component.h
+++ b/source/component.h
@@ -44,7 +44,7 @@ protected:
        InstallMap install_map;
        std::vector<std::string> problems;
 
-       Component(SourcePackage &, const std::string &);
+       Component(SourcePackage &p, const std::string &n): package(p), name(n) { }
 public:
        virtual ~Component() { }
 

diff --git a/source/config.cpp b/source/config.cpp
index 48864a9fac64f8fb33d7f4143acac3cb1a27c5ba..1d3b180d47ce41a586739dfb73cd89f8780e7a3d 100644 (file)
--- a/source/config.cpp
+++ b/source/config.cpp
@@ -12,10 +12,6 @@
 using namespace std;
 using namespace Msp;
 
-Config::Config(SourcePackage &p):
-       package(p)
-{ }
-
 const Config::Option &Config::add_option(const Feature &f)
 {
        Option opt(f);

diff --git a/source/config.h b/source/config.h
index 37508b056ef21f946592334a1078dcb5b7ab4341..ba8416b923a24128416623c22e08377facf5b220 100644 (file)
--- a/source/config.h
+++ b/source/config.h
@@ -43,7 +43,7 @@ private:
        mutable bool changed = false;
 
 public:
-       Config(SourcePackage &);
+       Config(SourcePackage &p): package(p) { }
 
        /** Adds a configuration option based on a feature. */
        const Option &add_option(const Feature &);

diff --git a/source/copy.cpp b/source/copy.cpp
index f7dab415920d09b2bf41374d7e9de6b7ef730588..45c5a81fa9ba60533a0471b105a2a26c4d25d2c0 100644 (file)
--- a/source/copy.cpp
+++ b/source/copy.cpp
@@ -14,10 +14,6 @@
 using namespace std;
 using namespace Msp;
 
-Copy::Copy(Builder &b):
-       Tool(b, "CP")
-{ }
-
 Target *Copy::create_target(const vector<Target *> &sources, const string &arg)
 {
        FileTarget &file_tgt = dynamic_cast<FileTarget &>(*sources.front());
@@ -37,10 +33,6 @@ Task *Copy::run(const Target &target) const
 }
 
 
-Copy::Worker::Worker(const InstalledFile &t):
-       target(t)
-{ }
-
 void Copy::Worker::main()
 {
        const FileTarget &source = target.get_source();

diff --git a/source/copy.h b/source/copy.h
index 5f20c161126752d0cf34194c857baa8306b53bab..a5044d8ba50a58bfcf5c56866ab59c962ac556fd 100644 (file)
--- a/source/copy.h
+++ b/source/copy.h
@@ -23,13 +23,13 @@ private:
                const InstalledFile ⌖
 
        public:
-               Worker(const InstalledFile &);
+               Worker(const InstalledFile &t): target(t) { }
        private:
                void main() override;
        };
 
 public:
-       Copy(Builder &);
+       Copy(Builder &b): Tool(b, "CP") { }
 
        Target *create_target(const std::vector<Target *> &, const std::string &) override;
        Task *run(const Target &) const override;

diff --git a/source/csourcefile.cpp b/source/csourcefile.cpp
index 6429d4fe287504948480bd2e740f02c392a46c36..bc766059879d210023af0d64c378477ffa28fcc5 100644 (file)
--- a/source/csourcefile.cpp
+++ b/source/csourcefile.cpp
@@ -11,10 +11,6 @@
 using namespace std;
 using namespace Msp;
 
-CSourceFile::CSourceFile(Builder &b, const FS::Path &p):
-       SourceFile(b, p)
-{ }
-
 CSourceFile::CSourceFile(Builder &b, const Component &c, const FS::Path &p):
        SourceFile(b, c, p)
 {

diff --git a/source/csourcefile.h b/source/csourcefile.h
index da966eb68ae33faae233e0abf344370cfe4a33e2..c57654a4cd6334cd98baba915baca1c1c75ca521 100644 (file)
--- a/source/csourcefile.h
+++ b/source/csourcefile.h
@@ -13,7 +13,7 @@ protected:
        std::vector<std::string> includes;
 
 public:
-       CSourceFile(Builder &, const Msp::FS::Path &);
+       CSourceFile(Builder &b, const Msp::FS::Path &p): SourceFile(b, p) { }
        CSourceFile(Builder &, const Component &, const Msp::FS::Path &);
 
        const char *get_type() const override { return "CSourceFile"; }

diff --git a/source/datasourcefile.cpp b/source/datasourcefile.cpp
deleted file mode 100644 (file)
index b2a6d21..0000000
--- a/source/datasourcefile.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-#include "datasourcefile.h"
-
-using namespace Msp;
-
-DataSourceFile::DataSourceFile(Builder &b, const FS::Path &p):
-       SourceFile(b, p)
-{ }
-
-DataSourceFile::DataSourceFile(Builder &b, const Component &c, const FS::Path &p):
-       SourceFile(b, c, p)
-{ }

diff --git a/source/datasourcefile.h b/source/datasourcefile.h
index 64093b5d31a405a620394d1d1fcfd45ffced8bcd..7518423f5e6ca2769b6e8eece89b9851aa118f0d 100644 (file)
--- a/source/datasourcefile.h
+++ b/source/datasourcefile.h
@@ -6,8 +6,8 @@
 class DataSourceFile: public SourceFile
 {
 public:
-       DataSourceFile(Builder &, const Msp::FS::Path &);
-       DataSourceFile(Builder &, const Component &, const Msp::FS::Path &);
+       DataSourceFile(Builder &b, const Msp::FS::Path &p): SourceFile(b, p) { }
+       DataSourceFile(Builder &b, const Component &c, const Msp::FS::Path &p): SourceFile(b, c, p) { }
 
        const char *get_type() const override { return "DataSourceFile"; }
 };

diff --git a/source/executable.cpp b/source/executable.cpp
index 488b6df513b5158206b59e72a8e532ec06d3cb44..aa0d8fba333476b8f6c88f96465a8821d2a12710 100644 (file)
--- a/source/executable.cpp
+++ b/source/executable.cpp
@@ -6,10 +6,6 @@
 using namespace std;
 using namespace Msp;
 
-Executable::Executable(Builder &b, const FS::Path &p):
-       Binary(b, p)
-{ }
-
 Executable::Executable(Builder &b, const Component &c, const vector<ObjectFile *> &objs):
        Binary(b, c, b.get_current_arch().create_filename<Executable>(c.get_name()), objs)
 {

diff --git a/source/executable.h b/source/executable.h
index a75e26eda45fd661631c1f63b5641ab377319957..5728e2f2eadf1db848b03943a037b61e40729d83 100644 (file)
--- a/source/executable.h
+++ b/source/executable.h
@@ -6,7 +6,7 @@
 class Executable: public Binary
 {
 public:
-       Executable(Builder &, const Msp::FS::Path &);
+       Executable(Builder &b, const Msp::FS::Path &p): Binary(b, p) { }
        Executable(Builder &, const Component &, const std::vector<ObjectFile *> &);
 
        const char *get_type() const override { return "Executable"; }

diff --git a/source/feature.cpp b/source/feature.cpp
index 891ba72c8514452094a3bef79feb14cb08a3be9a..25183777aab27c3b31715455114510d02a27760e 100644 (file)
--- a/source/feature.cpp
+++ b/source/feature.cpp
@@ -3,11 +3,6 @@
 using namespace std;
 using namespace Msp;
 
-Feature::Feature(const string &n):
-       name(n)
-{ }
-
-
 Feature::Loader::Loader(Feature &f):
        Msp::DataFile::ObjectLoader<Feature>(f)
 {

diff --git a/source/feature.h b/source/feature.h
index f8ec33471de5995e255e68c048a203e8ade78be2..0dca1f524ed315cf681df464abd278a2da384879 100644 (file)
--- a/source/feature.h
+++ b/source/feature.h
@@ -20,7 +20,7 @@ struct Feature
        std::vector<std::string> choices;
        bool exported = false;
 
-       Feature(const std::string &);
+       Feature(const std::string &n): name(n) { }
 };
 
 #endif

diff --git a/source/filetarget.cpp b/source/filetarget.cpp
index 07be2c9fc806ff234fe77cd1292d4159ea44d871..a2bd3f0a1e0b1f922e2fe89feff2bd59483ca39e 100644 (file)
--- a/source/filetarget.cpp
+++ b/source/filetarget.cpp
@@ -13,14 +13,6 @@
 using namespace std;
 using namespace Msp;
 
-FileTarget::FileTarget(Builder &b, const FS::Path &a):
-       FileTarget(b, 0, a)
-{ }
-
-FileTarget::FileTarget(Builder &b, const SourcePackage &p, const FS::Path &a):
-       FileTarget(b, &p, a)
-{ }
-
 FileTarget::FileTarget(Builder &b, const SourcePackage *p, const FS::Path &a):
        Target(b, generate_name(b, p, a)),
        path(a)

diff --git a/source/filetarget.h b/source/filetarget.h
index aff1fb7a4081cad3bddb098281389bbe63d9861f..da165d0d39d1ebed128c83c0d31ce4f2a184139c 100644 (file)
--- a/source/filetarget.h
+++ b/source/filetarget.h
@@ -19,8 +19,8 @@ protected:
        bool nested_build_sig = false;
        bool arch_in_build_sig = false;
 
-       FileTarget(Builder &, const Msp::FS::Path &);
-       FileTarget(Builder &, const SourcePackage &, const Msp::FS::Path &);
+       FileTarget(Builder &b, const Msp::FS::Path &a): FileTarget(b, 0, a) { }
+       FileTarget(Builder &b, const SourcePackage &p, const Msp::FS::Path &a): FileTarget(b, &p, a) { }
 private:
        FileTarget(Builder &, const SourcePackage *, const Msp::FS::Path &);
        void stat();

diff --git a/source/importlibrary.cpp b/source/importlibrary.cpp
index 9d2ea8fae42da17f392d6913e0bdd1d8181c4121..435fb30e50218f9446b48b468791d69e90cc5a17 100644 (file)
--- a/source/importlibrary.cpp
+++ b/source/importlibrary.cpp
@@ -10,10 +10,6 @@
 using namespace std;
 using namespace Msp;
 
-ImportLibrary::ImportLibrary(Builder &b, const FS::Path &p):
-       FileTarget(b, p)
-{ }
-
 ImportLibrary::ImportLibrary(Builder &b, const Component &c, SharedLibrary &sl, ExportDefinitions &exp):
        FileTarget(b, c.get_package(), c.get_package().get_output_directory()/generate_filename(c, sl)),
        shared_lib(&sl)

diff --git a/source/importlibrary.h b/source/importlibrary.h
index e985be7c54947f0273ed870a6a187d1f1a510372..1c5d682a3be001a61fc2003b4485eeec94a94686 100644 (file)
--- a/source/importlibrary.h
+++ b/source/importlibrary.h
@@ -16,7 +16,7 @@ private:
        SharedLibrary *shared_lib = 0;
 
 public:
-       ImportLibrary(Builder &, const Msp::FS::Path &);
+       ImportLibrary(Builder &b, const Msp::FS::Path &p): FileTarget(b, p) { }
        ImportLibrary(Builder &, const Component &, SharedLibrary &, ExportDefinitions &);
 private:
        static std::string generate_filename(const Component &, const SharedLibrary &);

diff --git a/source/installcomponent.cpp b/source/installcomponent.cpp
index 319053f0ba42bbfbbf7c27fc0a112a63b2d6ac75..86919fa3255ca484f760fd9fb6013d5a2e8686a4 100644 (file)
--- a/source/installcomponent.cpp
+++ b/source/installcomponent.cpp
@@ -7,10 +7,6 @@
 using namespace std;
 using namespace Msp;
 
-InstallComponent::InstallComponent(SourcePackage &p, const string &n):
-       Component(p, n)
-{ }
-
 void InstallComponent::create_targets() const
 {
        Builder &builder = package.get_builder();

diff --git a/source/installcomponent.h b/source/installcomponent.h
index 412bd0b58c5b6cfd5ca32ac3b2c7fbc9de42c406..457256d6d14be9863672e42e7268cce5ebdb9b39 100644 (file)
--- a/source/installcomponent.h
+++ b/source/installcomponent.h
@@ -6,7 +6,7 @@
 class InstallComponent: public Component
 {
 public:
-       InstallComponent(SourcePackage &, const std::string &);
+       InstallComponent(SourcePackage &p, const std::string &n): Component(p, n) { }
 
        void create_targets() const override;
 };

diff --git a/source/internaltask.cpp b/source/internaltask.cpp
index 0f3cbc2ba603771d93df9e7a945e8fcc4de447c0..5810be12670b7cecae652ae375666926fcd45e31 100644 (file)
--- a/source/internaltask.cpp
+++ b/source/internaltask.cpp
@@ -1,9 +1,5 @@
 #include "internaltask.h"
 
-InternalTask::InternalTask(Worker *w):
-       worker(w)
-{ }
-
 InternalTask::~InternalTask()
 {
        worker->join();

diff --git a/source/internaltask.h b/source/internaltask.h
index 98b76a0bb3a904391ae4643a76104daebf4cbc25..59545192a5bc82b130820d1e5b9bf05f0e94edc7 100644 (file)
--- a/source/internaltask.h
+++ b/source/internaltask.h
@@ -29,7 +29,7 @@ private:
        Worker *worker;
 
 public:
-       InternalTask(Worker *);
+       InternalTask(Worker *w): worker(w) { }
        ~InternalTask();
 
        std::string get_command() const override { return "<internal>"; }

diff --git a/source/objcsourcefile.cpp b/source/objcsourcefile.cpp
index ed334fc17e92b63c4e63f6ddff77911678845d10..953819f55daee4ead111b84106455bcdf90e8c1e 100644 (file)
--- a/source/objcsourcefile.cpp
+++ b/source/objcsourcefile.cpp
@@ -4,14 +4,6 @@
 using namespace std;
 using namespace Msp;
 
-ObjCSourceFile::ObjCSourceFile(Builder &b, const FS::Path &p):
-       CSourceFile(b, p)
-{ }
-
-ObjCSourceFile::ObjCSourceFile(Builder &b, const Component &c, const FS::Path &p):
-       CSourceFile(b, c, p)
-{ }
-
 void ObjCSourceFile::parse_includes(IO::Base &in)
 {
        static Regex r_include("^[ \t]*#(include|import)[ \t]+([\"<].*)[\">]");

diff --git a/source/objcsourcefile.h b/source/objcsourcefile.h
index fda3d293ed8079d452eb6452ffd7a029449d5c14..37f79a3f1f1b9d852857859ef900bb92cd5f185f 100644 (file)
--- a/source/objcsourcefile.h
+++ b/source/objcsourcefile.h
@@ -9,8 +9,7 @@ Represents an Objective-C source file.
 class ObjCSourceFile: public CSourceFile
 {
 public:
-       ObjCSourceFile(Builder &, const Msp::FS::Path &);
-       ObjCSourceFile(Builder &, const Component &, const Msp::FS::Path &);
+       using CSourceFile::CSourceFile;
 
        const char *get_type() const override { return "ObjCSourceFile"; }
 

diff --git a/source/packagemanager.cpp b/source/packagemanager.cpp
index 9e53bb422034e8714d970493e7de8768ac677f9a..37374b6ef05ea6e8c18ad5c7c92f868db8dee0bb 100644 (file)
--- a/source/packagemanager.cpp
+++ b/source/packagemanager.cpp
@@ -16,10 +16,6 @@
 using namespace std;
 using namespace Msp;
 
-PackageManager::PackageManager(Builder &b):
-       builder(b)
-{ }
-
 PackageManager::~PackageManager()
 {
        for(const auto &kvp: packages)

diff --git a/source/packagemanager.h b/source/packagemanager.h
index 22f1eacfbbe6eaf3eabce855ed69aa2350dc4ceb..fc0aa982e38fd4666800c867b482c07ab1a7b560 100644 (file)
--- a/source/packagemanager.h
+++ b/source/packagemanager.h
@@ -29,7 +29,7 @@ private:
        bool env_set = false;
 
 public:
-       PackageManager(Builder &);
+       PackageManager(Builder &b): builder(b) { }
        ~PackageManager();
 
        /// Adds a location to look for source packages from.

diff --git a/source/pkgconfiggenerator.cpp b/source/pkgconfiggenerator.cpp
index f042ec5f25a32d502849379d88c762f300494e8c..02f142331a124c8d4db38e8df0b630a28afd8ba7 100644 (file)
--- a/source/pkgconfiggenerator.cpp
+++ b/source/pkgconfiggenerator.cpp
@@ -8,11 +8,6 @@
 using namespace std;
 using namespace Msp;
 
-PkgConfigGenerator::PkgConfigGenerator(Builder &b):
-       Tool(b, "PCG")
-{
-}
-
 Target *PkgConfigGenerator::create_target(const vector<Target *> &, const string &)
 {
        throw logic_error("Not implemented");
@@ -26,10 +21,6 @@ Task *PkgConfigGenerator::run(const Target &target) const
 }
 
 
-PkgConfigGenerator::Worker::Worker(const PkgConfigFile &t):
-       target(t)
-{ }
-
 void PkgConfigGenerator::Worker::main()
 {
        Builder &builder = target.get_package()->get_builder();

diff --git a/source/pkgconfiggenerator.h b/source/pkgconfiggenerator.h
index 3b28e3f1e94907c22c8896b7e179a7f83385137e..727b3e29536e0e24c14cb42c054d3d8179e05ca4 100644 (file)
--- a/source/pkgconfiggenerator.h
+++ b/source/pkgconfiggenerator.h
@@ -15,7 +15,7 @@ private:
                const PkgConfigFile ⌖
 
        public:
-               Worker(const PkgConfigFile &);
+               Worker(const PkgConfigFile &t): target(t) { }
 
        private:
                void main() override;
@@ -24,7 +24,7 @@ private:
        };
 
 public:
-       PkgConfigGenerator(Builder &);
+       PkgConfigGenerator(Builder &b): Tool(b, "PCG") { }
 
        Target *create_target(const std::vector<Target *> &, const std::string &) override;
        Task *run(const Target &) const override;

diff --git a/source/sourcefile.cpp b/source/sourcefile.cpp
index 1dcfd2e6b3c7b588088a03d703aa9d3a24224154..b5b84c71694a6e1f0fdcd5ddd0347970f4897f74 100644 (file)
--- a/source/sourcefile.cpp
+++ b/source/sourcefile.cpp
@@ -2,10 +2,6 @@
 #include "sourcefile.h"
 #include "sourcepackage.h"
 
-SourceFile::SourceFile(Builder &b, const Msp::FS::Path &p):
-       FileTarget(b, p)
-{ }
-
 SourceFile::SourceFile(Builder &b, const Component &c, const Msp::FS::Path &p):
        FileTarget(b, c.get_package(), p)
 {

diff --git a/source/sourcefile.h b/source/sourcefile.h
index bdb657f83345171ffcdb608c176f525da5431c90..16521a5576e60fd8e384bb70ffc239d37ab554b2 100644 (file)
--- a/source/sourcefile.h
+++ b/source/sourcefile.h
@@ -6,7 +6,7 @@
 class SourceFile: public FileTarget
 {
 protected:
-       SourceFile(Builder &, const Msp::FS::Path &);
+       SourceFile(Builder &b, const Msp::FS::Path &p): FileTarget(b, p) { }
        SourceFile(Builder &, const Component &, const Msp::FS::Path &);
 };
 

diff --git a/source/staticlibrary.cpp b/source/staticlibrary.cpp
index c51596685d8927debc0afb5e5bb481b327f2dffb..039eb8e7e52c117a8e5b3dfa14bbf25b1064ddbd 100644 (file)
--- a/source/staticlibrary.cpp
+++ b/source/staticlibrary.cpp
@@ -7,10 +7,6 @@
 using namespace std;
 using namespace Msp;
 
-StaticLibrary::StaticLibrary(Builder &b, const FS::Path &p):
-       FileTarget(b, p)
-{ }
-
 StaticLibrary::StaticLibrary(Builder &b, const Component &c, const vector<ObjectFile *> &objs):
        FileTarget(b, c.get_package(), c.get_package().get_output_directory()/generate_filename(c))
 {

diff --git a/source/staticlibrary.h b/source/staticlibrary.h
index 6b52871437f1a9ddbfc1c3e5de6a8060cb52e683..98d299026bc366aed45ab21568530b02e82b84f2 100644 (file)
--- a/source/staticlibrary.h
+++ b/source/staticlibrary.h
@@ -18,7 +18,7 @@ private:
        BuildInfo build_info;
 
 public:
-       StaticLibrary(Builder &, const Msp::FS::Path &);
+       StaticLibrary(Builder &b, const Msp::FS::Path &p): FileTarget(b, p) { }
        StaticLibrary(Builder &, const Component &, const std::vector<ObjectFile *> &);
 private:
        static std::string generate_filename(const Component &);

diff --git a/source/templatefile.cpp b/source/templatefile.cpp
deleted file mode 100644 (file)
index f5bfcb5..0000000
--- a/source/templatefile.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "templatefile.h"
-
-using namespace Msp;
-
-TemplateFile::TemplateFile(Builder &b, const Component &c, const FS::Path &p):
-       SourceFile(b, c, p)
-{ }

diff --git a/source/templatefile.h b/source/templatefile.h
index cb2841eb535635d1b3bb764d206f66d9db017604..091202590e65effa6d257a56f06a24a0baf7a74b 100644 (file)
--- a/source/templatefile.h
+++ b/source/templatefile.h
@@ -9,7 +9,7 @@ Input file for SourceGenerator.
 class TemplateFile: public SourceFile
 {
 public:
-       TemplateFile(Builder &, const Component &, const Msp::FS::Path &);
+       TemplateFile(Builder &b, const Component &c, const Msp::FS::Path &p): SourceFile(b, c, p) { }
 
        const char *get_type() const override { return "TemplateFile"; }
 };

diff --git a/source/tool.cpp b/source/tool.cpp
index 5d0903a2e3c4eb44902ccd9d178c5aa207655e6a..852fa2d5805b294b4d74b5a5ab165039b08feaad 100644 (file)
--- a/source/tool.cpp
+++ b/source/tool.cpp
@@ -9,20 +9,6 @@
 using namespace std;
 using namespace Msp;
 
-Tool::Tool(Builder &b, const string &t):
-       Tool(b, 0, t)
-{ }
-
-Tool::Tool(Builder &b, const Architecture &a, const string &t):
-       Tool(b, &a, t)
-{ }
-
-Tool::Tool(Builder &b, const Architecture *a, const string &t):
-       builder(b),
-       architecture(a),
-       tag(t)
-{ }
-
 void Tool::set_command(const string &cmd, bool cross)
 {
        if(cmd.empty())
@@ -73,11 +59,6 @@ string Tool::create_build_signature(const BuildInfo &) const
 }
 
 
-SubTool::SubTool(Tool &p):
-       Tool(p),
-       parent(p)
-{ }
-
 Target *SubTool::create_source(const Component &c, const FS::Path &p) const
 {
        return parent.create_source(c, p);

diff --git a/source/tool.h b/source/tool.h
index e1bef2d8652031324338de553b5c46689213a194..6fa4fb5c127090bf81a0ded5574c14bd2aa0bc69 100644 (file)
--- a/source/tool.h
+++ b/source/tool.h
@@ -43,10 +43,10 @@ protected:
        bool prepared = false;
        std::vector<std::string> problems;
 
-       Tool(Builder &, const std::string &);
-       Tool(Builder &, const Architecture &, const std::string &);
+       Tool(Builder &b, const std::string &t): Tool(b, 0, t) { }
+       Tool(Builder &b, const Architecture &a, const std::string &t): Tool(b, &a, t) { }
 private:
-       Tool(Builder &, const Architecture *, const std::string &);
+       Tool(Builder &b, const Architecture *a, const std::string &t): builder(b), architecture(a), tag(t) { }
 public:
        virtual ~Tool() { }
 
@@ -133,7 +133,7 @@ class SubTool: public Tool
 protected:
        Tool &parent;
 
-       SubTool(Tool &);
+       SubTool(Tool &t): Tool(t), parent(t) { }
 
 public:
        Target *create_source(const Component &, const Msp::FS::Path &) const override;

diff --git a/source/vcxprojectgenerator.cpp b/source/vcxprojectgenerator.cpp
index 93c0eb49f7a6076608dd0cde22846492b94fbe36..1528802eddc45e811cce4bc4fb8918644b24bc93 100644 (file)
--- a/source/vcxprojectgenerator.cpp
+++ b/source/vcxprojectgenerator.cpp
@@ -12,10 +12,6 @@
 using namespace std;
 using namespace Msp;
 
-VcxProjectGenerator::VcxProjectGenerator(Builder &b):
-       Tool(b, "VCXG")
-{ }
-
 Target *VcxProjectGenerator::create_target(const vector<Target *> &, const string &)
 {
        throw logic_error("Not implemented");
@@ -29,10 +25,6 @@ Task *VcxProjectGenerator::run(const Target &target) const
 }
 
 
-VcxProjectGenerator::Worker::Worker(const VcxProjectFile &t):
-       target(t)
-{ }
-
 void VcxProjectGenerator::Worker::main()
 {
        const SourcePackage &spkg = *target.get_package();

diff --git a/source/vcxprojectgenerator.h b/source/vcxprojectgenerator.h
index a7feb1a859b97e99c7b1d3a8333f39f77f73e412..bf06f400b4fa4308de3cfd4bf74b9ff0efbcf48a 100644 (file)
--- a/source/vcxprojectgenerator.h
+++ b/source/vcxprojectgenerator.h
@@ -15,14 +15,14 @@ private:
                const VcxProjectFile ⌖
 
        public:
-               Worker(const VcxProjectFile &);
+               Worker(const VcxProjectFile &t): target(t) { }
 
        private:
                void main() override;
        };
 
 public:
-       VcxProjectGenerator(Builder &);
+       VcxProjectGenerator(Builder &b): Tool(b, "VCXG") { }
 
        Target *create_target(const std::vector<Target *> &, const std::string &) override;
        Task *run(const Target &) const override;

diff --git a/source/virtualfilesystem.cpp b/source/virtualfilesystem.cpp
index d3bc708faf99cbf25944d764f7054d40c643be00..16d4de8584a37dab7e8c2d426d8125fb56569351 100644 (file)
--- a/source/virtualfilesystem.cpp
+++ b/source/virtualfilesystem.cpp
@@ -15,11 +15,6 @@
 using namespace std;
 using namespace Msp;
 
-VirtualFileSystem::VirtualFileSystem(Builder &b):
-       builder(b)
-{
-}
-
 FileTarget *VirtualFileSystem::get_target(const FS::Path &p) const
 {
        auto i = targets.find(p.str());

diff --git a/source/virtualfilesystem.h b/source/virtualfilesystem.h
index 4aa20d4b158d1ac8985a46b0383d6c00938b2276..60e198ad3b2dcf866c2be8f67094e054edf146e9 100644 (file)
--- a/source/virtualfilesystem.h
+++ b/source/virtualfilesystem.h
@@ -29,7 +29,7 @@ private:
        SearchPath sys_bin_path;
 
 public:
-       VirtualFileSystem(Builder &);
+       VirtualFileSystem(Builder &b): builder(b) { }
 
        /** Gets an existing target associated with a path.  If no target has claimed
        that path, 0 is returned. */

diff --git a/source/virtualtarget.cpp b/source/virtualtarget.cpp
index 44a352421270c5f7b2581c3c34973d583d6c69c7..07177d86057387ad4feefc2dfcdfca885a81b1e0 100644 (file)
--- a/source/virtualtarget.cpp
+++ b/source/virtualtarget.cpp
@@ -7,10 +7,6 @@
 using namespace std;
 using namespace Msp;
 
-VirtualTarget::VirtualTarget(Builder &b, const string &n):
-       Target(b, n)
-{ }
-
 void VirtualTarget::check_rebuild()
 {
        // Virtual targets are only rebuilt if their dependencies need rebuilding.

diff --git a/source/virtualtarget.h b/source/virtualtarget.h
index 50d1274ff9a9b6b25b9a8a17e3ffc14be334743e..5151826df9a7bda482b9c1a5498828c09516d810 100644 (file)
--- a/source/virtualtarget.h
+++ b/source/virtualtarget.h
@@ -9,7 +9,7 @@ A target that is not associated with any file.
 class VirtualTarget: public Target
 {
 public:
-       VirtualTarget(Builder &, const std::string &);
+       VirtualTarget(Builder &b, const std::string &n): Target(b, n) { }
 
        const char *get_type() const override { return "VirtualTarget"; }
 private:

diff --git a/source/vssolutiongenerator.cpp b/source/vssolutiongenerator.cpp
index a810cab42f070ed6e2301ec6b2451f3f4833248f..9f8a7ab9f936ed52aec9a5cb61166add543d0e4b 100644 (file)
--- a/source/vssolutiongenerator.cpp
+++ b/source/vssolutiongenerator.cpp
@@ -10,10 +10,6 @@
 using namespace std;
 using namespace Msp;
 
-VsSolutionGenerator::VsSolutionGenerator(Builder &b):
-       Tool(b, "VSSG")
-{ }
-
 Target *VsSolutionGenerator::create_target(const vector<Target *> &, const string &)
 {
        throw logic_error("Not implemented");
@@ -27,10 +23,6 @@ Task *VsSolutionGenerator::run(const Target &target) const
 }
 
 
-VsSolutionGenerator::Worker::Worker(const VsSolutionFile &t):
-       target(t)
-{ }
-
 void VsSolutionGenerator::Worker::main()
 {
        const SourcePackage &spkg = *target.get_package();

diff --git a/source/vssolutiongenerator.h b/source/vssolutiongenerator.h
index 14eae5fd7ee10207f5218d7af4703d6811b2b110..68d581f501d171a63cf9d9a2451d67df6dcd2c68 100644 (file)
--- a/source/vssolutiongenerator.h
+++ b/source/vssolutiongenerator.h
@@ -15,14 +15,14 @@ private:
                const VsSolutionFile ⌖
 
        public:
-               Worker(const VsSolutionFile &);
+               Worker(const VsSolutionFile &t): target(t) { }
 
        private:
                void main() override;
        };
 
 public:
-       VsSolutionGenerator(Builder &);
+       VsSolutionGenerator(Builder &b): Tool(b, "VSSG") { }
 
        Target *create_target(const std::vector<Target *> &, const std::string &) override;
        Task *run(const Target &) const override;