Mark overridden virtual functions as such

diff --git a/source/androidapplicationcomponent.h b/source/androidapplicationcomponent.h
index af465e50cabc2ece4f9ad4f43ceeaa37abfddcb8..017467f20df897a9a58399d550c6065ae4ce93d0 100644 (file)
--- a/source/androidapplicationcomponent.h
+++ b/source/androidapplicationcomponent.h
@@ -23,7 +23,7 @@ private:
 public:
        AndroidApplicationComponent(SourcePackage &, const std::string &);
 
-       virtual void create_targets() const;
+       void create_targets() const override;
 };
 
 #endif

diff --git a/source/androidassetpackagingtool.h b/source/androidassetpackagingtool.h
index 13660875f843c91c1226c02036e8dfa02352e331..639da92359ccd09b958cd838caaad1bd988022f3 100644 (file)
--- a/source/androidassetpackagingtool.h
+++ b/source/androidassetpackagingtool.h
@@ -13,8 +13,8 @@ private:
 public:
        AndroidAssetPackagingTool(Builder &, const AndroidSdk &);
 
-       virtual Target *create_target(const std::list<Target *> &, const std::string &);
-       virtual Task *run(const Target &) const;
+       Target *create_target(const std::list<Target *> &, const std::string &) override;
+       Task *run(const Target &) const override;
 };
 
 #endif

diff --git a/source/androidcompiler.h b/source/androidcompiler.h
index dbd2da6e05f55fcabde6608fdd29211228a04ceb..d03c4fd904b105524b9d1c12cb95e8d4c1a3c9ce 100644 (file)
--- a/source/androidcompiler.h
+++ b/source/androidcompiler.h
@@ -14,7 +14,7 @@ public:
        AndroidCompiler(Builder &, const Architecture &, const std::string &, const AndroidNdk &);
 
 protected:
-       virtual void do_prepare();
+       void do_prepare() override;
 };
 
 #endif

diff --git a/source/androidlinker.h b/source/androidlinker.h
index 2c9ea725011e201a31ab365d300799656f5f4b41..9d880d274aa0622bf2a4627148c200742bfd3dfe 100644 (file)
--- a/source/androidlinker.h
+++ b/source/androidlinker.h
@@ -10,7 +10,7 @@ class AndroidLinker: public GnuLinker
 public:
        AndroidLinker(Builder &, const Architecture &, const AndroidNdk &);
 
-       virtual Target *create_target(const std::list<Target *> &, const std::string &);
+       Target *create_target(const std::list<Target *> &, const std::string &) override;
 };
 
 #endif

diff --git a/source/androidmanifestfile.h b/source/androidmanifestfile.h
index 8bd5fe3803f7468894ae6229b82b70e502ded002..8f1af504373dda15a68251cc895b780a39655d6d 100644 (file)
--- a/source/androidmanifestfile.h
+++ b/source/androidmanifestfile.h
@@ -20,7 +20,7 @@ private:
 public:
        AndroidManifestFile(Builder &, const AndroidApplicationComponent &);
 
-       virtual const char *get_type() const { return "AndroidManifestFile"; }
+       const char *get_type() const override { return "AndroidManifestFile"; }
 
        void set_native_library(SharedLibrary *);
        SharedLibrary *get_native_library() const { return native_lib; }

diff --git a/source/androidmanifestgenerator.h b/source/androidmanifestgenerator.h
index f0d4269cbd6f8371b18d12a57cba60babf04d241..c2c2a95741a2ea886b82eb2f8b53924da1895ad8 100644 (file)
--- a/source/androidmanifestgenerator.h
+++ b/source/androidmanifestgenerator.h
@@ -18,14 +18,14 @@ private:
                Worker(const AndroidManifestFile &);
 
        private:
-               virtual void main();
+               void main() override;
        };
 
 public:
        AndroidManifestGenerator(Builder &);
 
-       virtual Target *create_target(const std::list<Target *> &, const std::string &);
-       virtual Task *run(const Target &) const;
+       Target *create_target(const std::list<Target *> &, const std::string &) override;
+       Task *run(const Target &) const override;
 };
 
 #endif

diff --git a/source/androidpackagefile.h b/source/androidpackagefile.h
index 4f1c692bf2c90e07658e8406aee88dd8782dcdba..644b5d46163fcf30a2579552c62a1b678e9b9222 100644 (file)
--- a/source/androidpackagefile.h
+++ b/source/androidpackagefile.h
@@ -10,7 +10,7 @@ class AndroidPackageFile: public FileTarget
 public:
        AndroidPackageFile(Builder &, const Component &, AndroidResourceBundle &, const std::list<FileTarget *> &);
 
-       virtual const char *get_type() const { return "AndroidPackageFile"; }
+       const char *get_type() const override { return "AndroidPackageFile"; }
 };
 
 #endif

diff --git a/source/androidresourcebundle.h b/source/androidresourcebundle.h
index 253b44bacb0cfb3fa4bb36326db92656d4ef75a8..92fc2b854cbb62dbbc539a341db2baed78a0b6bf 100644 (file)
--- a/source/androidresourcebundle.h
+++ b/source/androidresourcebundle.h
@@ -10,7 +10,7 @@ class AndroidResourceBundle: public FileTarget
 public:
        AndroidResourceBundle(Builder &, const Component &, AndroidManifestFile &, const std::list<FileTarget *> &);
 
-       virtual const char *get_type() const { return "AndroidResourceBundle"; }
+       const char *get_type() const override { return "AndroidResourceBundle"; }
 };
 
 #endif

diff --git a/source/androidresourcefile.h b/source/androidresourcefile.h
index 5f3cd3a62e7dc09dfd11a51781c056c17dbb9c89..162026ce5bb4afe4d3600c17d3265909fecff4ed 100644 (file)
--- a/source/androidresourcefile.h
+++ b/source/androidresourcefile.h
@@ -14,7 +14,7 @@ private:
 public:
        AndroidResourceFile(Builder &, const Component &, const Msp::FS::Path &);
 
-       virtual const char *get_type() const { return "AndroidResourceFile"; }
+       const char *get_type() const override { return "AndroidResourceFile"; }
 };
 
 #endif

diff --git a/source/androidtools.h b/source/androidtools.h
index dfa8a11a09946ba4a1020a298ee99e00b0688958..bef95f8abea4eecae75cd6a531957663217eb51e 100644 (file)
--- a/source/androidtools.h
+++ b/source/androidtools.h
@@ -38,7 +38,7 @@ public:
 
 private:
        void find_build_tools_dir();
-       virtual void init_api_level(unsigned);
+       void init_api_level(unsigned) override;
 
 public:
        const Msp::FS::Path &get_build_tools_dir() const { return build_tools_dir; }
@@ -59,7 +59,7 @@ private:
        static Msp::FS::Path create_default_path(const AndroidSdk &);
 
        void find_toolchain_dir();
-       virtual void init_api_level(unsigned);
+       void init_api_level(unsigned) override;
 
 public:
        const Msp::FS::Path &get_bin_dir() const { return bin_dir; }

diff --git a/source/apkbuilder.h b/source/apkbuilder.h
index 7b73aa7620601be5d169035011c91bf55e319237..673063e61287ca202420b71ab7548e71c68cbf95 100644 (file)
--- a/source/apkbuilder.h
+++ b/source/apkbuilder.h
@@ -11,11 +11,11 @@ private:
 public:
        ApkBuilder(Builder &);
 
-       virtual Target *create_target(const std::list<Target *> &, const std::string &);
+       Target *create_target(const std::list<Target *> &, const std::string &) override;
 protected:
-       virtual void do_prepare();
+       void do_prepare() override;
 public:
-       virtual Task *run(const Target &) const;
+       Task *run(const Target &) const override;
 };
 
 #endif

diff --git a/source/binary.h b/source/binary.h
index d763dd572f97b084a9f9c7aa0b5bd831eaa632ac..a8d10f0384008a9599a8a001b5a6c87294e63ca2 100644 (file)
--- a/source/binary.h
+++ b/source/binary.h
@@ -23,10 +23,10 @@ protected:
        Binary(Builder &, const Component &, const std::string &, const std::list<ObjectFile *> &);
 
 public:
-       virtual void collect_build_info(BuildInfo &) const;
+       void collect_build_info(BuildInfo &) const override;
 
 protected:
-       virtual void find_dependencies();
+       void find_dependencies() override;
 };
 
 #endif

diff --git a/source/binarycomponent.h b/source/binarycomponent.h
index 3a6affd18e32c20ddc95f131a04e101aa034bd6d..7c8453420b2cd1cbef60f9cf53829507898e577a 100644 (file)
--- a/source/binarycomponent.h
+++ b/source/binarycomponent.h
@@ -32,9 +32,9 @@ public:
 
        Type get_type() const { return type; }
 
-       virtual void create_build_info();
-       virtual void update_exported_build_info(BuildInfo &) const;
-       virtual void create_targets() const;
+       void create_build_info() override;
+       void update_exported_build_info(BuildInfo &) const override;
+       void create_targets() const override;
 };
 
 #endif

diff --git a/source/binarypackage.h b/source/binarypackage.h
index b8c29de772e45610d9078de5ea0225c8ce961349..f015ee55de9dbcf76386bfaa3b7aa9737d7dadc5 100644 (file)
--- a/source/binarypackage.h
+++ b/source/binarypackage.h
@@ -36,7 +36,7 @@ public:
        static BinaryPackage *from_flags(Builder &, const std::string &, const Flags &, const Flags & = Flags());
 private:
        static void process_flags(const Flags &, BuildInfo &);
-       virtual void do_prepare();
+       void do_prepare() override;
 };
 
 #endif

diff --git a/source/buildercli.h b/source/buildercli.h
index efc2cc9bdc5431d4541ac2903d1d79a7c0c5835c..77e58ca9b472c2081fca80946b2a267229633096 100644 (file)
--- a/source/buildercli.h
+++ b/source/buildercli.h
@@ -39,7 +39,7 @@ public:
        BuilderCLI(int, char **);
        ~BuilderCLI();
 
-       virtual int main();
+       int main() override;
 
 private:
        bool prepare_build();

diff --git a/source/chainedtask.h b/source/chainedtask.h
index 2014f02f384f8c79518b5148740cd81c5c3b20b1..4cb677c84aaceb2f6f3934310ecbb038bca0848f 100644 (file)
--- a/source/chainedtask.h
+++ b/source/chainedtask.h
@@ -21,10 +21,10 @@ public:
 
        void add_task(Task *);
 
-       virtual std::string get_command() const;
-       virtual void start();
-       virtual Status check();
-       virtual Status wait();
+       std::string get_command() const override;
+       void start() override;
+       Status check() override;
+       Status wait() override;
 private:
        bool process(Status);
 };

diff --git a/source/compilecommandsgenerator.h b/source/compilecommandsgenerator.h
index ba74f1119e5425447462a7440af6b7c72482b1b2..29bb0432ec53afd76280d8203a6f3d5e227269fb 100644 (file)
--- a/source/compilecommandsgenerator.h
+++ b/source/compilecommandsgenerator.h
@@ -18,14 +18,14 @@ private:
                Worker(const CompileCommandsJson &);
 
        private:
-               virtual void main();
+               void main() override;
        };
 
 public:
        CompileCommandsGenerator(Builder &);
 
-       virtual Target *create_target(const std::list<Target *> &, const std::string &);
-       virtual Task *run(const Target &) const;
+       Target *create_target(const std::list<Target *> &, const std::string &) override;
+       Task *run(const Target &) const override;
 };
 
 #endif

diff --git a/source/compilecommandsjson.h b/source/compilecommandsjson.h
index 1d170c582d2c9c7c57c49269720d41c3be86748a..8798849065d127ea7ce9d0fd7c8801ef453eeb05 100644 (file)
--- a/source/compilecommandsjson.h
+++ b/source/compilecommandsjson.h
@@ -11,10 +11,10 @@ private:
 public:
        CompileCommandsJson(Builder &, const SourcePackage &);
 
-       virtual const char *get_type() const { return "CompileCommandsJson"; }
+       const char *get_type() const override { return "CompileCommandsJson"; }
 
 protected:
-       virtual void find_dependencies();
+       void find_dependencies() override;
 };
 
 #endif

diff --git a/source/copy.h b/source/copy.h
index dedd0f57a0e3aa41607d67b0f6d16c10c6fa799a..6353ab166b27412192c42ec0898b32cc1a3cfdc3 100644 (file)
--- a/source/copy.h
+++ b/source/copy.h
@@ -25,14 +25,14 @@ private:
        public:
                Worker(const InstalledFile &);
        private:
-               virtual void main();
+               void main() override;
        };
 
 public:
        Copy(Builder &);
 
-       virtual Target *create_target(const std::list<Target *> &, const std::string &);
-       virtual Task *run(const Target &) const;
+       Target *create_target(const std::list<Target *> &, const std::string &) override;
+       Task *run(const Target &) const override;
 };
 
 #endif

diff --git a/source/csourcefile.h b/source/csourcefile.h
index dce6e19c7a478bbbe3744811800de844a71f1e87..55809b094c71e3babf04a77f308d6346aeb01d8a 100644 (file)
--- a/source/csourcefile.h
+++ b/source/csourcefile.h
@@ -19,12 +19,12 @@ public:
        CSourceFile(Builder &, const Msp::FS::Path &);
        CSourceFile(Builder &, const Component &, const Msp::FS::Path &);
 
-       virtual const char *get_type() const { return "CSourceFile"; }
+       const char *get_type() const override { return "CSourceFile"; }
        const IncludeList &get_includes() const { return includes; }
 protected:
        virtual void parse_includes(Msp::IO::Base &);
-       virtual void find_dependencies();
-       virtual void modified();
+       void find_dependencies() override;
+       void modified() override;
 };
 
 #endif

diff --git a/source/datacollection.h b/source/datacollection.h
index b86da0762a90350ee7cd594437c87b1e248f3e6d..aeb270f4f11b3a92c73e51102c781d3f70c58c71 100644 (file)
--- a/source/datacollection.h
+++ b/source/datacollection.h
@@ -16,11 +16,11 @@ private:
        static Msp::FS::Path generate_target_path(const Component &, const Msp::FS::Path &);
 
 public:
-       virtual const char *get_type() const { return "DataCollection"; }
+       const char *get_type() const override { return "DataCollection"; }
        DataTransform &get_source() const { return source; }
 
 private:
-       virtual void find_dependencies();
+       void find_dependencies() override;
 };
 
 #endif

diff --git a/source/datapack.h b/source/datapack.h
index d2f667a3e9c66a0eabed5fc63247150d610934a3..81b2e9ed98156449e09552a0bfd5872ab54e09e4 100644 (file)
--- a/source/datapack.h
+++ b/source/datapack.h
@@ -16,7 +16,7 @@ private:
        static Msp::FS::Path generate_target_path(const Component &);
 
 public:
-       virtual const char *get_type() const { return "DataPack"; }
+       const char *get_type() const override { return "DataPack"; }
 
        const FileList &get_files() const { return files; }
 };

diff --git a/source/datapackcomponent.h b/source/datapackcomponent.h
index 75b99a6ecd986f438cd98835195519e6fd27b744..75eda738dec807c5a4bd9c90603a2d5942087487 100644 (file)
--- a/source/datapackcomponent.h
+++ b/source/datapackcomponent.h
@@ -8,7 +8,7 @@ class DataPackComponent: public Component
 public:
        DataPackComponent(SourcePackage &, const std::string &);
 
-       virtual void create_targets() const;
+       void create_targets() const override;
 };
 
 #endif

diff --git a/source/datasourcefile.h b/source/datasourcefile.h
index 23c254366b34ee116760585e1794298c5b99cf47..64093b5d31a405a620394d1d1fcfd45ffced8bcd 100644 (file)
--- a/source/datasourcefile.h
+++ b/source/datasourcefile.h
@@ -9,7 +9,7 @@ public:
        DataSourceFile(Builder &, const Msp::FS::Path &);
        DataSourceFile(Builder &, const Component &, const Msp::FS::Path &);
 
-       virtual const char *get_type() const { return "DataSourceFile"; }
+       const char *get_type() const override { return "DataSourceFile"; }
 };
 
 #endif

diff --git a/source/datatool.h b/source/datatool.h
index e89861240a78291edd647d4fe3d8b4f084ee8499..7996ab57b36c96e3f8016a8fbc328c9be8be3e5b 100644 (file)
--- a/source/datatool.h
+++ b/source/datatool.h
@@ -8,10 +8,10 @@ class DataTool: public Tool
 public:
        DataTool(Builder &);
 
-       virtual Target *create_source(const Component &, const Msp::FS::Path &) const;
-       virtual Target *create_target(const std::list<Target *> &, const std::string &);
-       virtual std::string create_build_signature(const BuildInfo &) const;
-       virtual Task *run(const Target &) const;
+       Target *create_source(const Component &, const Msp::FS::Path &) const override;
+       Target *create_target(const std::list<Target *> &, const std::string &) override;
+       std::string create_build_signature(const BuildInfo &) const override;
+       Task *run(const Target &) const override;
 };
 
 #endif

diff --git a/source/datatransform.h b/source/datatransform.h
index b39eacd881ef2e7a32d4d54e7dc99a71b474f8fb..f024973b76996b5fb2c0fff57dadf324ad318dd1 100644 (file)
--- a/source/datatransform.h
+++ b/source/datatransform.h
@@ -11,10 +11,10 @@ private:
 public:
        DataTransform(Builder &, const Component &, const Msp::FS::Path &);
 
-       virtual const char *get_type() const { return "DataTransform"; }
+       const char *get_type() const override { return "DataTransform"; }
 
 private:
-       virtual void find_dependencies();
+       void find_dependencies() override;
 };
 
 #endif

diff --git a/source/executable.h b/source/executable.h
index a8950f11f1336d53ef7ed5a991809dcdb09b4d7e..e9c99abf5d63e1998df28b78a4024d8ce6131194 100644 (file)
--- a/source/executable.h
+++ b/source/executable.h
@@ -9,7 +9,7 @@ public:
        Executable(Builder &, const Msp::FS::Path &);
        Executable(Builder &, const Component &, const std::list<ObjectFile *> &);
 
-       virtual const char *get_type() const { return "Executable"; }
+       const char *get_type() const override { return "Executable"; }
 };
 
 #endif

diff --git a/source/exportdefinitions.h b/source/exportdefinitions.h
index 22ba94bfbcc7fba2685b8759a9bb3978a51c7007..3e7a9943fe8afe46e8aae1d0e10d944efeb17a70 100644 (file)
--- a/source/exportdefinitions.h
+++ b/source/exportdefinitions.h
@@ -16,7 +16,7 @@ private:
        static Msp::FS::Path generate_target_path(const Component &);
 
 public:
-       virtual const char *get_type() const { return "ExportDefinitions"; }
+       const char *get_type() const override { return "ExportDefinitions"; }
 };
 
 #endif

diff --git a/source/externaltask.h b/source/externaltask.h
index 26a6acabe569356e630e109289ed8cb8e80e0546..80796139da36d9bf27b62f731d3dbc5b3aea3233 100644 (file)
--- a/source/externaltask.h
+++ b/source/externaltask.h
@@ -45,12 +45,12 @@ public:
        name.  If the working directory is not specified, no chdir is done. */
        ExternalTask(const Arguments &, const Msp::FS::Path & = Msp::FS::Path());
 
-       virtual ~ExternalTask();
+       ~ExternalTask();
 
-       virtual std::string get_command() const;
-       virtual void start();
-       virtual Status check();
-       virtual Status wait();
+       std::string get_command() const override;
+       void start() override;
+       Status check() override;
+       Status wait() override;
 private:
        Status do_wait(bool);
 

diff --git a/source/file.h b/source/file.h
index 5a216a9655b6aa65f4661db814e1c9ab381c705e..42d73b8c8366f29d056ff019c2b9c219527230b9 100644 (file)
--- a/source/file.h
+++ b/source/file.h
@@ -12,7 +12,7 @@ public:
        File(Builder &b, const Msp::FS::Path &t): FileTarget(b, t) { }
        File(Builder &b, const SourcePackage &p, const Msp::FS::Path &t): FileTarget(b, p, t) { }
 
-       virtual const char *get_type() const { return "File"; }
+       const char *get_type() const override { return "File"; }
 };
 
 #endif

diff --git a/source/filetarget.h b/source/filetarget.h
index 976590f4b67d15a96da867e046d4e9ac62fa3354..5c11b5cfc4e7de82bb45cd1dabc06b882d5038e8 100644 (file)
--- a/source/filetarget.h
+++ b/source/filetarget.h
@@ -39,16 +39,16 @@ public:
        void touch();
 
 protected:
-       virtual void check_rebuild();
+       void check_rebuild() override;
 
        virtual std::string create_build_signature() const;
 
-       virtual void build(Task &);
+       void build(Task &) override;
 
-       virtual void build_finished(bool);
+       void build_finished(bool) override;
 
 public:
-       virtual void clean();
+       void clean() override;
 };
 
 #endif

diff --git a/source/gnuarchiver.h b/source/gnuarchiver.h
index f7d90ab4df675c4835894f1de69a4e5120addf66..ce3906da228226a766ce2c809ae3b97156f0d564 100644 (file)
--- a/source/gnuarchiver.h
+++ b/source/gnuarchiver.h
@@ -8,9 +8,9 @@ class GnuArchiver: public Tool
 public:
        GnuArchiver(Builder &, const Architecture &);
 
-       virtual Target *create_target(const std::list<Target *> &, const std::string &);
-       virtual std::string create_build_signature(const BuildInfo &) const;
-       virtual Task *run(const Target &) const;
+       Target *create_target(const std::list<Target *> &, const std::string &) override;
+       std::string create_build_signature(const BuildInfo &) const override;
+       Task *run(const Target &) const override;
 };
 
 #endif

diff --git a/source/gnucompiler.h b/source/gnucompiler.h
index 9f5386d13a856df90a0a777f0a9cb94a802f3e4c..9f81ac8961588598d1cefd767bf2ca3f23c20ca6 100644 (file)
--- a/source/gnucompiler.h
+++ b/source/gnucompiler.h
@@ -18,17 +18,17 @@ protected:
 public:
        GnuCompiler(Builder &, const Architecture &, const std::string &);
 
-       virtual Target *create_source(const Component &, const Msp::FS::Path &) const;
-       virtual Target *create_source(const Msp::FS::Path &) const;
-       virtual Target *create_target(const std::list<Target *> &, const std::string &);
-       virtual std::string create_build_signature(const BuildInfo &) const;
+       Target *create_source(const Component &, const Msp::FS::Path &) const override;
+       Target *create_source(const Msp::FS::Path &) const override;
+       Target *create_target(const std::list<Target *> &, const std::string &) override;
+       std::string create_build_signature(const BuildInfo &) const override;
 protected:
-       virtual void do_prepare();
+       void do_prepare() override;
        void prepare_syspath();
        void prepare_version();
        void prepare_version(const std::string &);
 public:
-       virtual Task *run(const Target &) const;
+       Task *run(const Target &) const override;
 };
 
 #endif

diff --git a/source/gnulinker.h b/source/gnulinker.h
index e8a4e3ce996f749659485aa7133ec9ec82fcf58e..eb2b00f95b12bdf365ce1605d4aa3bb8f8cefd05 100644 (file)
--- a/source/gnulinker.h
+++ b/source/gnulinker.h
@@ -21,11 +21,11 @@ private:
        public:
                Linker(GnuLinker &, const std::string &);
 
-               virtual std::string create_build_signature(const BuildInfo &) const;
+               std::string create_build_signature(const BuildInfo &) const override;
        private:
-               virtual void do_prepare();
+               void do_prepare() override;
        public:
-               virtual Task *run(const Target &) const;
+               Task *run(const Target &) const override;
        };
 
        Linker *default_linker;
@@ -35,12 +35,12 @@ public:
        GnuLinker(Builder &, const Architecture &);
        ~GnuLinker();
 
-       virtual Target *create_target(const std::list<Target *> &, const std::string &);
-       virtual Target *create_install(Target &) const;
+       Target *create_target(const std::list<Target *> &, const std::string &) override;
+       Target *create_install(Target &) const override;
 protected:
-       virtual void do_prepare();
+       void do_prepare() override;
 public:
-       virtual Task *run(const Target &) const;
+       Task *run(const Target &) const override;
 };
 
 #endif

diff --git a/source/importlibrary.h b/source/importlibrary.h
index 7f7167b7ed3acdf8d0156cc248b5c070e16b0a23..26c116da5707e880ebf00e9bc96e3031128a92d3 100644 (file)
--- a/source/importlibrary.h
+++ b/source/importlibrary.h
@@ -22,7 +22,7 @@ private:
        static std::string generate_filename(const Component &, const SharedLibrary &);
 
 public:
-       virtual const char *get_type() const { return "ImportLibrary"; }
+       const char *get_type() const override { return "ImportLibrary"; }
 
        SharedLibrary *get_shared_library() const { return shared_lib; }
 };

diff --git a/source/installcomponent.h b/source/installcomponent.h
index 43dae7192972e9aaaca337d79694248c7879f505..412bd0b58c5b6cfd5ca32ac3b2c7fbc9de42c406 100644 (file)
--- a/source/installcomponent.h
+++ b/source/installcomponent.h
@@ -8,7 +8,7 @@ class InstallComponent: public Component
 public:
        InstallComponent(SourcePackage &, const std::string &);
 
-       virtual void create_targets() const;
+       void create_targets() const override;
 };
 
 #endif

diff --git a/source/installedfile.h b/source/installedfile.h
index 9e886d580a00976672dcd125742adb5234643380..0dd671f42bf56c745d44d860bd2b6448fcbc41e2 100644 (file)
--- a/source/installedfile.h
+++ b/source/installedfile.h
@@ -19,7 +19,7 @@ private:
        static Msp::FS::Path generate_target_path(const Msp::FS::Path &, const FileTarget &i, const std::string &);
 
 public:
-       virtual const char *get_type() const { return "InstalledFile"; }
+       const char *get_type() const override { return "InstalledFile"; }
        FileTarget &get_source() const { return source; }
 
        /** Sets a symlink for the file.  A relative path will be rooted at the
@@ -28,12 +28,12 @@ public:
 
        const Msp::FS::Path &get_symlink() const { return link; }
 
-       virtual Target *get_real_target();
+       Target *get_real_target() override;
 private:
-       virtual void check_rebuild();
+       void check_rebuild() override;
 
 public:
-       virtual void clean();
+       void clean() override;
 };
 
 #endif

diff --git a/source/internaltask.h b/source/internaltask.h
index c927b0ba9de5f0261ceb07b54860a5a89a3b044a..db3294bcbb10885841e0fe35dc8d0ad04e6697cc 100644 (file)
--- a/source/internaltask.h
+++ b/source/internaltask.h
@@ -32,10 +32,10 @@ public:
        InternalTask(Worker *);
        ~InternalTask();
 
-       virtual std::string get_command() const { return "<internal>"; }
-       virtual void start();
-       virtual Status check();
-       virtual Status wait();
+       std::string get_command() const override { return "<internal>"; }
+       void start() override;
+       Status check() override;
+       Status wait() override;
 };
 
 #endif

diff --git a/source/jarsigner.h b/source/jarsigner.h
index cc773eab0a05d3022b012db980f8d118d7051de1..9b695db4ceadd6b7d85989d62de563af86c21ee7 100644 (file)
--- a/source/jarsigner.h
+++ b/source/jarsigner.h
@@ -8,8 +8,8 @@ class JarSigner: public Tool
 public:
        JarSigner(Builder &);
 
-       virtual Target *create_target(const std::list<Target *> &, const std::string &);
-       virtual Task *run(const Target &) const;
+       Target *create_target(const std::list<Target *> &, const std::string &) override;
+       Task *run(const Target &) const override;
 };
 
 #endif

diff --git a/source/mingwdlltool.h b/source/mingwdlltool.h
index 2930831b9f908b3ccc314bd92f3f42c25c778450..2d2a621c4f2f2716dd8ae99c08a4212969d9e620 100644 (file)
--- a/source/mingwdlltool.h
+++ b/source/mingwdlltool.h
@@ -8,9 +8,9 @@ class MingwDllTool: public Tool
 public:
        MingwDllTool(Builder &, const Architecture &);
 
-       virtual Target *create_target(const std::list<Target *> &, const std::string &);
-       virtual Target *create_install(Target &) const;
-       virtual Task *run(const Target &) const;
+       Target *create_target(const std::list<Target *> &, const std::string &) override;
+       Target *create_install(Target &) const override;
+       Task *run(const Target &) const override;
 };
 
 #endif

diff --git a/source/msvcarchiver.h b/source/msvcarchiver.h
index 0467ffb2c5ab37638793fdb49c0ad62c7d71792b..a8fe34f887e6b75a7873385dcc4fa4ff144189c0 100644 (file)
--- a/source/msvcarchiver.h
+++ b/source/msvcarchiver.h
@@ -13,10 +13,10 @@ private:
 public:
        MsvcArchiver(Builder &, const Architecture &, const MicrosoftTools &);
 
-       virtual Target *create_target(const std::list<Target *> &, const std::string &);
-       virtual std::string create_build_signature(const BuildInfo &) const;
+       Target *create_target(const std::list<Target *> &, const std::string &) override;
+       std::string create_build_signature(const BuildInfo &) const override;
 
-       virtual Task *run(const Target &) const;
+       Task *run(const Target &) const override;
 };
 
 #endif

diff --git a/source/msvccompiler.h b/source/msvccompiler.h
index 2a6f91fdb32ccb9bf4ba9e8adeae750932fbfe03..bf2524ac7552da03ecca4cd06d5b1a6f8e495418 100644 (file)
--- a/source/msvccompiler.h
+++ b/source/msvccompiler.h
@@ -13,16 +13,16 @@ private:
 public:
        MsvcCompiler(Builder &, const Architecture &, const std::string &, const MicrosoftTools &);
 
-       virtual Target *create_source(const Component &, const Msp::FS::Path &) const;
-       virtual Target *create_source(const Msp::FS::Path &) const;
-       virtual Target *create_target(const std::list<Target *> &, const std::string &);
-       virtual std::string create_build_signature(const BuildInfo &) const;
+       Target *create_source(const Component &, const Msp::FS::Path &) const override;
+       Target *create_source(const Msp::FS::Path &) const override;
+       Target *create_target(const std::list<Target *> &, const std::string &) override;
+       std::string create_build_signature(const BuildInfo &) const override;
 
 protected:
-       virtual void do_prepare();
+       void do_prepare() override;
 
 public:
-       virtual Task *run(const Target &) const;
+       Task *run(const Target &) const override;
 };
 
 #endif

diff --git a/source/msvclinker.h b/source/msvclinker.h
index 50f8a7b26339167f5624f072e50ce8837cbd6b39..f1e275d3dbe58b2843b7625661fdc079190cf3e8 100644 (file)
--- a/source/msvclinker.h
+++ b/source/msvclinker.h
@@ -13,14 +13,14 @@ private:
 public:
        MsvcLinker(Builder &, const Architecture &, const MicrosoftTools &);
 
-       virtual Target *create_target(const std::list<Target *> &, const std::string &);
-       virtual std::string create_build_signature(const BuildInfo &) const;
+       Target *create_target(const std::list<Target *> &, const std::string &) override;
+       std::string create_build_signature(const BuildInfo &) const override;
 
 protected:
-       virtual void do_prepare();
+       void do_prepare() override;
 
 public:
-       virtual Task *run(const Target &) const;
+       Task *run(const Target &) const override;
 };
 
 #endif

diff --git a/source/objcsourcefile.h b/source/objcsourcefile.h
index 2069615b5c921ee821dcdfe9d08baa97e29ae0ed..fda3d293ed8079d452eb6452ffd7a029449d5c14 100644 (file)
--- a/source/objcsourcefile.h
+++ b/source/objcsourcefile.h
@@ -12,10 +12,10 @@ public:
        ObjCSourceFile(Builder &, const Msp::FS::Path &);
        ObjCSourceFile(Builder &, const Component &, const Msp::FS::Path &);
 
-       virtual const char *get_type() const { return "ObjCSourceFile"; }
+       const char *get_type() const override { return "ObjCSourceFile"; }
 
 protected:
-       virtual void parse_includes(Msp::IO::Base &);
+       void parse_includes(Msp::IO::Base &) override;
 };
 
 #endif

diff --git a/source/objectfile.h b/source/objectfile.h
index 48e4482d7ab4a153f251724d02f4f855c01c218c..fc844d9a04dff28786af13607351720dd404c1c6 100644 (file)
--- a/source/objectfile.h
+++ b/source/objectfile.h
@@ -20,16 +20,16 @@ private:
        static Msp::FS::Path generate_target_path(const Component &, const Msp::FS::Path &);
 
 public:
-       virtual const char *get_type() const { return "ObjectFile"; }
+       const char *get_type() const override { return "ObjectFile"; }
        SourceFile &get_source() const { return source; }
 
        void set_used_in_shared_library(bool);
        bool is_used_in_shared_library() const { return used_in_shlib; }
 
-       virtual void collect_build_info(BuildInfo &) const;
+       void collect_build_info(BuildInfo &) const override;
 
 private:
-       virtual void find_dependencies();
+       void find_dependencies() override;
 
        void find_dependencies(FileTarget *);
 };

diff --git a/source/pkgconfigfile.h b/source/pkgconfigfile.h
index 5ec1aa4994c044fdfbae297cb4450c77556ddf08..81c8cd68aeabd5b752f11f32004f6d6edfb7df7c 100644 (file)
--- a/source/pkgconfigfile.h
+++ b/source/pkgconfigfile.h
@@ -12,7 +12,7 @@ class PkgConfigFile: public FileTarget
 public:
        PkgConfigFile(Builder &, const SourcePackage &);
 
-       virtual const char *get_type() const { return "PkgConfigFile"; }
+       const char *get_type() const override { return "PkgConfigFile"; }
 };
 
 #endif

diff --git a/source/pkgconfiggenerator.h b/source/pkgconfiggenerator.h
index a9adbc6fe2a86100a26d9c032375b47e48442a72..a13e588e4d9729a89f9d78f419974898bec47d6c 100644 (file)
--- a/source/pkgconfiggenerator.h
+++ b/source/pkgconfiggenerator.h
@@ -18,7 +18,7 @@ private:
                Worker(const PkgConfigFile &);
 
        private:
-               virtual void main();
+               void main() override;
 
                std::string prefixify(const Msp::FS::Path &, const Msp::FS::Path &);
        };
@@ -26,8 +26,8 @@ private:
 public:
        PkgConfigGenerator(Builder &);
 
-       virtual Target *create_target(const std::list<Target *> &, const std::string &);
-       virtual Task *run(const Target &) const;
+       Target *create_target(const std::list<Target *> &, const std::string &) override;
+       Task *run(const Target &) const override;
 };
 
 #endif

diff --git a/source/sharedlibrary.h b/source/sharedlibrary.h
index c40bccd3bfde548e21efdf2d7b132c93e1eb835b..b2cd59b38ab1f77ab86aece9413989225e660898 100644 (file)
--- a/source/sharedlibrary.h
+++ b/source/sharedlibrary.h
@@ -28,7 +28,7 @@ private:
        static std::string generate_filename(const Component &);
 
 public:
-       virtual const char *get_type() const { return "SharedLibrary"; }
+       const char *get_type() const override { return "SharedLibrary"; }
        const std::string &get_libname() const { return libname; }
        const std::string &get_soname() const { return soname; }
 

diff --git a/source/sourcearchivecomponent.h b/source/sourcearchivecomponent.h
index cfef56e9abc964e18fa3aef9d6dfb6382dd7f338..94c1bc5bc805d9b2cd2676c9a98882b4fa750089 100644 (file)
--- a/source/sourcearchivecomponent.h
+++ b/source/sourcearchivecomponent.h
@@ -8,7 +8,7 @@ class SourceArchiveComponent: public Component
 public:
        SourceArchiveComponent(SourcePackage &);
 
-       virtual void create_targets() const;
+       void create_targets() const override;
 };
 
 #endif

diff --git a/source/sourcegenerator.h b/source/sourcegenerator.h
index b0c8d4bf997b114a725f027bb9866284b99c8b8d..964ea0a27c6724acfcb96f6176a1ef10e2fa2522 100644 (file)
--- a/source/sourcegenerator.h
+++ b/source/sourcegenerator.h
@@ -32,10 +32,10 @@ private:
 public:
        SourceGenerator(Builder &, const SourcePackage &, const std::string &);
 
-       virtual Target *create_source(const Component &, const Msp::FS::Path &) const;
-       virtual Target *create_target(const std::list<Target *> &, const std::string &);
+       Target *create_source(const Component &, const Msp::FS::Path &) const override;
+       Target *create_target(const std::list<Target *> &, const std::string &) override;
 
-       virtual Task *run(const Target &) const;
+       Task *run(const Target &) const override;
 };
 
 #endif

diff --git a/source/sourcepackage.h b/source/sourcepackage.h
index 5a1eddde5bd1b2793cf9b8e03b90ec9544434725..dfa2f4d295a921072f58460c1a0713ba52134984 100644 (file)
--- a/source/sourcepackage.h
+++ b/source/sourcepackage.h
@@ -33,7 +33,7 @@ public:
                Loader(SourcePackage &, const Config::InputOptions &);
        private:
                void init(const Config::InputOptions *);
-               virtual void finish();
+               void finish() override;
                void feature(const std::string &, const std::string &);
                template<typename C>
                void component(const std::string &);
@@ -87,12 +87,12 @@ public:
        void set_build_type(const BuildType &);
        const BuildInfo &get_build_info() const { return build_info; }
 private:
-       virtual void do_prepare();
+       void do_prepare() override;
 
 public:
        Cache &get_cache() const { return cache; }
 private:
-       virtual void save_caches();
+       void save_caches() override;
 };
 
 #endif

diff --git a/source/staticlibrary.h b/source/staticlibrary.h
index 26d33e350b5354ff641f95842c84703f71ad96e5..af8a57cc8f94414d456a5b90cce02a9b2ab7eed3 100644 (file)
--- a/source/staticlibrary.h
+++ b/source/staticlibrary.h
@@ -24,11 +24,11 @@ private:
        static std::string generate_filename(const Component &);
 
 public:
-       virtual const char *get_type() const { return "StaticLibrary"; }
+       const char *get_type() const override { return "StaticLibrary"; }
 
        void add_required_library(const std::string &);
        void add_library_path(const Msp::FS::Path &);
-       virtual void collect_build_info(BuildInfo &) const;
+       void collect_build_info(BuildInfo &) const override;
 };
 
 #endif

diff --git a/source/tar.h b/source/tar.h
index 9be26d9debcac1303259c766575d06e2e9ad96bf..3719c41ed7806fb0f89c1b1ae9f5b9a2ba790e22 100644 (file)
--- a/source/tar.h
+++ b/source/tar.h
@@ -19,15 +19,15 @@ private:
                Worker(const TarBall &);
 
        private:
-               virtual void main();
+               void main() override;
                void store_number(char *, unsigned, unsigned);
        };
 
 public:
        Tar(Builder &);
 
-       virtual Target *create_target(const std::list<Target *> &, const std::string &);
-       virtual Task *run(const Target &) const;
+       Target *create_target(const std::list<Target *> &, const std::string &) override;
+       Task *run(const Target &) const override;
 };
 
 #endif

diff --git a/source/tarball.h b/source/tarball.h
index 18ff19dcfcd9a8b72cad6f448a42cf7122c53b6b..105a2b1b08a582650ccc2a8f9623a6b214763655 100644 (file)
--- a/source/tarball.h
+++ b/source/tarball.h
@@ -8,7 +8,7 @@ class TarBall: public FileTarget
 public:
        TarBall(Builder &, const SourcePackage &, const std::string &);
 
-       virtual const char *get_type() const { return "TarBall"; }
+       const char *get_type() const override { return "TarBall"; }
        const SourcePackage *get_package() const;
 };
 

diff --git a/source/templatefile.h b/source/templatefile.h
index d65c8ea803de620decbf09ddf1d9ab6f4a54ddbe..cb2841eb535635d1b3bb764d206f66d9db017604 100644 (file)
--- a/source/templatefile.h
+++ b/source/templatefile.h
@@ -11,7 +11,7 @@ class TemplateFile: public SourceFile
 public:
        TemplateFile(Builder &, const Component &, const Msp::FS::Path &);
 
-       virtual const char *get_type() const { return "TemplateFile"; }
+       const char *get_type() const override { return "TemplateFile"; }
 };
 
 #endif

diff --git a/source/tool.h b/source/tool.h
index 41b8c5f24dd92387ae4bf454653c3984d34694b5..ee1fa7a1d4be81bce006281adc1b9dfb3a40314a 100644 (file)
--- a/source/tool.h
+++ b/source/tool.h
@@ -136,11 +136,11 @@ protected:
        SubTool(Tool &);
 
 public:
-       virtual Target *create_source(const Component &, const Msp::FS::Path &) const;
-       virtual Target *create_source(const Msp::FS::Path &) const;
-       virtual Target *create_target(const std::list<Target *> &, const std::string & = std::string());
-       virtual Target *create_install(Target &) const;
-       virtual std::string create_build_signature(const BuildInfo &) const;
+       Target *create_source(const Component &, const Msp::FS::Path &) const override;
+       Target *create_source(const Msp::FS::Path &) const override;
+       Target *create_target(const std::list<Target *> &, const std::string & = std::string()) override;
+       Target *create_install(Target &) const override;
+       std::string create_build_signature(const BuildInfo &) const override;
 };
 
 

diff --git a/source/vcxprojectfile.h b/source/vcxprojectfile.h
index ff3aba13ba316242bbfc06efdd4df09ebc209055..268d4bbb64a42c78d4bb487c82bdff4300dc42d5 100644 (file)
--- a/source/vcxprojectfile.h
+++ b/source/vcxprojectfile.h
@@ -11,7 +11,7 @@ private:
 public:
        VcxProjectFile(Builder &, const SourcePackage &);
 
-       virtual const char *get_type() const { return "VcxProjectFile"; }
+       const char *get_type() const override { return "VcxProjectFile"; }
 
        const std::string &get_guid() const { return guid; }
 };

diff --git a/source/vcxprojectgenerator.h b/source/vcxprojectgenerator.h
index 919b8ec16840c68a2c12ad3473e3ddd5eb58fd31..05bb720d81fe7d6ac6a472815d4b82e288abd4a6 100644 (file)
--- a/source/vcxprojectgenerator.h
+++ b/source/vcxprojectgenerator.h
@@ -18,14 +18,14 @@ private:
                Worker(const VcxProjectFile &);
 
        private:
-               virtual void main();
+               void main() override;
        };
 
 public:
        VcxProjectGenerator(Builder &);
 
-       virtual Target *create_target(const std::list<Target *> &, const std::string &);
-       virtual Task *run(const Target &) const;
+       Target *create_target(const std::list<Target *> &, const std::string &) override;
+       Task *run(const Target &) const override;
 };
 
 #endif

diff --git a/source/virtualtarget.h b/source/virtualtarget.h
index 8f3d95b0c0b540d16ab0b5dafc21db7235de98ef..50d1274ff9a9b6b25b9a8a17e3ffc14be334743e 100644 (file)
--- a/source/virtualtarget.h
+++ b/source/virtualtarget.h
@@ -11,12 +11,12 @@ class VirtualTarget: public Target
 public:
        VirtualTarget(Builder &, const std::string &);
 
-       virtual const char *get_type() const { return "VirtualTarget"; }
+       const char *get_type() const override { return "VirtualTarget"; }
 private:
-       virtual void check_rebuild();
+       void check_rebuild() override;
 
 public:
-       virtual Task *build();
+       Task *build() override;
 };
 
 #endif

diff --git a/source/vssolutionfile.h b/source/vssolutionfile.h
index d35b4b91f09b85e70e2aae9e4b86c2e84bed020b..0a97d3244022541360512c9bf10315dcfdcd8cdd 100644 (file)
--- a/source/vssolutionfile.h
+++ b/source/vssolutionfile.h
@@ -8,9 +8,9 @@ class VsSolutionFile: public FileTarget
 public:
        VsSolutionFile(Builder &, const SourcePackage &);
 
-       virtual const char *get_type() const { return "VsSolutionFile"; }
+       const char *get_type() const override { return "VsSolutionFile"; }
 protected:
-       virtual void find_dependencies();
+       void find_dependencies() override;
 };
 
 #endif

diff --git a/source/vssolutiongenerator.h b/source/vssolutiongenerator.h
index 8eaca7c5667c2987e57f5229b271f59adc5f5fbd..2efddcdad9eec188888a724f186938d5b2527331 100644 (file)
--- a/source/vssolutiongenerator.h
+++ b/source/vssolutiongenerator.h
@@ -18,14 +18,14 @@ private:
                Worker(const VsSolutionFile &);
 
        private:
-               virtual void main();
+               void main() override;
        };
 
 public:
        VsSolutionGenerator(Builder &);
 
-       virtual Target *create_target(const std::list<Target *> &, const std::string &);
-       virtual Task *run(const Target &) const;
+       Target *create_target(const std::list<Target *> &, const std::string &) override;
+       Task *run(const Target &) const override;
 };
 
 #endif