diff options
| author |  Marvin Schmidt <marv@exherbo.org>
| 2019-02-21 18:14:13 +0100 |
|---|---|---|
| committer |  Heiko Becker <heirecka@exherbo.org>
| 2020-10-16 17:59:26 +0000 |
| commit | 6e995e8d5f0e763b6dd6adef7b014eaf54121334 (patch) | |
| tree | 9d5dd7bc7ce267d4449cfd08d850ec33caf8be67 | |
| parent | 3e45be57eef80ab27eba09e0249c70c2ee931573 (diff) | |
| download | paludis-6e995e8d5f0e763b6dd6adef7b014eaf54121334.tar.gz paludis-6e995e8d5f0e763b6dd6adef7b014eaf54121334.tar.xz | |
modernize: Mark overriding functions as such
Done using clang-tidy's `modernize-use-override` check
186 files changed, 2284 insertions, 2285 deletions
diff --git a/.clang-tidy b/.clang-tidy index afb3c545c..eeef98f1b 100644 --- a/.clang-tidy +++ b/.clang-tidy @@ -1,7 +1,6 @@ --- Checks: "-*,\ modernize-*,\ --modernize-use-override,\ -modernize-loop-convert,\ -modernize-use-emplace,\ -modernize-use-using,\ diff --git a/doc/api/cplusplus/examples/example_command_line.hh b/doc/api/cplusplus/examples/example_command_line.hh index ac9c580a9..b12460743 100644 --- a/doc/api/cplusplus/examples/example_command_line.hh +++ b/doc/api/cplusplus/examples/example_command_line.hh @@ -38,7 +38,7 @@ namespace examples private: CommandLine(); - ~CommandLine(); + ~CommandLine() override; public: virtual void run(const int, const char * const * const, @@ -48,9 +48,9 @@ namespace examples ///\name Program information ///\{ - virtual std::string app_name() const; - virtual std::string app_synopsis() const; - virtual std::string app_description() const; + std::string app_name() const override; + std::string app_synopsis() const override; + std::string app_description() const override; ///\} diff --git a/paludis/about_metadata.hh b/paludis/about_metadata.hh index ecc18cfea..c8b8c405a 100644 --- a/paludis/about_metadata.hh +++ b/paludis/about_metadata.hh @@ -53,10 +53,10 @@ namespace paludis Pimp<AboutMetadata> _imp; AboutMetadata(); - ~AboutMetadata(); + ~AboutMetadata() override; protected: - void need_keys_added() const; + void need_keys_added() const override; }; extern template class Pimp<AboutMetadata>; diff --git a/paludis/action.hh b/paludis/action.hh index d89d3e900..96a3b5243 100644 --- a/paludis/action.hh +++ b/paludis/action.hh @@ -306,14 +306,14 @@ namespace paludis ///\{ InstallAction(const InstallActionOptions &); - ~InstallAction(); + ~InstallAction() override; ///\} /// Options for the action. const InstallActionOptions & options; - virtual const std::string simple_name() const PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::string simple_name() const override PALUDIS_ATTRIBUTE((warn_unused_result)); static const std::string class_simple_name() PALUDIS_ATTRIBUTE((warn_unused_result)); }; @@ -338,14 +338,14 @@ namespace paludis ///\{ FetchAction(const FetchActionOptions &); - ~FetchAction(); + ~FetchAction() override; ///\} /// Options for the action. const FetchActionOptions & options; - virtual const std::string simple_name() const PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::string simple_name() const override PALUDIS_ATTRIBUTE((warn_unused_result)); static const std::string class_simple_name() PALUDIS_ATTRIBUTE((warn_unused_result)); static const std::string ignore_unfetched_flag_name() PALUDIS_ATTRIBUTE((warn_unused_result)); @@ -370,14 +370,14 @@ namespace paludis ///\{ UninstallAction(const UninstallActionOptions &); - ~UninstallAction(); + ~UninstallAction() override; ///\} /// Options for the action. const UninstallActionOptions & options; - virtual const std::string simple_name() const PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::string simple_name() const override PALUDIS_ATTRIBUTE((warn_unused_result)); static const std::string class_simple_name() PALUDIS_ATTRIBUTE((warn_unused_result)); }; @@ -433,7 +433,7 @@ namespace paludis * \since 0.36 */ PretendAction(const PretendActionOptions &); - ~PretendAction(); + ~PretendAction() override; ///\} @@ -448,7 +448,7 @@ namespace paludis */ const PretendActionOptions & options; - virtual const std::string simple_name() const PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::string simple_name() const override PALUDIS_ATTRIBUTE((warn_unused_result)); static const std::string class_simple_name() PALUDIS_ATTRIBUTE((warn_unused_result)); }; @@ -473,7 +473,7 @@ namespace paludis ///\{ PretendFetchAction(const FetchActionOptions &); - ~PretendFetchAction(); + ~PretendFetchAction() override; ///\} @@ -483,7 +483,7 @@ namespace paludis /// Signal that we will fetch a particular file. virtual void will_fetch(const FSPath & destination, const unsigned long size_in_bytes) = 0; - virtual const std::string simple_name() const PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::string simple_name() const override PALUDIS_ATTRIBUTE((warn_unused_result)); static const std::string class_simple_name() PALUDIS_ATTRIBUTE((warn_unused_result)); }; @@ -531,7 +531,7 @@ namespace paludis * \since 0.36 */ ConfigAction(const ConfigActionOptions &); - ~ConfigAction(); + ~ConfigAction() override; ///\} @@ -540,7 +540,7 @@ namespace paludis */ const ConfigActionOptions & options; - virtual const std::string simple_name() const PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::string simple_name() const override PALUDIS_ATTRIBUTE((warn_unused_result)); static const std::string class_simple_name() PALUDIS_ATTRIBUTE((warn_unused_result)); }; @@ -593,7 +593,7 @@ namespace paludis */ InfoAction(const InfoActionOptions &); - ~InfoAction(); + ~InfoAction() override; ///\} @@ -602,7 +602,7 @@ namespace paludis */ const InfoActionOptions & options; - virtual const std::string simple_name() const PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::string simple_name() const override PALUDIS_ATTRIBUTE((warn_unused_result)); static const std::string class_simple_name() PALUDIS_ATTRIBUTE((warn_unused_result)); }; diff --git a/paludis/always_enabled_dependency_label.hh b/paludis/always_enabled_dependency_label.hh index ca58b8758..388aef0bc 100644 --- a/paludis/always_enabled_dependency_label.hh +++ b/paludis/always_enabled_dependency_label.hh @@ -35,12 +35,12 @@ namespace paludis public: AlwaysEnabledDependencyLabel(const std::string &); - ~AlwaysEnabledDependencyLabel(); + ~AlwaysEnabledDependencyLabel() override; - virtual const std::string text() const; - virtual bool enabled( + const std::string text() const override; + bool enabled( const Environment * const, - const std::shared_ptr<const PackageID> &) const; + const std::shared_ptr<const PackageID> &) const override; }; extern template class PALUDIS_VISIBLE AlwaysEnabledDependencyLabel<DependenciesBuildLabelTag>; diff --git a/paludis/args/args_option.hh b/paludis/args/args_option.hh index 8c0301302..cf0f42ff5 100644 --- a/paludis/args/args_option.hh +++ b/paludis/args/args_option.hh @@ -218,12 +218,12 @@ namespace paludis SwitchArg(ArgsGroup * const group, const std::string & long_name, char short_name, const std::string & description, const bool can_be_negated); - ~SwitchArg() = default; + ~SwitchArg() override = default; - virtual bool can_be_negated() const; + bool can_be_negated() const override; - virtual const std::string forwardable_string() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::shared_ptr<Sequence<std::string> > forwardable_args() const PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::string forwardable_string() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::shared_ptr<Sequence<std::string> > forwardable_args() const override PALUDIS_ATTRIBUTE((warn_unused_result)); }; /** @@ -266,10 +266,10 @@ namespace paludis */ void set_argument(const std::string & arg); - virtual bool can_be_negated() const; + bool can_be_negated() const override; - virtual const std::string forwardable_string() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::shared_ptr<Sequence<std::string> > forwardable_args() const PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::string forwardable_string() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::shared_ptr<Sequence<std::string> > forwardable_args() const override PALUDIS_ATTRIBUTE((warn_unused_result)); }; /** @@ -340,7 +340,7 @@ namespace paludis const StringSetArgOptions & options, void (* validator) (const std::string &)); - ~StringSetArg(); + ~StringSetArg() override; ///\} @@ -374,10 +374,10 @@ namespace paludis ///\} - virtual bool can_be_negated() const; + bool can_be_negated() const override; - virtual const std::string forwardable_string() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::shared_ptr<Sequence<std::string> > forwardable_args() const PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::string forwardable_string() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::shared_ptr<Sequence<std::string> > forwardable_args() const override PALUDIS_ATTRIBUTE((warn_unused_result)); }; /** @@ -401,7 +401,7 @@ namespace paludis StringSequenceArg(ArgsGroup * const, const std::string & long_name, const char short_name, const std::string & description); - ~StringSequenceArg(); + ~StringSequenceArg() override; ///\} @@ -422,10 +422,10 @@ namespace paludis */ void add_argument(const std::string & arg); - virtual bool can_be_negated() const; + bool can_be_negated() const override; - virtual const std::string forwardable_string() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::shared_ptr<Sequence<std::string> > forwardable_args() const PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::string forwardable_string() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::shared_ptr<Sequence<std::string> > forwardable_args() const override PALUDIS_ATTRIBUTE((warn_unused_result)); }; @@ -448,17 +448,17 @@ namespace paludis */ AliasArg(ArgsOption * const other, const std::string & new_long_name, bool is_hidden = false); - virtual bool specified() const + bool specified() const override { return _other->specified(); } - virtual bool explicitly_specified() const + bool explicitly_specified() const override { return _other->explicitly_specified(); } - virtual void set_specified(const ArgsOptionSpecifiedness value) + void set_specified(const ArgsOptionSpecifiedness value) override { _other->set_specified(value); } @@ -481,10 +481,10 @@ namespace paludis return _other; } - virtual bool can_be_negated() const; + bool can_be_negated() const override; - virtual const std::string forwardable_string() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::shared_ptr<Sequence<std::string> > forwardable_args() const PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::string forwardable_string() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::shared_ptr<Sequence<std::string> > forwardable_args() const override PALUDIS_ATTRIBUTE((warn_unused_result)); }; /** @@ -515,10 +515,10 @@ namespace paludis */ void set_argument(const int arg) { _argument = arg; } - virtual bool can_be_negated() const; + bool can_be_negated() const override; - virtual const std::string forwardable_string() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::shared_ptr<Sequence<std::string> > forwardable_args() const PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::string forwardable_string() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::shared_ptr<Sequence<std::string> > forwardable_args() const override PALUDIS_ATTRIBUTE((warn_unused_result)); }; /** @@ -604,7 +604,7 @@ namespace paludis const char short_name, const std::string & description, const EnumArgOptions & opts, const std::string & default_arg); - ~EnumArg(); + ~EnumArg() override; /** * Fetch the argument that was given to this option. @@ -648,10 +648,10 @@ namespace paludis ///\} - virtual bool can_be_negated() const; + bool can_be_negated() const override; - virtual const std::string forwardable_string() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::shared_ptr<Sequence<std::string> > forwardable_args() const PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::string forwardable_string() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::shared_ptr<Sequence<std::string> > forwardable_args() const override PALUDIS_ATTRIBUTE((warn_unused_result)); }; } diff --git a/paludis/args/log_level_arg.hh b/paludis/args/log_level_arg.hh index 40c3c7415..c7cdb9018 100644 --- a/paludis/args/log_level_arg.hh +++ b/paludis/args/log_level_arg.hh @@ -52,7 +52,7 @@ namespace paludis ///\{ LogLevelArg(ArgsGroup * const, const std::string &, char); - ~LogLevelArg() = default; + ~LogLevelArg() override = default; ///\} diff --git a/paludis/args/man.hh b/paludis/args/man.hh index fe77eecdd..7b42d42e7 100644 --- a/paludis/args/man.hh +++ b/paludis/args/man.hh @@ -115,48 +115,48 @@ namespace paludis ///\name Basic operations ///\{ AsciidocWriter(std::ostream & os); - ~AsciidocWriter() = default; + ~AsciidocWriter() override = default; ///\} void heading(const std::string & name, const std::string & section, - const std::string & synopis); - void start_usage_lines(); - void usage_line(const std::string & name, const std::string & line); + const std::string & synopis) override; + void start_usage_lines() override; + void usage_line(const std::string & name, const std::string & line) override; - void start_description(const std::string & description); - void extra_description(const std::string & description); - void end_description(); + void start_description(const std::string & description) override; + void extra_description(const std::string & description) override; + void end_description() override; - void start_options(const std::string & s); - void start_arg_group(const std::string & name, const std::string & description); + void start_options(const std::string & s) override; + void start_arg_group(const std::string & name, const std::string & description) override; void arg_group_item(const char & short_name, const std::string & long_name, - const std::string & negated_long_name, const std::string & description); - void start_extra_arg(); - void extra_arg_enum(const AllowedEnumArg &, const std::string & default_arg); - void extra_arg_string_set(const std::string & first, const std::string & second); - void end_extra_arg(); - void end_arg_group(); - void end_options(); - - void start_environment(); - void environment_line(const std::string & first, const std::string & second); - void end_environment(); - - void start_examples(); - void example(const std::string &, const std::string &); - void end_examples(); - - void start_notes(); - void note(const std::string &); - void end_notes(); - - void section(const std::string & title); - void subsection(const std::string & title); - void paragraph(const std::string & text); - - void start_see_alsos(); - void see_also(const std::string &, const int, const bool first); - void end_see_alsos(); + const std::string & negated_long_name, const std::string & description) override; + void start_extra_arg() override; + void extra_arg_enum(const AllowedEnumArg &, const std::string & default_arg) override; + void extra_arg_string_set(const std::string & first, const std::string & second) override; + void end_extra_arg() override; + void end_arg_group() override; + void end_options() override; + + void start_environment() override; + void environment_line(const std::string & first, const std::string & second) override; + void end_environment() override; + + void start_examples() override; + void example(const std::string &, const std::string &) override; + void end_examples() override; + + void start_notes() override; + void note(const std::string &) override; + void end_notes() override; + + void section(const std::string & title) override; + void subsection(const std::string & title) override; + void paragraph(const std::string & text) override; + + void start_see_alsos() override; + void see_also(const std::string &, const int, const bool first) override; + void end_see_alsos() override; }; } } diff --git a/paludis/buffer_output_manager.hh b/paludis/buffer_output_manager.hh index e255f6bd1..02a647295 100644 --- a/paludis/buffer_output_manager.hh +++ b/paludis/buffer_output_manager.hh @@ -39,17 +39,17 @@ namespace paludis BufferOutputManager( const std::shared_ptr<OutputManager> & ); - ~BufferOutputManager(); + ~BufferOutputManager() override; - virtual std::ostream & stdout_stream() PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual std::ostream & stderr_stream() PALUDIS_ATTRIBUTE((warn_unused_result)); + std::ostream & stdout_stream() override PALUDIS_ATTRIBUTE((warn_unused_result)); + std::ostream & stderr_stream() override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual void succeeded(); - virtual void ignore_succeeded(); - virtual void flush(); - virtual bool want_to_flush() const; - virtual void nothing_more_to_come(); - virtual void message(const MessageType, const std::string &); + void succeeded() override; + void ignore_succeeded() override; + void flush() override; + bool want_to_flush() const override; + void nothing_more_to_come() override; + void message(const MessageType, const std::string &) override; static const std::shared_ptr<const Set<std::string> > factory_managers() PALUDIS_ATTRIBUTE((warn_unused_result)); diff --git a/paludis/command_output_manager.hh b/paludis/command_output_manager.hh index 27699c2bd..f3c108d8e 100644 --- a/paludis/command_output_manager.hh +++ b/paludis/command_output_manager.hh @@ -53,17 +53,17 @@ namespace paludis const std::string & succeeded_command, const std::string & nothing_more_to_come_command ); - ~CommandOutputManager() noexcept(false); + ~CommandOutputManager() noexcept(false) override; - virtual std::ostream & stdout_stream() PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual std::ostream & stderr_stream() PALUDIS_ATTRIBUTE((warn_unused_result)); + std::ostream & stdout_stream() override PALUDIS_ATTRIBUTE((warn_unused_result)); + std::ostream & stderr_stream() override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual void succeeded(); - virtual void ignore_succeeded(); - virtual void flush(); - virtual bool want_to_flush() const; - virtual void nothing_more_to_come(); - virtual void message(const MessageType, const std::string &); + void succeeded() override; + void ignore_succeeded() override; + void flush() override; + bool want_to_flush() const override; + void nothing_more_to_come() override; + void message(const MessageType, const std::string &) override; static const std::shared_ptr<const Set<std::string> > factory_managers() PALUDIS_ATTRIBUTE((warn_unused_result)); diff --git a/paludis/contents.hh b/paludis/contents.hh index 77b9b9e8f..90d7951ae 100644 --- a/paludis/contents.hh +++ b/paludis/contents.hh @@ -59,14 +59,14 @@ namespace paludis Pimp<ContentsEntry> _imp; protected: - virtual void need_keys_added() const; + void need_keys_added() const override; public: ///\name Basic operations ///\{ ContentsEntry(const FSPath & path); - virtual ~ContentsEntry() = 0; + ~ContentsEntry() override = 0; ///\} @@ -115,7 +115,7 @@ namespace paludis ///\{ ContentsFileEntry(const FSPath &, const std::string &); - ~ContentsFileEntry(); + ~ContentsFileEntry() override; ///\} @@ -186,7 +186,7 @@ namespace paludis ContentsSymEntry(const FSPath &, const std::string &, const std::string &); - ~ContentsSymEntry(); + ~ContentsSymEntry() override; ///\} diff --git a/paludis/create_output_manager_info.hh b/paludis/create_output_manager_info.hh index d1235e925..69748a365 100644 --- a/paludis/create_output_manager_info.hh +++ b/paludis/create_output_manager_info.hh @@ -109,7 +109,7 @@ namespace paludis */ const ClientOutputFeatures client_output_features() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual void serialise(Serialiser &) const; + void serialise(Serialiser &) const override; static const std::shared_ptr<CreateOutputManagerForPackageIDActionInfo> deserialise( Deserialisation & d) PALUDIS_ATTRIBUTE((warn_unused_result)); @@ -153,7 +153,7 @@ namespace paludis */ const ClientOutputFeatures client_output_features() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual void serialise(Serialiser &) const; + void serialise(Serialiser &) const override; static const std::shared_ptr<CreateOutputManagerForRepositorySyncInfo> deserialise( Deserialisation & d) PALUDIS_ATTRIBUTE((warn_unused_result)); diff --git a/paludis/dep_label.hh b/paludis/dep_label.hh index e09e0fb39..0a9724ad5 100644 --- a/paludis/dep_label.hh +++ b/paludis/dep_label.hh @@ -93,11 +93,11 @@ namespace paludis ///\{ SpecificURILabel(const std::string &); - ~SpecificURILabel(); + ~SpecificURILabel() override; ///\} - virtual const std::string text() const PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::string text() const override PALUDIS_ATTRIBUTE((warn_unused_result)); /// Convenience typedef alias to obtain our tag. typedef T_ Tag; diff --git a/paludis/dep_spec.hh b/paludis/dep_spec.hh index 8b0b4410c..d4e5f5746 100644 --- a/paludis/dep_spec.hh +++ b/paludis/dep_spec.hh @@ -85,7 +85,7 @@ namespace paludis ///\name Basic operations ///\{ - virtual ~DepSpec(); + ~DepSpec() override; DepSpec(const DepSpec &) = delete; DepSpec & operator= (const DepSpec &) = delete; @@ -124,7 +124,7 @@ namespace paludis ///\} - virtual std::shared_ptr<DepSpec> clone() const PALUDIS_ATTRIBUTE((warn_unused_result)); + std::shared_ptr<DepSpec> clone() const override PALUDIS_ATTRIBUTE((warn_unused_result)); }; /** @@ -145,7 +145,7 @@ namespace paludis ///\} - virtual std::shared_ptr<DepSpec> clone() const PALUDIS_ATTRIBUTE((warn_unused_result)); + std::shared_ptr<DepSpec> clone() const override PALUDIS_ATTRIBUTE((warn_unused_result)); }; /** @@ -166,7 +166,7 @@ namespace paludis ///\} - virtual std::shared_ptr<DepSpec> clone() const PALUDIS_ATTRIBUTE((warn_unused_result)); + std::shared_ptr<DepSpec> clone() const override PALUDIS_ATTRIBUTE((warn_unused_result)); }; /** @@ -187,7 +187,7 @@ namespace paludis ///\} - virtual std::shared_ptr<DepSpec> clone() const PALUDIS_ATTRIBUTE((warn_unused_result)); + std::shared_ptr<DepSpec> clone() const override PALUDIS_ATTRIBUTE((warn_unused_result)); }; /** @@ -215,7 +215,7 @@ namespace paludis ConditionalDepSpec(const std::shared_ptr<const ConditionalDepSpecData> &); ConditionalDepSpec(const ConditionalDepSpec &); - ~ConditionalDepSpec(); + ~ConditionalDepSpec() override; ///\} @@ -278,7 +278,7 @@ namespace paludis StringDepSpec(const std::string &); - ~StringDepSpec(); + ~StringDepSpec() override; ///\} @@ -372,7 +372,7 @@ namespace paludis PackageDepSpec(const PackageDepSpec &); - ~PackageDepSpec(); + ~PackageDepSpec() override; ///\} @@ -465,7 +465,7 @@ namespace paludis ///\} - virtual std::shared_ptr<DepSpec> clone() const PALUDIS_ATTRIBUTE((warn_unused_result)); + std::shared_ptr<DepSpec> clone() const override PALUDIS_ATTRIBUTE((warn_unused_result)); }; /** @@ -491,7 +491,7 @@ namespace paludis /// Fetch the name of our set. const SetName name() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual std::shared_ptr<DepSpec> clone() const PALUDIS_ATTRIBUTE((warn_unused_result)); + std::shared_ptr<DepSpec> clone() const override PALUDIS_ATTRIBUTE((warn_unused_result)); }; /** @@ -512,7 +512,7 @@ namespace paludis ///\} - virtual std::shared_ptr<DepSpec> clone() const PALUDIS_ATTRIBUTE((warn_unused_result)); + std::shared_ptr<DepSpec> clone() const override PALUDIS_ATTRIBUTE((warn_unused_result)); }; /** @@ -555,7 +555,7 @@ namespace paludis */ std::string filename() const; - virtual std::shared_ptr<DepSpec> clone() const PALUDIS_ATTRIBUTE((warn_unused_result)); + std::shared_ptr<DepSpec> clone() const override PALUDIS_ATTRIBUTE((warn_unused_result)); }; /** @@ -578,7 +578,7 @@ namespace paludis ///\} - virtual std::shared_ptr<DepSpec> clone() const PALUDIS_ATTRIBUTE((warn_unused_result)); + std::shared_ptr<DepSpec> clone() const override PALUDIS_ATTRIBUTE((warn_unused_result)); }; /** @@ -637,7 +637,7 @@ namespace paludis * * \since 0.73 */ - virtual const std::shared_ptr<const DepSpecAnnotations> maybe_annotations() const PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::shared_ptr<const DepSpecAnnotations> maybe_annotations() const override PALUDIS_ATTRIBUTE((warn_unused_result)); /** * Change our annotations, may be null. Forwards to the @@ -645,9 +645,9 @@ namespace paludis * * \since 0.73 */ - virtual void set_annotations(const std::shared_ptr<const DepSpecAnnotations> &); + void set_annotations(const std::shared_ptr<const DepSpecAnnotations> &) override; - virtual std::shared_ptr<DepSpec> clone() const PALUDIS_ATTRIBUTE((warn_unused_result)); + std::shared_ptr<DepSpec> clone() const override PALUDIS_ATTRIBUTE((warn_unused_result)); }; /** @@ -672,7 +672,7 @@ namespace paludis ///\{ LabelsDepSpec(); - ~LabelsDepSpec(); + ~LabelsDepSpec() override; ///\} @@ -690,7 +690,7 @@ namespace paludis ///\} - virtual std::shared_ptr<DepSpec> clone() const PALUDIS_ATTRIBUTE((warn_unused_result)); + std::shared_ptr<DepSpec> clone() const override PALUDIS_ATTRIBUTE((warn_unused_result)); }; class PALUDIS_VISIBLE PlainTextLabelDepSpec : @@ -701,11 +701,11 @@ namespace paludis ///\{ PlainTextLabelDepSpec(const std::string &); - ~PlainTextLabelDepSpec(); + ~PlainTextLabelDepSpec() override; ///\} - virtual std::shared_ptr<DepSpec> clone() const PALUDIS_ATTRIBUTE((warn_unused_result)); + std::shared_ptr<DepSpec> clone() const override PALUDIS_ATTRIBUTE((warn_unused_result)); const std::string label() const PALUDIS_ATTRIBUTE((warn_unused_result)); }; diff --git a/paludis/elf_linkage_checker.hh b/paludis/elf_linkage_checker.hh index b5bce3d13..5f9a872f8 100644 --- a/paludis/elf_linkage_checker.hh +++ b/paludis/elf_linkage_checker.hh @@ -35,14 +35,14 @@ namespace paludis public: ElfLinkageChecker(const FSPath &, const std::shared_ptr<const Sequence<std::string>> &); - virtual ~ElfLinkageChecker(); + ~ElfLinkageChecker() override; - virtual bool check_file(const FSPath &) PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual void note_symlink(const FSPath &, const FSPath &); + bool check_file(const FSPath &) override PALUDIS_ATTRIBUTE((warn_unused_result)); + void note_symlink(const FSPath &, const FSPath &) override; - virtual void add_extra_lib_dir(const FSPath &); - virtual void need_breakage_added( - const std::function<void (const FSPath &, const std::string &)> &); + void add_extra_lib_dir(const FSPath &) override; + void need_breakage_added( + const std::function<void (const FSPath &, const std::string &)> &) override; }; } diff --git a/paludis/elike_choices.hh b/paludis/elike_choices.hh index 01d1b0e45..fd22dfb50 100644 --- a/paludis/elike_choices.hh +++ b/paludis/elike_choices.hh @@ -41,17 +41,17 @@ namespace paludis const Environment * const env, const std::shared_ptr<const Choice> &, const bool mask); - virtual const UnprefixedChoiceName unprefixed_name() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const ChoiceNameWithPrefix name_with_prefix() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual bool enabled() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual bool enabled_by_default() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual bool locked() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::string description() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual ChoiceOrigin origin() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::string parameter() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::shared_ptr<const PermittedChoiceValueParameterValues> permitted_parameter_values() const - PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual bool presumed() const PALUDIS_ATTRIBUTE((warn_unused_result)); + const UnprefixedChoiceName unprefixed_name() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + const ChoiceNameWithPrefix name_with_prefix() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + bool enabled() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + bool enabled_by_default() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + bool locked() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::string description() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + ChoiceOrigin origin() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::string parameter() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::shared_ptr<const PermittedChoiceValueParameterValues> permitted_parameter_values() const + override PALUDIS_ATTRIBUTE((warn_unused_result)); + bool presumed() const override PALUDIS_ATTRIBUTE((warn_unused_result)); static const UnprefixedChoiceName canonical_unprefixed_name() PALUDIS_ATTRIBUTE((warn_unused_result)); static const ChoiceNameWithPrefix canonical_name_with_prefix() PALUDIS_ATTRIBUTE((warn_unused_result)); @@ -69,17 +69,17 @@ namespace paludis const Environment * const env, const std::shared_ptr<const Choice> &, const bool mask); - virtual const UnprefixedChoiceName unprefixed_name() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const ChoiceNameWithPrefix name_with_prefix() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual bool enabled() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual bool enabled_by_default() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual bool locked() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::string description() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual ChoiceOrigin origin() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::string parameter() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::shared_ptr<const PermittedChoiceValueParameterValues> permitted_parameter_values() const - PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual bool presumed() const PALUDIS_ATTRIBUTE((warn_unused_result)); + const UnprefixedChoiceName unprefixed_name() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + const ChoiceNameWithPrefix name_with_prefix() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + bool enabled() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + bool enabled_by_default() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + bool locked() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::string description() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + ChoiceOrigin origin() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::string parameter() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::shared_ptr<const PermittedChoiceValueParameterValues> permitted_parameter_values() const + override PALUDIS_ATTRIBUTE((warn_unused_result)); + bool presumed() const override PALUDIS_ATTRIBUTE((warn_unused_result)); static const UnprefixedChoiceName canonical_unprefixed_name() PALUDIS_ATTRIBUTE((warn_unused_result)); static const ChoiceNameWithPrefix canonical_name_with_prefix() PALUDIS_ATTRIBUTE((warn_unused_result)); @@ -97,17 +97,17 @@ namespace paludis const Environment * const env, const std::shared_ptr<const Choice> &, const bool mask); - virtual const UnprefixedChoiceName unprefixed_name() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const ChoiceNameWithPrefix name_with_prefix() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual bool enabled() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual bool enabled_by_default() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual bool locked() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::string description() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual ChoiceOrigin origin() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::string parameter() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::shared_ptr<const PermittedChoiceValueParameterValues> permitted_parameter_values() const - PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual bool presumed() const PALUDIS_ATTRIBUTE((warn_unused_result)); + const UnprefixedChoiceName unprefixed_name() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + const ChoiceNameWithPrefix name_with_prefix() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + bool enabled() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + bool enabled_by_default() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + bool locked() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::string description() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + ChoiceOrigin origin() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::string parameter() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::shared_ptr<const PermittedChoiceValueParameterValues> permitted_parameter_values() const + override PALUDIS_ATTRIBUTE((warn_unused_result)); + bool presumed() const override PALUDIS_ATTRIBUTE((warn_unused_result)); static const UnprefixedChoiceName canonical_unprefixed_name() PALUDIS_ATTRIBUTE((warn_unused_result)); static const ChoiceNameWithPrefix canonical_name_with_prefix() PALUDIS_ATTRIBUTE((warn_unused_result)); @@ -124,17 +124,17 @@ namespace paludis ELikeJobsChoiceValue(const std::shared_ptr<const PackageID> &, const Environment * const env, const std::shared_ptr<const Choice> &); - virtual const UnprefixedChoiceName unprefixed_name() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const ChoiceNameWithPrefix name_with_prefix() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual bool enabled() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual bool enabled_by_default() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual bool locked() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::string description() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual ChoiceOrigin origin() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::string parameter() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::shared_ptr<const PermittedChoiceValueParameterValues> permitted_parameter_values() const - PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual bool presumed() const PALUDIS_ATTRIBUTE((warn_unused_result)); + const UnprefixedChoiceName unprefixed_name() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + const ChoiceNameWithPrefix name_with_prefix() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + bool enabled() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + bool enabled_by_default() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + bool locked() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::string description() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + ChoiceOrigin origin() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::string parameter() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::shared_ptr<const PermittedChoiceValueParameterValues> permitted_parameter_values() const + override PALUDIS_ATTRIBUTE((warn_unused_result)); + bool presumed() const override PALUDIS_ATTRIBUTE((warn_unused_result)); static const UnprefixedChoiceName canonical_unprefixed_name() PALUDIS_ATTRIBUTE((warn_unused_result)); static const ChoiceNameWithPrefix canonical_name_with_prefix() PALUDIS_ATTRIBUTE((warn_unused_result)); @@ -150,17 +150,17 @@ namespace paludis ELikeTraceChoiceValue(const std::shared_ptr<const PackageID> &, const Environment * const env, const std::shared_ptr<const Choice> &); - virtual const UnprefixedChoiceName unprefixed_name() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const ChoiceNameWithPrefix name_with_prefix() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual bool enabled() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual bool enabled_by_default() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual bool locked() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::string description() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual ChoiceOrigin origin() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::string parameter() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::shared_ptr<const PermittedChoiceValueParameterValues> permitted_parameter_values() const - PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual bool presumed() const PALUDIS_ATTRIBUTE((warn_unused_result)); + const UnprefixedChoiceName unprefixed_name() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + const ChoiceNameWithPrefix name_with_prefix() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + bool enabled() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + bool enabled_by_default() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + bool locked() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::string description() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + ChoiceOrigin origin() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::string parameter() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::shared_ptr<const PermittedChoiceValueParameterValues> permitted_parameter_values() const + override PALUDIS_ATTRIBUTE((warn_unused_result)); + bool presumed() const override PALUDIS_ATTRIBUTE((warn_unused_result)); static const UnprefixedChoiceName canonical_unprefixed_name() PALUDIS_ATTRIBUTE((warn_unused_result)); static const ChoiceNameWithPrefix canonical_name_with_prefix() PALUDIS_ATTRIBUTE((warn_unused_result)); @@ -178,17 +178,17 @@ namespace paludis const Environment * const env, const std::shared_ptr<const Choice> &, const ELikeSymbolsChoiceValueParameter _force); - virtual const UnprefixedChoiceName unprefixed_name() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const ChoiceNameWithPrefix name_with_prefix() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual bool enabled() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual bool enabled_by_default() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual bool locked() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::string description() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual ChoiceOrigin origin() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::string parameter() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::shared_ptr<const PermittedChoiceValueParameterValues> permitted_parameter_values() const - PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual bool presumed() const PALUDIS_ATTRIBUTE((warn_unused_result)); + const UnprefixedChoiceName unprefixed_name() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + const ChoiceNameWithPrefix name_with_prefix() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + bool enabled() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + bool enabled_by_default() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + bool locked() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::string description() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + ChoiceOrigin origin() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::string parameter() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::shared_ptr<const PermittedChoiceValueParameterValues> permitted_parameter_values() const + override PALUDIS_ATTRIBUTE((warn_unused_result)); + bool presumed() const override PALUDIS_ATTRIBUTE((warn_unused_result)); static const UnprefixedChoiceName canonical_unprefixed_name() PALUDIS_ATTRIBUTE((warn_unused_result)); static const ChoiceNameWithPrefix canonical_name_with_prefix() PALUDIS_ATTRIBUTE((warn_unused_result)); @@ -210,17 +210,17 @@ namespace paludis const Environment * const env, const std::shared_ptr<const Choice> &, const ELikeWorkChoiceValueParameter force); - virtual const UnprefixedChoiceName unprefixed_name() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const ChoiceNameWithPrefix name_with_prefix() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual bool enabled() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual bool enabled_by_default() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual bool locked() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::string description() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual ChoiceOrigin origin() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::string parameter() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::shared_ptr<const PermittedChoiceValueParameterValues> permitted_parameter_values() const - PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual bool presumed() const PALUDIS_ATTRIBUTE((warn_unused_result)); + const UnprefixedChoiceName unprefixed_name() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + const ChoiceNameWithPrefix name_with_prefix() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + bool enabled() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + bool enabled_by_default() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + bool locked() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::string description() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + ChoiceOrigin origin() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::string parameter() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::shared_ptr<const PermittedChoiceValueParameterValues> permitted_parameter_values() const + override PALUDIS_ATTRIBUTE((warn_unused_result)); + bool presumed() const override PALUDIS_ATTRIBUTE((warn_unused_result)); static const UnprefixedChoiceName canonical_unprefixed_name() PALUDIS_ATTRIBUTE((warn_unused_result)); static const ChoiceNameWithPrefix canonical_name_with_prefix() PALUDIS_ATTRIBUTE((warn_unused_result)); @@ -244,26 +244,26 @@ namespace paludis ///\name Properties ///\{ - virtual const UnprefixedChoiceName unprefixed_name() const - PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const ChoiceNameWithPrefix name_with_prefix() const - PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual bool enabled() const - PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual bool enabled_by_default() const - PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual bool presumed() const - PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual bool locked() const - PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::string description() const - PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual ChoiceOrigin origin() const - PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::string parameter() const - PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::shared_ptr<const PermittedChoiceValueParameterValues> permitted_parameter_values() const - PALUDIS_ATTRIBUTE((warn_unused_result)); + const UnprefixedChoiceName unprefixed_name() const + override PALUDIS_ATTRIBUTE((warn_unused_result)); + const ChoiceNameWithPrefix name_with_prefix() const + override PALUDIS_ATTRIBUTE((warn_unused_result)); + bool enabled() const + override PALUDIS_ATTRIBUTE((warn_unused_result)); + bool enabled_by_default() const + override PALUDIS_ATTRIBUTE((warn_unused_result)); + bool presumed() const + override PALUDIS_ATTRIBUTE((warn_unused_result)); + bool locked() const + override PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::string description() const + override PALUDIS_ATTRIBUTE((warn_unused_result)); + ChoiceOrigin origin() const + override PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::string parameter() const + override PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::shared_ptr<const PermittedChoiceValueParameterValues> permitted_parameter_values() const + override PALUDIS_ATTRIBUTE((warn_unused_result)); /// \} diff --git a/paludis/elike_slot_requirement.hh b/paludis/elike_slot_requirement.hh index a447ecb63..c52cb0a61 100644 --- a/paludis/elike_slot_requirement.hh +++ b/paludis/elike_slot_requirement.hh @@ -36,9 +36,9 @@ namespace paludis public: ELikeSlotExactFullRequirement(const std::pair<SlotName, SlotName> &, const std::shared_ptr<const SlotRequirement> &); - virtual const std::string as_string() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::shared_ptr<const SlotRequirement> maybe_original_requirement_if_rewritten() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::pair<SlotName, SlotName> slots() const PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::string as_string() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::shared_ptr<const SlotRequirement> maybe_original_requirement_if_rewritten() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::pair<SlotName, SlotName> slots() const override PALUDIS_ATTRIBUTE((warn_unused_result)); }; class PALUDIS_VISIBLE ELikeSlotExactPartialRequirement : @@ -51,25 +51,25 @@ namespace paludis public: ELikeSlotExactPartialRequirement(const SlotName &, const std::shared_ptr<const SlotRequirement> &); - virtual const std::string as_string() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::shared_ptr<const SlotRequirement> maybe_original_requirement_if_rewritten() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const SlotName slot() const PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::string as_string() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::shared_ptr<const SlotRequirement> maybe_original_requirement_if_rewritten() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + const SlotName slot() const override PALUDIS_ATTRIBUTE((warn_unused_result)); }; class PALUDIS_VISIBLE ELikeSlotAnyUnlockedRequirement : public SlotAnyUnlockedRequirement { public: - virtual const std::string as_string() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::shared_ptr<const SlotRequirement> maybe_original_requirement_if_rewritten() const PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::string as_string() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::shared_ptr<const SlotRequirement> maybe_original_requirement_if_rewritten() const override PALUDIS_ATTRIBUTE((warn_unused_result)); }; class PALUDIS_VISIBLE ELikeSlotAnyAtAllLockedRequirement : public SlotAnyAtAllLockedRequirement { public: - virtual const std::string as_string() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::shared_ptr<const SlotRequirement> maybe_original_requirement_if_rewritten() const PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::string as_string() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::shared_ptr<const SlotRequirement> maybe_original_requirement_if_rewritten() const override PALUDIS_ATTRIBUTE((warn_unused_result)); }; class PALUDIS_VISIBLE ELikeSlotAnyPartialLockedRequirement : @@ -81,9 +81,9 @@ namespace paludis public: ELikeSlotAnyPartialLockedRequirement(const SlotName &); - virtual const std::string as_string() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::shared_ptr<const SlotRequirement> maybe_original_requirement_if_rewritten() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const SlotName slot() const PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::string as_string() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::shared_ptr<const SlotRequirement> maybe_original_requirement_if_rewritten() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + const SlotName slot() const override PALUDIS_ATTRIBUTE((warn_unused_result)); }; class PALUDIS_VISIBLE ELikeSlotUnknownRewrittenRequirement : @@ -95,9 +95,9 @@ namespace paludis public: ELikeSlotUnknownRewrittenRequirement(const SlotName &); - virtual const std::string as_string() const PALUDIS_ATTRIBUTE((noreturn)); - virtual const std::shared_ptr<const SlotRequirement> maybe_original_requirement_if_rewritten() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const SlotName slot() const PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::string as_string() const override PALUDIS_ATTRIBUTE((noreturn)); + const std::shared_ptr<const SlotRequirement> maybe_original_requirement_if_rewritten() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + const SlotName slot() const override PALUDIS_ATTRIBUTE((warn_unused_result)); }; } diff --git a/paludis/environment.hh b/paludis/environment.hh index fafd47745..60e906f8b 100644 --- a/paludis/environment.hh +++ b/paludis/environment.hh @@ -79,7 +79,7 @@ namespace paludis AmbiguousPackageNameError(const AmbiguousPackageNameError &); - virtual ~AmbiguousPackageNameError(); + ~AmbiguousPackageNameError() override; ///\} @@ -135,7 +135,7 @@ namespace paludis NoSuchPackageError(const std::string & name) noexcept; - virtual ~NoSuchPackageError() = default; + ~NoSuchPackageError() override = default; ///\} @@ -167,7 +167,7 @@ namespace paludis NoSuchRepositoryError(const RepositoryName &) noexcept; - ~NoSuchRepositoryError(); + ~NoSuchRepositoryError() override; ///\} @@ -207,7 +207,7 @@ namespace paludis ///\{ Environment() = default; - virtual ~Environment() = 0; + ~Environment() override = 0; Environment(const Environment &) = delete; Environment & operator= (const Environment &) = delete; diff --git a/paludis/environment_implementation.hh b/paludis/environment_implementation.hh index 7cb4b90b1..be9bfceda 100644 --- a/paludis/environment_implementation.hh +++ b/paludis/environment_implementation.hh @@ -65,72 +65,72 @@ namespace paludis ///\{ EnvironmentImplementation(); - virtual ~EnvironmentImplementation() = 0; + ~EnvironmentImplementation() override = 0; ///\} - virtual std::shared_ptr<const FSPathSequence> bashrc_files() const - PALUDIS_ATTRIBUTE((warn_unused_result)); + std::shared_ptr<const FSPathSequence> bashrc_files() const + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual std::shared_ptr<const FSPathSequence> syncers_dirs() const - PALUDIS_ATTRIBUTE((warn_unused_result)); + std::shared_ptr<const FSPathSequence> syncers_dirs() const + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual std::shared_ptr<const FSPathSequence> fetchers_dirs() const - PALUDIS_ATTRIBUTE((warn_unused_result)); + std::shared_ptr<const FSPathSequence> fetchers_dirs() const + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual std::string distribution() const - PALUDIS_ATTRIBUTE((warn_unused_result)); + std::string distribution() const + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual bool is_paludis_package(const QualifiedPackageName &) const - PALUDIS_ATTRIBUTE((warn_unused_result)); + bool is_paludis_package(const QualifiedPackageName &) const + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual std::shared_ptr<PackageIDSequence> operator[] (const Selection &) const - PALUDIS_ATTRIBUTE((warn_unused_result)); + std::shared_ptr<PackageIDSequence> operator[] (const Selection &) const + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual NotifierCallbackID add_notifier_callback(const NotifierCallbackFunction &); + NotifierCallbackID add_notifier_callback(const NotifierCallbackFunction &) override; - virtual void remove_notifier_callback(const NotifierCallbackID); + void remove_notifier_callback(const NotifierCallbackID) override; - virtual void trigger_notifier_callback(const NotifierCallbackEvent &) const; + void trigger_notifier_callback(const NotifierCallbackEvent &) const override; - virtual void add_set( + void add_set( const SetName &, const SetName &, const std::function<std::shared_ptr<const SetSpecTree> ()> &, - const bool combine) const; + const bool combine) const override; - virtual std::shared_ptr<const SetNameSet> set_names() const - PALUDIS_ATTRIBUTE((warn_unused_result)); + std::shared_ptr<const SetNameSet> set_names() const + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::shared_ptr<const SetSpecTree> set(const SetName &) const - PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::shared_ptr<const SetSpecTree> set(const SetName &) const + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual void add_repository(int importance, const std::shared_ptr<Repository> &); + void add_repository(int importance, const std::shared_ptr<Repository> &) override; - virtual const std::shared_ptr<const Repository> fetch_repository(const RepositoryName &) const - PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::shared_ptr<const Repository> fetch_repository(const RepositoryName &) const + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::shared_ptr<Repository> fetch_repository(const RepositoryName &) - PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::shared_ptr<Repository> fetch_repository(const RepositoryName &) + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual bool has_repository_named(const RepositoryName &) const - PALUDIS_ATTRIBUTE((warn_unused_result)); + bool has_repository_named(const RepositoryName &) const + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual QualifiedPackageName fetch_unique_qualified_package_name( + QualifiedPackageName fetch_unique_qualified_package_name( const PackageNamePart &, const Filter & = all_filter(), const bool disambiguate = true) const - PALUDIS_ATTRIBUTE((warn_unused_result)); + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual bool more_important_than(const RepositoryName &, const RepositoryName &) const - PALUDIS_ATTRIBUTE((warn_unused_result)); + bool more_important_than(const RepositoryName &, const RepositoryName &) const + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual RepositoryConstIterator begin_repositories() const - PALUDIS_ATTRIBUTE((warn_unused_result)); + RepositoryConstIterator begin_repositories() const + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual RepositoryConstIterator end_repositories() const - PALUDIS_ATTRIBUTE((warn_unused_result)); + RepositoryConstIterator end_repositories() const + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::shared_ptr<const Set<std::string> > expand_licence( - const std::string &) const; + const std::shared_ptr<const Set<std::string> > expand_licence( + const std::string &) const override; }; class PALUDIS_VISIBLE DuplicateSetError : diff --git a/paludis/environments/paludis/paludis_environment.hh b/paludis/environments/paludis/paludis_environment.hh index 701537594..93b638bd4 100644 --- a/paludis/environments/paludis/paludis_environment.hh +++ b/paludis/environments/paludis/paludis_environment.hh @@ -50,8 +50,8 @@ namespace paludis Pimp<PaludisEnvironment> _imp; protected: - virtual void need_keys_added() const; - virtual void populate_sets() const; + void need_keys_added() const override; + void populate_sets() const override; public: ///\name Basic operations @@ -59,7 +59,7 @@ namespace paludis PaludisEnvironment(const std::string &); - ~PaludisEnvironment(); + ~PaludisEnvironment() override; ///\} @@ -73,95 +73,95 @@ namespace paludis ///\} - virtual std::shared_ptr<const FSPathSequence> bashrc_files() const - PALUDIS_ATTRIBUTE((warn_unused_result)); + std::shared_ptr<const FSPathSequence> bashrc_files() const + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual std::shared_ptr<const FSPathSequence> syncers_dirs() const - PALUDIS_ATTRIBUTE((warn_unused_result)); + std::shared_ptr<const FSPathSequence> syncers_dirs() const + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual std::shared_ptr<const FSPathSequence> fetchers_dirs() const - PALUDIS_ATTRIBUTE((warn_unused_result)); + std::shared_ptr<const FSPathSequence> fetchers_dirs() const + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual std::shared_ptr<const FSPathSequence> hook_dirs() const - PALUDIS_ATTRIBUTE((warn_unused_result)); + std::shared_ptr<const FSPathSequence> hook_dirs() const + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual std::string reduced_username() const - PALUDIS_ATTRIBUTE((warn_unused_result)); + std::string reduced_username() const + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual uid_t reduced_uid() const - PALUDIS_ATTRIBUTE((warn_unused_result)); + uid_t reduced_uid() const + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual gid_t reduced_gid() const - PALUDIS_ATTRIBUTE((warn_unused_result)); + gid_t reduced_gid() const + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual std::shared_ptr<const MirrorsSequence> mirrors(const std::string &) const - PALUDIS_ATTRIBUTE((warn_unused_result)); + std::shared_ptr<const MirrorsSequence> mirrors(const std::string &) const + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual HookResult perform_hook( + HookResult perform_hook( const Hook &, const std::shared_ptr<OutputManager> &) const - PALUDIS_ATTRIBUTE((warn_unused_result)); + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual std::string distribution() const - PALUDIS_ATTRIBUTE((warn_unused_result)); + std::string distribution() const + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual bool accept_keywords(const std::shared_ptr<const KeywordNameSet> &, const std::shared_ptr<const PackageID> &) const - PALUDIS_ATTRIBUTE((warn_unused_result)); + bool accept_keywords(const std::shared_ptr<const KeywordNameSet> &, const std::shared_ptr<const PackageID> &) const + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual bool accept_license(const std::string &, const std::shared_ptr<const PackageID> &) const - PALUDIS_ATTRIBUTE((warn_unused_result)); + bool accept_license(const std::string &, const std::shared_ptr<const PackageID> &) const + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::shared_ptr<const Mask> mask_for_user(const std::shared_ptr<const PackageID> &, const bool) const - PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::shared_ptr<const Mask> mask_for_user(const std::shared_ptr<const PackageID> &, const bool) const + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual bool unmasked_by_user(const std::shared_ptr<const PackageID> &, const std::string &) const - PALUDIS_ATTRIBUTE((warn_unused_result)); + bool unmasked_by_user(const std::shared_ptr<const PackageID> &, const std::string &) const + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual bool add_to_world(const QualifiedPackageName &) const; + bool add_to_world(const QualifiedPackageName &) const override; - virtual bool add_to_world(const SetName &) const; + bool add_to_world(const SetName &) const override; - virtual bool remove_from_world(const QualifiedPackageName &) const; + bool remove_from_world(const QualifiedPackageName &) const override; - virtual bool remove_from_world(const SetName &) const; + bool remove_from_world(const SetName &) const override; - virtual const std::shared_ptr<const MetadataValueKey<std::string> > format_key() const; - virtual const std::shared_ptr<const MetadataValueKey<FSPath> > config_location_key() const; - virtual const std::shared_ptr<const MetadataValueKey<FSPath> > preferred_root_key() const; - virtual const std::shared_ptr<const MetadataValueKey<FSPath> > system_root_key() const; + const std::shared_ptr<const MetadataValueKey<std::string> > format_key() const override; + const std::shared_ptr<const MetadataValueKey<FSPath> > config_location_key() const override; + const std::shared_ptr<const MetadataValueKey<FSPath> > preferred_root_key() const override; + const std::shared_ptr<const MetadataValueKey<FSPath> > system_root_key() const override; - virtual const Tribool want_choice_enabled( + const Tribool want_choice_enabled( const std::shared_ptr<const PackageID> &, const std::shared_ptr<const Choice> &, const UnprefixedChoiceName & ) const - PALUDIS_ATTRIBUTE((warn_unused_result)); + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::string value_for_choice_parameter( + const std::string value_for_choice_parameter( const std::shared_ptr<const PackageID> &, const std::shared_ptr<const Choice> &, const UnprefixedChoiceName & ) const - PALUDIS_ATTRIBUTE((warn_unused_result)); + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual std::shared_ptr<const Set<UnprefixedChoiceName> > known_choice_value_names( + std::shared_ptr<const Set<UnprefixedChoiceName> > known_choice_value_names( const std::shared_ptr<const PackageID> &, const std::shared_ptr<const Choice> & ) const - PALUDIS_ATTRIBUTE((warn_unused_result)); + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual Tribool interest_in_suggestion( + Tribool interest_in_suggestion( const std::shared_ptr<const PackageID> & from_id, - const PackageDepSpec & spec) const; + const PackageDepSpec & spec) const override; - virtual const std::shared_ptr<OutputManager> create_output_manager( - const CreateOutputManagerInfo &) const; + const std::shared_ptr<OutputManager> create_output_manager( + const CreateOutputManagerInfo &) const override; - virtual const std::shared_ptr<Repository> repository_from_new_config_file( - const FSPath &) PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::shared_ptr<Repository> repository_from_new_config_file( + const FSPath &) override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual void update_config_files_for_package_move( - const PackageDepSpec &, const QualifiedPackageName &) const; + void update_config_files_for_package_move( + const PackageDepSpec &, const QualifiedPackageName &) const override; }; } #endif diff --git a/paludis/environments/test/test_environment.hh b/paludis/environments/test/test_environment.hh index c07511eef..6a79893b0 100644 --- a/paludis/environments/test/test_environment.hh +++ b/paludis/environments/test/test_environment.hh @@ -46,8 +46,8 @@ namespace paludis Pimp<TestEnvironment> _imp; protected: - virtual void need_keys_added() const; - virtual void populate_sets() const; + void need_keys_added() const override; + void populate_sets() const override; public: ///\name Basic operations @@ -58,86 +58,86 @@ namespace paludis TestEnvironment(const FSPath &); TestEnvironment(const FSPath &, bool); - ~TestEnvironment(); + ~TestEnvironment() override; ///\} - virtual bool accept_license(const std::string &, const std::shared_ptr<const PackageID> &) const - PALUDIS_ATTRIBUTE((warn_unused_result)); + bool accept_license(const std::string &, const std::shared_ptr<const PackageID> &) const + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual bool accept_keywords(const std::shared_ptr<const KeywordNameSet> &, const std::shared_ptr<const PackageID> &) const - PALUDIS_ATTRIBUTE((warn_unused_result)); + bool accept_keywords(const std::shared_ptr<const KeywordNameSet> &, const std::shared_ptr<const PackageID> &) const + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::shared_ptr<const Mask> mask_for_user(const std::shared_ptr<const PackageID> &, const bool) const - PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::shared_ptr<const Mask> mask_for_user(const std::shared_ptr<const PackageID> &, const bool) const + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual bool unmasked_by_user(const std::shared_ptr<const PackageID> &, const std::string &) const - PALUDIS_ATTRIBUTE((warn_unused_result)); + bool unmasked_by_user(const std::shared_ptr<const PackageID> &, const std::string &) const + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual std::shared_ptr<const FSPathSequence> hook_dirs() const - PALUDIS_ATTRIBUTE((warn_unused_result)); + std::shared_ptr<const FSPathSequence> hook_dirs() const + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual std::string reduced_username() const; + std::string reduced_username() const override; - virtual uid_t reduced_uid() const; + uid_t reduced_uid() const override; - virtual gid_t reduced_gid() const; + gid_t reduced_gid() const override; - virtual std::shared_ptr<const MirrorsSequence> mirrors(const std::string &) const - PALUDIS_ATTRIBUTE((warn_unused_result)); + std::shared_ptr<const MirrorsSequence> mirrors(const std::string &) const + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual HookResult perform_hook( + HookResult perform_hook( const Hook &, const std::shared_ptr<OutputManager> &) const - PALUDIS_ATTRIBUTE((warn_unused_result)); + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual bool add_to_world(const QualifiedPackageName &) const; + bool add_to_world(const QualifiedPackageName &) const override; - virtual bool add_to_world(const SetName &) const; + bool add_to_world(const SetName &) const override; - virtual bool remove_from_world(const QualifiedPackageName &) const; + bool remove_from_world(const QualifiedPackageName &) const override; - virtual bool remove_from_world(const SetName &) const; + bool remove_from_world(const SetName &) const override; - virtual const std::shared_ptr<const MetadataValueKey<std::string> > format_key() const; - virtual const std::shared_ptr<const MetadataValueKey<FSPath> > config_location_key() const; - virtual const std::shared_ptr<const MetadataValueKey<FSPath> > preferred_root_key() const; - virtual const std::shared_ptr<const MetadataValueKey<FSPath> > system_root_key() const; + const std::shared_ptr<const MetadataValueKey<std::string> > format_key() const override; + const std::shared_ptr<const MetadataValueKey<FSPath> > config_location_key() const override; + const std::shared_ptr<const MetadataValueKey<FSPath> > preferred_root_key() const override; + const std::shared_ptr<const MetadataValueKey<FSPath> > system_root_key() const override; - virtual Tribool interest_in_suggestion( + Tribool interest_in_suggestion( const std::shared_ptr<const PackageID> & from_id, - const PackageDepSpec & spec) const; + const PackageDepSpec & spec) const override; - virtual const Tribool want_choice_enabled( + const Tribool want_choice_enabled( const std::shared_ptr<const PackageID> &, const std::shared_ptr<const Choice> &, const UnprefixedChoiceName & ) const - PALUDIS_ATTRIBUTE((warn_unused_result)); + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::string value_for_choice_parameter( + const std::string value_for_choice_parameter( const std::shared_ptr<const PackageID> &, const std::shared_ptr<const Choice> &, const UnprefixedChoiceName & ) const - PALUDIS_ATTRIBUTE((warn_unused_result)); + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual std::shared_ptr<const Set<UnprefixedChoiceName> > known_choice_value_names( + std::shared_ptr<const Set<UnprefixedChoiceName> > known_choice_value_names( const std::shared_ptr<const PackageID> &, const std::shared_ptr<const Choice> & ) const - PALUDIS_ATTRIBUTE((warn_unused_result)); + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::shared_ptr<OutputManager> create_output_manager( - const CreateOutputManagerInfo &) const; + const std::shared_ptr<OutputManager> create_output_manager( + const CreateOutputManagerInfo &) const override; void set_want_choice_enabled(const ChoicePrefixName &, const UnprefixedChoiceName &, const Tribool); - virtual const std::shared_ptr<Repository> repository_from_new_config_file( - const FSPath &) PALUDIS_ATTRIBUTE((noreturn)); + const std::shared_ptr<Repository> repository_from_new_config_file( + const FSPath &) override PALUDIS_ATTRIBUTE((noreturn)); - virtual void update_config_files_for_package_move( - const PackageDepSpec &, const QualifiedPackageName &) const; + void update_config_files_for_package_move( + const PackageDepSpec &, const QualifiedPackageName &) const override; void set_system_root(const FSPath &); }; diff --git a/paludis/file_output_manager.hh b/paludis/file_output_manager.hh index f87510ae5..6efc86176 100644 --- a/paludis/file_output_manager.hh +++ b/paludis/file_output_manager.hh @@ -44,17 +44,17 @@ namespace paludis const bool keep_on_empty, const std::shared_ptr<OutputManager> & summary_output_manager, const std::string & summary_output_message); - ~FileOutputManager(); + ~FileOutputManager() override; - virtual std::ostream & stdout_stream() PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual std::ostream & stderr_stream() PALUDIS_ATTRIBUTE((warn_unused_result)); + std::ostream & stdout_stream() override PALUDIS_ATTRIBUTE((warn_unused_result)); + std::ostream & stderr_stream() override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual void succeeded(); - virtual void ignore_succeeded(); - virtual void flush(); - virtual bool want_to_flush() const; - virtual void nothing_more_to_come(); - virtual void message(const MessageType, const std::string &); + void succeeded() override; + void ignore_succeeded() override; + void flush() override; + bool want_to_flush() const override; + void nothing_more_to_come() override; + void message(const MessageType, const std::string &) override; static const std::shared_ptr<const Set<std::string> > factory_managers() PALUDIS_ATTRIBUTE((warn_unused_result)); diff --git a/paludis/filter_handler.hh b/paludis/filter_handler.hh index 0699d4eac..5e2897e06 100644 --- a/paludis/filter_handler.hh +++ b/paludis/filter_handler.hh @@ -63,25 +63,25 @@ namespace paludis public FilterHandler { public: - virtual const RepositoryContentMayExcludes may_excludes() const; + const RepositoryContentMayExcludes may_excludes() const override; - virtual std::shared_ptr<const RepositoryNameSet> repositories( + std::shared_ptr<const RepositoryNameSet> repositories( const Environment * const, - const std::shared_ptr<const RepositoryNameSet> &) const; + const std::shared_ptr<const RepositoryNameSet> &) const override; - virtual std::shared_ptr<const CategoryNamePartSet> categories( + std::shared_ptr<const CategoryNamePartSet> categories( const Environment * const, const std::shared_ptr<const RepositoryNameSet> &, - const std::shared_ptr<const CategoryNamePartSet> &) const; + const std::shared_ptr<const CategoryNamePartSet> &) const override; - virtual std::shared_ptr<const QualifiedPackageNameSet> packages( + std::shared_ptr<const QualifiedPackageNameSet> packages( const Environment * const, const std::shared_ptr<const RepositoryNameSet> &, - const std::shared_ptr<const QualifiedPackageNameSet> &) const; + const std::shared_ptr<const QualifiedPackageNameSet> &) const override; - virtual std::shared_ptr<const PackageIDSet> ids( + std::shared_ptr<const PackageIDSet> ids( const Environment * const, - const std::shared_ptr<const PackageIDSet> &) const; + const std::shared_ptr<const PackageIDSet> &) const override; }; } diff --git a/paludis/format_messages_output_manager.hh b/paludis/format_messages_output_manager.hh index 95203c02e..91ea172af 100644 --- a/paludis/format_messages_output_manager.hh +++ b/paludis/format_messages_output_manager.hh @@ -60,17 +60,17 @@ namespace paludis const std::string & format_status, const FormatMessagesOutputManagerFormatFunction &); - ~FormatMessagesOutputManager(); + ~FormatMessagesOutputManager() override; - virtual std::ostream & stdout_stream() PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual std::ostream & stderr_stream() PALUDIS_ATTRIBUTE((warn_unused_result)); + std::ostream & stdout_stream() override PALUDIS_ATTRIBUTE((warn_unused_result)); + std::ostream & stderr_stream() override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual void succeeded(); - virtual void ignore_succeeded(); - virtual void flush(); - virtual bool want_to_flush() const; - virtual void nothing_more_to_come(); - virtual void message(const MessageType, const std::string &); + void succeeded() override; + void ignore_succeeded() override; + void flush() override; + bool want_to_flush() const override; + void nothing_more_to_come() override; + void message(const MessageType, const std::string &) override; static const std::shared_ptr<const Set<std::string> > factory_managers() PALUDIS_ATTRIBUTE((warn_unused_result)); diff --git a/paludis/formatted_pretty_printer.hh b/paludis/formatted_pretty_printer.hh index a8f55fd88..bbdf766d1 100644 --- a/paludis/formatted_pretty_printer.hh +++ b/paludis/formatted_pretty_printer.hh @@ -47,35 +47,35 @@ namespace paludis FormattedPrettyPrinter( const Environment * const, const std::shared_ptr<const PackageID> &); - ~FormattedPrettyPrinter(); + ~FormattedPrettyPrinter() override; - virtual const std::string prettify(const PackageDepSpec &) const; - virtual const std::string prettify(const BlockDepSpec &) const; - virtual const std::string prettify(const ConditionalDepSpec &) const; - virtual const std::string prettify(const NamedSetDepSpec &) const; - virtual const std::string prettify(const SimpleURIDepSpec &) const; - virtual const std::string prettify(const PlainTextDepSpec &) const; - virtual const std::string prettify(const LicenseDepSpec &) const; - virtual const std::string prettify(const FetchableURIDepSpec &) const; - virtual const std::string prettify(const URILabelsDepSpec &) const; - virtual const std::string prettify(const DependenciesLabelsDepSpec &) const; - virtual const std::string prettify(const PlainTextLabelDepSpec &) const; + const std::string prettify(const PackageDepSpec &) const override; + const std::string prettify(const BlockDepSpec &) const override; + const std::string prettify(const ConditionalDepSpec &) const override; + const std::string prettify(const NamedSetDepSpec &) const override; + const std::string prettify(const SimpleURIDepSpec &) const override; + const std::string prettify(const PlainTextDepSpec &) const override; + const std::string prettify(const LicenseDepSpec &) const override; + const std::string prettify(const FetchableURIDepSpec &) const override; + const std::string prettify(const URILabelsDepSpec &) const override; + const std::string prettify(const DependenciesLabelsDepSpec &) const override; + const std::string prettify(const PlainTextLabelDepSpec &) const override; - virtual const std::string prettify(const std::shared_ptr<const PackageID> &) const; + const std::string prettify(const std::shared_ptr<const PackageID> &) const override; - virtual const std::string prettify(const bool) const; + const std::string prettify(const bool) const override; - virtual const std::string prettify(const long) const; + const std::string prettify(const long) const override; - virtual const std::string prettify(const std::string &) const; + const std::string prettify(const std::string &) const override; - virtual const std::string prettify(const std::pair<const std::string, std::string> &) const; + const std::string prettify(const std::pair<const std::string, std::string> &) const override; - virtual const std::string prettify(const FSPath &) const; + const std::string prettify(const FSPath &) const override; - virtual const std::string prettify(const KeywordName &) const; + const std::string prettify(const KeywordName &) const override; - virtual const std::string prettify(const Maintainer &) const; + const std::string prettify(const Maintainer &) const override; }; } diff --git a/paludis/forward_at_finish_output_manager.hh b/paludis/forward_at_finish_output_manager.hh index fc6c6cd6f..92f184b47 100644 --- a/paludis/forward_at_finish_output_manager.hh +++ b/paludis/forward_at_finish_output_manager.hh @@ -41,17 +41,17 @@ namespace paludis const bool if_success, const bool if_failure, const std::shared_ptr<OutputManager> & child); - ~ForwardAtFinishOutputManager(); + ~ForwardAtFinishOutputManager() override; - virtual std::ostream & stdout_stream() PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual std::ostream & stderr_stream() PALUDIS_ATTRIBUTE((warn_unused_result)); + std::ostream & stdout_stream() override PALUDIS_ATTRIBUTE((warn_unused_result)); + std::ostream & stderr_stream() override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual void succeeded(); - virtual void ignore_succeeded(); - virtual void flush(); - virtual bool want_to_flush() const; - virtual void message(const MessageType, const std::string &); - virtual void nothing_more_to_come(); + void succeeded() override; + void ignore_succeeded() override; + void flush() override; + bool want_to_flush() const override; + void message(const MessageType, const std::string &) override; + void nothing_more_to_come() override; static const std::shared_ptr<const Set<std::string> > factory_managers() PALUDIS_ATTRIBUTE((warn_unused_result)); diff --git a/paludis/fs_merger.hh b/paludis/fs_merger.hh index a27f3393e..e1102ed66 100644 --- a/paludis/fs_merger.hh +++ b/paludis/fs_merger.hh @@ -166,7 +166,7 @@ namespace paludis ///\} - virtual Hook extend_hook(const Hook &); + Hook extend_hook(const Hook &) override; ///\name Track and record merges ///\{ @@ -181,7 +181,7 @@ namespace paludis ///\name Handle filesystem entry things ///\{ - virtual void on_file_main(bool is_check, const FSPath & src, const FSPath & dst); + void on_file_main(bool is_check, const FSPath & src, const FSPath & dst) override; virtual void on_file_over_nothing(bool is_check, const FSPath &, const FSPath &); virtual void on_file_over_file(bool is_check, const FSPath &, const FSPath &); virtual void on_file_over_dir(bool is_check, const FSPath &, const FSPath &); @@ -192,9 +192,9 @@ namespace paludis virtual void unlink_file(FSPath); virtual void record_install_file(const FSPath &, const FSPath &, const std::string &, const FSMergerStatusFlags &) = 0; - virtual void on_enter_dir(bool is_check, const FSPath); + void on_enter_dir(bool is_check, const FSPath) override; - virtual void on_dir_main(bool is_check, const FSPath & src, const FSPath & dst); + void on_dir_main(bool is_check, const FSPath & src, const FSPath & dst) override; virtual void on_dir_over_nothing(bool is_check, const FSPath &, const FSPath &); virtual void on_dir_over_file(bool is_check, const FSPath &, const FSPath &); virtual void on_dir_over_dir(bool is_check, const FSPath &, const FSPath &); @@ -206,7 +206,7 @@ namespace paludis virtual void record_install_dir(const FSPath &, const FSPath &, const FSMergerStatusFlags &) = 0; virtual void record_install_under_dir(const FSPath &, const FSMergerStatusFlags &) = 0; - virtual void on_sym_main(bool is_check, const FSPath & src, const FSPath & dst); + void on_sym_main(bool is_check, const FSPath & src, const FSPath & dst) override; virtual void on_sym_over_nothing(bool is_check, const FSPath &, const FSPath &); virtual void on_sym_over_file(bool is_check, const FSPath &, const FSPath &); virtual void on_sym_over_dir(bool is_check, const FSPath &, const FSPath &); @@ -219,11 +219,11 @@ namespace paludis virtual void unlink_misc(FSPath); - virtual void prepare_install_under(); + void prepare_install_under() override; - virtual FSPath canonicalise_root_path(const FSPath & f); + FSPath canonicalise_root_path(const FSPath & f) override; - virtual void do_dir_recursive(bool is_check, const FSPath &, const FSPath &); + void do_dir_recursive(bool is_check, const FSPath &, const FSPath &) override; ///\} @@ -251,7 +251,7 @@ namespace paludis ///\} - virtual void merge(); + void merge() override; }; } diff --git a/paludis/generator_handler.hh b/paludis/generator_handler.hh index 5a42da3a4..5e42a8d98 100644 --- a/paludis/generator_handler.hh +++ b/paludis/generator_handler.hh @@ -68,26 +68,26 @@ namespace paludis public GeneratorHandler { public: - virtual std::shared_ptr<const RepositoryNameSet> repositories( + std::shared_ptr<const RepositoryNameSet> repositories( const Environment * const env, - const RepositoryContentMayExcludes &) const; + const RepositoryContentMayExcludes &) const override; - virtual std::shared_ptr<const CategoryNamePartSet> categories( + std::shared_ptr<const CategoryNamePartSet> categories( const Environment * const env, const std::shared_ptr<const RepositoryNameSet> & repos, - const RepositoryContentMayExcludes &) const; + const RepositoryContentMayExcludes &) const override; - virtual std::shared_ptr<const QualifiedPackageNameSet> packages( + std::shared_ptr<const QualifiedPackageNameSet> packages( const Environment * const env, const std::shared_ptr<const RepositoryNameSet> & repos, const std::shared_ptr<const CategoryNamePartSet> & cats, - const RepositoryContentMayExcludes &) const; + const RepositoryContentMayExcludes &) const override; - virtual std::shared_ptr<const PackageIDSet> ids( + std::shared_ptr<const PackageIDSet> ids( const Environment * const env, const std::shared_ptr<const RepositoryNameSet> & repos, const std::shared_ptr<const QualifiedPackageNameSet> & qpns, - const RepositoryContentMayExcludes &) const; + const RepositoryContentMayExcludes &) const override; }; } diff --git a/paludis/ipc_output_manager.hh b/paludis/ipc_output_manager.hh index 3ddac98fe..7970182f1 100644 --- a/paludis/ipc_output_manager.hh +++ b/paludis/ipc_output_manager.hh @@ -45,17 +45,17 @@ namespace paludis const int pipe_read_fd, const int pipe_write_fd, const CreateOutputManagerInfo &); - ~IPCOutputManager() noexcept(false); + ~IPCOutputManager() noexcept(false) override; - virtual std::ostream & stdout_stream() PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual std::ostream & stderr_stream() PALUDIS_ATTRIBUTE((warn_unused_result)); + std::ostream & stdout_stream() override PALUDIS_ATTRIBUTE((warn_unused_result)); + std::ostream & stderr_stream() override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual void succeeded(); - virtual void ignore_succeeded(); - virtual void flush(); - virtual bool want_to_flush() const; - virtual void nothing_more_to_come(); - virtual void message(const MessageType, const std::string &); + void succeeded() override; + void ignore_succeeded() override; + void flush() override; + bool want_to_flush() const override; + void nothing_more_to_come() override; + void message(const MessageType, const std::string &) override; }; class PALUDIS_VISIBLE IPCInputManager diff --git a/paludis/libtool_linkage_checker.hh b/paludis/libtool_linkage_checker.hh index 9aa894470..ba12ac721 100644 --- a/paludis/libtool_linkage_checker.hh +++ b/paludis/libtool_linkage_checker.hh @@ -33,14 +33,14 @@ namespace paludis public: LibtoolLinkageChecker(const FSPath &); - virtual ~LibtoolLinkageChecker(); + ~LibtoolLinkageChecker() override; - virtual bool check_file(const FSPath &) PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual void note_symlink(const FSPath &, const FSPath &); + bool check_file(const FSPath &) override PALUDIS_ATTRIBUTE((warn_unused_result)); + void note_symlink(const FSPath &, const FSPath &) override; - virtual void add_extra_lib_dir(const FSPath &); - virtual void need_breakage_added( - const std::function<void (const FSPath &, const std::string &)> &); + void add_extra_lib_dir(const FSPath &) override; + void need_breakage_added( + const std::function<void (const FSPath &, const std::string &)> &) override; }; } diff --git a/paludis/literal_metadata_key.hh b/paludis/literal_metadata_key.hh index 2d81b114f..45e2fbaa0 100644 --- a/paludis/literal_metadata_key.hh +++ b/paludis/literal_metadata_key.hh @@ -43,9 +43,9 @@ namespace paludis public MetadataValueKey<T_> { public: - virtual const std::string pretty_print_value( + const std::string pretty_print_value( const PrettyPrinter &, - const PrettyPrintOptions &) const PALUDIS_ATTRIBUTE((warn_unused_result)); + const PrettyPrintOptions &) const override PALUDIS_ATTRIBUTE((warn_unused_result)); }; /** @@ -68,15 +68,15 @@ namespace paludis LiteralMetadataValueKey(const std::string &, const std::string &, const MetadataKeyType, const T_ &); - ~LiteralMetadataValueKey(); + ~LiteralMetadataValueKey() override; ///\} - virtual const T_ parse_value() const PALUDIS_ATTRIBUTE((warn_unused_result)); + const T_ parse_value() const override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::string raw_name() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::string human_name() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual MetadataKeyType type() const PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::string raw_name() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::string human_name() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + MetadataKeyType type() const override PALUDIS_ATTRIBUTE((warn_unused_result)); /** * \since 0.36 @@ -103,19 +103,19 @@ namespace paludis LiteralMetadataFSPathSequenceKey(const std::string &, const std::string &, const MetadataKeyType, const std::shared_ptr<const FSPathSequence> &); - ~LiteralMetadataFSPathSequenceKey(); + ~LiteralMetadataFSPathSequenceKey() override; ///\} - virtual const std::shared_ptr<const FSPathSequence> parse_value() const PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::shared_ptr<const FSPathSequence> parse_value() const override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::string raw_name() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::string human_name() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual MetadataKeyType type() const PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::string raw_name() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::string human_name() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + MetadataKeyType type() const override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::string pretty_print_value( + const std::string pretty_print_value( const PrettyPrinter &, - const PrettyPrintOptions &) const PALUDIS_ATTRIBUTE((warn_unused_result)); + const PrettyPrintOptions &) const override PALUDIS_ATTRIBUTE((warn_unused_result)); }; /** @@ -137,19 +137,19 @@ namespace paludis LiteralMetadataStringSetKey(const std::string &, const std::string &, const MetadataKeyType, const std::shared_ptr<const Set<std::string> > &); - ~LiteralMetadataStringSetKey(); + ~LiteralMetadataStringSetKey() override; ///\} - virtual const std::shared_ptr<const Set<std::string> > parse_value() const PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::shared_ptr<const Set<std::string> > parse_value() const override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::string raw_name() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::string human_name() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual MetadataKeyType type() const PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::string raw_name() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::string human_name() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + MetadataKeyType type() const override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::string pretty_print_value( + const std::string pretty_print_value( const PrettyPrinter &, - const PrettyPrintOptions &) const PALUDIS_ATTRIBUTE((warn_unused_result)); + const PrettyPrintOptions &) const override PALUDIS_ATTRIBUTE((warn_unused_result)); }; /** @@ -171,19 +171,19 @@ namespace paludis LiteralMetadataStringSequenceKey(const std::string &, const std::string &, const MetadataKeyType, const std::shared_ptr<const Sequence<std::string> > &); - ~LiteralMetadataStringSequenceKey(); + ~LiteralMetadataStringSequenceKey() override; ///\} - virtual const std::shared_ptr<const Sequence<std::string> > parse_value() const PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::shared_ptr<const Sequence<std::string> > parse_value() const override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::string raw_name() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::string human_name() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual MetadataKeyType type() const PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::string raw_name() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::string human_name() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + MetadataKeyType type() const override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::string pretty_print_value( + const std::string pretty_print_value( const PrettyPrinter &, - const PrettyPrintOptions &) const PALUDIS_ATTRIBUTE((warn_unused_result)); + const PrettyPrintOptions &) const override PALUDIS_ATTRIBUTE((warn_unused_result)); }; /** @@ -205,15 +205,15 @@ namespace paludis ///\{ LiteralMetadataTimeKey(const std::string &, const std::string &, const MetadataKeyType, const Timestamp); - ~LiteralMetadataTimeKey(); + ~LiteralMetadataTimeKey() override; ///\} - virtual Timestamp parse_value() const PALUDIS_ATTRIBUTE((warn_unused_result)); + Timestamp parse_value() const override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::string raw_name() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::string human_name() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual MetadataKeyType type() const PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::string raw_name() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::string human_name() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + MetadataKeyType type() const override PALUDIS_ATTRIBUTE((warn_unused_result)); }; /** @@ -235,19 +235,19 @@ namespace paludis LiteralMetadataStringStringMapKey(const std::string &, const std::string &, const MetadataKeyType, const std::shared_ptr<const Map<std::string, std::string> > &); - ~LiteralMetadataStringStringMapKey(); + ~LiteralMetadataStringStringMapKey() override; ///\} - virtual const std::shared_ptr<const Map<std::string, std::string> > parse_value() const PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::shared_ptr<const Map<std::string, std::string> > parse_value() const override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::string raw_name() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::string human_name() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual MetadataKeyType type() const PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::string raw_name() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::string human_name() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + MetadataKeyType type() const override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::string pretty_print_value( + const std::string pretty_print_value( const PrettyPrinter &, - const PrettyPrintOptions &) const PALUDIS_ATTRIBUTE((warn_unused_result)); + const PrettyPrintOptions &) const override PALUDIS_ATTRIBUTE((warn_unused_result)); }; /** @@ -269,19 +269,19 @@ namespace paludis LiteralMetadataMaintainersKey(const std::string &, const std::string &, const MetadataKeyType, const std::shared_ptr<const Maintainers> &); - ~LiteralMetadataMaintainersKey(); + ~LiteralMetadataMaintainersKey() override; ///\} - virtual const std::shared_ptr<const Maintainers> parse_value() const PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::shared_ptr<const Maintainers> parse_value() const override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::string raw_name() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::string human_name() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual MetadataKeyType type() const PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::string raw_name() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::string human_name() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + MetadataKeyType type() const override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::string pretty_print_value( + const std::string pretty_print_value( const PrettyPrinter &, - const PrettyPrintOptions &) const PALUDIS_ATTRIBUTE((warn_unused_result)); + const PrettyPrintOptions &) const override PALUDIS_ATTRIBUTE((warn_unused_result)); }; } diff --git a/paludis/metadata_key.hh b/paludis/metadata_key.hh index 953c5f3f2..a1860344b 100644 --- a/paludis/metadata_key.hh +++ b/paludis/metadata_key.hh @@ -178,7 +178,7 @@ namespace paludis ///\name Basic operations ///\{ - virtual ~MetadataSectionKey() = 0; + ~MetadataSectionKey() override = 0; ///\} }; @@ -228,7 +228,7 @@ namespace paludis public ImplementAcceptMethods<MetadataKey, MetadataValueKey<C_> > { public: - virtual ~MetadataValueKey() = 0; + ~MetadataValueKey() override = 0; /** * Fetch our value. @@ -252,7 +252,7 @@ namespace paludis public ImplementAcceptMethods<MetadataKey, MetadataTimeKey> { public: - virtual ~MetadataTimeKey() = 0; + ~MetadataTimeKey() override = 0; /** * Fetch our value. @@ -278,7 +278,7 @@ namespace paludis public ImplementAcceptMethods<MetadataKey, MetadataCollectionKey<C_> > { public: - virtual ~MetadataCollectionKey() = 0; + ~MetadataCollectionKey() override = 0; /** * Fetch our value, parse not necessarily cached (so @@ -304,7 +304,7 @@ namespace paludis public ImplementAcceptMethods<MetadataKey, MetadataSpecTreeKey<C_> > { public: - virtual ~MetadataSpecTreeKey() = 0; + ~MetadataSpecTreeKey() override = 0; /** * Fetch our value, parse not necessarily cached (so @@ -333,7 +333,7 @@ namespace paludis public ImplementAcceptMethods<MetadataKey, MetadataSpecTreeKey<FetchableURISpecTree> > { public: - virtual ~MetadataSpecTreeKey() = 0; + ~MetadataSpecTreeKey() override = 0; /** * Fetch our value, parse not necessarily cached (so @@ -369,7 +369,7 @@ namespace paludis public ImplementAcceptMethods<MetadataKey, MetadataSpecTreeKey<DependencySpecTree> > { public: - virtual ~MetadataSpecTreeKey() = 0; + ~MetadataSpecTreeKey() override = 0; /** * Fetch our value, parse not necessarily cached (so diff --git a/paludis/ndbam_merger.hh b/paludis/ndbam_merger.hh index 57834bd68..9610a3896 100644 --- a/paludis/ndbam_merger.hh +++ b/paludis/ndbam_merger.hh @@ -83,30 +83,30 @@ namespace paludis public FSMerger { private: - void display_override(const std::string &) const; + void display_override(const std::string &) const override; Pimp<NDBAMMerger> _imp; public: NDBAMMerger(const NDBAMMergerParams &); - ~NDBAMMerger(); + ~NDBAMMerger() override; - virtual Hook extend_hook(const Hook &); + Hook extend_hook(const Hook &) override; - virtual void record_install_file(const FSPath &, const FSPath &, const std::string &, const FSMergerStatusFlags &); - virtual void record_install_dir(const FSPath &, const FSPath &, const FSMergerStatusFlags &); - virtual void record_install_under_dir(const FSPath &, const FSMergerStatusFlags &); - virtual void record_install_sym(const FSPath &, const FSPath &, const FSMergerStatusFlags &); + void record_install_file(const FSPath &, const FSPath &, const std::string &, const FSMergerStatusFlags &) override; + void record_install_dir(const FSPath &, const FSPath &, const FSMergerStatusFlags &) override; + void record_install_under_dir(const FSPath &, const FSMergerStatusFlags &) override; + void record_install_sym(const FSPath &, const FSPath &, const FSMergerStatusFlags &) override; - virtual void on_error(bool is_check, const std::string &); - virtual void on_warn(bool is_check, const std::string &); - virtual void on_enter_dir(bool is_check, const FSPath); + void on_error(bool is_check, const std::string &) override; + void on_warn(bool is_check, const std::string &) override; + void on_enter_dir(bool is_check, const FSPath) override; - virtual bool config_protected(const FSPath &, const FSPath &); - virtual std::string make_config_protect_name(const FSPath &, const FSPath &); + bool config_protected(const FSPath &, const FSPath &) override; + std::string make_config_protect_name(const FSPath &, const FSPath &) override; - virtual void merge(); - virtual bool check(); + void merge() override; + bool check() override; }; } diff --git a/paludis/ndbam_unmerger.hh b/paludis/ndbam_unmerger.hh index 77ca0d226..9b13c8d99 100644 --- a/paludis/ndbam_unmerger.hh +++ b/paludis/ndbam_unmerger.hh @@ -85,25 +85,25 @@ namespace paludis bool config_protected(const FSPath &) const; std::string make_tidy(const FSPath &) const; - void populate_unmerge_set(); + void populate_unmerge_set() override; - void display(const std::string &) const; + void display(const std::string &) const override; - bool check_file(const std::shared_ptr<const ContentsEntry> &) const; - bool check_dir(const std::shared_ptr<const ContentsEntry> &) const; - bool check_sym(const std::shared_ptr<const ContentsEntry> &) const; - bool check_misc(const std::shared_ptr<const ContentsEntry> &) const; + bool check_file(const std::shared_ptr<const ContentsEntry> &) const override; + bool check_dir(const std::shared_ptr<const ContentsEntry> &) const override; + bool check_sym(const std::shared_ptr<const ContentsEntry> &) const override; + bool check_misc(const std::shared_ptr<const ContentsEntry> &) const override; public: ///\name Basic operations ///\{ NDBAMUnmerger(const NDBAMUnmergerOptions &); - ~NDBAMUnmerger(); + ~NDBAMUnmerger() override; ///\} - virtual Hook extend_hook(const Hook &) const; + Hook extend_hook(const Hook &) const override; }; } diff --git a/paludis/package_id.hh b/paludis/package_id.hh index af8fe463f..520a2a24f 100644 --- a/paludis/package_id.hh +++ b/paludis/package_id.hh @@ -124,7 +124,7 @@ namespace paludis ///\{ PackageID(); - virtual ~PackageID() = 0; + ~PackageID() override = 0; std::size_t hash() const PALUDIS_ATTRIBUTE((warn_unused_result)); diff --git a/paludis/python_hooks.cc b/paludis/python_hooks.cc index 566bd1ddc..248805e88 100644 --- a/paludis/python_hooks.cc +++ b/paludis/python_hooks.cc @@ -63,16 +63,16 @@ namespace public: PyHookFile(const FSPath &, const bool, const Environment * const); - virtual HookResult run(const Hook &, const std::shared_ptr<OutputManager> &) const PALUDIS_ATTRIBUTE((warn_unused_result)); + HookResult run(const Hook &, const std::shared_ptr<OutputManager> &) const override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const FSPath file_name() const + const FSPath file_name() const override { return _file_name; } - virtual void add_dependencies(const Hook &, DirectedGraph<std::string, int> &); + void add_dependencies(const Hook &, DirectedGraph<std::string, int> &) override; - virtual const std::shared_ptr<const Sequence<std::string> > auto_hook_names() const + const std::shared_ptr<const Sequence<std::string> > auto_hook_names() const override { return std::make_shared<Sequence<std::string>>(); } diff --git a/paludis/repositories/accounts/accounts_dep_key.hh b/paludis/repositories/accounts/accounts_dep_key.hh index 49721cab2..e7702d1e4 100644 --- a/paludis/repositories/accounts/accounts_dep_key.hh +++ b/paludis/repositories/accounts/accounts_dep_key.hh @@ -36,21 +36,21 @@ namespace paludis public: AccountsDepKey(const Environment * const e, const std::shared_ptr<const Set<std::string> > &); - ~AccountsDepKey(); + ~AccountsDepKey() override; - virtual const std::string raw_name() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::string human_name() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual MetadataKeyType type() const PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::string raw_name() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::string human_name() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + MetadataKeyType type() const override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::shared_ptr<const DependencySpecTree> parse_value() const - PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::shared_ptr<const DependencySpecTree> parse_value() const + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::shared_ptr<const DependenciesLabelSequence> initial_labels() const - PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::shared_ptr<const DependenciesLabelSequence> initial_labels() const + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::string pretty_print_value( + const std::string pretty_print_value( const PrettyPrinter &, - const PrettyPrintOptions &) const PALUDIS_ATTRIBUTE((warn_unused_result)); + const PrettyPrintOptions &) const override PALUDIS_ATTRIBUTE((warn_unused_result)); }; } } diff --git a/paludis/repositories/accounts/accounts_id.hh b/paludis/repositories/accounts/accounts_id.hh index 4d4c1e05b..62aed57b8 100644 --- a/paludis/repositories/accounts/accounts_id.hh +++ b/paludis/repositories/accounts/accounts_id.hh @@ -40,60 +40,60 @@ namespace paludis void _need_file_keys() const; protected: - virtual void clear_metadata_keys() const; - virtual void need_keys_added() const; - virtual void need_masks_added() const; + void clear_metadata_keys() const override; + void need_keys_added() const override; + void need_masks_added() const override; public: AccountsID(const Environment * const, const QualifiedPackageName &, const RepositoryName &, const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > &, const FSPath &, const bool is_user, const bool masked); - ~AccountsID(); + ~AccountsID() override; - virtual const std::string canonical_form(const PackageIDCanonicalForm) const; + const std::string canonical_form(const PackageIDCanonicalForm) const override; - virtual const QualifiedPackageName name() const; - virtual const VersionSpec version() const; - virtual const RepositoryName repository_name() const; - virtual PackageDepSpec uniquely_identifying_spec() const; + const QualifiedPackageName name() const override; + const VersionSpec version() const override; + const RepositoryName repository_name() const override; + PackageDepSpec uniquely_identifying_spec() const override; ///\name Specific metadata keys ///\{ - virtual const std::shared_ptr<const MetadataValueKey<Slot> > slot_key() const; - virtual const std::shared_ptr<const MetadataCollectionKey<KeywordNameSet> > keywords_key() const; - virtual const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > build_dependencies_key() const; - virtual const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > run_dependencies_key() const; - virtual const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > post_dependencies_key() const; - virtual const std::shared_ptr<const MetadataSpecTreeKey<FetchableURISpecTree> > fetches_key() const; - virtual const std::shared_ptr<const MetadataSpecTreeKey<SimpleURISpecTree> > homepage_key() const; - virtual const std::shared_ptr<const MetadataValueKey<std::string> > short_description_key() const; - virtual const std::shared_ptr<const MetadataValueKey<std::string> > long_description_key() const; - virtual const std::shared_ptr<const MetadataTimeKey> installed_time_key() const; - virtual const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > from_repositories_key() const; - virtual const std::shared_ptr<const MetadataValueKey<FSPath> > fs_location_key() const; - virtual const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > behaviours_key() const; - virtual const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const Choices> > > choices_key() const; - virtual const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > dependencies_key() const; + const std::shared_ptr<const MetadataValueKey<Slot> > slot_key() const override; + const std::shared_ptr<const MetadataCollectionKey<KeywordNameSet> > keywords_key() const override; + const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > build_dependencies_key() const override; + const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > run_dependencies_key() const override; + const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > post_dependencies_key() const override; + const std::shared_ptr<const MetadataSpecTreeKey<FetchableURISpecTree> > fetches_key() const override; + const std::shared_ptr<const MetadataSpecTreeKey<SimpleURISpecTree> > homepage_key() const override; + const std::shared_ptr<const MetadataValueKey<std::string> > short_description_key() const override; + const std::shared_ptr<const MetadataValueKey<std::string> > long_description_key() const override; + const std::shared_ptr<const MetadataTimeKey> installed_time_key() const override; + const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > from_repositories_key() const override; + const std::shared_ptr<const MetadataValueKey<FSPath> > fs_location_key() const override; + const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > behaviours_key() const override; + const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const Choices> > > choices_key() const override; + const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > dependencies_key() const override; ///\} ///\name Actions ///\{ - virtual bool supports_action(const SupportsActionTestBase &) const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual void perform_action(Action &) const; + bool supports_action(const SupportsActionTestBase &) const override PALUDIS_ATTRIBUTE((warn_unused_result)); + void perform_action(Action &) const override; - virtual const std::shared_ptr<const Contents> contents() const; + const std::shared_ptr<const Contents> contents() const override; ///\} - virtual bool arbitrary_less_than_comparison(const PackageID &) const - PALUDIS_ATTRIBUTE((warn_unused_result)); + bool arbitrary_less_than_comparison(const PackageID &) const + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual std::size_t extra_hash_value() const - PALUDIS_ATTRIBUTE((warn_unused_result)); + std::size_t extra_hash_value() const + override PALUDIS_ATTRIBUTE((warn_unused_result)); }; } } diff --git a/paludis/repositories/accounts/accounts_installed_mask.hh b/paludis/repositories/accounts/accounts_installed_mask.hh index 1aa5e8515..d5b1c81be 100644 --- a/paludis/repositories/accounts/accounts_installed_mask.hh +++ b/paludis/repositories/accounts/accounts_installed_mask.hh @@ -30,9 +30,9 @@ namespace paludis public UnsupportedMask { public: - virtual char key() const; - virtual const std::string description() const; - virtual const std::string explanation() const; + char key() const override; + const std::string description() const override; + const std::string explanation() const override; }; } } diff --git a/paludis/repositories/accounts/accounts_repository.hh b/paludis/repositories/accounts/accounts_repository.hh index 54b844a2e..676bb10ac 100644 --- a/paludis/repositories/accounts/accounts_repository.hh +++ b/paludis/repositories/accounts/accounts_repository.hh @@ -63,13 +63,13 @@ namespace paludis void _add_metadata_keys(); protected: - virtual void need_keys_added() const; + void need_keys_added() const override; public: AccountsRepository(const AccountsRepositoryParams &); AccountsRepository(const InstalledAccountsRepositoryParams &); - ~AccountsRepository(); + ~AccountsRepository() override; ///\name RepositoryFactory functions ///\{ @@ -108,65 +108,65 @@ namespace paludis ///\name Specific metadata keys ///\{ - virtual const std::shared_ptr<const MetadataValueKey<std::string> > format_key() const; - virtual const std::shared_ptr<const MetadataValueKey<FSPath> > location_key() const; - virtual const std::shared_ptr<const MetadataValueKey<FSPath> > installed_root_key() const; - virtual const std::shared_ptr<const MetadataCollectionKey<Map<std::string, std::string> > > sync_host_key() const; + const std::shared_ptr<const MetadataValueKey<std::string> > format_key() const override; + const std::shared_ptr<const MetadataValueKey<FSPath> > location_key() const override; + const std::shared_ptr<const MetadataValueKey<FSPath> > installed_root_key() const override; + const std::shared_ptr<const MetadataCollectionKey<Map<std::string, std::string> > > sync_host_key() const override; ///\} ///\name Repository content queries ///\{ - virtual const bool is_unimportant() const; - virtual bool has_category_named(const CategoryNamePart & c, const RepositoryContentMayExcludes &) const; - virtual bool has_package_named(const QualifiedPackageName & q, const RepositoryContentMayExcludes &) const; - virtual std::shared_ptr<const CategoryNamePartSet> category_names(const RepositoryContentMayExcludes &) const; - virtual std::shared_ptr<const CategoryNamePartSet> unimportant_category_names(const RepositoryContentMayExcludes &) const; - virtual std::shared_ptr<const CategoryNamePartSet> category_names_containing_package( - const PackageNamePart & p, const RepositoryContentMayExcludes &) const; - virtual std::shared_ptr<const QualifiedPackageNameSet> package_names( - const CategoryNamePart & c, const RepositoryContentMayExcludes &) const; - virtual std::shared_ptr<const PackageIDSequence> package_ids(const QualifiedPackageName & p, const RepositoryContentMayExcludes &) const; - virtual bool some_ids_might_support_action(const SupportsActionTestBase &) const; - virtual bool some_ids_might_not_be_masked() const; - virtual const std::shared_ptr<const Set<std::string> > maybe_expand_licence_nonrecursively( - const std::string &) const; + const bool is_unimportant() const override; + bool has_category_named(const CategoryNamePart & c, const RepositoryContentMayExcludes &) const override; + bool has_package_named(const QualifiedPackageName & q, const RepositoryContentMayExcludes &) const override; + std::shared_ptr<const CategoryNamePartSet> category_names(const RepositoryContentMayExcludes &) const override; + std::shared_ptr<const CategoryNamePartSet> unimportant_category_names(const RepositoryContentMayExcludes &) const override; + std::shared_ptr<const CategoryNamePartSet> category_names_containing_package( + const PackageNamePart & p, const RepositoryContentMayExcludes &) const override; + std::shared_ptr<const QualifiedPackageNameSet> package_names( + const CategoryNamePart & c, const RepositoryContentMayExcludes &) const override; + std::shared_ptr<const PackageIDSequence> package_ids(const QualifiedPackageName & p, const RepositoryContentMayExcludes &) const override; + bool some_ids_might_support_action(const SupportsActionTestBase &) const override; + bool some_ids_might_not_be_masked() const override; + const std::shared_ptr<const Set<std::string> > maybe_expand_licence_nonrecursively( + const std::string &) const override; ///\} ///\name Repository behaviour methods ///\{ - virtual void invalidate(); - virtual void regenerate_cache() const; + void invalidate() override; + void regenerate_cache() const override; - virtual HookResult perform_hook( + HookResult perform_hook( const Hook & hook, - const std::shared_ptr<OutputManager> &); + const std::shared_ptr<OutputManager> &) override; - virtual bool sync( + bool sync( const std::string &, const std::string &, - const std::shared_ptr<OutputManager> &) const; + const std::shared_ptr<OutputManager> &) const override; ///\} ///\name Destination functions ///\{ - virtual bool is_suitable_destination_for(const std::shared_ptr<const PackageID> &) const - PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual bool want_pre_post_phases() const - PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual void merge(const MergeParams &); + bool is_suitable_destination_for(const std::shared_ptr<const PackageID> &) const + override PALUDIS_ATTRIBUTE((warn_unused_result)); + bool want_pre_post_phases() const + override PALUDIS_ATTRIBUTE((warn_unused_result)); + void merge(const MergeParams &) override; ///\} ///\name Set methods ///\{ - virtual void populate_sets() const; + void populate_sets() const override; ///\} }; diff --git a/paludis/repositories/accounts/dummy_accounts_handler.hh b/paludis/repositories/accounts/dummy_accounts_handler.hh index 2d450c712..1ea83fc8a 100644 --- a/paludis/repositories/accounts/dummy_accounts_handler.hh +++ b/paludis/repositories/accounts/dummy_accounts_handler.hh @@ -30,7 +30,7 @@ namespace paludis public AccountsHandler { public: - virtual void merge(const MergeParams &); + void merge(const MergeParams &) override; }; } } diff --git a/paludis/repositories/accounts/installed_accounts_id.hh b/paludis/repositories/accounts/installed_accounts_id.hh index dc6a2439a..e9a41eabf 100644 --- a/paludis/repositories/accounts/installed_accounts_id.hh +++ b/paludis/repositories/accounts/installed_accounts_id.hh @@ -39,59 +39,59 @@ namespace paludis void _add_metadata_keys() const; protected: - virtual void clear_metadata_keys() const; - virtual void need_keys_added() const; - virtual void need_masks_added() const; + void clear_metadata_keys() const override; + void need_keys_added() const override; + void need_masks_added() const override; public: InstalledAccountsID(const Environment * const, const QualifiedPackageName &, const RepositoryName &, const bool is_user); - ~InstalledAccountsID(); + ~InstalledAccountsID() override; - virtual const std::string canonical_form(const PackageIDCanonicalForm) const; + const std::string canonical_form(const PackageIDCanonicalForm) const override; - virtual const QualifiedPackageName name() const; - virtual const VersionSpec version() const; - virtual const RepositoryName repository_name() const; - virtual PackageDepSpec uniquely_identifying_spec() const; + const QualifiedPackageName name() const override; + const VersionSpec version() const override; + const RepositoryName repository_name() const override; + PackageDepSpec uniquely_identifying_spec() const override; ///\name Specific metadata keys ///\{ - virtual const std::shared_ptr<const MetadataValueKey<Slot> > slot_key() const; - virtual const std::shared_ptr<const MetadataCollectionKey<KeywordNameSet> > keywords_key() const; - virtual const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > build_dependencies_key() const; - virtual const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > run_dependencies_key() const; - virtual const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > post_dependencies_key() const; - virtual const std::shared_ptr<const MetadataSpecTreeKey<FetchableURISpecTree> > fetches_key() const; - virtual const std::shared_ptr<const MetadataSpecTreeKey<SimpleURISpecTree> > homepage_key() const; - virtual const std::shared_ptr<const MetadataValueKey<std::string> > short_description_key() const; - virtual const std::shared_ptr<const MetadataValueKey<std::string> > long_description_key() const; - virtual const std::shared_ptr<const MetadataTimeKey> installed_time_key() const; - virtual const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > from_repositories_key() const; - virtual const std::shared_ptr<const MetadataValueKey<FSPath> > fs_location_key() const; - virtual const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > behaviours_key() const; - virtual const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const Choices> > > choices_key() const; - virtual const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > dependencies_key() const; + const std::shared_ptr<const MetadataValueKey<Slot> > slot_key() const override; + const std::shared_ptr<const MetadataCollectionKey<KeywordNameSet> > keywords_key() const override; + const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > build_dependencies_key() const override; + const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > run_dependencies_key() const override; + const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > post_dependencies_key() const override; + const std::shared_ptr<const MetadataSpecTreeKey<FetchableURISpecTree> > fetches_key() const override; + const std::shared_ptr<const MetadataSpecTreeKey<SimpleURISpecTree> > homepage_key() const override; + const std::shared_ptr<const MetadataValueKey<std::string> > short_description_key() const override; + const std::shared_ptr<const MetadataValueKey<std::string> > long_description_key() const override; + const std::shared_ptr<const MetadataTimeKey> installed_time_key() const override; + const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > from_repositories_key() const override; + const std::shared_ptr<const MetadataValueKey<FSPath> > fs_location_key() const override; + const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > behaviours_key() const override; + const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const Choices> > > choices_key() const override; + const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > dependencies_key() const override; ///\} ///\name Actions ///\{ - virtual bool supports_action(const SupportsActionTestBase &) const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual void perform_action(Action &) const PALUDIS_ATTRIBUTE((noreturn)); + bool supports_action(const SupportsActionTestBase &) const override PALUDIS_ATTRIBUTE((warn_unused_result)); + void perform_action(Action &) const override PALUDIS_ATTRIBUTE((noreturn)); - virtual const std::shared_ptr<const Contents> contents() const; + const std::shared_ptr<const Contents> contents() const override; ///\} - virtual bool arbitrary_less_than_comparison(const PackageID &) const - PALUDIS_ATTRIBUTE((warn_unused_result)); + bool arbitrary_less_than_comparison(const PackageID &) const + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual std::size_t extra_hash_value() const - PALUDIS_ATTRIBUTE((warn_unused_result)); + std::size_t extra_hash_value() const + override PALUDIS_ATTRIBUTE((warn_unused_result)); }; } } diff --git a/paludis/repositories/accounts/passwd_accounts_handler.hh b/paludis/repositories/accounts/passwd_accounts_handler.hh index 7da0cf907..f25c4253b 100644 --- a/paludis/repositories/accounts/passwd_accounts_handler.hh +++ b/paludis/repositories/accounts/passwd_accounts_handler.hh @@ -30,7 +30,7 @@ namespace paludis public AccountsHandler { public: - virtual void merge(const MergeParams &); + void merge(const MergeParams &) override; void merge_user(const MergeParams &); void merge_group(const MergeParams &); diff --git a/paludis/repositories/e/e_choices_key.hh b/paludis/repositories/e/e_choices_key.hh index 92de6c07c..5ea9868de 100644 --- a/paludis/repositories/e/e_choices_key.hh +++ b/paludis/repositories/e/e_choices_key.hh @@ -53,13 +53,13 @@ namespace paludis const std::shared_ptr<const ERepository> & maybe_profile, const std::function<std::shared_ptr<const Map<ChoiceNameWithPrefix, std::string> > ()> & maybe_descriptions_fn); - ~EChoicesKey(); + ~EChoicesKey() override; - const std::shared_ptr<const Choices> parse_value() const PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::shared_ptr<const Choices> parse_value() const override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::string raw_name() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::string human_name() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual MetadataKeyType type() const PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::string raw_name() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::string human_name() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + MetadataKeyType type() const override PALUDIS_ATTRIBUTE((warn_unused_result)); }; } } diff --git a/paludis/repositories/e/e_installed_repository.hh b/paludis/repositories/e/e_installed_repository.hh index 977407c38..e85d238cd 100644 --- a/paludis/repositories/e/e_installed_repository.hh +++ b/paludis/repositories/e/e_installed_repository.hh @@ -51,7 +51,7 @@ namespace paludis protected: EInstalledRepository(const EInstalledRepositoryParams &, const RepositoryName &, const RepositoryCapabilities &); - ~EInstalledRepository(); + ~EInstalledRepository() override; std::string snoop_variable_from_environment_file( const FSPath &, @@ -61,42 +61,42 @@ namespace paludis public: /* RepositoryEnvironmentVariableInterface */ - virtual std::string get_environment_variable( + std::string get_environment_variable( const std::shared_ptr<const PackageID> & for_package, const std::string & var) const - PALUDIS_ATTRIBUTE((warn_unused_result)); + override PALUDIS_ATTRIBUTE((warn_unused_result)); /* RepositoryDestinationInterface */ - virtual bool is_suitable_destination_for(const std::shared_ptr<const PackageID> &) const - PALUDIS_ATTRIBUTE((warn_unused_result)); + bool is_suitable_destination_for(const std::shared_ptr<const PackageID> &) const + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual bool want_pre_post_phases() const - PALUDIS_ATTRIBUTE((warn_unused_result)); + bool want_pre_post_phases() const + override PALUDIS_ATTRIBUTE((warn_unused_result)); /* Repository */ - virtual std::shared_ptr<const CategoryNamePartSet> unimportant_category_names( - const RepositoryContentMayExcludes &) const; + std::shared_ptr<const CategoryNamePartSet> unimportant_category_names( + const RepositoryContentMayExcludes &) const override; - virtual const bool is_unimportant() const; + const bool is_unimportant() const override; - virtual bool some_ids_might_support_action(const SupportsActionTestBase &) const; + bool some_ids_might_support_action(const SupportsActionTestBase &) const override; - virtual bool some_ids_might_not_be_masked() const; + bool some_ids_might_not_be_masked() const override; HookResult perform_hook( const Hook & hook, const std::shared_ptr<OutputManager> &) - PALUDIS_ATTRIBUTE((warn_unused_result)); + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual bool sync( + bool sync( const std::string &, const std::string &, - const std::shared_ptr<OutputManager> &) const; + const std::shared_ptr<OutputManager> &) const override; - virtual const std::shared_ptr<const Set<std::string> > maybe_expand_licence_nonrecursively( - const std::string &) const; + const std::shared_ptr<const Set<std::string> > maybe_expand_licence_nonrecursively( + const std::string &) const override; ///\name For use by EInstalledRepositoryID ///\{ @@ -118,7 +118,7 @@ namespace paludis ///\name Set methods ///\{ - virtual void populate_sets() const; + void populate_sets() const override; ///\} diff --git a/paludis/repositories/e/e_installed_repository_id.hh b/paludis/repositories/e/e_installed_repository_id.hh index d6a76d4ab..1a0946e6d 100644 --- a/paludis/repositories/e/e_installed_repository_id.hh +++ b/paludis/repositories/e/e_installed_repository_id.hh @@ -37,8 +37,8 @@ namespace paludis Pimp<EInstalledRepositoryID> _imp; protected: - virtual void need_keys_added() const; - virtual void need_masks_added() const; + void need_keys_added() const override; + void need_masks_added() const override; EInstalledRepositoryID(const QualifiedPackageName &, const VersionSpec &, const Environment * const, @@ -46,70 +46,70 @@ namespace paludis const FSPath & file); public: - ~EInstalledRepositoryID(); - - virtual const std::string canonical_form(const PackageIDCanonicalForm) const; - virtual PackageDepSpec uniquely_identifying_spec() const; - - virtual const QualifiedPackageName name() const; - virtual const VersionSpec version() const; - virtual const RepositoryName repository_name() const; - virtual const std::shared_ptr<const EAPI> eapi() const; - virtual bool is_installed() const PALUDIS_ATTRIBUTE((warn_unused_result)); - - virtual const std::shared_ptr<const MetadataValueKey<Slot> > slot_key() const; - virtual const std::shared_ptr<const MetadataCollectionKey<KeywordNameSet> > keywords_key() const; - virtual const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > build_dependencies_key() const; - virtual const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > run_dependencies_key() const; - virtual const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > post_dependencies_key() const; - virtual const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > dependencies_key() const; - virtual const std::shared_ptr<const MetadataSpecTreeKey<PlainTextSpecTree> > restrict_key() const; - virtual const std::shared_ptr<const MetadataSpecTreeKey<PlainTextSpecTree> > properties_key() const; - virtual const std::shared_ptr<const MetadataSpecTreeKey<FetchableURISpecTree> > fetches_key() const; - virtual const std::shared_ptr<const MetadataSpecTreeKey<SimpleURISpecTree> > homepage_key() const; - virtual const std::shared_ptr<const MetadataValueKey<std::string> > short_description_key() const; - virtual const std::shared_ptr<const MetadataValueKey<std::string> > long_description_key() const; - virtual const std::shared_ptr<const MetadataTimeKey> installed_time_key() const; - virtual const std::shared_ptr<const MetadataValueKey<FSPath> > fs_location_key() const; - virtual const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > from_repositories_key() const; - - virtual const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > raw_use_key() const; - virtual const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > raw_iuse_key() const; - virtual const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > raw_iuse_effective_key() const; - virtual const std::shared_ptr<const MetadataSpecTreeKey<PlainTextSpecTree> > raw_myoptions_key() const; - virtual const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > raw_use_expand_key() const; - virtual const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > raw_use_expand_hidden_key() const; - virtual const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const Choices> > > choices_key() const; - virtual const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > inherited_key() const; - virtual const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > defined_phases_key() const; - virtual const std::shared_ptr<const MetadataSpecTreeKey<LicenseSpecTree> > license_key() const; - virtual const std::shared_ptr<const MetadataSpecTreeKey<RequiredUseSpecTree> > required_use_key() const; - virtual const std::shared_ptr<const MetadataValueKey<std::string> > scm_revision_key() const; - virtual const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > behaviours_key() const; - - virtual bool supports_action(const SupportsActionTestBase &) const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual void perform_action(Action &) const; - - virtual bool arbitrary_less_than_comparison(const PackageID &) const - PALUDIS_ATTRIBUTE((warn_unused_result)); - - virtual std::size_t extra_hash_value() const - PALUDIS_ATTRIBUTE((warn_unused_result)); + ~EInstalledRepositoryID() override; + + const std::string canonical_form(const PackageIDCanonicalForm) const override; + PackageDepSpec uniquely_identifying_spec() const override; + + const QualifiedPackageName name() const override; + const VersionSpec version() const override; + const RepositoryName repository_name() const override; + const std::shared_ptr<const EAPI> eapi() const override; + bool is_installed() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + + const std::shared_ptr<const MetadataValueKey<Slot> > slot_key() const override; + const std::shared_ptr<const MetadataCollectionKey<KeywordNameSet> > keywords_key() const override; + const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > build_dependencies_key() const override; + const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > run_dependencies_key() const override; + const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > post_dependencies_key() const override; + const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > dependencies_key() const override; + const std::shared_ptr<const MetadataSpecTreeKey<PlainTextSpecTree> > restrict_key() const override; + const std::shared_ptr<const MetadataSpecTreeKey<PlainTextSpecTree> > properties_key() const override; + const std::shared_ptr<const MetadataSpecTreeKey<FetchableURISpecTree> > fetches_key() const override; + const std::shared_ptr<const MetadataSpecTreeKey<SimpleURISpecTree> > homepage_key() const override; + const std::shared_ptr<const MetadataValueKey<std::string> > short_description_key() const override; + const std::shared_ptr<const MetadataValueKey<std::string> > long_description_key() const override; + const std::shared_ptr<const MetadataTimeKey> installed_time_key() const override; + const std::shared_ptr<const MetadataValueKey<FSPath> > fs_location_key() const override; + const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > from_repositories_key() const override; + + const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > raw_use_key() const override; + const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > raw_iuse_key() const override; + const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > raw_iuse_effective_key() const override; + const std::shared_ptr<const MetadataSpecTreeKey<PlainTextSpecTree> > raw_myoptions_key() const override; + const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > raw_use_expand_key() const override; + const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > raw_use_expand_hidden_key() const override; + const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const Choices> > > choices_key() const override; + const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > inherited_key() const override; + const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > defined_phases_key() const override; + const std::shared_ptr<const MetadataSpecTreeKey<LicenseSpecTree> > license_key() const override; + const std::shared_ptr<const MetadataSpecTreeKey<RequiredUseSpecTree> > required_use_key() const override; + const std::shared_ptr<const MetadataValueKey<std::string> > scm_revision_key() const override; + const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > behaviours_key() const override; + + bool supports_action(const SupportsActionTestBase &) const override PALUDIS_ATTRIBUTE((warn_unused_result)); + void perform_action(Action &) const override; + + bool arbitrary_less_than_comparison(const PackageID &) const + override PALUDIS_ATTRIBUTE((warn_unused_result)); + + std::size_t extra_hash_value() const + override PALUDIS_ATTRIBUTE((warn_unused_result)); virtual std::string fs_location_raw_name() const = 0; virtual std::string fs_location_human_name() const = 0; virtual std::string contents_filename() const = 0; - virtual const std::shared_ptr<const ChoiceValue> make_choice_value( + const std::shared_ptr<const ChoiceValue> make_choice_value( const std::shared_ptr<const Choice> &, const UnprefixedChoiceName &, const Tribool, - const bool, const ChoiceOrigin, const std::string &, const bool, const bool) const; + const bool, const ChoiceOrigin, const std::string &, const bool, const bool) const override; - virtual void add_build_options(const std::shared_ptr<Choices> &) const; + void add_build_options(const std::shared_ptr<Choices> &) const override; - virtual void purge_invalid_cache() const; - virtual void can_drop_in_memory_cache() const; + void purge_invalid_cache() const override; + void can_drop_in_memory_cache() const override; - virtual void set_scm_revision(const std::string &) const PALUDIS_ATTRIBUTE((noreturn)); + void set_scm_revision(const std::string &) const override PALUDIS_ATTRIBUTE((noreturn)); }; } } diff --git a/paludis/repositories/e/e_key.hh b/paludis/repositories/e/e_key.hh index 3e1022fa7..43953a089 100644 --- a/paludis/repositories/e/e_key.hh +++ b/paludis/repositories/e/e_key.hh @@ -46,21 +46,21 @@ namespace paludis const std::string &, const std::string &, const std::string &, const std::shared_ptr<const DependenciesLabelSequence> &, const MetadataKeyType); - ~EDependenciesKey(); + ~EDependenciesKey() override; - virtual const std::shared_ptr<const DependencySpecTree> parse_value() const - PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::shared_ptr<const DependencySpecTree> parse_value() const + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::shared_ptr<const DependenciesLabelSequence> initial_labels() const - PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::shared_ptr<const DependenciesLabelSequence> initial_labels() const + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::string raw_name() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::string human_name() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual MetadataKeyType type() const PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::string raw_name() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::string human_name() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + MetadataKeyType type() const override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::string pretty_print_value( + const std::string pretty_print_value( const PrettyPrinter &, - const PrettyPrintOptions &) const PALUDIS_ATTRIBUTE((warn_unused_result)); + const PrettyPrintOptions &) const override PALUDIS_ATTRIBUTE((warn_unused_result)); }; class EFetchableURIKey : @@ -75,21 +75,21 @@ namespace paludis const std::shared_ptr<const EAPIMetadataVariable> &, const std::string &, const MetadataKeyType); - ~EFetchableURIKey(); + ~EFetchableURIKey() override; - virtual const std::shared_ptr<const FetchableURISpecTree> parse_value() const - PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::shared_ptr<const FetchableURISpecTree> parse_value() const + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::shared_ptr<const URILabel> initial_label() const - PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::shared_ptr<const URILabel> initial_label() const + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::string raw_name() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::string human_name() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual MetadataKeyType type() const PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::string raw_name() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::string human_name() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + MetadataKeyType type() const override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::string pretty_print_value( + const std::string pretty_print_value( const PrettyPrinter &, - const PrettyPrintOptions &) const PALUDIS_ATTRIBUTE((warn_unused_result)); + const PrettyPrintOptions &) const override PALUDIS_ATTRIBUTE((warn_unused_result)); }; class ESimpleURIKey : @@ -104,18 +104,18 @@ namespace paludis const std::shared_ptr<const EAPI> &, const std::string &, const MetadataKeyType, const bool is_installed); - ~ESimpleURIKey(); + ~ESimpleURIKey() override; - virtual const std::shared_ptr<const SimpleURISpecTree> parse_value() const - PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::shared_ptr<const SimpleURISpecTree> parse_value() const + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::string raw_name() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::string human_name() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual MetadataKeyType type() const PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::string raw_name() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::string human_name() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + MetadataKeyType type() const override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::string pretty_print_value( + const std::string pretty_print_value( const PrettyPrinter &, - const PrettyPrintOptions &) const PALUDIS_ATTRIBUTE((warn_unused_result)); + const PrettyPrintOptions &) const override PALUDIS_ATTRIBUTE((warn_unused_result)); }; class EPlainTextSpecKey : @@ -130,18 +130,18 @@ namespace paludis const std::shared_ptr<const EAPI> &, const std::string &, const MetadataKeyType, bool is_installed); - ~EPlainTextSpecKey(); + ~EPlainTextSpecKey() override; - virtual const std::shared_ptr<const PlainTextSpecTree> parse_value() const - PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::shared_ptr<const PlainTextSpecTree> parse_value() const + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::string raw_name() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::string human_name() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual MetadataKeyType type() const PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::string raw_name() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::string human_name() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + MetadataKeyType type() const override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::string pretty_print_value( + const std::string pretty_print_value( const PrettyPrinter &, - const PrettyPrintOptions &) const PALUDIS_ATTRIBUTE((warn_unused_result)); + const PrettyPrintOptions &) const override PALUDIS_ATTRIBUTE((warn_unused_result)); }; class EMyOptionsKey : @@ -156,18 +156,18 @@ namespace paludis const std::shared_ptr<const EAPI> &, const std::string &, const MetadataKeyType, bool); - ~EMyOptionsKey(); + ~EMyOptionsKey() override; - virtual const std::shared_ptr<const PlainTextSpecTree> parse_value() const - PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::shared_ptr<const PlainTextSpecTree> parse_value() const + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::string raw_name() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::string human_name() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual MetadataKeyType type() const PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::string raw_name() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::string human_name() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + MetadataKeyType type() const override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::string pretty_print_value( + const std::string pretty_print_value( const PrettyPrinter &, - const PrettyPrintOptions &) const PALUDIS_ATTRIBUTE((warn_unused_result)); + const PrettyPrintOptions &) const override PALUDIS_ATTRIBUTE((warn_unused_result)); }; class ERequiredUseKey : @@ -182,18 +182,18 @@ namespace paludis const std::shared_ptr<const EAPI> &, const std::string &, const MetadataKeyType, bool i); - ~ERequiredUseKey(); + ~ERequiredUseKey() override; - virtual const std::shared_ptr<const RequiredUseSpecTree> parse_value() const - PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::shared_ptr<const RequiredUseSpecTree> parse_value() const + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::string raw_name() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::string human_name() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual MetadataKeyType type() const PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::string raw_name() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::string human_name() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + MetadataKeyType type() const override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::string pretty_print_value( + const std::string pretty_print_value( const PrettyPrinter &, - const PrettyPrintOptions &) const PALUDIS_ATTRIBUTE((warn_unused_result)); + const PrettyPrintOptions &) const override PALUDIS_ATTRIBUTE((warn_unused_result)); }; class ELicenseKey : @@ -209,18 +209,18 @@ namespace paludis const std::shared_ptr<const EAPI> &, const std::string &, const MetadataKeyType, bool is_installed); - ~ELicenseKey(); + ~ELicenseKey() override; - virtual const std::shared_ptr<const LicenseSpecTree> parse_value() const - PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::shared_ptr<const LicenseSpecTree> parse_value() const + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::string raw_name() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::string human_name() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual MetadataKeyType type() const PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::string raw_name() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::string human_name() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + MetadataKeyType type() const override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::string pretty_print_value( + const std::string pretty_print_value( const PrettyPrinter &, - const PrettyPrintOptions &) const PALUDIS_ATTRIBUTE((warn_unused_result)); + const PrettyPrintOptions &) const override PALUDIS_ATTRIBUTE((warn_unused_result)); }; class EMTimeKey : @@ -231,14 +231,14 @@ namespace paludis public: EMTimeKey(const std::string &, const std::string &, const FSPath &, const MetadataKeyType); - ~EMTimeKey(); + ~EMTimeKey() override; Timestamp parse_value() const - PALUDIS_ATTRIBUTE((warn_unused_result)); + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::string raw_name() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::string human_name() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual MetadataKeyType type() const PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::string raw_name() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::string human_name() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + MetadataKeyType type() const override PALUDIS_ATTRIBUTE((warn_unused_result)); }; } } diff --git a/paludis/repositories/e/e_mask.hh b/paludis/repositories/e/e_mask.hh index 550ef0560..d28efbee4 100644 --- a/paludis/repositories/e/e_mask.hh +++ b/paludis/repositories/e/e_mask.hh @@ -35,11 +35,11 @@ namespace paludis public: EUnsupportedMask(const char, const std::string &, const std::string &); - ~EUnsupportedMask(); + ~EUnsupportedMask() override; - virtual char key() const; - virtual const std::string description() const; - virtual const std::string explanation() const; + char key() const override; + const std::string description() const override; + const std::string explanation() const override; }; class ERepositoryMask : @@ -51,14 +51,14 @@ namespace paludis public: ERepositoryMask(const char, const std::string & description, const std::string & comment, const std::string & token, const FSPath &); - ~ERepositoryMask(); + ~ERepositoryMask() override; - virtual char key() const; - const std::string description() const; + char key() const override; + const std::string description() const override; - virtual const std::string comment() const; - virtual const std::string token() const; - virtual const FSPath mask_file() const; + const std::string comment() const override; + const std::string token() const override; + const FSPath mask_file() const override; }; const std::shared_ptr<const UnacceptedMask> create_e_unaccepted_mask( diff --git a/paludis/repositories/e/e_repository.hh b/paludis/repositories/e/e_repository.hh index fcfe23633..85588a0cc 100644 --- a/paludis/repositories/e/e_repository.hh +++ b/paludis/repositories/e/e_repository.hh @@ -63,7 +63,7 @@ namespace paludis void need_mirrors() const; protected: - virtual void need_keys_added() const; + void need_keys_added() const override; public: /** @@ -74,64 +74,64 @@ namespace paludis /** * Destructor. */ - ~ERepository(); + ~ERepository() override; - virtual void invalidate(); + void invalidate() override; - virtual void purge_invalid_cache() const; + void purge_invalid_cache() const override; /* RepositoryDestinationInterface */ - virtual bool is_suitable_destination_for(const std::shared_ptr<const PackageID> &) const - PALUDIS_ATTRIBUTE((warn_unused_result)); + bool is_suitable_destination_for(const std::shared_ptr<const PackageID> &) const + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual bool want_pre_post_phases() const - PALUDIS_ATTRIBUTE((warn_unused_result)); + bool want_pre_post_phases() const + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual void merge(const MergeParams &); + void merge(const MergeParams &) override; /* RepositoryManifestInterface */ - virtual void make_manifest(const QualifiedPackageName & qpn); + void make_manifest(const QualifiedPackageName & qpn) override; /* RepositorySyncableInterface */ - virtual bool sync( + bool sync( const std::string &, const std::string &, - const std::shared_ptr<OutputManager> &) const; + const std::shared_ptr<OutputManager> &) const override; /* RepositoryEnvironmentVariableInterface */ - virtual std::string get_environment_variable( + std::string get_environment_variable( const std::shared_ptr<const PackageID> & for_package, const std::string & var) const - PALUDIS_ATTRIBUTE((warn_unused_result)); + override PALUDIS_ATTRIBUTE((warn_unused_result)); /* Repository */ - virtual std::shared_ptr<const PackageIDSequence> package_ids( + std::shared_ptr<const PackageIDSequence> package_ids( const QualifiedPackageName &, const RepositoryContentMayExcludes &) const - PALUDIS_ATTRIBUTE((warn_unused_result)); + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual std::shared_ptr<const QualifiedPackageNameSet> package_names( + std::shared_ptr<const QualifiedPackageNameSet> package_names( const CategoryNamePart &, const RepositoryContentMayExcludes &) const - PALUDIS_ATTRIBUTE((warn_unused_result)); + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual std::shared_ptr<const CategoryNamePartSet> category_names(const RepositoryContentMayExcludes &) const - PALUDIS_ATTRIBUTE((warn_unused_result)); + std::shared_ptr<const CategoryNamePartSet> category_names(const RepositoryContentMayExcludes &) const + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual std::shared_ptr<const CategoryNamePartSet> category_names_containing_package( - const PackageNamePart &, const RepositoryContentMayExcludes &) const; + std::shared_ptr<const CategoryNamePartSet> category_names_containing_package( + const PackageNamePart &, const RepositoryContentMayExcludes &) const override; - virtual bool has_package_named(const QualifiedPackageName &, const RepositoryContentMayExcludes &) const - PALUDIS_ATTRIBUTE((warn_unused_result)); + bool has_package_named(const QualifiedPackageName &, const RepositoryContentMayExcludes &) const + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual bool has_category_named(const CategoryNamePart &, const RepositoryContentMayExcludes &) const - PALUDIS_ATTRIBUTE((warn_unused_result)); + bool has_category_named(const CategoryNamePart &, const RepositoryContentMayExcludes &) const + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual bool some_ids_might_support_action(const SupportsActionTestBase &) const; + bool some_ids_might_support_action(const SupportsActionTestBase &) const override; - virtual bool some_ids_might_not_be_masked() const; + bool some_ids_might_not_be_masked() const override; const erepository::ERepositoryParams & params() const; @@ -139,13 +139,13 @@ namespace paludis std::string environment_updated_profile_variable(const std::string &) const; HookResult perform_hook(const Hook &, const std::shared_ptr<OutputManager> &) - PALUDIS_ATTRIBUTE((warn_unused_result)); + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual std::shared_ptr<const CategoryNamePartSet> unimportant_category_names(const RepositoryContentMayExcludes &) const; - virtual const bool is_unimportant() const; + std::shared_ptr<const CategoryNamePartSet> unimportant_category_names(const RepositoryContentMayExcludes &) const override; + const bool is_unimportant() const override; - virtual const std::shared_ptr<const Set<std::string> > maybe_expand_licence_nonrecursively( - const std::string &) const; + const std::shared_ptr<const Set<std::string> > maybe_expand_licence_nonrecursively( + const std::string &) const override; /** * Update GLEP 42 news files. @@ -155,15 +155,15 @@ namespace paludis const std::shared_ptr<const erepository::Layout> layout() const; const std::shared_ptr<const erepository::Profile> profile() const; - void regenerate_cache() const; + void regenerate_cache() const override; /* Keys */ - virtual const std::shared_ptr<const MetadataValueKey<std::string> > format_key() const; - virtual const std::shared_ptr<const MetadataValueKey<FSPath> > location_key() const; - virtual const std::shared_ptr<const MetadataValueKey<FSPath> > installed_root_key() const; + const std::shared_ptr<const MetadataValueKey<std::string> > format_key() const override; + const std::shared_ptr<const MetadataValueKey<FSPath> > location_key() const override; + const std::shared_ptr<const MetadataValueKey<FSPath> > installed_root_key() const override; virtual const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > info_vars_key() const; - virtual const std::shared_ptr<const MetadataCollectionKey<Map<std::string, std::string> > > sync_host_key() const; + const std::shared_ptr<const MetadataCollectionKey<Map<std::string, std::string> > > sync_host_key() const override; ///\name RepositoryFactory functions ///\{ @@ -192,7 +192,7 @@ namespace paludis ///\name Set methods ///\{ - virtual void populate_sets() const; + void populate_sets() const override; ///\} diff --git a/paludis/repositories/e/e_stripper.hh b/paludis/repositories/e/e_stripper.hh index 810cc0369..4256223ce 100644 --- a/paludis/repositories/e/e_stripper.hh +++ b/paludis/repositories/e/e_stripper.hh @@ -60,19 +60,19 @@ namespace paludis Pimp<EStripper> _imp; protected: - virtual void on_enter_dir(const FSPath &); - virtual void on_leave_dir(const FSPath &); + void on_enter_dir(const FSPath &) override; + void on_leave_dir(const FSPath &) override; - virtual void on_strip(const FSPath &); - virtual void on_split(const FSPath &, const FSPath &); - virtual void on_dwarf_compress(const FSPath &); - virtual void on_unknown(const FSPath &); + void on_strip(const FSPath &) override; + void on_split(const FSPath &, const FSPath &) override; + void on_dwarf_compress(const FSPath &) override; + void on_unknown(const FSPath &) override; public: EStripper(const EStripperOptions &); - ~EStripper(); + ~EStripper() override; - virtual void strip(); + void strip() override; }; } } diff --git a/paludis/repositories/e/ebuild.hh b/paludis/repositories/e/ebuild.hh index 0266773ae..f77b1cb05 100644 --- a/paludis/repositories/e/ebuild.hh +++ b/paludis/repositories/e/ebuild.hh @@ -447,13 +447,13 @@ namespace paludis const std::string _var; protected: - virtual std::string commands() const; + std::string commands() const override; - virtual void extend_command(Process &); + void extend_command(Process &) override; - virtual bool do_run_command(Process &); + bool do_run_command(Process &) override; - virtual bool failure(); + bool failure() override; public: /** @@ -483,11 +483,11 @@ namespace paludis /// Parameters for fetch. const EbuildNoFetchCommandParams fetch_params; - virtual std::string commands() const; + std::string commands() const override; - virtual bool failure() PALUDIS_ATTRIBUTE((noreturn)); + bool failure() override PALUDIS_ATTRIBUTE((noreturn)); - virtual void extend_command(Process &); + void extend_command(Process &) override; public: /** @@ -509,11 +509,11 @@ namespace paludis /// Parameters for install. const EbuildInstallCommandParams install_params; - virtual std::string commands() const; + std::string commands() const override; - virtual bool failure() PALUDIS_ATTRIBUTE((noreturn)); + bool failure() override PALUDIS_ATTRIBUTE((noreturn)); - virtual void extend_command(Process &); + void extend_command(Process &) override; public: /** @@ -535,11 +535,11 @@ namespace paludis /// Parameters for install. const EbuildFetchExtraCommandParams fetch_extra_params; - virtual std::string commands() const; + std::string commands() const override; - virtual bool failure() PALUDIS_ATTRIBUTE((noreturn)); + bool failure() override PALUDIS_ATTRIBUTE((noreturn)); - virtual void extend_command(Process &); + void extend_command(Process &) override; public: /** @@ -560,13 +560,13 @@ namespace paludis /// Parameters for uninstall. const EbuildUninstallCommandParams uninstall_params; - virtual std::string commands() const; + std::string commands() const override; - virtual bool failure() PALUDIS_ATTRIBUTE((noreturn)); + bool failure() override PALUDIS_ATTRIBUTE((noreturn)); - virtual void extend_command(Process &); + void extend_command(Process &) override; - virtual std::string ebuild_file() const; + std::string ebuild_file() const override; public: /** @@ -587,13 +587,13 @@ namespace paludis /// Parameters for config. const EbuildConfigCommandParams config_params; - virtual std::string commands() const; + std::string commands() const override; - virtual bool failure() PALUDIS_ATTRIBUTE((noreturn)); + bool failure() override PALUDIS_ATTRIBUTE((noreturn)); - virtual void extend_command(Process &); + void extend_command(Process &) override; - virtual std::string ebuild_file() const; + std::string ebuild_file() const override; public: /** @@ -614,11 +614,11 @@ namespace paludis /// Parameters for config. const EbuildPretendCommandParams pretend_params; - virtual std::string commands() const; + std::string commands() const override; - virtual bool failure(); + bool failure() override; - virtual void extend_command(Process &); + void extend_command(Process &) override; public: /** @@ -640,11 +640,11 @@ namespace paludis /// Parameters for config. const EbuildBadOptionsCommandParams bad_options_params; - virtual std::string commands() const; + std::string commands() const override; - virtual bool failure(); + bool failure() override; - virtual void extend_command(Process &); + void extend_command(Process &) override; public: /** @@ -665,13 +665,13 @@ namespace paludis /// Parameters for config. const EbuildInfoCommandParams info_params; - virtual std::string commands() const; + std::string commands() const override; - virtual bool failure() PALUDIS_ATTRIBUTE((noreturn)); + bool failure() override PALUDIS_ATTRIBUTE((noreturn)); - virtual void extend_command(Process &); + void extend_command(Process &) override; - virtual std::string ebuild_file() const; + std::string ebuild_file() const override; public: /** @@ -774,17 +774,17 @@ namespace paludis public: EbuildMetadataCommand(const EbuildCommandParams &); - ~EbuildMetadataCommand(); + ~EbuildMetadataCommand() override; - std::string commands() const; + std::string commands() const override; - bool failure(); + bool failure() override; - bool do_run_command(Process &); + bool do_run_command(Process &) override; - virtual bool in_metadata_generation() const; + bool in_metadata_generation() const override; - virtual void extend_command(Process &); + void extend_command(Process &) override; void load(const std::shared_ptr<const EbuildID> &); }; diff --git a/paludis/repositories/e/ebuild_id.hh b/paludis/repositories/e/ebuild_id.hh index 7c31c4a46..16601805a 100644 --- a/paludis/repositories/e/ebuild_id.hh +++ b/paludis/repositories/e/ebuild_id.hh @@ -41,12 +41,12 @@ namespace paludis Pimp<EbuildID> _imp; protected: - virtual void need_keys_added() const; + void need_keys_added() const override; void need_non_xml_keys_added() const; const std::shared_ptr<const EAPI> presource_eapi() const; void need_xml_keys_added() const; - virtual void need_masks_added() const; + void need_masks_added() const override; void need_behaviours() const; @@ -62,47 +62,47 @@ namespace paludis const time_t master_mtime, const std::shared_ptr<const EclassMtimes> & eclass_mtimes); - ~EbuildID(); - - virtual const std::string canonical_form(const PackageIDCanonicalForm) const; - virtual PackageDepSpec uniquely_identifying_spec() const; - - virtual const QualifiedPackageName name() const; - virtual const VersionSpec version() const; - virtual const RepositoryName repository_name() const; - virtual bool is_installed() const PALUDIS_ATTRIBUTE((warn_unused_result)); - - virtual const std::shared_ptr<const MetadataValueKey<Slot> > slot_key() const; - virtual const std::shared_ptr<const MetadataCollectionKey<KeywordNameSet> > keywords_key() const; - virtual const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > build_dependencies_key() const; - virtual const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > run_dependencies_key() const; - virtual const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > post_dependencies_key() const; - virtual const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > dependencies_key() const; - virtual const std::shared_ptr<const MetadataSpecTreeKey<FetchableURISpecTree> > fetches_key() const; - virtual const std::shared_ptr<const MetadataSpecTreeKey<SimpleURISpecTree> > homepage_key() const; - virtual const std::shared_ptr<const MetadataValueKey<std::string> > short_description_key() const; - virtual const std::shared_ptr<const MetadataValueKey<std::string> > long_description_key() const; - virtual const std::shared_ptr<const MetadataTimeKey> installed_time_key() const; - virtual const std::shared_ptr<const MetadataValueKey<FSPath> > fs_location_key() const; - virtual const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const Choices> > > choices_key() const; - const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > from_repositories_key() const; - - const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > inherited_key() const; - const std::shared_ptr<const MetadataSpecTreeKey<LicenseSpecTree> > license_key() const; - virtual const std::shared_ptr<const MetadataSpecTreeKey<PlainTextSpecTree> > restrict_key() const; - virtual const std::shared_ptr<const MetadataSpecTreeKey<PlainTextSpecTree> > properties_key() const; - - virtual const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > raw_use_key() const; - virtual const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > raw_iuse_key() const; - virtual const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > raw_iuse_effective_key() const; - virtual const std::shared_ptr<const MetadataSpecTreeKey<PlainTextSpecTree> > raw_myoptions_key() const; - virtual const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > raw_use_expand_key() const; - virtual const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > raw_use_expand_hidden_key() const; - virtual const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > defined_phases_key() const; - virtual const std::shared_ptr<const MetadataSpecTreeKey<RequiredUseSpecTree> > required_use_key() const; - virtual const std::shared_ptr<const MetadataValueKey<std::string> > scm_revision_key() const; - - virtual const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > behaviours_key() const; + ~EbuildID() override; + + const std::string canonical_form(const PackageIDCanonicalForm) const override; + PackageDepSpec uniquely_identifying_spec() const override; + + const QualifiedPackageName name() const override; + const VersionSpec version() const override; + const RepositoryName repository_name() const override; + bool is_installed() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + + const std::shared_ptr<const MetadataValueKey<Slot> > slot_key() const override; + const std::shared_ptr<const MetadataCollectionKey<KeywordNameSet> > keywords_key() const override; + const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > build_dependencies_key() const override; + const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > run_dependencies_key() const override; + const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > post_dependencies_key() const override; + const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > dependencies_key() const override; + const std::shared_ptr<const MetadataSpecTreeKey<FetchableURISpecTree> > fetches_key() const override; + const std::shared_ptr<const MetadataSpecTreeKey<SimpleURISpecTree> > homepage_key() const override; + const std::shared_ptr<const MetadataValueKey<std::string> > short_description_key() const override; + const std::shared_ptr<const MetadataValueKey<std::string> > long_description_key() const override; + const std::shared_ptr<const MetadataTimeKey> installed_time_key() const override; + const std::shared_ptr<const MetadataValueKey<FSPath> > fs_location_key() const override; + const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const Choices> > > choices_key() const override; + const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > from_repositories_key() const override; + + const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > inherited_key() const override; + const std::shared_ptr<const MetadataSpecTreeKey<LicenseSpecTree> > license_key() const override; + const std::shared_ptr<const MetadataSpecTreeKey<PlainTextSpecTree> > restrict_key() const override; + const std::shared_ptr<const MetadataSpecTreeKey<PlainTextSpecTree> > properties_key() const override; + + const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > raw_use_key() const override; + const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > raw_iuse_key() const override; + const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > raw_iuse_effective_key() const override; + const std::shared_ptr<const MetadataSpecTreeKey<PlainTextSpecTree> > raw_myoptions_key() const override; + const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > raw_use_expand_key() const override; + const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > raw_use_expand_hidden_key() const override; + const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > defined_phases_key() const override; + const std::shared_ptr<const MetadataSpecTreeKey<RequiredUseSpecTree> > required_use_key() const override; + const std::shared_ptr<const MetadataValueKey<std::string> > scm_revision_key() const override; + + const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > behaviours_key() const override; const std::shared_ptr<const MetadataSpecTreeKey<PlainTextSpecTree> > remote_ids_key() const; const std::shared_ptr<const MetadataSpecTreeKey<PlainTextSpecTree> > bugs_to_key() const; @@ -113,11 +113,11 @@ namespace paludis const std::shared_ptr<const MetadataTimeKey> generated_time_key() const; const std::shared_ptr<const MetadataValueKey<std::string> > generated_using_key() const; - virtual bool arbitrary_less_than_comparison(const PackageID &) const - PALUDIS_ATTRIBUTE((warn_unused_result)); + bool arbitrary_less_than_comparison(const PackageID &) const + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual std::size_t extra_hash_value() const - PALUDIS_ATTRIBUTE((warn_unused_result)); + std::size_t extra_hash_value() const + override PALUDIS_ATTRIBUTE((warn_unused_result)); void set_eapi(const std::string &) const; std::string guessed_eapi_name() const; @@ -156,25 +156,25 @@ namespace paludis void load_generated_time(const std::string &, const std::string &, const std::string &) const; void load_scm_revision(const std::string &, const std::string &, const std::string &) const; - virtual bool supports_action(const SupportsActionTestBase &) const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual void perform_action(Action &) const; + bool supports_action(const SupportsActionTestBase &) const override PALUDIS_ATTRIBUTE((warn_unused_result)); + void perform_action(Action &) const override; - virtual const std::shared_ptr<const EAPI> eapi() const PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::shared_ptr<const EAPI> eapi() const override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::shared_ptr<const ChoiceValue> make_choice_value( + const std::shared_ptr<const ChoiceValue> make_choice_value( const std::shared_ptr<const Choice> &, const UnprefixedChoiceName &, const Tribool, - const bool, const ChoiceOrigin, const std::string &, const bool, const bool) const; + const bool, const ChoiceOrigin, const std::string &, const bool, const bool) const override; - virtual void add_build_options(const std::shared_ptr<Choices> &) const; + void add_build_options(const std::shared_ptr<Choices> &) const override; - virtual void purge_invalid_cache() const; + void purge_invalid_cache() const override; bool might_be_binary() const; bool is_stable() const; - virtual void set_scm_revision(const std::string &) const; + void set_scm_revision(const std::string &) const override; - virtual const std::shared_ptr<const Contents> contents() const; + const std::shared_ptr<const Contents> contents() const override; }; } } diff --git a/paludis/repositories/e/exheres_layout.hh b/paludis/repositories/e/exheres_layout.hh index 732a04d4a..46e50d13e 100644 --- a/paludis/repositories/e/exheres_layout.hh +++ b/paludis/repositories/e/exheres_layout.hh @@ -52,91 +52,91 @@ namespace paludis const ERepository * const, const FSPath &, const std::shared_ptr<const FSPathSequence> &); - virtual ~ExheresLayout(); + ~ExheresLayout() override; ///\} - virtual bool has_category_named(const CategoryNamePart &) const - PALUDIS_ATTRIBUTE((warn_unused_result)); + bool has_category_named(const CategoryNamePart &) const + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual bool has_package_named(const QualifiedPackageName &) const - PALUDIS_ATTRIBUTE((warn_unused_result)); + bool has_package_named(const QualifiedPackageName &) const + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual FSPath categories_file() const - PALUDIS_ATTRIBUTE((warn_unused_result)); + FSPath categories_file() const + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual std::shared_ptr<const CategoryNamePartSet> category_names() const - PALUDIS_ATTRIBUTE((warn_unused_result)); + std::shared_ptr<const CategoryNamePartSet> category_names() const + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual std::shared_ptr<const QualifiedPackageNameSet> package_names( + std::shared_ptr<const QualifiedPackageNameSet> package_names( const CategoryNamePart &) const - PALUDIS_ATTRIBUTE((warn_unused_result)); + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual std::shared_ptr<const PackageIDSequence> package_ids( + std::shared_ptr<const PackageIDSequence> package_ids( const QualifiedPackageName &) const - PALUDIS_ATTRIBUTE((warn_unused_result)); + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::shared_ptr<const FSPathSequence> info_packages_files() const - PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::shared_ptr<const FSPathSequence> info_packages_files() const + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::shared_ptr<const FSPathSequence> info_variables_files() const - PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::shared_ptr<const FSPathSequence> info_variables_files() const + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual FSPath package_directory(const QualifiedPackageName &) const - PALUDIS_ATTRIBUTE((warn_unused_result)); + FSPath package_directory(const QualifiedPackageName &) const + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual FSPath category_directory(const CategoryNamePart &) const - PALUDIS_ATTRIBUTE((warn_unused_result)); + FSPath category_directory(const CategoryNamePart &) const + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual FSPath binary_ebuild_directory(const QualifiedPackageName &) const PALUDIS_ATTRIBUTE((warn_unused_result)); + FSPath binary_ebuild_directory(const QualifiedPackageName &) const override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual std::shared_ptr<const FSPathSequence> arch_list_files() const - PALUDIS_ATTRIBUTE((warn_unused_result)); + std::shared_ptr<const FSPathSequence> arch_list_files() const + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual std::shared_ptr<const FSPathSequence> repository_mask_files() const - PALUDIS_ATTRIBUTE((warn_unused_result)); + std::shared_ptr<const FSPathSequence> repository_mask_files() const + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual std::shared_ptr<const FSPathSequence> profiles_desc_files() const - PALUDIS_ATTRIBUTE((warn_unused_result)); + std::shared_ptr<const FSPathSequence> profiles_desc_files() const + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual std::shared_ptr<const FSPathSequence> mirror_files() const - PALUDIS_ATTRIBUTE((warn_unused_result)); + std::shared_ptr<const FSPathSequence> mirror_files() const + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual std::shared_ptr<const UseDescFileInfoSequence> use_desc_files() const - PALUDIS_ATTRIBUTE((warn_unused_result)); + std::shared_ptr<const UseDescFileInfoSequence> use_desc_files() const + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual FSPath profiles_base_dir() const - PALUDIS_ATTRIBUTE((warn_unused_result)); + FSPath profiles_base_dir() const + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual std::shared_ptr<const FSPathSequence> exlibsdirs(const QualifiedPackageName &) const; + std::shared_ptr<const FSPathSequence> exlibsdirs(const QualifiedPackageName &) const override; - virtual std::shared_ptr<const FSPathSequence> exlibsdirs_global() const - PALUDIS_ATTRIBUTE((warn_unused_result)); + std::shared_ptr<const FSPathSequence> exlibsdirs_global() const + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual std::shared_ptr<const FSPathSequence> exlibsdirs_category(const CategoryNamePart &) const - PALUDIS_ATTRIBUTE((warn_unused_result)); + std::shared_ptr<const FSPathSequence> exlibsdirs_category(const CategoryNamePart &) const + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual std::shared_ptr<const FSPathSequence> exlibsdirs_package(const QualifiedPackageName &) const - PALUDIS_ATTRIBUTE((warn_unused_result)); + std::shared_ptr<const FSPathSequence> exlibsdirs_package(const QualifiedPackageName &) const + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual std::shared_ptr<const FSPathSequence> licenses_dirs() const - PALUDIS_ATTRIBUTE((warn_unused_result)); + std::shared_ptr<const FSPathSequence> licenses_dirs() const + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual std::shared_ptr<Map<FSPath, std::string, FSPathComparator> > manifest_files( + std::shared_ptr<Map<FSPath, std::string, FSPathComparator> > manifest_files( const QualifiedPackageName &, const FSPath &) const - PALUDIS_ATTRIBUTE((warn_unused_result)); + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual std::shared_ptr<MetadataValueKey<FSPath> > accounts_repository_data_location_key() const - PALUDIS_ATTRIBUTE((warn_unused_result)); + std::shared_ptr<MetadataValueKey<FSPath> > accounts_repository_data_location_key() const + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual std::shared_ptr<MetadataValueKey<FSPath> > e_updates_location_key() const - PALUDIS_ATTRIBUTE((warn_unused_result)); + std::shared_ptr<MetadataValueKey<FSPath> > e_updates_location_key() const + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual std::shared_ptr<MetadataValueKey<FSPath> > licence_groups_location_key() const - PALUDIS_ATTRIBUTE((warn_unused_result)); + std::shared_ptr<MetadataValueKey<FSPath> > licence_groups_location_key() const + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual std::shared_ptr<const MasksInfo> repository_masks(const std::shared_ptr<const PackageID> &) const - PALUDIS_ATTRIBUTE((warn_unused_result)); + std::shared_ptr<const MasksInfo> repository_masks(const std::shared_ptr<const PackageID> &) const + override PALUDIS_ATTRIBUTE((warn_unused_result)); }; } } diff --git a/paludis/repositories/e/exheres_profile.hh b/paludis/repositories/e/exheres_profile.hh index 34a93ed0c..484570a43 100644 --- a/paludis/repositories/e/exheres_profile.hh +++ b/paludis/repositories/e/exheres_profile.hh @@ -48,57 +48,57 @@ namespace paludis const bool has_master_repositories, const bool ignore_deprecated_profiles); - virtual ~ExheresProfile(); + ~ExheresProfile() override; - virtual std::shared_ptr<const FSPathSequence> profiles_with_parents() const - PALUDIS_ATTRIBUTE((warn_unused_result)); + std::shared_ptr<const FSPathSequence> profiles_with_parents() const + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual bool use_masked( + bool use_masked( const std::shared_ptr<const EbuildID> &, const std::shared_ptr<const Choice> &, const UnprefixedChoiceName & value_unprefixed, const ChoiceNameWithPrefix & value_prefixed - ) const PALUDIS_ATTRIBUTE((warn_unused_result)); + ) const override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual bool use_forced( + bool use_forced( const std::shared_ptr<const EbuildID> &, const std::shared_ptr<const Choice> &, const UnprefixedChoiceName & value_unprefixed, const ChoiceNameWithPrefix & value_prefixed - ) const PALUDIS_ATTRIBUTE((warn_unused_result)); + ) const override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual Tribool use_state_ignoring_masks( + Tribool use_state_ignoring_masks( const std::shared_ptr<const PackageID> &, const std::shared_ptr<const Choice> &, const UnprefixedChoiceName & value_unprefixed, const ChoiceNameWithPrefix & value_prefixed - ) const PALUDIS_ATTRIBUTE((warn_unused_result)); + ) const override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::shared_ptr<const Set<UnprefixedChoiceName> > known_choice_value_names( + const std::shared_ptr<const Set<UnprefixedChoiceName> > known_choice_value_names( const std::shared_ptr<const erepository::ERepositoryID> &, const std::shared_ptr<const Choice> & - ) const PALUDIS_ATTRIBUTE((warn_unused_result)); - - virtual const std::shared_ptr<const Set<std::string> > use_expand() const - PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::shared_ptr<const Set<std::string> > use_expand_hidden() const - PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::shared_ptr<const Set<std::string>> use_expand_no_describe() const - PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::shared_ptr<const Set<std::string> > use_expand_unprefixed() const - PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::shared_ptr<const Set<std::string> > use_expand_implicit() const - PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::shared_ptr<const Set<std::string> > iuse_implicit() const - PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::shared_ptr<const Set<std::string> > use_expand_values(const std::string &) const - PALUDIS_ATTRIBUTE((warn_unused_result)); - - virtual const std::string environment_variable(const std::string &) const; - - virtual const std::shared_ptr<const MasksInfo> profile_masks(const std::shared_ptr<const PackageID> &) const; - - virtual const std::shared_ptr<const SetSpecTree> system_packages() const; + ) const override PALUDIS_ATTRIBUTE((warn_unused_result)); + + const std::shared_ptr<const Set<std::string> > use_expand() const + override PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::shared_ptr<const Set<std::string> > use_expand_hidden() const + override PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::shared_ptr<const Set<std::string>> use_expand_no_describe() const + override PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::shared_ptr<const Set<std::string> > use_expand_unprefixed() const + override PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::shared_ptr<const Set<std::string> > use_expand_implicit() const + override PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::shared_ptr<const Set<std::string> > iuse_implicit() const + override PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::shared_ptr<const Set<std::string> > use_expand_values(const std::string &) const + override PALUDIS_ATTRIBUTE((warn_unused_result)); + + const std::string environment_variable(const std::string &) const override; + + const std::shared_ptr<const MasksInfo> profile_masks(const std::shared_ptr<const PackageID> &) const override; + + const std::shared_ptr<const SetSpecTree> system_packages() const override; }; } } diff --git a/paludis/repositories/e/exndbam_id.hh b/paludis/repositories/e/exndbam_id.hh index f8cd07634..45179a99c 100644 --- a/paludis/repositories/e/exndbam_id.hh +++ b/paludis/repositories/e/exndbam_id.hh @@ -40,10 +40,10 @@ namespace paludis const FSPath & file, const NDBAM * const); - virtual std::string fs_location_raw_name() const; - virtual std::string fs_location_human_name() const; - virtual std::string contents_filename() const; - virtual const std::shared_ptr<const Contents> contents() const; + std::string fs_location_raw_name() const override; + std::string fs_location_human_name() const override; + std::string contents_filename() const override; + const std::shared_ptr<const Contents> contents() const override; }; } } diff --git a/paludis/repositories/e/exndbam_repository.hh b/paludis/repositories/e/exndbam_repository.hh index ea8897856..f5cb53508 100644 --- a/paludis/repositories/e/exndbam_repository.hh +++ b/paludis/repositories/e/exndbam_repository.hh @@ -62,7 +62,7 @@ namespace paludis void _add_metadata_keys() const; protected: - virtual void need_keys_added() const; + void need_keys_added() const override; public: /** @@ -73,60 +73,60 @@ namespace paludis /** * Destructor. */ - ~ExndbamRepository(); + ~ExndbamRepository() override; - virtual void invalidate(); + void invalidate() override; - virtual void regenerate_cache() const; + void regenerate_cache() const override; /* RepositoryDestinationInterface */ - virtual void merge(const MergeParams &); + void merge(const MergeParams &) override; /* Repository */ - virtual std::shared_ptr<const PackageIDSequence> package_ids( + std::shared_ptr<const PackageIDSequence> package_ids( const QualifiedPackageName &, const RepositoryContentMayExcludes &) const - PALUDIS_ATTRIBUTE((warn_unused_result)); + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual std::shared_ptr<const QualifiedPackageNameSet> package_names( + std::shared_ptr<const QualifiedPackageNameSet> package_names( const CategoryNamePart &, const RepositoryContentMayExcludes &) const - PALUDIS_ATTRIBUTE((warn_unused_result)); + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual std::shared_ptr<const CategoryNamePartSet> category_names( + std::shared_ptr<const CategoryNamePartSet> category_names( const RepositoryContentMayExcludes &) const - PALUDIS_ATTRIBUTE((warn_unused_result)); + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual std::shared_ptr<const CategoryNamePartSet> category_names_containing_package( + std::shared_ptr<const CategoryNamePartSet> category_names_containing_package( const PackageNamePart &, const RepositoryContentMayExcludes &) const - PALUDIS_ATTRIBUTE((warn_unused_result)); + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual bool has_package_named(const QualifiedPackageName &, + bool has_package_named(const QualifiedPackageName &, const RepositoryContentMayExcludes &) const - PALUDIS_ATTRIBUTE((warn_unused_result)); + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual bool has_category_named(const CategoryNamePart &, + bool has_category_named(const CategoryNamePart &, const RepositoryContentMayExcludes &) const - PALUDIS_ATTRIBUTE((warn_unused_result)); + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const bool is_unimportant() const; + const bool is_unimportant() const override; /* Keys */ - virtual const std::shared_ptr<const MetadataValueKey<std::string> > format_key() const; - virtual const std::shared_ptr<const MetadataValueKey<FSPath> > location_key() const; - virtual const std::shared_ptr<const MetadataValueKey<FSPath> > installed_root_key() const; - virtual const std::shared_ptr<const MetadataCollectionKey<Map<std::string, std::string> > > sync_host_key() const; + const std::shared_ptr<const MetadataValueKey<std::string> > format_key() const override; + const std::shared_ptr<const MetadataValueKey<FSPath> > location_key() const override; + const std::shared_ptr<const MetadataValueKey<FSPath> > installed_root_key() const override; + const std::shared_ptr<const MetadataCollectionKey<Map<std::string, std::string> > > sync_host_key() const override; ///\name For use by ExndbamID ///\{ void perform_uninstall( const std::shared_ptr<const erepository::ERepositoryID> & id, - const UninstallAction &) const; + const UninstallAction &) const override; ///\} @@ -147,7 +147,7 @@ namespace paludis ///\} - virtual void perform_updates(); + void perform_updates() override; }; class PALUDIS_VISIBLE ExndbamRepositoryConfigurationError : public ConfigurationError diff --git a/paludis/repositories/e/info_metadata_key.hh b/paludis/repositories/e/info_metadata_key.hh index 1fa002e49..30120f5ef 100644 --- a/paludis/repositories/e/info_metadata_key.hh +++ b/paludis/repositories/e/info_metadata_key.hh @@ -21,17 +21,17 @@ namespace paludis Pimp<InfoPkgsMetadataKey> _imp; protected: - virtual void need_keys_added() const; + void need_keys_added() const override; public: InfoPkgsMetadataKey(const Environment * const e, const std::shared_ptr<const FSPathSequence> & f, const ERepository * const); - ~InfoPkgsMetadataKey(); + ~InfoPkgsMetadataKey() override; - virtual const std::string raw_name() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::string human_name() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual MetadataKeyType type() const PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::string raw_name() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::string human_name() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + MetadataKeyType type() const override PALUDIS_ATTRIBUTE((warn_unused_result)); }; class InfoVarsMetadataKey : @@ -42,17 +42,17 @@ namespace paludis public: InfoVarsMetadataKey(const std::shared_ptr<const FSPathSequence> &); - ~InfoVarsMetadataKey(); + ~InfoVarsMetadataKey() override; - const std::shared_ptr<const Set<std::string> > parse_value() const; + const std::shared_ptr<const Set<std::string> > parse_value() const override; - virtual const std::string raw_name() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::string human_name() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual MetadataKeyType type() const PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::string raw_name() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::string human_name() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + MetadataKeyType type() const override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::string pretty_print_value( + const std::string pretty_print_value( const PrettyPrinter &, - const PrettyPrintOptions &) const PALUDIS_ATTRIBUTE((warn_unused_result)); + const PrettyPrintOptions &) const override PALUDIS_ATTRIBUTE((warn_unused_result)); }; } diff --git a/paludis/repositories/e/pbin_merger.hh b/paludis/repositories/e/pbin_merger.hh index 687242eae..358b8f36e 100644 --- a/paludis/repositories/e/pbin_merger.hh +++ b/paludis/repositories/e/pbin_merger.hh @@ -69,25 +69,25 @@ namespace paludis Pimp<PbinMerger> _imp; protected: - virtual void on_error(bool is_check, const std::string &); - virtual void on_warn(bool is_check, const std::string &); - virtual void display_override(const std::string &) const; + void on_error(bool is_check, const std::string &) override; + void on_warn(bool is_check, const std::string &) override; + void display_override(const std::string &) const override; - virtual void on_enter_dir(bool is_check, const FSPath); + void on_enter_dir(bool is_check, const FSPath) override; - virtual void on_done_merge(); + void on_done_merge() override; - virtual void track_install_file(const FSPath &, const FSPath &); - virtual void track_install_sym(const FSPath &, const FSPath &); + void track_install_file(const FSPath &, const FSPath &) override; + void track_install_sym(const FSPath &, const FSPath &) override; public: PbinMerger(const PbinMergerParams &); ~PbinMerger(); - virtual Hook extend_hook(const Hook &); + Hook extend_hook(const Hook &) override; - virtual void merge(); - virtual bool check(); + void merge() override; + bool check() override; }; } } diff --git a/paludis/repositories/e/traditional_layout.hh b/paludis/repositories/e/traditional_layout.hh index 973dab56c..78441e1cf 100644 --- a/paludis/repositories/e/traditional_layout.hh +++ b/paludis/repositories/e/traditional_layout.hh @@ -55,94 +55,94 @@ namespace paludis const FSPath &, const std::shared_ptr<const FSPathSequence> &); - virtual ~TraditionalLayout(); + ~TraditionalLayout() override; ///\} - virtual bool has_category_named(const CategoryNamePart &) const - PALUDIS_ATTRIBUTE((warn_unused_result)); + bool has_category_named(const CategoryNamePart &) const + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual bool has_package_named(const QualifiedPackageName &) const - PALUDIS_ATTRIBUTE((warn_unused_result)); + bool has_package_named(const QualifiedPackageName &) const + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual FSPath categories_file() const - PALUDIS_ATTRIBUTE((warn_unused_result)); + FSPath categories_file() const + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual std::shared_ptr<const CategoryNamePartSet> category_names() const - PALUDIS_ATTRIBUTE((warn_unused_result)); + std::shared_ptr<const CategoryNamePartSet> category_names() const + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual std::shared_ptr<const QualifiedPackageNameSet> package_names( + std::shared_ptr<const QualifiedPackageNameSet> package_names( const CategoryNamePart &) const - PALUDIS_ATTRIBUTE((warn_unused_result)); + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual std::shared_ptr<const PackageIDSequence> package_ids( + std::shared_ptr<const PackageIDSequence> package_ids( const QualifiedPackageName &) const - PALUDIS_ATTRIBUTE((warn_unused_result)); + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::shared_ptr<const FSPathSequence> info_packages_files() const - PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::shared_ptr<const FSPathSequence> info_packages_files() const + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::shared_ptr<const FSPathSequence> info_variables_files() const - PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::shared_ptr<const FSPathSequence> info_variables_files() const + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual FSPath package_directory(const QualifiedPackageName &) const - PALUDIS_ATTRIBUTE((warn_unused_result)); + FSPath package_directory(const QualifiedPackageName &) const + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual FSPath category_directory(const CategoryNamePart &) const - PALUDIS_ATTRIBUTE((warn_unused_result)); + FSPath category_directory(const CategoryNamePart &) const + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual FSPath binary_ebuild_directory(const QualifiedPackageName &) const PALUDIS_ATTRIBUTE((warn_unused_result)); + FSPath binary_ebuild_directory(const QualifiedPackageName &) const override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual std::shared_ptr<const FSPathSequence> arch_list_files() const - PALUDIS_ATTRIBUTE((warn_unused_result)); + std::shared_ptr<const FSPathSequence> arch_list_files() const + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual std::shared_ptr<const FSPathSequence> repository_mask_files() const - PALUDIS_ATTRIBUTE((warn_unused_result)); + std::shared_ptr<const FSPathSequence> repository_mask_files() const + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual std::shared_ptr<const FSPathSequence> profiles_desc_files() const - PALUDIS_ATTRIBUTE((warn_unused_result)); + std::shared_ptr<const FSPathSequence> profiles_desc_files() const + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual std::shared_ptr<const FSPathSequence> mirror_files() const - PALUDIS_ATTRIBUTE((warn_unused_result)); + std::shared_ptr<const FSPathSequence> mirror_files() const + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual std::shared_ptr<const UseDescFileInfoSequence> use_desc_files() const - PALUDIS_ATTRIBUTE((warn_unused_result)); + std::shared_ptr<const UseDescFileInfoSequence> use_desc_files() const + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual FSPath profiles_base_dir() const - PALUDIS_ATTRIBUTE((warn_unused_result)); + FSPath profiles_base_dir() const + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual std::shared_ptr<const FSPathSequence> exlibsdirs(const QualifiedPackageName &) const - PALUDIS_ATTRIBUTE((warn_unused_result)); + std::shared_ptr<const FSPathSequence> exlibsdirs(const QualifiedPackageName &) const + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual std::shared_ptr<const FSPathSequence> exlibsdirs_global() const - PALUDIS_ATTRIBUTE((warn_unused_result)); + std::shared_ptr<const FSPathSequence> exlibsdirs_global() const + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual std::shared_ptr<const FSPathSequence> exlibsdirs_category(const CategoryNamePart &) const - PALUDIS_ATTRIBUTE((warn_unused_result)); + std::shared_ptr<const FSPathSequence> exlibsdirs_category(const CategoryNamePart &) const + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual std::shared_ptr<const FSPathSequence> exlibsdirs_package(const QualifiedPackageName &) const - PALUDIS_ATTRIBUTE((warn_unused_result)); + std::shared_ptr<const FSPathSequence> exlibsdirs_package(const QualifiedPackageName &) const + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual std::shared_ptr<const FSPathSequence> licenses_dirs() const - PALUDIS_ATTRIBUTE((warn_unused_result)); + std::shared_ptr<const FSPathSequence> licenses_dirs() const + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual std::shared_ptr<Map<FSPath, std::string, FSPathComparator> > manifest_files( + std::shared_ptr<Map<FSPath, std::string, FSPathComparator> > manifest_files( const QualifiedPackageName &, const FSPath &) const - PALUDIS_ATTRIBUTE((warn_unused_result)); + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual std::shared_ptr<MetadataValueKey<FSPath> > accounts_repository_data_location_key() const - PALUDIS_ATTRIBUTE((warn_unused_result)); + std::shared_ptr<MetadataValueKey<FSPath> > accounts_repository_data_location_key() const + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual std::shared_ptr<MetadataValueKey<FSPath> > e_updates_location_key() const - PALUDIS_ATTRIBUTE((warn_unused_result)); + std::shared_ptr<MetadataValueKey<FSPath> > e_updates_location_key() const + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual std::shared_ptr<MetadataValueKey<FSPath> > licence_groups_location_key() const - PALUDIS_ATTRIBUTE((warn_unused_result)); + std::shared_ptr<MetadataValueKey<FSPath> > licence_groups_location_key() const + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual FSPath sync_filter_file() const; + FSPath sync_filter_file() const override; - virtual std::shared_ptr<const MasksInfo> repository_masks(const std::shared_ptr<const PackageID> &) const - PALUDIS_ATTRIBUTE((warn_unused_result)); + std::shared_ptr<const MasksInfo> repository_masks(const std::shared_ptr<const PackageID> &) const + override PALUDIS_ATTRIBUTE((warn_unused_result)); }; } } diff --git a/paludis/repositories/e/traditional_profile.hh b/paludis/repositories/e/traditional_profile.hh index 5a98a3b8d..81044a9f0 100644 --- a/paludis/repositories/e/traditional_profile.hh +++ b/paludis/repositories/e/traditional_profile.hh @@ -47,57 +47,57 @@ namespace paludis const bool ignore_deprecated_profiles ); - virtual ~TraditionalProfile(); + ~TraditionalProfile() override; - virtual std::shared_ptr<const FSPathSequence> profiles_with_parents() const - PALUDIS_ATTRIBUTE((warn_unused_result)); + std::shared_ptr<const FSPathSequence> profiles_with_parents() const + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual bool use_masked( + bool use_masked( const std::shared_ptr<const EbuildID> &, const std::shared_ptr<const Choice> &, const UnprefixedChoiceName & value_unprefixed, const ChoiceNameWithPrefix & value_prefixed - ) const PALUDIS_ATTRIBUTE((warn_unused_result)); + ) const override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual bool use_forced( + bool use_forced( const std::shared_ptr<const EbuildID> &, const std::shared_ptr<const Choice> &, const UnprefixedChoiceName & value_unprefixed, const ChoiceNameWithPrefix & value_prefixed - ) const PALUDIS_ATTRIBUTE((warn_unused_result)); + ) const override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual Tribool use_state_ignoring_masks( + Tribool use_state_ignoring_masks( const std::shared_ptr<const PackageID> &, const std::shared_ptr<const Choice> &, const UnprefixedChoiceName & value_unprefixed, const ChoiceNameWithPrefix & value_prefixed - ) const PALUDIS_ATTRIBUTE((warn_unused_result)); + ) const override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::shared_ptr<const Set<UnprefixedChoiceName> > known_choice_value_names( + const std::shared_ptr<const Set<UnprefixedChoiceName> > known_choice_value_names( const std::shared_ptr<const erepository::ERepositoryID> &, const std::shared_ptr<const Choice> & - ) const PALUDIS_ATTRIBUTE((warn_unused_result)); - - virtual const std::shared_ptr<const Set<std::string> > use_expand() const - PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::shared_ptr<const Set<std::string> > use_expand_hidden() const - PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::shared_ptr<const Set<std::string>> use_expand_no_describe() const - PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::shared_ptr<const Set<std::string> > use_expand_unprefixed() const - PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::shared_ptr<const Set<std::string> > use_expand_implicit() const - PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::shared_ptr<const Set<std::string> > iuse_implicit() const - PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::shared_ptr<const Set<std::string> > use_expand_values(const std::string &) const - PALUDIS_ATTRIBUTE((warn_unused_result)); - - virtual const std::string environment_variable(const std::string &) const; - - virtual const std::shared_ptr<const MasksInfo> profile_masks(const std::shared_ptr<const PackageID> &) const; - - virtual const std::shared_ptr<const SetSpecTree> system_packages() const; + ) const override PALUDIS_ATTRIBUTE((warn_unused_result)); + + const std::shared_ptr<const Set<std::string> > use_expand() const + override PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::shared_ptr<const Set<std::string> > use_expand_hidden() const + override PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::shared_ptr<const Set<std::string>> use_expand_no_describe() const + override PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::shared_ptr<const Set<std::string> > use_expand_unprefixed() const + override PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::shared_ptr<const Set<std::string> > use_expand_implicit() const + override PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::shared_ptr<const Set<std::string> > iuse_implicit() const + override PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::shared_ptr<const Set<std::string> > use_expand_values(const std::string &) const + override PALUDIS_ATTRIBUTE((warn_unused_result)); + + const std::string environment_variable(const std::string &) const override; + + const std::shared_ptr<const MasksInfo> profile_masks(const std::shared_ptr<const PackageID> &) const override; + + const std::shared_ptr<const SetSpecTree> system_packages() const override; }; } } diff --git a/paludis/repositories/e/vdb_id.hh b/paludis/repositories/e/vdb_id.hh index e2c191b80..aba1b2983 100644 --- a/paludis/repositories/e/vdb_id.hh +++ b/paludis/repositories/e/vdb_id.hh @@ -35,10 +35,10 @@ namespace paludis const RepositoryName &, const FSPath & file); - virtual std::string fs_location_raw_name() const; - virtual std::string fs_location_human_name() const; - virtual std::string contents_filename() const; - virtual const std::shared_ptr<const Contents> contents() const; + std::string fs_location_raw_name() const override; + std::string fs_location_human_name() const override; + std::string contents_filename() const override; + const std::shared_ptr<const Contents> contents() const override; }; } } diff --git a/paludis/repositories/e/vdb_merger.hh b/paludis/repositories/e/vdb_merger.hh index 753d19fc6..685b53305 100644 --- a/paludis/repositories/e/vdb_merger.hh +++ b/paludis/repositories/e/vdb_merger.hh @@ -80,7 +80,7 @@ namespace paludis public FSMerger { private: - void display_override(const std::string &) const; + void display_override(const std::string &) const override; Pimp<VDBMerger> _imp; @@ -89,30 +89,30 @@ namespace paludis ///\{ VDBMerger(const VDBMergerParams &); - ~VDBMerger(); + ~VDBMerger() override; ///\} - virtual Hook extend_hook(const Hook &); + Hook extend_hook(const Hook &) override; - virtual void record_install_file(const FSPath &, const FSPath &, const std::string &, const FSMergerStatusFlags &); - virtual void record_install_dir(const FSPath &, const FSPath &, const FSMergerStatusFlags &); - virtual void record_install_under_dir(const FSPath &, const FSMergerStatusFlags &); - virtual void record_install_sym(const FSPath &, const FSPath &, const FSMergerStatusFlags &); + void record_install_file(const FSPath &, const FSPath &, const std::string &, const FSMergerStatusFlags &) override; + void record_install_dir(const FSPath &, const FSPath &, const FSMergerStatusFlags &) override; + void record_install_under_dir(const FSPath &, const FSMergerStatusFlags &) override; + void record_install_sym(const FSPath &, const FSPath &, const FSMergerStatusFlags &) override; - virtual void on_error(bool is_check, const std::string &); - virtual void on_warn(bool is_check, const std::string &); - virtual void on_enter_dir(bool is_check, const FSPath); + void on_error(bool is_check, const std::string &) override; + void on_warn(bool is_check, const std::string &) override; + void on_enter_dir(bool is_check, const FSPath) override; - virtual void on_file(bool is_check, const FSPath &, const FSPath &); - virtual void on_dir(bool is_check, const FSPath &, const FSPath &); - virtual void on_sym(bool is_check, const FSPath &, const FSPath &); + void on_file(bool is_check, const FSPath &, const FSPath &) override; + void on_dir(bool is_check, const FSPath &, const FSPath &) override; + void on_sym(bool is_check, const FSPath &, const FSPath &) override; - virtual bool config_protected(const FSPath &, const FSPath &); - virtual std::string make_config_protect_name(const FSPath &, const FSPath &); + bool config_protected(const FSPath &, const FSPath &) override; + std::string make_config_protect_name(const FSPath &, const FSPath &) override; - virtual void merge(); - virtual bool check(); + void merge() override; + bool check() override; }; } diff --git a/paludis/repositories/e/vdb_repository.hh b/paludis/repositories/e/vdb_repository.hh index 0164ca26a..314d9c75b 100644 --- a/paludis/repositories/e/vdb_repository.hh +++ b/paludis/repositories/e/vdb_repository.hh @@ -91,7 +91,7 @@ namespace paludis PALUDIS_ATTRIBUTE((warn_unused_result)); protected: - virtual void need_keys_added() const; + void need_keys_added() const override; public: /** @@ -102,51 +102,51 @@ namespace paludis /** * Destructor. */ - ~VDBRepository(); + ~VDBRepository() override; - virtual void invalidate(); + void invalidate() override; - virtual void regenerate_cache() const; + void regenerate_cache() const override; - virtual void perform_uninstall( + void perform_uninstall( const std::shared_ptr<const erepository::ERepositoryID> & id, - const UninstallAction &) const; + const UninstallAction &) const override; /* RepositoryDestinationInterface */ - virtual void merge(const MergeParams &); + void merge(const MergeParams &) override; /* Repository */ - virtual std::shared_ptr<const PackageIDSequence> package_ids( + std::shared_ptr<const PackageIDSequence> package_ids( const QualifiedPackageName &, const RepositoryContentMayExcludes &) const - PALUDIS_ATTRIBUTE((warn_unused_result)); + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual std::shared_ptr<const QualifiedPackageNameSet> package_names( + std::shared_ptr<const QualifiedPackageNameSet> package_names( const CategoryNamePart &, const RepositoryContentMayExcludes &) const - PALUDIS_ATTRIBUTE((warn_unused_result)); + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual std::shared_ptr<const CategoryNamePartSet> category_names( + std::shared_ptr<const CategoryNamePartSet> category_names( const RepositoryContentMayExcludes &) const - PALUDIS_ATTRIBUTE((warn_unused_result)); + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual std::shared_ptr<const CategoryNamePartSet> category_names_containing_package( + std::shared_ptr<const CategoryNamePartSet> category_names_containing_package( const PackageNamePart &, const RepositoryContentMayExcludes &) const - PALUDIS_ATTRIBUTE((warn_unused_result)); + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual bool has_package_named(const QualifiedPackageName &, const RepositoryContentMayExcludes &) const - PALUDIS_ATTRIBUTE((warn_unused_result)); + bool has_package_named(const QualifiedPackageName &, const RepositoryContentMayExcludes &) const + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual bool has_category_named(const CategoryNamePart &, const RepositoryContentMayExcludes &) const - PALUDIS_ATTRIBUTE((warn_unused_result)); + bool has_category_named(const CategoryNamePart &, const RepositoryContentMayExcludes &) const + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const bool is_unimportant() const; + const bool is_unimportant() const override; /* Keys */ - virtual const std::shared_ptr<const MetadataValueKey<std::string> > format_key() const; - virtual const std::shared_ptr<const MetadataValueKey<FSPath> > location_key() const; - virtual const std::shared_ptr<const MetadataValueKey<FSPath> > installed_root_key() const; - virtual const std::shared_ptr<const MetadataCollectionKey<Map<std::string, std::string> > > sync_host_key() const; + const std::shared_ptr<const MetadataValueKey<std::string> > format_key() const override; + const std::shared_ptr<const MetadataValueKey<FSPath> > location_key() const override; + const std::shared_ptr<const MetadataValueKey<FSPath> > installed_root_key() const override; + const std::shared_ptr<const MetadataCollectionKey<Map<std::string, std::string> > > sync_host_key() const override; ///\name RepositoryFactory functions ///\{ @@ -165,7 +165,7 @@ namespace paludis ///\} - virtual void perform_updates(); + void perform_updates() override; }; /** diff --git a/paludis/repositories/e/vdb_unmerger.hh b/paludis/repositories/e/vdb_unmerger.hh index f4c2e5d65..af300899b 100644 --- a/paludis/repositories/e/vdb_unmerger.hh +++ b/paludis/repositories/e/vdb_unmerger.hh @@ -95,25 +95,25 @@ namespace paludis bool config_protected(const FSPath &) const; std::string make_tidy(const FSPath &) const; - void populate_unmerge_set(); + void populate_unmerge_set() override; - void display(const std::string &) const; + void display(const std::string &) const override; - bool check_file(const std::shared_ptr<const ContentsEntry> &) const; - bool check_dir(const std::shared_ptr<const ContentsEntry> &) const; - bool check_sym(const std::shared_ptr<const ContentsEntry> &) const; - bool check_misc(const std::shared_ptr<const ContentsEntry> &) const; + bool check_file(const std::shared_ptr<const ContentsEntry> &) const override; + bool check_dir(const std::shared_ptr<const ContentsEntry> &) const override; + bool check_sym(const std::shared_ptr<const ContentsEntry> &) const override; + bool check_misc(const std::shared_ptr<const ContentsEntry> &) const override; public: ///\name Basic operations ///\{ VDBUnmerger(const VDBUnmergerOptions &); - ~VDBUnmerger(); + ~VDBUnmerger() override; ///\} - virtual Hook extend_hook(const Hook &) const; + Hook extend_hook(const Hook &) const override; }; } diff --git a/paludis/repositories/fake/fake_installed_repository.hh b/paludis/repositories/fake/fake_installed_repository.hh index 87725315d..a6f8e981c 100644 --- a/paludis/repositories/fake/fake_installed_repository.hh +++ b/paludis/repositories/fake/fake_installed_repository.hh @@ -58,13 +58,13 @@ namespace paludis protected: /* RepositoryDestinationInterface */ - virtual bool is_suitable_destination_for(const std::shared_ptr<const PackageID> &) const - PALUDIS_ATTRIBUTE((warn_unused_result)); + bool is_suitable_destination_for(const std::shared_ptr<const PackageID> &) const + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual bool want_pre_post_phases() const - PALUDIS_ATTRIBUTE((warn_unused_result)); + bool want_pre_post_phases() const + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual void merge(const MergeParams &); + void merge(const MergeParams &) override; public: ///\name Basic operations @@ -72,24 +72,24 @@ namespace paludis ///\since 0.42 FakeInstalledRepository(const FakeInstalledRepositoryParams &); - ~FakeInstalledRepository(); + ~FakeInstalledRepository() override; ///\} - virtual bool some_ids_might_support_action(const SupportsActionTestBase &) const; + bool some_ids_might_support_action(const SupportsActionTestBase &) const override; - virtual bool some_ids_might_not_be_masked() const; + bool some_ids_might_not_be_masked() const override; - virtual const bool is_unimportant() const; + const bool is_unimportant() const override; /* Keys */ - virtual const std::shared_ptr<const MetadataValueKey<std::string> > format_key() const; - virtual const std::shared_ptr<const MetadataValueKey<FSPath> > location_key() const; - virtual const std::shared_ptr<const MetadataValueKey<FSPath> > installed_root_key() const; - virtual const std::shared_ptr<const MetadataCollectionKey<Map<std::string, std::string> > > sync_host_key() const; + const std::shared_ptr<const MetadataValueKey<std::string> > format_key() const override; + const std::shared_ptr<const MetadataValueKey<FSPath> > location_key() const override; + const std::shared_ptr<const MetadataValueKey<FSPath> > installed_root_key() const override; + const std::shared_ptr<const MetadataCollectionKey<Map<std::string, std::string> > > sync_host_key() const override; - virtual const std::shared_ptr<const Set<std::string> > maybe_expand_licence_nonrecursively( - const std::string &) const; + const std::shared_ptr<const Set<std::string> > maybe_expand_licence_nonrecursively( + const std::string &) const override; ///\name RepositoryFactory functions ///\{ diff --git a/paludis/repositories/fake/fake_package_id.hh b/paludis/repositories/fake/fake_package_id.hh index 2662850e7..07fbb3dbf 100644 --- a/paludis/repositories/fake/fake_package_id.hh +++ b/paludis/repositories/fake/fake_package_id.hh @@ -41,17 +41,17 @@ namespace paludis const std::shared_ptr<const PackageID> &, const Environment * const); public: - ~FakeMetadataCollectionKey(); + ~FakeMetadataCollectionKey() override; - virtual const std::shared_ptr<const C_> parse_value() const PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::shared_ptr<const C_> parse_value() const override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::string raw_name() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::string human_name() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual MetadataKeyType type() const PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::string raw_name() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::string human_name() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + MetadataKeyType type() const override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::string pretty_print_value( + const std::string pretty_print_value( const PrettyPrinter &, - const PrettyPrintOptions &) const PALUDIS_ATTRIBUTE((warn_unused_result)); + const PrettyPrintOptions &) const override PALUDIS_ATTRIBUTE((warn_unused_result)); }; class PALUDIS_VISIBLE FakeMetadataKeywordSetKey : @@ -63,9 +63,9 @@ namespace paludis void set_from_string(const std::string &); - virtual const std::string pretty_print_value( + const std::string pretty_print_value( const PrettyPrinter &, - const PrettyPrintOptions &) const PALUDIS_ATTRIBUTE((warn_unused_result)); + const PrettyPrintOptions &) const override PALUDIS_ATTRIBUTE((warn_unused_result)); }; template <typename C_> @@ -78,20 +78,20 @@ namespace paludis public: FakeMetadataSpecTreeKey(const std::string &, const std::string &, const std::string &, const std::function<const std::shared_ptr<const C_> (const std::string &)> &, const MetadataKeyType); - ~FakeMetadataSpecTreeKey(); + ~FakeMetadataSpecTreeKey() override; - virtual const std::shared_ptr<const C_> parse_value() const - PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::shared_ptr<const C_> parse_value() const + override PALUDIS_ATTRIBUTE((warn_unused_result)); void set_from_string(const std::string &); - virtual const std::string raw_name() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::string human_name() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual MetadataKeyType type() const PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::string raw_name() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::string human_name() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + MetadataKeyType type() const override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::string pretty_print_value( + const std::string pretty_print_value( const PrettyPrinter &, - const PrettyPrintOptions &) const PALUDIS_ATTRIBUTE((warn_unused_result)); + const PrettyPrintOptions &) const override PALUDIS_ATTRIBUTE((warn_unused_result)); }; template <> @@ -105,23 +105,23 @@ namespace paludis FakeMetadataSpecTreeKey(const std::string &, const std::string &, const std::string &, const std::function<const std::shared_ptr<const FetchableURISpecTree> (const std::string &)> &, const MetadataKeyType); - ~FakeMetadataSpecTreeKey(); + ~FakeMetadataSpecTreeKey() override; - virtual const std::shared_ptr<const FetchableURISpecTree> parse_value() const - PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::shared_ptr<const FetchableURISpecTree> parse_value() const + override PALUDIS_ATTRIBUTE((warn_unused_result)); void set_from_string(const std::string &); - virtual const std::shared_ptr<const URILabel> initial_label() const - PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::shared_ptr<const URILabel> initial_label() const + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::string raw_name() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::string human_name() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual MetadataKeyType type() const PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::string raw_name() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::string human_name() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + MetadataKeyType type() const override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::string pretty_print_value( + const std::string pretty_print_value( const PrettyPrinter &, - const PrettyPrintOptions &) const PALUDIS_ATTRIBUTE((warn_unused_result)); + const PrettyPrintOptions &) const override PALUDIS_ATTRIBUTE((warn_unused_result)); }; template <> @@ -136,23 +136,23 @@ namespace paludis const std::function<const std::shared_ptr<const DependencySpecTree> (const std::string &)> &, const std::shared_ptr<const DependenciesLabelSequence> &, const MetadataKeyType); - ~FakeMetadataSpecTreeKey(); + ~FakeMetadataSpecTreeKey() override; - virtual const std::shared_ptr<const DependencySpecTree> parse_value() const - PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::shared_ptr<const DependencySpecTree> parse_value() const + override PALUDIS_ATTRIBUTE((warn_unused_result)); void set_from_string(const std::string &); - virtual const std::shared_ptr<const DependenciesLabelSequence> initial_labels() const - PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::shared_ptr<const DependenciesLabelSequence> initial_labels() const + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::string raw_name() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::string human_name() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual MetadataKeyType type() const PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::string raw_name() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::string human_name() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + MetadataKeyType type() const override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::string pretty_print_value( + const std::string pretty_print_value( const PrettyPrinter &, - const PrettyPrintOptions &) const PALUDIS_ATTRIBUTE((warn_unused_result)); + const PrettyPrintOptions &) const override PALUDIS_ATTRIBUTE((warn_unused_result)); }; class PALUDIS_VISIBLE FakeMetadataChoicesKey : @@ -165,14 +165,14 @@ namespace paludis FakeMetadataChoicesKey( const Environment * const, const std::shared_ptr<const PackageID> &); - ~FakeMetadataChoicesKey(); + ~FakeMetadataChoicesKey() override; void add(const std::string &, const std::string &); - const std::shared_ptr<const Choices> parse_value() const PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::shared_ptr<const Choices> parse_value() const override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::string raw_name() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::string human_name() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual MetadataKeyType type() const PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::string raw_name() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::string human_name() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + MetadataKeyType type() const override PALUDIS_ATTRIBUTE((warn_unused_result)); }; class PALUDIS_VISIBLE FakeUnacceptedMask : @@ -183,11 +183,11 @@ namespace paludis public: FakeUnacceptedMask(const char, const std::string &, const std::string &); - ~FakeUnacceptedMask(); + ~FakeUnacceptedMask() override; - char key() const; - const std::string description() const; - const std::string unaccepted_key_name() const; + char key() const override; + const std::string description() const override; + const std::string unaccepted_key_name() const override; }; class PALUDIS_VISIBLE FakeUnsupportedMask : @@ -195,11 +195,11 @@ namespace paludis { public: FakeUnsupportedMask(); - ~FakeUnsupportedMask(); + ~FakeUnsupportedMask() override; - char key() const; - const std::string description() const; - const std::string explanation() const; + char key() const override; + const std::string description() const override; + const std::string explanation() const override; }; /** @@ -218,8 +218,8 @@ namespace paludis Pimp<FakePackageID> _imp; protected: - virtual void need_keys_added() const; - virtual void need_masks_added() const; + void need_keys_added() const override; + void need_masks_added() const override; public: ///\name Basic operations @@ -228,34 +228,34 @@ namespace paludis FakePackageID(const Environment * const e, const RepositoryName &, const QualifiedPackageName &, const VersionSpec &); - ~FakePackageID(); + ~FakePackageID() override; ///\} - virtual const std::string canonical_form(const PackageIDCanonicalForm) const; - - virtual const QualifiedPackageName name() const; - virtual const VersionSpec version() const; - virtual const RepositoryName repository_name() const; - virtual PackageDepSpec uniquely_identifying_spec() const; - - virtual const std::shared_ptr<const MetadataValueKey<Slot> > slot_key() const; - virtual const std::shared_ptr<const MetadataCollectionKey<KeywordNameSet> > keywords_key() const; - virtual const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > dependencies_key() const; - virtual const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > build_dependencies_key() const; - virtual const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > run_dependencies_key() const; - virtual const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > post_dependencies_key() const; - virtual const std::shared_ptr<const MetadataSpecTreeKey<FetchableURISpecTree> > fetches_key() const; - virtual const std::shared_ptr<const MetadataSpecTreeKey<SimpleURISpecTree> > homepage_key() const; - virtual const std::shared_ptr<const MetadataValueKey<std::string> > short_description_key() const; - virtual const std::shared_ptr<const MetadataValueKey<std::string> > long_description_key() const; - virtual const std::shared_ptr<const MetadataTimeKey> installed_time_key() const; - virtual const std::shared_ptr<const MetadataValueKey<FSPath> > fs_location_key() const; + const std::string canonical_form(const PackageIDCanonicalForm) const override; + + const QualifiedPackageName name() const override; + const VersionSpec version() const override; + const RepositoryName repository_name() const override; + PackageDepSpec uniquely_identifying_spec() const override; + + const std::shared_ptr<const MetadataValueKey<Slot> > slot_key() const override; + const std::shared_ptr<const MetadataCollectionKey<KeywordNameSet> > keywords_key() const override; + const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > dependencies_key() const override; + const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > build_dependencies_key() const override; + const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > run_dependencies_key() const override; + const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > post_dependencies_key() const override; + const std::shared_ptr<const MetadataSpecTreeKey<FetchableURISpecTree> > fetches_key() const override; + const std::shared_ptr<const MetadataSpecTreeKey<SimpleURISpecTree> > homepage_key() const override; + const std::shared_ptr<const MetadataValueKey<std::string> > short_description_key() const override; + const std::shared_ptr<const MetadataValueKey<std::string> > long_description_key() const override; + const std::shared_ptr<const MetadataTimeKey> installed_time_key() const override; + const std::shared_ptr<const MetadataValueKey<FSPath> > fs_location_key() const override; virtual const std::shared_ptr<const MetadataValueKey<long> > size_of_download_required_key() const; virtual const std::shared_ptr<const MetadataValueKey<long> > size_of_all_distfiles_key() const; - virtual const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > behaviours_key() const; - virtual const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > from_repositories_key() const; - virtual const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const Choices> > > choices_key() const; + const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > behaviours_key() const override; + const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > from_repositories_key() const override; + const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const Choices> > > choices_key() const override; const std::shared_ptr<const MetadataSpecTreeKey<LicenseSpecTree> > license_key() const; @@ -279,13 +279,13 @@ namespace paludis char use_expand_separator() const; - virtual bool arbitrary_less_than_comparison(const PackageID &) const; - virtual std::size_t extra_hash_value() const; + bool arbitrary_less_than_comparison(const PackageID &) const override; + std::size_t extra_hash_value() const override; - virtual bool supports_action(const SupportsActionTestBase &) const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual void perform_action(Action &) const; + bool supports_action(const SupportsActionTestBase &) const override PALUDIS_ATTRIBUTE((warn_unused_result)); + void perform_action(Action &) const override; - virtual const std::shared_ptr<const Contents> contents() const; + const std::shared_ptr<const Contents> contents() const override; }; } diff --git a/paludis/repositories/fake/fake_repository.hh b/paludis/repositories/fake/fake_repository.hh index 9c8abeb39..a45c8eb3f 100644 --- a/paludis/repositories/fake/fake_repository.hh +++ b/paludis/repositories/fake/fake_repository.hh @@ -63,25 +63,25 @@ namespace paludis ///\since 0.26 FakeRepository(const FakeRepositoryParams &); - ~FakeRepository(); + ~FakeRepository() override; ///\} - virtual bool some_ids_might_support_action(const SupportsActionTestBase &) const; + bool some_ids_might_support_action(const SupportsActionTestBase &) const override; - virtual bool some_ids_might_not_be_masked() const; + bool some_ids_might_not_be_masked() const override; - virtual const bool is_unimportant() const; + const bool is_unimportant() const override; - virtual const std::shared_ptr<const Set<std::string> > maybe_expand_licence_nonrecursively( - const std::string &) const; + const std::shared_ptr<const Set<std::string> > maybe_expand_licence_nonrecursively( + const std::string &) const override; /* Keys */ - virtual const std::shared_ptr<const MetadataValueKey<std::string> > format_key() const; - virtual const std::shared_ptr<const MetadataValueKey<FSPath> > location_key() const; - virtual const std::shared_ptr<const MetadataValueKey<FSPath> > installed_root_key() const; - virtual const std::shared_ptr<const MetadataCollectionKey<Map<std::string, std::string> > > sync_host_key() const; + const std::shared_ptr<const MetadataValueKey<std::string> > format_key() const override; + const std::shared_ptr<const MetadataValueKey<FSPath> > location_key() const override; + const std::shared_ptr<const MetadataValueKey<FSPath> > installed_root_key() const override; + const std::shared_ptr<const MetadataCollectionKey<Map<std::string, std::string> > > sync_host_key() const override; }; } diff --git a/paludis/repositories/fake/fake_repository_base.hh b/paludis/repositories/fake/fake_repository_base.hh index f1b056791..b94636357 100644 --- a/paludis/repositories/fake/fake_repository_base.hh +++ b/paludis/repositories/fake/fake_repository_base.hh @@ -56,13 +56,13 @@ namespace paludis FakeRepositoryBase(const Environment * const env, const RepositoryName & name, const RepositoryCapabilities & caps); - virtual void need_keys_added() const; + void need_keys_added() const override; public: /** * Destructor. */ - ~FakeRepositoryBase(); + ~FakeRepositoryBase() override; /** * Add a category. @@ -88,7 +88,7 @@ namespace paludis std::shared_ptr<FakePackageID> add_version(const std::string & c, const std::string & p, const std::string & v); - virtual void invalidate(); + void invalidate() override; /** * Fetch our associated environment. @@ -97,33 +97,33 @@ namespace paludis /* Repository */ - virtual std::shared_ptr<const PackageIDSequence> package_ids( + std::shared_ptr<const PackageIDSequence> package_ids( const QualifiedPackageName &, const RepositoryContentMayExcludes &) const - PALUDIS_ATTRIBUTE((warn_unused_result)); + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual std::shared_ptr<const QualifiedPackageNameSet> package_names( + std::shared_ptr<const QualifiedPackageNameSet> package_names( const CategoryNamePart &, const RepositoryContentMayExcludes &) const - PALUDIS_ATTRIBUTE((warn_unused_result)); + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual std::shared_ptr<const CategoryNamePartSet> category_names(const RepositoryContentMayExcludes &) const - PALUDIS_ATTRIBUTE((warn_unused_result)); + std::shared_ptr<const CategoryNamePartSet> category_names(const RepositoryContentMayExcludes &) const + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual bool has_package_named(const QualifiedPackageName &, const RepositoryContentMayExcludes &) const - PALUDIS_ATTRIBUTE((warn_unused_result)); + bool has_package_named(const QualifiedPackageName &, const RepositoryContentMayExcludes &) const + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual bool has_category_named(const CategoryNamePart &, const RepositoryContentMayExcludes &) const - PALUDIS_ATTRIBUTE((warn_unused_result)); + bool has_category_named(const CategoryNamePart &, const RepositoryContentMayExcludes &) const + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual bool sync(const std::string &, const std::string &, const std::shared_ptr<OutputManager> &) const; + bool sync(const std::string &, const std::string &, const std::shared_ptr<OutputManager> &) const override; ///\name Set methods ///\{ - virtual void populate_sets() const; + void populate_sets() const override; ///\} - virtual HookResult perform_hook(const Hook & hook, const std::shared_ptr<OutputManager> &); + HookResult perform_hook(const Hook & hook, const std::shared_ptr<OutputManager> &) override; }; } diff --git a/paludis/repositories/repository/repository_id.hh b/paludis/repositories/repository/repository_id.hh index 600fb8754..e31dda372 100644 --- a/paludis/repositories/repository/repository_id.hh +++ b/paludis/repositories/repository/repository_id.hh @@ -50,49 +50,49 @@ namespace paludis Pimp<RepositoryID> _imp; protected: - void need_keys_added() const; - void need_masks_added() const; + void need_keys_added() const override; + void need_masks_added() const override; public: RepositoryID(const RepositoryIDParams &); - ~RepositoryID(); + ~RepositoryID() override; - const std::string canonical_form(const PackageIDCanonicalForm) const; - const QualifiedPackageName name() const; - const VersionSpec version() const; - const RepositoryName repository_name() const; - virtual PackageDepSpec uniquely_identifying_spec() const; + const std::string canonical_form(const PackageIDCanonicalForm) const override; + const QualifiedPackageName name() const override; + const VersionSpec version() const override; + const RepositoryName repository_name() const override; + PackageDepSpec uniquely_identifying_spec() const override; - const std::shared_ptr<const MetadataValueKey<Slot> > slot_key() const; - const std::shared_ptr<const MetadataCollectionKey<KeywordNameSet> > keywords_key() const; + const std::shared_ptr<const MetadataValueKey<Slot> > slot_key() const override; + const std::shared_ptr<const MetadataCollectionKey<KeywordNameSet> > keywords_key() const override; const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > - dependencies_key() const; + dependencies_key() const override; const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > - build_dependencies_key() const; + build_dependencies_key() const override; const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > - run_dependencies_key() const; + run_dependencies_key() const override; const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > - post_dependencies_key() const; - const std::shared_ptr<const MetadataSpecTreeKey<FetchableURISpecTree> > fetches_key() const; - const std::shared_ptr<const MetadataSpecTreeKey<SimpleURISpecTree> > homepage_key() const; - const std::shared_ptr<const MetadataValueKey<std::string> > short_description_key() const; - const std::shared_ptr<const MetadataValueKey<std::string> > long_description_key() const; - const std::shared_ptr<const MetadataTimeKey> installed_time_key() const; - const std::shared_ptr<const MetadataValueKey<FSPath> > fs_location_key() const; - const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > behaviours_key() const; - const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > from_repositories_key() const; - const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const Choices> > > choices_key() const; + post_dependencies_key() const override; + const std::shared_ptr<const MetadataSpecTreeKey<FetchableURISpecTree> > fetches_key() const override; + const std::shared_ptr<const MetadataSpecTreeKey<SimpleURISpecTree> > homepage_key() const override; + const std::shared_ptr<const MetadataValueKey<std::string> > short_description_key() const override; + const std::shared_ptr<const MetadataValueKey<std::string> > long_description_key() const override; + const std::shared_ptr<const MetadataTimeKey> installed_time_key() const override; + const std::shared_ptr<const MetadataValueKey<FSPath> > fs_location_key() const override; + const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > behaviours_key() const override; + const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > from_repositories_key() const override; + const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const Choices> > > choices_key() const override; bool supports_action(const SupportsActionTestBase &) const - PALUDIS_ATTRIBUTE((warn_unused_result)); - void perform_action(Action &) const PALUDIS_ATTRIBUTE((noreturn)); + override PALUDIS_ATTRIBUTE((warn_unused_result)); + void perform_action(Action &) const override PALUDIS_ATTRIBUTE((noreturn)); bool arbitrary_less_than_comparison(const PackageID &) const - PALUDIS_ATTRIBUTE((warn_unused_result)); + override PALUDIS_ATTRIBUTE((warn_unused_result)); std::size_t extra_hash_value() const - PALUDIS_ATTRIBUTE((warn_unused_result)); + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::shared_ptr<const Contents> contents() const; + const std::shared_ptr<const Contents> contents() const override; }; } } diff --git a/paludis/repositories/repository/repository_repository.hh b/paludis/repositories/repository/repository_repository.hh index 020d13e6a..41acbd2ac 100644 --- a/paludis/repositories/repository/repository_repository.hh +++ b/paludis/repositories/repository/repository_repository.hh @@ -65,45 +65,45 @@ namespace paludis void _add_metadata_keys(); protected: - virtual void need_keys_added() const; + void need_keys_added() const override; public: RepositoryRepository(const RepositoryRepositoryParams &); - ~RepositoryRepository(); + ~RepositoryRepository() override; - virtual const bool is_unimportant() const; + const bool is_unimportant() const override; - virtual const std::shared_ptr<const MetadataValueKey<std::string> > format_key() const; - virtual const std::shared_ptr<const MetadataValueKey<FSPath> > location_key() const; - virtual const std::shared_ptr<const MetadataValueKey<FSPath> > installed_root_key() const; - virtual const std::shared_ptr<const MetadataCollectionKey<Map<std::string, std::string> > > sync_host_key() const; + const std::shared_ptr<const MetadataValueKey<std::string> > format_key() const override; + const std::shared_ptr<const MetadataValueKey<FSPath> > location_key() const override; + const std::shared_ptr<const MetadataValueKey<FSPath> > installed_root_key() const override; + const std::shared_ptr<const MetadataCollectionKey<Map<std::string, std::string> > > sync_host_key() const override; - virtual bool has_category_named(const CategoryNamePart & c, const RepositoryContentMayExcludes &) const; - virtual bool has_package_named(const QualifiedPackageName & q, const RepositoryContentMayExcludes &) const; - virtual std::shared_ptr<const CategoryNamePartSet> category_names(const RepositoryContentMayExcludes &) const; - virtual std::shared_ptr<const CategoryNamePartSet> unimportant_category_names(const RepositoryContentMayExcludes &) const; - virtual std::shared_ptr<const CategoryNamePartSet> category_names_containing_package( - const PackageNamePart & p, const RepositoryContentMayExcludes &) const; - virtual std::shared_ptr<const QualifiedPackageNameSet> package_names( - const CategoryNamePart & c, const RepositoryContentMayExcludes &) const; - virtual std::shared_ptr<const PackageIDSequence> package_ids(const QualifiedPackageName & p, const RepositoryContentMayExcludes &) const; + bool has_category_named(const CategoryNamePart & c, const RepositoryContentMayExcludes &) const override; + bool has_package_named(const QualifiedPackageName & q, const RepositoryContentMayExcludes &) const override; + std::shared_ptr<const CategoryNamePartSet> category_names(const RepositoryContentMayExcludes &) const override; + std::shared_ptr<const CategoryNamePartSet> unimportant_category_names(const RepositoryContentMayExcludes &) const override; + std::shared_ptr<const CategoryNamePartSet> category_names_containing_package( + const PackageNamePart & p, const RepositoryContentMayExcludes &) const override; + std::shared_ptr<const QualifiedPackageNameSet> package_names( + const CategoryNamePart & c, const RepositoryContentMayExcludes &) const override; + std::shared_ptr<const PackageIDSequence> package_ids(const QualifiedPackageName & p, const RepositoryContentMayExcludes &) const override; - virtual bool some_ids_might_support_action(const SupportsActionTestBase &) const; - virtual bool some_ids_might_not_be_masked() const; - virtual void invalidate(); + bool some_ids_might_support_action(const SupportsActionTestBase &) const override; + bool some_ids_might_not_be_masked() const override; + void invalidate() override; - virtual bool sync(const std::string &, const std::string &, const std::shared_ptr<OutputManager> &) const; + bool sync(const std::string &, const std::string &, const std::shared_ptr<OutputManager> &) const override; - virtual bool is_suitable_destination_for(const std::shared_ptr<const PackageID> &) const - PALUDIS_ATTRIBUTE((warn_unused_result)); + bool is_suitable_destination_for(const std::shared_ptr<const PackageID> &) const + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual bool want_pre_post_phases() const - PALUDIS_ATTRIBUTE((warn_unused_result)); + bool want_pre_post_phases() const + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual void merge(const MergeParams &); + void merge(const MergeParams &) override; - virtual const std::shared_ptr<const Set<std::string> > maybe_expand_licence_nonrecursively( - const std::string &) const; + const std::shared_ptr<const Set<std::string> > maybe_expand_licence_nonrecursively( + const std::string &) const override; ///\name RepositoryFactory functions ///\{ @@ -125,11 +125,11 @@ namespace paludis ///\name Set methods ///\{ - virtual void populate_sets() const; + void populate_sets() const override; ///\} - virtual HookResult perform_hook(const Hook & hook, const std::shared_ptr<OutputManager> &); + HookResult perform_hook(const Hook & hook, const std::shared_ptr<OutputManager> &) override; }; } diff --git a/paludis/repositories/unavailable/unavailable_mask.hh b/paludis/repositories/unavailable/unavailable_mask.hh index f5cae389f..d4d5ef360 100644 --- a/paludis/repositories/unavailable/unavailable_mask.hh +++ b/paludis/repositories/unavailable/unavailable_mask.hh @@ -30,27 +30,27 @@ namespace paludis public UnsupportedMask { public: - virtual const std::string explanation() const; - virtual char key() const; - virtual const std::string description() const; + const std::string explanation() const override; + char key() const override; + const std::string description() const override; }; class NoConfigurationInformationMask : public UnsupportedMask { public: - virtual const std::string explanation() const; - virtual char key() const; - virtual const std::string description() const; + const std::string explanation() const override; + char key() const override; + const std::string description() const override; }; class AlreadyConfiguredMask : public UnsupportedMask { public: - virtual const std::string explanation() const; - virtual char key() const; - virtual const std::string description() const; + const std::string explanation() const override; + char key() const override; + const std::string description() const override; }; } } diff --git a/paludis/repositories/unavailable/unavailable_package_id.hh b/paludis/repositories/unavailable/unavailable_package_id.hh index 196a1e994..1c28392f7 100644 --- a/paludis/repositories/unavailable/unavailable_package_id.hh +++ b/paludis/repositories/unavailable/unavailable_package_id.hh @@ -64,49 +64,49 @@ namespace paludis Pimp<UnavailablePackageID> _imp; protected: - void need_keys_added() const; - void need_masks_added() const; + void need_keys_added() const override; + void need_masks_added() const override; public: UnavailablePackageID(const UnavailablePackageIDParams &); - ~UnavailablePackageID(); + ~UnavailablePackageID() override; - const std::string canonical_form(const PackageIDCanonicalForm) const; - const QualifiedPackageName name() const; - const VersionSpec version() const; - const RepositoryName repository_name() const; - virtual PackageDepSpec uniquely_identifying_spec() const; + const std::string canonical_form(const PackageIDCanonicalForm) const override; + const QualifiedPackageName name() const override; + const VersionSpec version() const override; + const RepositoryName repository_name() const override; + PackageDepSpec uniquely_identifying_spec() const override; - const std::shared_ptr<const MetadataValueKey<Slot> > slot_key() const; - const std::shared_ptr<const MetadataCollectionKey<KeywordNameSet> > keywords_key() const; + const std::shared_ptr<const MetadataValueKey<Slot> > slot_key() const override; + const std::shared_ptr<const MetadataCollectionKey<KeywordNameSet> > keywords_key() const override; const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > - dependencies_key() const; + dependencies_key() const override; const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > - build_dependencies_key() const; + build_dependencies_key() const override; const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > - run_dependencies_key() const; + run_dependencies_key() const override; const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > - post_dependencies_key() const; - const std::shared_ptr<const MetadataSpecTreeKey<FetchableURISpecTree> > fetches_key() const; - const std::shared_ptr<const MetadataSpecTreeKey<SimpleURISpecTree> > homepage_key() const; - const std::shared_ptr<const MetadataValueKey<std::string> > short_description_key() const; - const std::shared_ptr<const MetadataValueKey<std::string> > long_description_key() const; - const std::shared_ptr<const MetadataTimeKey> installed_time_key() const; - const std::shared_ptr<const MetadataValueKey<FSPath> > fs_location_key() const; - const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > behaviours_key() const; - const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > from_repositories_key() const; - const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const Choices> > > choices_key() const; + post_dependencies_key() const override; + const std::shared_ptr<const MetadataSpecTreeKey<FetchableURISpecTree> > fetches_key() const override; + const std::shared_ptr<const MetadataSpecTreeKey<SimpleURISpecTree> > homepage_key() const override; + const std::shared_ptr<const MetadataValueKey<std::string> > short_description_key() const override; + const std::shared_ptr<const MetadataValueKey<std::string> > long_description_key() const override; + const std::shared_ptr<const MetadataTimeKey> installed_time_key() const override; + const std::shared_ptr<const MetadataValueKey<FSPath> > fs_location_key() const override; + const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > behaviours_key() const override; + const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > from_repositories_key() const override; + const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const Choices> > > choices_key() const override; bool supports_action(const SupportsActionTestBase &) const - PALUDIS_ATTRIBUTE((warn_unused_result)); - void perform_action(Action &) const PALUDIS_ATTRIBUTE((noreturn)); + override PALUDIS_ATTRIBUTE((warn_unused_result)); + void perform_action(Action &) const override PALUDIS_ATTRIBUTE((noreturn)); bool arbitrary_less_than_comparison(const PackageID &) const - PALUDIS_ATTRIBUTE((warn_unused_result)); + override PALUDIS_ATTRIBUTE((warn_unused_result)); std::size_t extra_hash_value() const - PALUDIS_ATTRIBUTE((warn_unused_result)); + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::shared_ptr<const Contents> contents() const; + const std::shared_ptr<const Contents> contents() const override; }; } } diff --git a/paludis/repositories/unavailable/unavailable_repository.hh b/paludis/repositories/unavailable/unavailable_repository.hh index bc796e4da..737a42cfd 100644 --- a/paludis/repositories/unavailable/unavailable_repository.hh +++ b/paludis/repositories/unavailable/unavailable_repository.hh @@ -64,37 +64,37 @@ namespace paludis void _add_metadata_keys(); protected: - virtual void need_keys_added() const; + void need_keys_added() const override; public: UnavailableRepository(const UnavailableRepositoryParams &); - ~UnavailableRepository(); + ~UnavailableRepository() override; - virtual const bool is_unimportant() const; + const bool is_unimportant() const override; - virtual const std::shared_ptr<const MetadataValueKey<std::string> > format_key() const; - virtual const std::shared_ptr<const MetadataValueKey<FSPath> > location_key() const; - virtual const std::shared_ptr<const MetadataValueKey<FSPath> > installed_root_key() const; - virtual const std::shared_ptr<const MetadataCollectionKey<Map<std::string, std::string> > > sync_host_key() const; + const std::shared_ptr<const MetadataValueKey<std::string> > format_key() const override; + const std::shared_ptr<const MetadataValueKey<FSPath> > location_key() const override; + const std::shared_ptr<const MetadataValueKey<FSPath> > installed_root_key() const override; + const std::shared_ptr<const MetadataCollectionKey<Map<std::string, std::string> > > sync_host_key() const override; - virtual bool has_category_named(const CategoryNamePart & c, const RepositoryContentMayExcludes &) const; - virtual bool has_package_named(const QualifiedPackageName & q, const RepositoryContentMayExcludes &) const; - virtual std::shared_ptr<const CategoryNamePartSet> category_names(const RepositoryContentMayExcludes &) const; - virtual std::shared_ptr<const CategoryNamePartSet> unimportant_category_names(const RepositoryContentMayExcludes &) const; - virtual std::shared_ptr<const CategoryNamePartSet> category_names_containing_package( - const PackageNamePart & p, const RepositoryContentMayExcludes &) const; - virtual std::shared_ptr<const QualifiedPackageNameSet> package_names( - const CategoryNamePart & c, const RepositoryContentMayExcludes &) const; - virtual std::shared_ptr<const PackageIDSequence> package_ids(const QualifiedPackageName & p, const RepositoryContentMayExcludes &) const; + bool has_category_named(const CategoryNamePart & c, const RepositoryContentMayExcludes &) const override; + bool has_package_named(const QualifiedPackageName & q, const RepositoryContentMayExcludes &) const override; + std::shared_ptr<const CategoryNamePartSet> category_names(const RepositoryContentMayExcludes &) const override; + std::shared_ptr<const CategoryNamePartSet> unimportant_category_names(const RepositoryContentMayExcludes &) const override; + std::shared_ptr<const CategoryNamePartSet> category_names_containing_package( + const PackageNamePart & p, const RepositoryContentMayExcludes &) const override; + std::shared_ptr<const QualifiedPackageNameSet> package_names( + const CategoryNamePart & c, const RepositoryContentMayExcludes &) const override; + std::shared_ptr<const PackageIDSequence> package_ids(const QualifiedPackageName & p, const RepositoryContentMayExcludes &) const override; - virtual bool some_ids_might_support_action(const SupportsActionTestBase &) const; - virtual bool some_ids_might_not_be_masked() const; - virtual void invalidate(); + bool some_ids_might_support_action(const SupportsActionTestBase &) const override; + bool some_ids_might_not_be_masked() const override; + void invalidate() override; - virtual bool sync(const std::string &, const std::string &, const std::shared_ptr<OutputManager> &) const; + bool sync(const std::string &, const std::string &, const std::shared_ptr<OutputManager> &) const override; - virtual const std::shared_ptr<const Set<std::string> > maybe_expand_licence_nonrecursively( - const std::string &) const; + const std::shared_ptr<const Set<std::string> > maybe_expand_licence_nonrecursively( + const std::string &) const override; ///\name RepositoryFactory functions ///\{ @@ -116,11 +116,11 @@ namespace paludis ///\name Set methods ///\{ - virtual void populate_sets() const; + void populate_sets() const override; ///\} - virtual HookResult perform_hook(const Hook & hook, const std::shared_ptr<OutputManager> &); + HookResult perform_hook(const Hook & hook, const std::shared_ptr<OutputManager> &) override; }; } diff --git a/paludis/repositories/unavailable/unavailable_repository_dependencies_key.hh b/paludis/repositories/unavailable/unavailable_repository_dependencies_key.hh index 45ea6b46a..388324591 100644 --- a/paludis/repositories/unavailable/unavailable_repository_dependencies_key.hh +++ b/paludis/repositories/unavailable/unavailable_repository_dependencies_key.hh @@ -38,20 +38,20 @@ namespace paludis const Environment * const env, const std::string & r, const std::string & h, const MetadataKeyType t, const std::string & v); - ~UnavailableRepositoryDependenciesKey(); + ~UnavailableRepositoryDependenciesKey() override; - const std::shared_ptr<const DependencySpecTree> parse_value() const; + const std::shared_ptr<const DependencySpecTree> parse_value() const override; - virtual const std::shared_ptr<const DependenciesLabelSequence> initial_labels() const - PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::shared_ptr<const DependenciesLabelSequence> initial_labels() const + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::string raw_name() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::string human_name() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual MetadataKeyType type() const PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::string raw_name() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::string human_name() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + MetadataKeyType type() const override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::string pretty_print_value( + const std::string pretty_print_value( const PrettyPrinter &, - const PrettyPrintOptions &) const PALUDIS_ATTRIBUTE((warn_unused_result)); + const PrettyPrintOptions &) const override PALUDIS_ATTRIBUTE((warn_unused_result)); }; } } diff --git a/paludis/repositories/unavailable/unavailable_repository_id.hh b/paludis/repositories/unavailable/unavailable_repository_id.hh index e947f54db..08c70914c 100644 --- a/paludis/repositories/unavailable/unavailable_repository_id.hh +++ b/paludis/repositories/unavailable/unavailable_repository_id.hh @@ -64,49 +64,49 @@ namespace paludis Pimp<UnavailableRepositoryID> _imp; protected: - void need_keys_added() const; - void need_masks_added() const; + void need_keys_added() const override; + void need_masks_added() const override; public: UnavailableRepositoryID(const UnavailableRepositoryIDParams &); - ~UnavailableRepositoryID(); + ~UnavailableRepositoryID() override; - const std::string canonical_form(const PackageIDCanonicalForm) const; - const QualifiedPackageName name() const; - const VersionSpec version() const; - const RepositoryName repository_name() const; - virtual PackageDepSpec uniquely_identifying_spec() const; + const std::string canonical_form(const PackageIDCanonicalForm) const override; + const QualifiedPackageName name() const override; + const VersionSpec version() const override; + const RepositoryName repository_name() const override; + PackageDepSpec uniquely_identifying_spec() const override; - const std::shared_ptr<const MetadataValueKey<Slot> > slot_key() const; - const std::shared_ptr<const MetadataCollectionKey<KeywordNameSet> > keywords_key() const; + const std::shared_ptr<const MetadataValueKey<Slot> > slot_key() const override; + const std::shared_ptr<const MetadataCollectionKey<KeywordNameSet> > keywords_key() const override; const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > - dependencies_key() const; + dependencies_key() const override; const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > - build_dependencies_key() const; + build_dependencies_key() const override; const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > - run_dependencies_key() const; + run_dependencies_key() const override; const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > - post_dependencies_key() const; - const std::shared_ptr<const MetadataSpecTreeKey<FetchableURISpecTree> > fetches_key() const; - const std::shared_ptr<const MetadataSpecTreeKey<SimpleURISpecTree> > homepage_key() const; - const std::shared_ptr<const MetadataValueKey<std::string> > short_description_key() const; - const std::shared_ptr<const MetadataValueKey<std::string> > long_description_key() const; - const std::shared_ptr<const MetadataTimeKey> installed_time_key() const; - const std::shared_ptr<const MetadataValueKey<FSPath> > fs_location_key() const; - const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > behaviours_key() const; - const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > from_repositories_key() const; - const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const Choices> > > choices_key() const; + post_dependencies_key() const override; + const std::shared_ptr<const MetadataSpecTreeKey<FetchableURISpecTree> > fetches_key() const override; + const std::shared_ptr<const MetadataSpecTreeKey<SimpleURISpecTree> > homepage_key() const override; + const std::shared_ptr<const MetadataValueKey<std::string> > short_description_key() const override; + const std::shared_ptr<const MetadataValueKey<std::string> > long_description_key() const override; + const std::shared_ptr<const MetadataTimeKey> installed_time_key() const override; + const std::shared_ptr<const MetadataValueKey<FSPath> > fs_location_key() const override; + const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > behaviours_key() const override; + const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > from_repositories_key() const override; + const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const Choices> > > choices_key() const override; bool supports_action(const SupportsActionTestBase &) const - PALUDIS_ATTRIBUTE((warn_unused_result)); - void perform_action(Action &) const; + override PALUDIS_ATTRIBUTE((warn_unused_result)); + void perform_action(Action &) const override; bool arbitrary_less_than_comparison(const PackageID &) const - PALUDIS_ATTRIBUTE((warn_unused_result)); + override PALUDIS_ATTRIBUTE((warn_unused_result)); std::size_t extra_hash_value() const - PALUDIS_ATTRIBUTE((warn_unused_result)); + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::shared_ptr<const Contents> contents() const; + const std::shared_ptr<const Contents> contents() const override; }; } } diff --git a/paludis/repositories/unpackaged/installed_id.hh b/paludis/repositories/unpackaged/installed_id.hh index 8a357710d..32acac404 100644 --- a/paludis/repositories/unpackaged/installed_id.hh +++ b/paludis/repositories/unpackaged/installed_id.hh @@ -40,52 +40,52 @@ namespace paludis Pimp<InstalledUnpackagedID> _imp; protected: - void need_keys_added() const; - void need_masks_added() const; + void need_keys_added() const override; + void need_masks_added() const override; public: InstalledUnpackagedID(const Environment * const, const QualifiedPackageName &, const VersionSpec &, const SlotName &, const RepositoryName &, const FSPath &, const std::string &, const FSPath &, const NDBAM * const); - ~InstalledUnpackagedID(); + ~InstalledUnpackagedID() override; - virtual const std::string canonical_form(const PackageIDCanonicalForm) const; - virtual const QualifiedPackageName name() const; - virtual const VersionSpec version() const; - virtual const RepositoryName repository_name() const; - virtual PackageDepSpec uniquely_identifying_spec() const; + const std::string canonical_form(const PackageIDCanonicalForm) const override; + const QualifiedPackageName name() const override; + const VersionSpec version() const override; + const RepositoryName repository_name() const override; + PackageDepSpec uniquely_identifying_spec() const override; - virtual const std::shared_ptr<const MetadataValueKey<Slot> > slot_key() const; - virtual const std::shared_ptr<const MetadataCollectionKey<KeywordNameSet> > keywords_key() const; - virtual const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > dependencies_key() const; - virtual const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > build_dependencies_key() const; - virtual const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > run_dependencies_key() const; - virtual const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > post_dependencies_key() const; - virtual const std::shared_ptr<const MetadataSpecTreeKey<FetchableURISpecTree> > fetches_key() const; - virtual const std::shared_ptr<const MetadataSpecTreeKey<SimpleURISpecTree> > homepage_key() const; - virtual const std::shared_ptr<const MetadataValueKey<std::string> > short_description_key() const; - virtual const std::shared_ptr<const MetadataValueKey<std::string> > long_description_key() const; - virtual const std::shared_ptr<const MetadataTimeKey> installed_time_key() const; - virtual const std::shared_ptr<const MetadataValueKey<FSPath> > fs_location_key() const; - virtual const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > behaviours_key() const; - virtual const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > from_repositories_key() const; - virtual const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const Choices> > > choices_key() const; + const std::shared_ptr<const MetadataValueKey<Slot> > slot_key() const override; + const std::shared_ptr<const MetadataCollectionKey<KeywordNameSet> > keywords_key() const override; + const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > dependencies_key() const override; + const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > build_dependencies_key() const override; + const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > run_dependencies_key() const override; + const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > post_dependencies_key() const override; + const std::shared_ptr<const MetadataSpecTreeKey<FetchableURISpecTree> > fetches_key() const override; + const std::shared_ptr<const MetadataSpecTreeKey<SimpleURISpecTree> > homepage_key() const override; + const std::shared_ptr<const MetadataValueKey<std::string> > short_description_key() const override; + const std::shared_ptr<const MetadataValueKey<std::string> > long_description_key() const override; + const std::shared_ptr<const MetadataTimeKey> installed_time_key() const override; + const std::shared_ptr<const MetadataValueKey<FSPath> > fs_location_key() const override; + const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > behaviours_key() const override; + const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > from_repositories_key() const override; + const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const Choices> > > choices_key() const override; - virtual bool supports_action(const SupportsActionTestBase &) const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual void perform_action(Action &) const; + bool supports_action(const SupportsActionTestBase &) const override PALUDIS_ATTRIBUTE((warn_unused_result)); + void perform_action(Action &) const override; - virtual bool arbitrary_less_than_comparison(const PackageID &) const - PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual std::size_t extra_hash_value() const - PALUDIS_ATTRIBUTE((warn_unused_result)); + bool arbitrary_less_than_comparison(const PackageID &) const + override PALUDIS_ATTRIBUTE((warn_unused_result)); + std::size_t extra_hash_value() const + override PALUDIS_ATTRIBUTE((warn_unused_result)); void uninstall( const bool replace, const std::shared_ptr<const PackageID> & if_for_install_id, const std::shared_ptr<OutputManager> & output_manager) const; - virtual const std::shared_ptr<const Contents> contents() const; + const std::shared_ptr<const Contents> contents() const override; }; } } diff --git a/paludis/repositories/unpackaged/installed_repository.hh b/paludis/repositories/unpackaged/installed_repository.hh index d8c7e6ead..e3e6ef61c 100644 --- a/paludis/repositories/unpackaged/installed_repository.hh +++ b/paludis/repositories/unpackaged/installed_repository.hh @@ -54,63 +54,63 @@ namespace paludis void _add_metadata_keys() const; protected: - virtual void need_keys_added() const; + void need_keys_added() const override; public: InstalledUnpackagedRepository( const RepositoryName &, const unpackaged_repositories::InstalledUnpackagedRepositoryParams &); - ~InstalledUnpackagedRepository(); + ~InstalledUnpackagedRepository() override; - virtual void invalidate(); + void invalidate() override; - virtual bool is_suitable_destination_for(const std::shared_ptr<const PackageID> &) const - PALUDIS_ATTRIBUTE((warn_unused_result)); + bool is_suitable_destination_for(const std::shared_ptr<const PackageID> &) const + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual bool want_pre_post_phases() const - PALUDIS_ATTRIBUTE((warn_unused_result)); + bool want_pre_post_phases() const + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual void merge(const MergeParams &); + void merge(const MergeParams &) override; void deindex(const QualifiedPackageName &) const; - virtual std::shared_ptr<const PackageIDSequence> package_ids( + std::shared_ptr<const PackageIDSequence> package_ids( const QualifiedPackageName &, const RepositoryContentMayExcludes &) const - PALUDIS_ATTRIBUTE((warn_unused_result)); + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual std::shared_ptr<const QualifiedPackageNameSet> package_names( + std::shared_ptr<const QualifiedPackageNameSet> package_names( const CategoryNamePart &, const RepositoryContentMayExcludes &) const - PALUDIS_ATTRIBUTE((warn_unused_result)); + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual std::shared_ptr<const CategoryNamePartSet> category_names(const RepositoryContentMayExcludes &) const - PALUDIS_ATTRIBUTE((warn_unused_result)); + std::shared_ptr<const CategoryNamePartSet> category_names(const RepositoryContentMayExcludes &) const + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual std::shared_ptr<const CategoryNamePartSet> category_names_containing_package( + std::shared_ptr<const CategoryNamePartSet> category_names_containing_package( const PackageNamePart &, const RepositoryContentMayExcludes &) const - PALUDIS_ATTRIBUTE((warn_unused_result)); + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual bool has_package_named(const QualifiedPackageName &, const RepositoryContentMayExcludes &) const - PALUDIS_ATTRIBUTE((warn_unused_result)); + bool has_package_named(const QualifiedPackageName &, const RepositoryContentMayExcludes &) const + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual bool has_category_named(const CategoryNamePart &, const RepositoryContentMayExcludes &) const - PALUDIS_ATTRIBUTE((warn_unused_result)); + bool has_category_named(const CategoryNamePart &, const RepositoryContentMayExcludes &) const + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual bool some_ids_might_support_action(const SupportsActionTestBase &) const; + bool some_ids_might_support_action(const SupportsActionTestBase &) const override; - virtual bool some_ids_might_not_be_masked() const; + bool some_ids_might_not_be_masked() const override; - virtual const bool is_unimportant() const; + const bool is_unimportant() const override; - virtual const std::shared_ptr<const Set<std::string> > maybe_expand_licence_nonrecursively( - const std::string &) const; + const std::shared_ptr<const Set<std::string> > maybe_expand_licence_nonrecursively( + const std::string &) const override; /* Keys */ - virtual const std::shared_ptr<const MetadataValueKey<std::string> > format_key() const; - virtual const std::shared_ptr<const MetadataValueKey<FSPath> > location_key() const; - virtual const std::shared_ptr<const MetadataValueKey<FSPath> > installed_root_key() const; - virtual const std::shared_ptr<const MetadataCollectionKey<Map<std::string, std::string> > > sync_host_key() const; + const std::shared_ptr<const MetadataValueKey<std::string> > format_key() const override; + const std::shared_ptr<const MetadataValueKey<FSPath> > location_key() const override; + const std::shared_ptr<const MetadataValueKey<FSPath> > installed_root_key() const override; + const std::shared_ptr<const MetadataCollectionKey<Map<std::string, std::string> > > sync_host_key() const override; ///\name RepositoryFactory functions ///\{ @@ -132,14 +132,14 @@ namespace paludis ///\name Set methods ///\{ - virtual void populate_sets() const; + void populate_sets() const override; ///\} - virtual HookResult perform_hook(const Hook & hook, const std::shared_ptr<OutputManager> &) - PALUDIS_ATTRIBUTE((warn_unused_result)); + HookResult perform_hook(const Hook & hook, const std::shared_ptr<OutputManager> &) + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual bool sync(const std::string &, const std::string &, const std::shared_ptr<OutputManager> &) const; + bool sync(const std::string &, const std::string &, const std::shared_ptr<OutputManager> &) const override; }; } diff --git a/paludis/repositories/unpackaged/unpackaged_id.hh b/paludis/repositories/unpackaged/unpackaged_id.hh index 1c0097df5..324b20066 100644 --- a/paludis/repositories/unpackaged/unpackaged_id.hh +++ b/paludis/repositories/unpackaged/unpackaged_id.hh @@ -38,8 +38,8 @@ namespace paludis Pimp<UnpackagedID> _imp; protected: - void need_keys_added() const; - void need_masks_added() const; + void need_keys_added() const override; + void need_masks_added() const override; public: UnpackagedID(const Environment * const, const QualifiedPackageName &, const VersionSpec &, @@ -47,42 +47,42 @@ namespace paludis const std::string &, const std::string &, const std::string &, const Tribool, const Tribool); - ~UnpackagedID(); + ~UnpackagedID() override; - virtual const std::string canonical_form(const PackageIDCanonicalForm) const; - virtual const QualifiedPackageName name() const; - virtual const VersionSpec version() const; - virtual const RepositoryName repository_name() const; - virtual PackageDepSpec uniquely_identifying_spec() const; + const std::string canonical_form(const PackageIDCanonicalForm) const override; + const QualifiedPackageName name() const override; + const VersionSpec version() const override; + const RepositoryName repository_name() const override; + PackageDepSpec uniquely_identifying_spec() const override; - virtual const std::shared_ptr<const MetadataValueKey<Slot> > slot_key() const; - virtual const std::shared_ptr<const MetadataCollectionKey<KeywordNameSet> > keywords_key() const; - virtual const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > dependencies_key() const; - virtual const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > build_dependencies_key() const; - virtual const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > run_dependencies_key() const; - virtual const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > post_dependencies_key() const; - virtual const std::shared_ptr<const MetadataSpecTreeKey<FetchableURISpecTree> > fetches_key() const; - virtual const std::shared_ptr<const MetadataSpecTreeKey<SimpleURISpecTree> > homepage_key() const; - virtual const std::shared_ptr<const MetadataValueKey<std::string> > short_description_key() const; - virtual const std::shared_ptr<const MetadataValueKey<std::string> > long_description_key() const; - virtual const std::shared_ptr<const MetadataTimeKey> installed_time_key() const; - virtual const std::shared_ptr<const MetadataValueKey<FSPath> > fs_location_key() const; - virtual const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > behaviours_key() const; - virtual const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > from_repositories_key() const; - virtual const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const Choices> > > choices_key() const; + const std::shared_ptr<const MetadataValueKey<Slot> > slot_key() const override; + const std::shared_ptr<const MetadataCollectionKey<KeywordNameSet> > keywords_key() const override; + const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > dependencies_key() const override; + const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > build_dependencies_key() const override; + const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > run_dependencies_key() const override; + const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > post_dependencies_key() const override; + const std::shared_ptr<const MetadataSpecTreeKey<FetchableURISpecTree> > fetches_key() const override; + const std::shared_ptr<const MetadataSpecTreeKey<SimpleURISpecTree> > homepage_key() const override; + const std::shared_ptr<const MetadataValueKey<std::string> > short_description_key() const override; + const std::shared_ptr<const MetadataValueKey<std::string> > long_description_key() const override; + const std::shared_ptr<const MetadataTimeKey> installed_time_key() const override; + const std::shared_ptr<const MetadataValueKey<FSPath> > fs_location_key() const override; + const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > behaviours_key() const override; + const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > from_repositories_key() const override; + const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const Choices> > > choices_key() const override; const std::shared_ptr<const MetadataValueKey<bool> > strip_key() const; const std::shared_ptr<const MetadataValueKey<bool> > preserve_work_key() const; - virtual bool supports_action(const SupportsActionTestBase &) const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual void perform_action(Action &) const; + bool supports_action(const SupportsActionTestBase &) const override PALUDIS_ATTRIBUTE((warn_unused_result)); + void perform_action(Action &) const override; - virtual bool arbitrary_less_than_comparison(const PackageID &) const - PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual std::size_t extra_hash_value() const - PALUDIS_ATTRIBUTE((warn_unused_result)); + bool arbitrary_less_than_comparison(const PackageID &) const + override PALUDIS_ATTRIBUTE((warn_unused_result)); + std::size_t extra_hash_value() const + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::shared_ptr<const Contents> contents() const; + const std::shared_ptr<const Contents> contents() const override; }; } } diff --git a/paludis/repositories/unpackaged/unpackaged_key.hh b/paludis/repositories/unpackaged/unpackaged_key.hh index b4f54a53f..6d36c4611 100644 --- a/paludis/repositories/unpackaged/unpackaged_key.hh +++ b/paludis/repositories/unpackaged/unpackaged_key.hh @@ -40,20 +40,20 @@ namespace paludis const std::string & r, const std::string & h, const MetadataKeyType t, const std::shared_ptr<const DependenciesLabelSequence> &, const std::string & v); - ~UnpackagedDependencyKey(); + ~UnpackagedDependencyKey() override; - const std::shared_ptr<const DependencySpecTree> parse_value() const; + const std::shared_ptr<const DependencySpecTree> parse_value() const override; - virtual const std::shared_ptr<const DependenciesLabelSequence> initial_labels() const - PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::shared_ptr<const DependenciesLabelSequence> initial_labels() const + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::string raw_name() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::string human_name() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual MetadataKeyType type() const PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::string raw_name() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::string human_name() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + MetadataKeyType type() const override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::string pretty_print_value( + const std::string pretty_print_value( const PrettyPrinter &, - const PrettyPrintOptions &) const PALUDIS_ATTRIBUTE((warn_unused_result)); + const PrettyPrintOptions &) const override PALUDIS_ATTRIBUTE((warn_unused_result)); }; class UnpackagedChoicesKey : @@ -66,13 +66,13 @@ namespace paludis UnpackagedChoicesKey(const Environment * const env, const std::string & r, const std::string & h, const MetadataKeyType t, const UnpackagedID * const id); - ~UnpackagedChoicesKey(); + ~UnpackagedChoicesKey() override; - virtual const std::shared_ptr<const Choices> parse_value() const; + const std::shared_ptr<const Choices> parse_value() const override; - virtual const std::string raw_name() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::string human_name() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual MetadataKeyType type() const PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::string raw_name() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::string human_name() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + MetadataKeyType type() const override PALUDIS_ATTRIBUTE((warn_unused_result)); }; } } diff --git a/paludis/repositories/unpackaged/unpackaged_repository.hh b/paludis/repositories/unpackaged/unpackaged_repository.hh index d49255ef9..c8faa1c6b 100644 --- a/paludis/repositories/unpackaged/unpackaged_repository.hh +++ b/paludis/repositories/unpackaged/unpackaged_repository.hh @@ -71,54 +71,54 @@ namespace paludis void _add_metadata_keys() const; protected: - virtual void need_keys_added() const; + void need_keys_added() const override; public: UnpackagedRepository( const RepositoryName &, const unpackaged_repositories::UnpackagedRepositoryParams &); - ~UnpackagedRepository(); + ~UnpackagedRepository() override; - virtual void invalidate(); + void invalidate() override; - virtual std::shared_ptr<const PackageIDSequence> package_ids( + std::shared_ptr<const PackageIDSequence> package_ids( const QualifiedPackageName &, const RepositoryContentMayExcludes &) const - PALUDIS_ATTRIBUTE((warn_unused_result)); + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual std::shared_ptr<const QualifiedPackageNameSet> package_names( + std::shared_ptr<const QualifiedPackageNameSet> package_names( const CategoryNamePart &, const RepositoryContentMayExcludes &) const - PALUDIS_ATTRIBUTE((warn_unused_result)); + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual std::shared_ptr<const CategoryNamePartSet> category_names(const RepositoryContentMayExcludes &) const - PALUDIS_ATTRIBUTE((warn_unused_result)); + std::shared_ptr<const CategoryNamePartSet> category_names(const RepositoryContentMayExcludes &) const + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual std::shared_ptr<const CategoryNamePartSet> category_names_containing_package( + std::shared_ptr<const CategoryNamePartSet> category_names_containing_package( const PackageNamePart &, const RepositoryContentMayExcludes &) const - PALUDIS_ATTRIBUTE((warn_unused_result)); + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual bool has_package_named(const QualifiedPackageName &, const RepositoryContentMayExcludes &) const - PALUDIS_ATTRIBUTE((warn_unused_result)); + bool has_package_named(const QualifiedPackageName &, const RepositoryContentMayExcludes &) const + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual bool has_category_named(const CategoryNamePart &, const RepositoryContentMayExcludes &) const - PALUDIS_ATTRIBUTE((warn_unused_result)); + bool has_category_named(const CategoryNamePart &, const RepositoryContentMayExcludes &) const + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual bool some_ids_might_support_action(const SupportsActionTestBase &) const; - virtual bool some_ids_might_not_be_masked() const; + bool some_ids_might_support_action(const SupportsActionTestBase &) const override; + bool some_ids_might_not_be_masked() const override; - virtual const bool is_unimportant() const; + const bool is_unimportant() const override; - virtual bool sync(const std::string &, const std::string &, const std::shared_ptr<OutputManager> &) const; + bool sync(const std::string &, const std::string &, const std::shared_ptr<OutputManager> &) const override; - virtual const std::shared_ptr<const Set<std::string> > maybe_expand_licence_nonrecursively( - const std::string &) const; + const std::shared_ptr<const Set<std::string> > maybe_expand_licence_nonrecursively( + const std::string &) const override; /* Keys */ - virtual const std::shared_ptr<const MetadataValueKey<std::string> > format_key() const; - virtual const std::shared_ptr<const MetadataValueKey<FSPath> > location_key() const; - virtual const std::shared_ptr<const MetadataValueKey<FSPath> > installed_root_key() const; - virtual const std::shared_ptr<const MetadataCollectionKey<Map<std::string, std::string> > > sync_host_key() const; + const std::shared_ptr<const MetadataValueKey<std::string> > format_key() const override; + const std::shared_ptr<const MetadataValueKey<FSPath> > location_key() const override; + const std::shared_ptr<const MetadataValueKey<FSPath> > installed_root_key() const override; + const std::shared_ptr<const MetadataCollectionKey<Map<std::string, std::string> > > sync_host_key() const override; ///\name RepositoryFactory functions ///\{ @@ -140,12 +140,12 @@ namespace paludis ///\name Set methods ///\{ - virtual void populate_sets() const; + void populate_sets() const override; ///\} - virtual HookResult perform_hook(const Hook & hook, const std::shared_ptr<OutputManager> &) - PALUDIS_ATTRIBUTE((warn_unused_result)); + HookResult perform_hook(const Hook & hook, const std::shared_ptr<OutputManager> &) + override PALUDIS_ATTRIBUTE((warn_unused_result)); }; } diff --git a/paludis/repositories/unpackaged/unpackaged_stripper.hh b/paludis/repositories/unpackaged/unpackaged_stripper.hh index 6f48fa562..25f966dc3 100644 --- a/paludis/repositories/unpackaged/unpackaged_stripper.hh +++ b/paludis/repositories/unpackaged/unpackaged_stripper.hh @@ -60,19 +60,19 @@ namespace paludis Pimp<UnpackagedStripper> _imp; protected: - virtual void on_enter_dir(const FSPath &); - virtual void on_leave_dir(const FSPath &); + void on_enter_dir(const FSPath &) override; + void on_leave_dir(const FSPath &) override; - virtual void on_strip(const FSPath &); - virtual void on_split(const FSPath &, const FSPath &); - virtual void on_dwarf_compress(const FSPath &); - virtual void on_unknown(const FSPath &); + void on_strip(const FSPath &) override; + void on_split(const FSPath &, const FSPath &) override; + void on_dwarf_compress(const FSPath &) override; + void on_unknown(const FSPath &) override; public: UnpackagedStripper(const UnpackagedStripperOptions &); - ~UnpackagedStripper(); + ~UnpackagedStripper() override; - virtual void strip(); + void strip() override; }; } } diff --git a/paludis/repositories/unwritten/unwritten_id.hh b/paludis/repositories/unwritten/unwritten_id.hh index 341348aaa..8472bd0c1 100644 --- a/paludis/repositories/unwritten/unwritten_id.hh +++ b/paludis/repositories/unwritten/unwritten_id.hh @@ -76,49 +76,49 @@ namespace paludis Pimp<UnwrittenID> _imp; protected: - void need_keys_added() const; - void need_masks_added() const; + void need_keys_added() const override; + void need_masks_added() const override; public: UnwrittenID(const UnwrittenIDParams &); - ~UnwrittenID(); + ~UnwrittenID() override; - const std::string canonical_form(const PackageIDCanonicalForm) const; - const QualifiedPackageName name() const; - const VersionSpec version() const; - const RepositoryName repository_name() const; - virtual PackageDepSpec uniquely_identifying_spec() const; + const std::string canonical_form(const PackageIDCanonicalForm) const override; + const QualifiedPackageName name() const override; + const VersionSpec version() const override; + const RepositoryName repository_name() const override; + PackageDepSpec uniquely_identifying_spec() const override; - const std::shared_ptr<const MetadataValueKey<Slot> > slot_key() const; - const std::shared_ptr<const MetadataCollectionKey<KeywordNameSet> > keywords_key() const; + const std::shared_ptr<const MetadataValueKey<Slot> > slot_key() const override; + const std::shared_ptr<const MetadataCollectionKey<KeywordNameSet> > keywords_key() const override; const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > - dependencies_key() const; + dependencies_key() const override; const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > - build_dependencies_key() const; + build_dependencies_key() const override; const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > - run_dependencies_key() const; + run_dependencies_key() const override; const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > - post_dependencies_key() const; - const std::shared_ptr<const MetadataSpecTreeKey<FetchableURISpecTree> > fetches_key() const; - const std::shared_ptr<const MetadataSpecTreeKey<SimpleURISpecTree> > homepage_key() const; - const std::shared_ptr<const MetadataValueKey<std::string> > short_description_key() const; - const std::shared_ptr<const MetadataValueKey<std::string> > long_description_key() const; - const std::shared_ptr<const MetadataTimeKey> installed_time_key() const; - const std::shared_ptr<const MetadataValueKey<FSPath> > fs_location_key() const; - const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > behaviours_key() const; - const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > from_repositories_key() const; - const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const Choices> > > choices_key() const; + post_dependencies_key() const override; + const std::shared_ptr<const MetadataSpecTreeKey<FetchableURISpecTree> > fetches_key() const override; + const std::shared_ptr<const MetadataSpecTreeKey<SimpleURISpecTree> > homepage_key() const override; + const std::shared_ptr<const MetadataValueKey<std::string> > short_description_key() const override; + const std::shared_ptr<const MetadataValueKey<std::string> > long_description_key() const override; + const std::shared_ptr<const MetadataTimeKey> installed_time_key() const override; + const std::shared_ptr<const MetadataValueKey<FSPath> > fs_location_key() const override; + const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > behaviours_key() const override; + const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > from_repositories_key() const override; + const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const Choices> > > choices_key() const override; bool supports_action(const SupportsActionTestBase &) const - PALUDIS_ATTRIBUTE((warn_unused_result)); - void perform_action(Action &) const PALUDIS_ATTRIBUTE((noreturn)); + override PALUDIS_ATTRIBUTE((warn_unused_result)); + void perform_action(Action &) const override PALUDIS_ATTRIBUTE((noreturn)); bool arbitrary_less_than_comparison(const PackageID &) const - PALUDIS_ATTRIBUTE((warn_unused_result)); + override PALUDIS_ATTRIBUTE((warn_unused_result)); std::size_t extra_hash_value() const - PALUDIS_ATTRIBUTE((warn_unused_result)); + override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::shared_ptr<const Contents> contents() const; + const std::shared_ptr<const Contents> contents() const override; }; } } diff --git a/paludis/repositories/unwritten/unwritten_mask.hh b/paludis/repositories/unwritten/unwritten_mask.hh index 2789ee7f5..e5cc28ed0 100644 --- a/paludis/repositories/unwritten/unwritten_mask.hh +++ b/paludis/repositories/unwritten/unwritten_mask.hh @@ -30,18 +30,18 @@ namespace paludis public UnsupportedMask { public: - virtual const std::string explanation() const; - virtual char key() const; - virtual const std::string description() const; + const std::string explanation() const override; + char key() const override; + const std::string description() const override; }; class GraveyardMask : public UnsupportedMask { public: - virtual const std::string explanation() const; - virtual char key() const; - virtual const std::string description() const; + const std::string explanation() const override; + char key() const override; + const std::string description() const override; }; } } diff --git a/paludis/repositories/unwritten/unwritten_repository.hh b/paludis/repositories/unwritten/unwritten_repository.hh index 38ddb5f30..bc73cb759 100644 --- a/paludis/repositories/unwritten/unwritten_repository.hh +++ b/paludis/repositories/unwritten/unwritten_repository.hh @@ -63,37 +63,37 @@ namespace paludis void _add_metadata_keys(); protected: - virtual void need_keys_added() const; + void need_keys_added() const override; public: UnwrittenRepository(const UnwrittenRepositoryParams &); - ~UnwrittenRepository(); + ~UnwrittenRepository() override; - virtual const bool is_unimportant() const; + const bool is_unimportant() const override; - virtual const std::shared_ptr<const MetadataValueKey<std::string> > format_key() const; - virtual const std::shared_ptr<const MetadataValueKey<FSPath> > location_key() const; - virtual const std::shared_ptr<const MetadataValueKey<FSPath> > installed_root_key() const; - virtual const std::shared_ptr<const MetadataCollectionKey<Map<std::string, std::string> > > sync_host_key() const; + const std::shared_ptr<const MetadataValueKey<std::string> > format_key() const override; + const std::shared_ptr<const MetadataValueKey<FSPath> > location_key() const override; + const std::shared_ptr<const MetadataValueKey<FSPath> > installed_root_key() const override; + const std::shared_ptr<const MetadataCollectionKey<Map<std::string, std::string> > > sync_host_key() const override; - virtual bool has_category_named(const CategoryNamePart & c, const RepositoryContentMayExcludes &) const; - virtual bool has_package_named(const QualifiedPackageName & q, const RepositoryContentMayExcludes &) const; - virtual std::shared_ptr<const CategoryNamePartSet> category_names(const RepositoryContentMayExcludes &) const; - virtual std::shared_ptr<const CategoryNamePartSet> unimportant_category_names(const RepositoryContentMayExcludes &) const; - virtual std::shared_ptr<const CategoryNamePartSet> category_names_containing_package( - const PackageNamePart & p, const RepositoryContentMayExcludes &) const; - virtual std::shared_ptr<const QualifiedPackageNameSet> package_names( - const CategoryNamePart & c, const RepositoryContentMayExcludes &) const; - virtual std::shared_ptr<const PackageIDSequence> package_ids(const QualifiedPackageName & p, const RepositoryContentMayExcludes &) const; + bool has_category_named(const CategoryNamePart & c, const RepositoryContentMayExcludes &) const override; + bool has_package_named(const QualifiedPackageName & q, const RepositoryContentMayExcludes &) const override; + std::shared_ptr<const CategoryNamePartSet> category_names(const RepositoryContentMayExcludes &) const override; + std::shared_ptr<const CategoryNamePartSet> unimportant_category_names(const RepositoryContentMayExcludes &) const override; + std::shared_ptr<const CategoryNamePartSet> category_names_containing_package( + const PackageNamePart & p, const RepositoryContentMayExcludes &) const override; + std::shared_ptr<const QualifiedPackageNameSet> package_names( + const CategoryNamePart & c, const RepositoryContentMayExcludes &) const override; + std::shared_ptr<const PackageIDSequence> package_ids(const QualifiedPackageName & p, const RepositoryContentMayExcludes &) const override; - virtual bool some_ids_might_support_action(const SupportsActionTestBase &) const; - virtual bool some_ids_might_not_be_masked() const; - virtual void invalidate(); + bool some_ids_might_support_action(const SupportsActionTestBase &) const override; + bool some_ids_might_not_be_masked() const override; + void invalidate() override; - virtual bool sync(const std::string &, const std::string &, const std::shared_ptr<OutputManager> & output_manager) const; + bool sync(const std::string &, const std::string &, const std::shared_ptr<OutputManager> & output_manager) const override; - virtual const std::shared_ptr<const Set<std::string> > maybe_expand_licence_nonrecursively( - const std::string &) const; + const std::shared_ptr<const Set<std::string> > maybe_expand_licence_nonrecursively( + const std::string &) const override; ///\name RepositoryFactory functions ///\{ @@ -115,11 +115,11 @@ namespace paludis ///\name Set methods ///\{ - virtual void populate_sets() const; + void populate_sets() const override; ///\} - virtual HookResult perform_hook(const Hook & hook, const std::shared_ptr<OutputManager> &); + HookResult perform_hook(const Hook & hook, const std::shared_ptr<OutputManager> &) override; }; } diff --git a/paludis/repository.hh b/paludis/repository.hh index a16171a8f..8e2426bd0 100644 --- a/paludis/repository.hh +++ b/paludis/repository.hh @@ -197,7 +197,7 @@ namespace paludis NoSuchSetError(const std::string & name) noexcept; - virtual ~NoSuchSetError(); + ~NoSuchSetError() override; ///\} @@ -226,7 +226,7 @@ namespace paludis RecursivelyDefinedSetError(const std::string & name) noexcept; - virtual ~RecursivelyDefinedSetError(); + ~RecursivelyDefinedSetError() override; ///\} @@ -262,7 +262,7 @@ namespace paludis ///\name Basic operations ///\{ - virtual ~Repository(); + ~Repository() override; Repository(const Repository &) = delete; Repository & operator= (const Repository &) = delete; diff --git a/paludis/resolver/decision.hh b/paludis/resolver/decision.hh index f6be49a9d..f53cddbfb 100644 --- a/paludis/resolver/decision.hh +++ b/paludis/resolver/decision.hh @@ -66,12 +66,12 @@ namespace paludis public: NothingNoChangeDecision(const Resolvent &, const bool); - ~NothingNoChangeDecision(); + ~NothingNoChangeDecision() override; - virtual const Resolvent resolvent() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual bool taken() const PALUDIS_ATTRIBUTE((warn_unused_result)); + const Resolvent resolvent() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + bool taken() const override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual void serialise(Serialiser &) const; + void serialise(Serialiser &) const override; }; class PALUDIS_VISIBLE ExistingNoChangeDecision : @@ -88,17 +88,17 @@ namespace paludis const ExistingPackageIDAttributes &, const bool taken ); - ~ExistingNoChangeDecision(); + ~ExistingNoChangeDecision() override; const std::shared_ptr<const PackageID> existing_id() const PALUDIS_ATTRIBUTE((warn_unused_result)); const ExistingPackageIDAttributes attributes() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const Resolvent resolvent() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual bool taken() const PALUDIS_ATTRIBUTE((warn_unused_result)); + const Resolvent resolvent() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + bool taken() const override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual void serialise(Serialiser &) const; + void serialise(Serialiser &) const override; }; class PALUDIS_VISIBLE ConfirmableDecision : @@ -163,7 +163,7 @@ namespace paludis const std::function<void (ChangesToMakeDecision &)> & ); - ~ChangesToMakeDecision(); + ~ChangesToMakeDecision() override; const std::shared_ptr<const Destination> destination() const PALUDIS_ATTRIBUTE((warn_unused_result)); @@ -187,13 +187,13 @@ namespace paludis void set_change_type(ChangeType); - virtual const Resolvent resolvent() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual bool taken() const PALUDIS_ATTRIBUTE((warn_unused_result)); + const Resolvent resolvent() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + bool taken() const override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::shared_ptr<const RequiredConfirmations> required_confirmations_if_any() const PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::shared_ptr<const RequiredConfirmations> required_confirmations_if_any() const override PALUDIS_ATTRIBUTE((warn_unused_result)); void add_required_confirmation(const std::shared_ptr<const RequiredConfirmation> &); - virtual void serialise(Serialiser &) const; + void serialise(Serialiser &) const override; static const std::shared_ptr<ChangesToMakeDecision> deserialise( Deserialisation & d) PALUDIS_ATTRIBUTE((warn_unused_result)); @@ -213,18 +213,18 @@ namespace paludis const Resolvent &, const std::shared_ptr<const PackageIDSequence> &, const bool taken); - ~RemoveDecision(); + ~RemoveDecision() override; - virtual const Resolvent resolvent() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual bool taken() const PALUDIS_ATTRIBUTE((warn_unused_result)); + const Resolvent resolvent() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + bool taken() const override PALUDIS_ATTRIBUTE((warn_unused_result)); const std::shared_ptr<const PackageIDSequence> ids() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::shared_ptr<const RequiredConfirmations> required_confirmations_if_any() const PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::shared_ptr<const RequiredConfirmations> required_confirmations_if_any() const override PALUDIS_ATTRIBUTE((warn_unused_result)); void add_required_confirmation(const std::shared_ptr<const RequiredConfirmation> &); - virtual void serialise(Serialiser &) const; + void serialise(Serialiser &) const override; static const std::shared_ptr<RemoveDecision> deserialise( Deserialisation & d) PALUDIS_ATTRIBUTE((warn_unused_result)); @@ -242,12 +242,12 @@ namespace paludis const Resolvent &, const std::shared_ptr<const UnsuitableCandidates> &, const bool taken); - ~UnableToMakeDecision(); + ~UnableToMakeDecision() override; - virtual const Resolvent resolvent() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual bool taken() const PALUDIS_ATTRIBUTE((warn_unused_result)); + const Resolvent resolvent() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + bool taken() const override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual void serialise(Serialiser &) const; + void serialise(Serialiser &) const override; const std::shared_ptr<const UnsuitableCandidates> unsuitable_candidates() const PALUDIS_ATTRIBUTE((warn_unused_result)); @@ -268,17 +268,17 @@ namespace paludis const Resolvent &, const std::shared_ptr<const PackageID> &, const bool taken); - ~BreakDecision(); + ~BreakDecision() override; const std::shared_ptr<const PackageID> existing_id() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const Resolvent resolvent() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual bool taken() const PALUDIS_ATTRIBUTE((warn_unused_result)); + const Resolvent resolvent() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + bool taken() const override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::shared_ptr<const RequiredConfirmations> required_confirmations_if_any() const PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::shared_ptr<const RequiredConfirmations> required_confirmations_if_any() const override PALUDIS_ATTRIBUTE((warn_unused_result)); void add_required_confirmation(const std::shared_ptr<const RequiredConfirmation> &); - virtual void serialise(Serialiser &) const; + void serialise(Serialiser &) const override; static const std::shared_ptr<BreakDecision> deserialise( Deserialisation & d) PALUDIS_ATTRIBUTE((warn_unused_result)); diff --git a/paludis/resolver/job.hh b/paludis/resolver/job.hh index 71918c01c..82c420b21 100644 --- a/paludis/resolver/job.hh +++ b/paludis/resolver/job.hh @@ -88,19 +88,19 @@ namespace paludis const PackageDepSpec &, const bool was_target ); - ~FetchJob(); + ~FetchJob() override; const PackageDepSpec origin_id_spec() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::shared_ptr<JobState> state() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual void set_state(const std::shared_ptr<JobState> &); + const std::shared_ptr<JobState> state() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + void set_state(const std::shared_ptr<JobState> &) override; - virtual bool was_target() const PALUDIS_ATTRIBUTE((warn_unused_result)); + bool was_target() const override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::shared_ptr<const JobRequirements> requirements() const PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::shared_ptr<const JobRequirements> requirements() const override PALUDIS_ATTRIBUTE((warn_unused_result)); static const std::shared_ptr<FetchJob> deserialise(Deserialisation &) PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual void serialise(Serialiser &) const; + void serialise(Serialiser &) const override; }; class PALUDIS_VISIBLE InstallJob : @@ -118,22 +118,22 @@ namespace paludis const DestinationType, const std::shared_ptr<const Sequence<PackageDepSpec> > &, const bool was_target); - ~InstallJob(); + ~InstallJob() override; const PackageDepSpec origin_id_spec() const PALUDIS_ATTRIBUTE((warn_unused_result)); const RepositoryName destination_repository_name() const PALUDIS_ATTRIBUTE((warn_unused_result)); DestinationType destination_type() const PALUDIS_ATTRIBUTE((warn_unused_result)); const std::shared_ptr<const Sequence<PackageDepSpec> > replacing_specs() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::shared_ptr<JobState> state() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual void set_state(const std::shared_ptr<JobState> &); + const std::shared_ptr<JobState> state() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + void set_state(const std::shared_ptr<JobState> &) override; - virtual bool was_target() const PALUDIS_ATTRIBUTE((warn_unused_result)); + bool was_target() const override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::shared_ptr<const JobRequirements> requirements() const PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::shared_ptr<const JobRequirements> requirements() const override PALUDIS_ATTRIBUTE((warn_unused_result)); static const std::shared_ptr<InstallJob> deserialise(Deserialisation &) PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual void serialise(Serialiser &) const; + void serialise(Serialiser &) const override; }; class PALUDIS_VISIBLE UninstallJob : @@ -149,19 +149,19 @@ namespace paludis const std::shared_ptr<const Sequence<PackageDepSpec> > &, const bool was_target ); - ~UninstallJob(); + ~UninstallJob() override; const std::shared_ptr<const Sequence<PackageDepSpec> > ids_to_remove_specs() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::shared_ptr<JobState> state() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual void set_state(const std::shared_ptr<JobState> &); + const std::shared_ptr<JobState> state() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + void set_state(const std::shared_ptr<JobState> &) override; - virtual bool was_target() const PALUDIS_ATTRIBUTE((warn_unused_result)); + bool was_target() const override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::shared_ptr<const JobRequirements> requirements() const PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::shared_ptr<const JobRequirements> requirements() const override PALUDIS_ATTRIBUTE((warn_unused_result)); static const std::shared_ptr<UninstallJob> deserialise(Deserialisation &) PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual void serialise(Serialiser &) const; + void serialise(Serialiser &) const override; }; } } diff --git a/paludis/resolver/job_state.hh b/paludis/resolver/job_state.hh index f8d4547ec..113a2d4c3 100644 --- a/paludis/resolver/job_state.hh +++ b/paludis/resolver/job_state.hh @@ -48,7 +48,7 @@ namespace paludis public ImplementAcceptMethods<JobState, JobPendingState> { public: - virtual void serialise(Serialiser &) const; + void serialise(Serialiser &) const override; static const std::shared_ptr<JobPendingState> deserialise(Deserialisation &) PALUDIS_ATTRIBUTE((warn_unused_result)); }; @@ -61,7 +61,7 @@ namespace paludis public: JobActiveState(); - ~JobActiveState(); + ~JobActiveState() override; void set_output_manager(const std::shared_ptr<OutputManager> &); const std::shared_ptr<JobSucceededState> succeeded() const PALUDIS_ATTRIBUTE((warn_unused_result)); @@ -69,7 +69,7 @@ namespace paludis const std::shared_ptr<OutputManager> output_manager() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual void serialise(Serialiser &) const; + void serialise(Serialiser &) const override; static const std::shared_ptr<JobActiveState> deserialise(Deserialisation &) PALUDIS_ATTRIBUTE((warn_unused_result)); }; @@ -82,11 +82,11 @@ namespace paludis public: JobSucceededState(const std::shared_ptr<OutputManager> &); - ~JobSucceededState(); + ~JobSucceededState() override; const std::shared_ptr<OutputManager> output_manager() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual void serialise(Serialiser &) const; + void serialise(Serialiser &) const override; static const std::shared_ptr<JobSucceededState> deserialise(Deserialisation &) PALUDIS_ATTRIBUTE((warn_unused_result)); }; @@ -99,11 +99,11 @@ namespace paludis public: JobFailedState(const std::shared_ptr<OutputManager> &); - ~JobFailedState(); + ~JobFailedState() override; const std::shared_ptr<OutputManager> output_manager() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual void serialise(Serialiser &) const; + void serialise(Serialiser &) const override; static const std::shared_ptr<JobFailedState> deserialise(Deserialisation &) PALUDIS_ATTRIBUTE((warn_unused_result)); }; @@ -112,7 +112,7 @@ namespace paludis public ImplementAcceptMethods<JobState, JobSkippedState> { public: - virtual void serialise(Serialiser &) const; + void serialise(Serialiser &) const override; static const std::shared_ptr<JobSkippedState> deserialise(Deserialisation &) PALUDIS_ATTRIBUTE((warn_unused_result)); }; } diff --git a/paludis/resolver/reason.hh b/paludis/resolver/reason.hh index de9f08580..3d3fbd481 100644 --- a/paludis/resolver/reason.hh +++ b/paludis/resolver/reason.hh @@ -65,11 +65,11 @@ namespace paludis public: TargetReason(const std::string &); - ~TargetReason(); + ~TargetReason() override; const std::string extra_information() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual void serialise(Serialiser &) const; + void serialise(Serialiser &) const override; }; class DependencyReason : @@ -87,7 +87,7 @@ namespace paludis const SanitisedDependency & s, const Tribool already_met); - ~DependencyReason(); + ~DependencyReason() override; const std::shared_ptr<const PackageID> from_id() const; const std::shared_ptr<const ChangedChoices> from_id_changed_choices() const; @@ -95,7 +95,7 @@ namespace paludis const SanitisedDependency & sanitised_dependency() const; Tribool already_met() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual void serialise(Serialiser &) const; + void serialise(Serialiser &) const override; }; class DependentReason : @@ -107,11 +107,11 @@ namespace paludis public: DependentReason(const DependentPackageID &); - ~DependentReason(); + ~DependentReason() override; const DependentPackageID dependent_upon() const; - virtual void serialise(Serialiser &) const; + void serialise(Serialiser &) const override; }; class WasUsedByReason : @@ -123,11 +123,11 @@ namespace paludis public: WasUsedByReason(const std::shared_ptr<const ChangeByResolventSequence> & ids); - ~WasUsedByReason(); + ~WasUsedByReason() override; const std::shared_ptr<const ChangeByResolventSequence> ids_and_resolvents_being_removed() const; - virtual void serialise(Serialiser &) const; + void serialise(Serialiser &) const override; }; class PresetReason : @@ -141,13 +141,13 @@ namespace paludis PresetReason( const std::string &, const std::shared_ptr<const Reason> &); - ~PresetReason(); + ~PresetReason() override; const std::shared_ptr<const Reason> maybe_reason_for_preset() const PALUDIS_ATTRIBUTE((warn_unused_result)); const std::string maybe_explanation() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual void serialise(Serialiser &) const; + void serialise(Serialiser &) const override; }; class SetReason : @@ -159,12 +159,12 @@ namespace paludis public: SetReason(const SetName &, const std::shared_ptr<const Reason> &); - ~SetReason(); + ~SetReason() override; const SetName set_name() const PALUDIS_ATTRIBUTE((warn_unused_result)); const std::shared_ptr<const Reason> reason_for_set() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual void serialise(Serialiser &) const; + void serialise(Serialiser &) const override; }; class LikeOtherDestinationTypeReason : @@ -176,12 +176,12 @@ namespace paludis public: LikeOtherDestinationTypeReason(const Resolvent &, const std::shared_ptr<const Reason> &); - ~LikeOtherDestinationTypeReason(); + ~LikeOtherDestinationTypeReason() override; const Resolvent other_resolvent() const PALUDIS_ATTRIBUTE((warn_unused_result)); const std::shared_ptr<const Reason> reason_for_other() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual void serialise(Serialiser &) const; + void serialise(Serialiser &) const override; }; class ViaBinaryReason : @@ -193,11 +193,11 @@ namespace paludis public: ViaBinaryReason(const Resolvent &); - ~ViaBinaryReason(); + ~ViaBinaryReason() override; const Resolvent other_resolvent() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual void serialise(Serialiser &) const; + void serialise(Serialiser &) const override; }; } diff --git a/paludis/resolver/required_confirmations.hh b/paludis/resolver/required_confirmations.hh index c76ab7b2e..fe6f350e7 100644 --- a/paludis/resolver/required_confirmations.hh +++ b/paludis/resolver/required_confirmations.hh @@ -50,7 +50,7 @@ namespace paludis static const std::shared_ptr<DowngradeConfirmation> deserialise( Deserialisation & d) PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual void serialise(Serialiser &) const; + void serialise(Serialiser &) const override; }; class PALUDIS_VISIBLE NotBestConfirmation : @@ -61,7 +61,7 @@ namespace paludis static const std::shared_ptr<NotBestConfirmation> deserialise( Deserialisation & d) PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual void serialise(Serialiser &) const; + void serialise(Serialiser &) const override; }; class PALUDIS_VISIBLE BreakConfirmation : @@ -72,7 +72,7 @@ namespace paludis static const std::shared_ptr<BreakConfirmation> deserialise( Deserialisation & d) PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual void serialise(Serialiser &) const; + void serialise(Serialiser &) const override; }; class PALUDIS_VISIBLE RemoveSystemPackageConfirmation : @@ -83,7 +83,7 @@ namespace paludis static const std::shared_ptr<RemoveSystemPackageConfirmation> deserialise( Deserialisation & d) PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual void serialise(Serialiser &) const; + void serialise(Serialiser &) const override; }; class PALUDIS_VISIBLE MaskedConfirmation : @@ -94,7 +94,7 @@ namespace paludis static const std::shared_ptr<MaskedConfirmation> deserialise( Deserialisation & d) PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual void serialise(Serialiser &) const; + void serialise(Serialiser &) const override; }; class PALUDIS_VISIBLE ChangedChoicesConfirmation : @@ -105,7 +105,7 @@ namespace paludis static const std::shared_ptr<ChangedChoicesConfirmation> deserialise( Deserialisation & d) PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual void serialise(Serialiser &) const; + void serialise(Serialiser &) const override; }; class PALUDIS_VISIBLE UninstallConfirmation : @@ -116,7 +116,7 @@ namespace paludis static const std::shared_ptr<UninstallConfirmation> deserialise( Deserialisation & d) PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual void serialise(Serialiser &) const; + void serialise(Serialiser &) const override; }; } } diff --git a/paludis/resolver/suggest_restart.hh b/paludis/resolver/suggest_restart.hh index 3c2d453e3..940bd55b7 100644 --- a/paludis/resolver/suggest_restart.hh +++ b/paludis/resolver/suggest_restart.hh @@ -46,7 +46,7 @@ namespace paludis const std::shared_ptr<const Decision> & new_decision, const std::shared_ptr<const Constraint> & suggested_preset) noexcept; SuggestRestart(const SuggestRestart &); - ~SuggestRestart(); + ~SuggestRestart() override; const Resolvent resolvent() const PALUDIS_ATTRIBUTE((warn_unused_result)); const std::shared_ptr<const Decision> previous_decision() const PALUDIS_ATTRIBUTE((warn_unused_result)); diff --git a/paludis/standard_output_manager.hh b/paludis/standard_output_manager.hh index ebce384c3..4a2d60964 100644 --- a/paludis/standard_output_manager.hh +++ b/paludis/standard_output_manager.hh @@ -34,17 +34,17 @@ namespace paludis { public: StandardOutputManager(); - ~StandardOutputManager(); + ~StandardOutputManager() override; - virtual std::ostream & stdout_stream() PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual std::ostream & stderr_stream() PALUDIS_ATTRIBUTE((warn_unused_result)); + std::ostream & stdout_stream() override PALUDIS_ATTRIBUTE((warn_unused_result)); + std::ostream & stderr_stream() override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual void succeeded(); - virtual void ignore_succeeded(); - virtual void flush(); - virtual bool want_to_flush() const; - virtual void message(const MessageType, const std::string &); - virtual void nothing_more_to_come(); + void succeeded() override; + void ignore_succeeded() override; + void flush() override; + bool want_to_flush() const override; + void message(const MessageType, const std::string &) override; + void nothing_more_to_come() override; static const std::shared_ptr<const Set<std::string> > factory_managers() PALUDIS_ATTRIBUTE((warn_unused_result)); diff --git a/paludis/syncer.hh b/paludis/syncer.hh index c6d4e92db..db7f6b98b 100644 --- a/paludis/syncer.hh +++ b/paludis/syncer.hh @@ -140,12 +140,12 @@ namespace paludis /** * Destructor. */ - virtual ~DefaultSyncer(); + ~DefaultSyncer() override; /** * Perform the sync. */ - virtual void sync(const SyncOptions &) const; + void sync(const SyncOptions &) const override; }; /** diff --git a/paludis/tar_merger.hh b/paludis/tar_merger.hh index c6f8775ed..ea6e5e1b8 100644 --- a/paludis/tar_merger.hh +++ b/paludis/tar_merger.hh @@ -75,7 +75,7 @@ namespace paludis Pimp<TarMerger> _imp; protected: - virtual FSPath canonicalise_root_path(const FSPath & f); + FSPath canonicalise_root_path(const FSPath & f) override; virtual void add_file(const FSPath &, const FSPath &); @@ -86,13 +86,13 @@ namespace paludis TarMerger(const TarMergerParams &); ~TarMerger(); - virtual void on_file_main(bool is_check, const FSPath &, const FSPath &); - virtual void on_dir_main(bool is_check, const FSPath &, const FSPath &); - virtual void on_sym_main(bool is_check, const FSPath &, const FSPath &); + void on_file_main(bool is_check, const FSPath &, const FSPath &) override; + void on_dir_main(bool is_check, const FSPath &, const FSPath &) override; + void on_sym_main(bool is_check, const FSPath &, const FSPath &) override; - virtual void prepare_install_under(); + void prepare_install_under() override; - virtual void merge(); + void merge() override; }; } diff --git a/paludis/tee_output_manager.hh b/paludis/tee_output_manager.hh index 52b956861..e6144f6aa 100644 --- a/paludis/tee_output_manager.hh +++ b/paludis/tee_output_manager.hh @@ -48,17 +48,17 @@ namespace paludis const std::shared_ptr<const OutputManagerSequence> &, const std::shared_ptr<const OutputManagerSequence> &); - ~TeeOutputManager(); + ~TeeOutputManager() override; - virtual std::ostream & stdout_stream() PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual std::ostream & stderr_stream() PALUDIS_ATTRIBUTE((warn_unused_result)); + std::ostream & stdout_stream() override PALUDIS_ATTRIBUTE((warn_unused_result)); + std::ostream & stderr_stream() override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual void succeeded(); - virtual void ignore_succeeded(); - virtual void flush(); - virtual bool want_to_flush() const; - virtual void nothing_more_to_come(); - virtual void message(const MessageType, const std::string &); + void succeeded() override; + void ignore_succeeded() override; + void flush() override; + bool want_to_flush() const override; + void nothing_more_to_come() override; + void message(const MessageType, const std::string &) override; static const std::shared_ptr<const Set<std::string> > factory_managers() PALUDIS_ATTRIBUTE((warn_unused_result)); diff --git a/paludis/unformatted_pretty_printer.hh b/paludis/unformatted_pretty_printer.hh index 113e54d49..6a3231b71 100644 --- a/paludis/unformatted_pretty_printer.hh +++ b/paludis/unformatted_pretty_printer.hh @@ -30,36 +30,36 @@ namespace paludis public: UnformattedPrettyPrinter(); - virtual const std::string indentify(const int) const; - virtual const std::string newline() const; + const std::string indentify(const int) const override; + const std::string newline() const override; - virtual const std::string prettify(const PackageDepSpec &) const; - virtual const std::string prettify(const BlockDepSpec &) const; - virtual const std::string prettify(const ConditionalDepSpec &) const; - virtual const std::string prettify(const NamedSetDepSpec &) const; - virtual const std::string prettify(const SimpleURIDepSpec &) const; - virtual const std::string prettify(const PlainTextDepSpec &) const; - virtual const std::string prettify(const LicenseDepSpec &) const; - virtual const std::string prettify(const FetchableURIDepSpec &) const; - virtual const std::string prettify(const URILabelsDepSpec &) const; - virtual const std::string prettify(const DependenciesLabelsDepSpec &) const; - virtual const std::string prettify(const PlainTextLabelDepSpec &) const; + const std::string prettify(const PackageDepSpec &) const override; + const std::string prettify(const BlockDepSpec &) const override; + const std::string prettify(const ConditionalDepSpec &) const override; + const std::string prettify(const NamedSetDepSpec &) const override; + const std::string prettify(const SimpleURIDepSpec &) const override; + const std::string prettify(const PlainTextDepSpec &) const override; + const std::string prettify(const LicenseDepSpec &) const override; + const std::string prettify(const FetchableURIDepSpec &) const override; + const std::string prettify(const URILabelsDepSpec &) const override; + const std::string prettify(const DependenciesLabelsDepSpec &) const override; + const std::string prettify(const PlainTextLabelDepSpec &) const override; - virtual const std::string prettify(const std::shared_ptr<const PackageID> &) const; + const std::string prettify(const std::shared_ptr<const PackageID> &) const override; - virtual const std::string prettify(const bool) const; + const std::string prettify(const bool) const override; - virtual const std::string prettify(const long) const; + const std::string prettify(const long) const override; - virtual const std::string prettify(const std::string &) const; + const std::string prettify(const std::string &) const override; - virtual const std::string prettify(const std::pair<const std::string, std::string> &) const; + const std::string prettify(const std::pair<const std::string, std::string> &) const override; - virtual const std::string prettify(const FSPath &) const; + const std::string prettify(const FSPath &) const override; - virtual const std::string prettify(const KeywordName &) const; + const std::string prettify(const KeywordName &) const override; - virtual const std::string prettify(const Maintainer &) const; + const std::string prettify(const Maintainer &) const override; }; } diff --git a/paludis/user_dep_spec.hh b/paludis/user_dep_spec.hh index 8795dafc6..70f0001ef 100644 --- a/paludis/user_dep_spec.hh +++ b/paludis/user_dep_spec.hh @@ -62,9 +62,9 @@ namespace paludis public: UserSlotExactFullRequirement(const std::pair<SlotName, SlotName> &); - virtual const std::pair<SlotName, SlotName> slots() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::string as_string() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::shared_ptr<const SlotRequirement> maybe_original_requirement_if_rewritten() const PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::pair<SlotName, SlotName> slots() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::string as_string() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::shared_ptr<const SlotRequirement> maybe_original_requirement_if_rewritten() const override PALUDIS_ATTRIBUTE((warn_unused_result)); }; class PALUDIS_VISIBLE UserSlotExactPartialRequirement : @@ -81,9 +81,9 @@ namespace paludis ///\} - virtual const SlotName slot() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::string as_string() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::shared_ptr<const SlotRequirement> maybe_original_requirement_if_rewritten() const PALUDIS_ATTRIBUTE((warn_unused_result)); + const SlotName slot() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::string as_string() const override PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::shared_ptr<const SlotRequirement> maybe_original_requirement_if_rewritten() const override PALUDIS_ATTRIBUTE((warn_unused_result)); }; /** @@ -103,27 +103,27 @@ namespace paludis ///\{ UserKeyRequirement(const std::string &); - ~UserKeyRequirement(); + ~UserKeyRequirement() override; ///\} - virtual const std::pair<bool, std::string> requirement_met( + const std::pair<bool, std::string> requirement_met( const Environment * const, const ChangedChoices *, const std::shared_ptr<const PackageID> &, const std::shared_ptr<const PackageID> &, - const ChangedChoices * const) const PALUDIS_ATTRIBUTE((warn_unused_result)); + const ChangedChoices * const) const override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::string as_human_string( - const std::shared_ptr<const PackageID> &) const PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::string as_human_string( + const std::shared_ptr<const PackageID> &) const override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::string as_raw_string() const PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::string as_raw_string() const override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual Tribool accumulate_changes_to_make_met( + Tribool accumulate_changes_to_make_met( const Environment * const, const ChangedChoices * const, const std::shared_ptr<const PackageID> &, const std::shared_ptr<const PackageID> &, - ChangedChoices &) const PALUDIS_ATTRIBUTE((warn_unused_result)); + ChangedChoices &) const override PALUDIS_ATTRIBUTE((warn_unused_result)); }; extern template class Pimp<UserKeyRequirement>; @@ -144,27 +144,27 @@ namespace paludis ///\{ ExcludeRequirement(const PackageDepSpec &); - ~ExcludeRequirement(); + ~ExcludeRequirement() override; ///\} - virtual const std::pair<bool, std::string> requirement_met( + const std::pair<bool, std::string> requirement_met( const Environment * const, const ChangedChoices *, const std::shared_ptr<const PackageID> &, const std::shared_ptr<const PackageID> &, - const ChangedChoices * const) const PALUDIS_ATTRIBUTE((warn_unused_result)); + const ChangedChoices * const) const override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::string as_human_string( - const std::shared_ptr<const PackageID> &) const PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::string as_human_string( + const std::shared_ptr<const PackageID> &) const override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual const std::string as_raw_string() const PALUDIS_ATTRIBUTE((warn_unused_result)); + const std::string as_raw_string() const override PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual Tribool accumulate_changes_to_make_met( + Tribool accumulate_changes_to_make_met( const Environment * const, const ChangedChoices * const, const std::shared_ptr<const PackageID> &, const std::shared_ptr<const PackageID> &, - ChangedChoices &) const PALUDIS_ATTRIBUTE((warn_unused_result)); + ChangedChoices &) const override PALUDIS_ATTRIBUTE((warn_unused_result)); }; } diff --git a/paludis/util/buffer_output_stream.hh b/paludis/util/buffer_output_stream.hh index 4ba27cb54..329f3064d 100644 --- a/paludis/util/buffer_output_stream.hh +++ b/paludis/util/buffer_output_stream.hh @@ -34,12 +34,12 @@ namespace paludis Pimp<BufferOutputStreamBuf> _imp; protected: - virtual int_type overflow(int_type c); - virtual std::streamsize xsputn(const char * s, std::streamsize num); + int_type overflow(int_type c) override; + std::streamsize xsputn(const char * s, std::streamsize num) override; public: BufferOutputStreamBuf(); - ~BufferOutputStreamBuf(); + ~BufferOutputStreamBuf() override; void unbuffer(std::ostream &); bool anything_to_unbuffer() const PALUDIS_ATTRIBUTE((warn_unused_result)); @@ -61,7 +61,7 @@ namespace paludis { public: BufferOutputStream(); - ~BufferOutputStream() = default; + ~BufferOutputStream() override = default; void unbuffer(std::ostream &); bool anything_to_unbuffer() const PALUDIS_ATTRIBUTE((warn_unused_result)); diff --git a/paludis/util/clone.hh b/paludis/util/clone.hh index daf0c5990..0e5995753 100644 --- a/paludis/util/clone.hh +++ b/paludis/util/clone.hh @@ -76,12 +76,12 @@ namespace paludis public virtual Cloneable<Base_> { public: - virtual std::shared_ptr<Base_> clone() const PALUDIS_ATTRIBUTE((warn_unused_result)); + std::shared_ptr<Base_> clone() const override PALUDIS_ATTRIBUTE((warn_unused_result)); ///\name Basic operations ///\{ - virtual ~CloneUsingThis(); + ~CloneUsingThis() override; ///\} }; diff --git a/paludis/util/config_file.hh b/paludis/util/config_file.hh index e3926a107..5135b64a2 100644 --- a/paludis/util/config_file.hh +++ b/paludis/util/config_file.hh @@ -164,7 +164,7 @@ namespace paludis LineConfigFile(const Source &, const LineConfigFileOptions &); - ~LineConfigFile(); + ~LineConfigFile() override; ///\} @@ -230,7 +230,7 @@ namespace paludis const TransformationFunction & ); - ~KeyValueConfigFile(); + ~KeyValueConfigFile() override; ///\} diff --git a/paludis/util/discard_output_stream.hh b/paludis/util/discard_output_stream.hh index a0577f83e..459fb6370 100644 --- a/paludis/util/discard_output_stream.hh +++ b/paludis/util/discard_output_stream.hh @@ -29,11 +29,11 @@ namespace paludis public std::streambuf { protected: - virtual int_type - overflow(int_type c); + int_type + overflow(int_type c) override; - virtual std::streamsize - xsputn(const char * s, std::streamsize num); + std::streamsize + xsputn(const char * s, std::streamsize num) override; }; class PALUDIS_VISIBLE DiscardOutputStreamBase diff --git a/paludis/util/elf_dynamic_section.hh b/paludis/util/elf_dynamic_section.hh index aee94b5d0..469154e64 100644 --- a/paludis/util/elf_dynamic_section.hh +++ b/paludis/util/elf_dynamic_section.hh @@ -59,7 +59,7 @@ namespace paludis public: DynamicEntry(const std::string &); - ~DynamicEntry(); + ~DynamicEntry() override; virtual void initialize(typename ElfType_::Word, const typename ElfType_::DynamicEntry & entry); std::string tag_name() const @@ -78,7 +78,7 @@ namespace paludis { public: DynamicEntryUnknown(); - virtual ~DynamicEntryUnknown(); + ~DynamicEntryUnknown() override; }; template <typename ElfType_> @@ -89,7 +89,7 @@ namespace paludis { public: DynamicEntryFlag(const std::string &); - ~DynamicEntryFlag(); + ~DynamicEntryFlag() override; }; template <typename ElfType_> @@ -103,8 +103,8 @@ namespace paludis public: DynamicEntryValue(const std::string &); - virtual ~DynamicEntryValue(); - virtual void initialize(typename ElfType_::Word, const typename ElfType_::DynamicEntry & entry); + ~DynamicEntryValue() override; + void initialize(typename ElfType_::Word, const typename ElfType_::DynamicEntry & entry) override; typename ElfType_::DynamicValue operator() () const { @@ -123,8 +123,8 @@ namespace paludis public: DynamicEntryPointer(const std::string &); - virtual ~DynamicEntryPointer(); - virtual void initialize(typename ElfType_::Word, const typename ElfType_::DynamicEntry &); + ~DynamicEntryPointer() override; + void initialize(typename ElfType_::Word, const typename ElfType_::DynamicEntry &) override; typename ElfType_::DynamicPointer operator() () const { @@ -151,8 +151,8 @@ namespace paludis public: DynamicEntryString(const std::string &); - virtual ~DynamicEntryString(); - virtual void initialize(typename ElfType_::Word, const typename ElfType_::DynamicEntry &); + ~DynamicEntryString() override; + void initialize(typename ElfType_::Word, const typename ElfType_::DynamicEntry &) override; std::string operator() () const { @@ -204,9 +204,9 @@ namespace paludis public: DynamicSection(typename ElfType_::Word, const typename ElfType_::SectionHeader &, std::istream &, bool); - virtual ~DynamicSection(); + ~DynamicSection() override; - virtual std::string get_type() const; + std::string get_type() const override; void resolve_entry_names(Section<ElfType_> &); diff --git a/paludis/util/elf_relocation_section.hh b/paludis/util/elf_relocation_section.hh index f995c5cbd..1830c99ca 100644 --- a/paludis/util/elf_relocation_section.hh +++ b/paludis/util/elf_relocation_section.hh @@ -105,9 +105,9 @@ namespace paludis public: RelocationSection(typename ElfType_::Word, const typename ElfType_::SectionHeader &, std::istream &, bool); - virtual ~RelocationSection(); + ~RelocationSection() override; - virtual std::string get_type() const + std::string get_type() const override { return Relocation_::type_name; } diff --git a/paludis/util/elf_sections.hh b/paludis/util/elf_sections.hh index 69683704a..c2f00a5ae 100644 --- a/paludis/util/elf_sections.hh +++ b/paludis/util/elf_sections.hh @@ -118,8 +118,8 @@ namespace paludis { public: GenericSection(typename ElfType_::Word, const typename ElfType_::SectionHeader &); - virtual ~GenericSection(); - virtual std::string get_type() const; + ~GenericSection() override; + std::string get_type() const override; }; template <typename ElfType_> @@ -132,7 +132,7 @@ namespace paludis public: StringSection(typename ElfType_::Word, const typename ElfType_::SectionHeader &, std::istream &, bool); - virtual ~StringSection(); + ~StringSection() override; std::string get_string(typename ElfType_::Word) const; typename ElfType_::Word get_max_string() const @@ -140,7 +140,7 @@ namespace paludis return _stringTable.length(); } - virtual std::string get_type() const; + std::string get_type() const override; }; } diff --git a/paludis/util/elf_symbol_section.hh b/paludis/util/elf_symbol_section.hh index bb258114d..1ffa20a51 100644 --- a/paludis/util/elf_symbol_section.hh +++ b/paludis/util/elf_symbol_section.hh @@ -89,9 +89,9 @@ namespace paludis public: SymbolSection(typename ElfType_::Word, const typename ElfType_::SectionHeader &, std::istream &, bool); - virtual ~SymbolSection(); + ~SymbolSection() override; - virtual std::string get_type() const + std::string get_type() const override { return _type; } diff --git a/paludis/util/exception.hh b/paludis/util/exception.hh index 9c0d9e3d2..9f0d18543 100644 --- a/paludis/util/exception.hh +++ b/paludis/util/exception.hh @@ -96,7 +96,7 @@ namespace paludis ///\name Basic operations ///\{ - virtual ~Exception(); + ~Exception() override; ///\} @@ -118,7 +118,7 @@ namespace paludis /** * A better what, if possible. */ - const char * what() const noexcept; + const char * what() const noexcept override; }; /** diff --git a/paludis/util/graph.hh b/paludis/util/graph.hh index 50806fe56..1467652bc 100644 --- a/paludis/util/graph.hh +++ b/paludis/util/graph.hh @@ -130,7 +130,7 @@ namespace paludis ///\{ NoGraphTopologicalOrderExistsError(const std::shared_ptr<const RemainingNodes> &) noexcept; - ~NoGraphTopologicalOrderExistsError() = default; + ~NoGraphTopologicalOrderExistsError() override = default; ///\} diff --git a/paludis/util/pipe.hh b/paludis/util/pipe.hh index 3e5710bec..a330a7338 100644 --- a/paludis/util/pipe.hh +++ b/paludis/util/pipe.hh @@ -52,7 +52,7 @@ namespace paludis explicit Pipe(const bool close_exec); - virtual ~Pipe() = default; + ~Pipe() override = default; ///\} diff --git a/paludis/util/pool.hh b/paludis/util/pool.hh index 3d5d8a534..965cec621 100644 --- a/paludis/util/pool.hh +++ b/paludis/util/pool.hh @@ -95,11 +95,11 @@ namespace paludis public: explicit ConcretePoolKey(const T_ &); - virtual ~ConcretePoolKey(); + ~ConcretePoolKey() override; - virtual std::size_t hash() const; + std::size_t hash() const override; - bool same_value(const PoolKey &) const; + bool same_value(const PoolKey &) const override; }; class PALUDIS_VISIBLE PoolKeys diff --git a/paludis/util/pty.hh b/paludis/util/pty.hh index f32961209..50f313fff 100644 --- a/paludis/util/pty.hh +++ b/paludis/util/pty.hh @@ -72,7 +72,7 @@ namespace paludis explicit Pty(const bool close_exec); explicit Pty(const bool close_exec, const unsigned short columns, const unsigned short lines); - virtual ~Pty() = default; + ~Pty() override = default; ///\} diff --git a/paludis/util/safe_ifstream.hh b/paludis/util/safe_ifstream.hh index 5c381bbf0..993b7a9c0 100644 --- a/paludis/util/safe_ifstream.hh +++ b/paludis/util/safe_ifstream.hh @@ -55,9 +55,9 @@ namespace paludis static const int buffer_size = 512 + lookbehind_size; char buffer[buffer_size]; - virtual int_type underflow(); - virtual pos_type seekoff(off_type, std::ios_base::seekdir, std::ios_base::openmode); - virtual pos_type seekpos(pos_type, std::ios_base::openmode); + int_type underflow() override; + pos_type seekoff(off_type, std::ios_base::seekdir, std::ios_base::openmode) override; + pos_type seekpos(pos_type, std::ios_base::openmode) override; public: ///\name Basic operations @@ -112,7 +112,7 @@ namespace paludis explicit SafeIFStream(const int fd); explicit SafeIFStream(const FSPath &); - ~SafeIFStream(); + ~SafeIFStream() override; ///\} }; diff --git a/paludis/util/safe_ofstream.hh b/paludis/util/safe_ofstream.hh index a0ddce3ac..a7ffdb903 100644 --- a/paludis/util/safe_ofstream.hh +++ b/paludis/util/safe_ofstream.hh @@ -56,18 +56,18 @@ namespace paludis Pimp<SafeOFStreamBuf> _imp; protected: - virtual int_type - overflow(int_type c); + int_type + overflow(int_type c) override; - virtual std::streamsize - xsputn(const char * s, std::streamsize num); + std::streamsize + xsputn(const char * s, std::streamsize num) override; public: ///\name Basic operations ///\{ SafeOFStreamBuf(const int f, const bool buffer); - ~SafeOFStreamBuf(); + ~SafeOFStreamBuf() override; ///\} diff --git a/paludis/util/string_list_stream.hh b/paludis/util/string_list_stream.hh index 4f1ead564..0f3121dac 100644 --- a/paludis/util/string_list_stream.hh +++ b/paludis/util/string_list_stream.hh @@ -35,14 +35,14 @@ namespace paludis Pimp<StringListStreamBuf> _imp; protected: - virtual int_type underflow(); + int_type underflow() override; - virtual int_type overflow(int_type c); - virtual std::streamsize xsputn(const char * s, std::streamsize num); + int_type overflow(int_type c) override; + std::streamsize xsputn(const char * s, std::streamsize num) override; public: StringListStreamBuf(); - ~StringListStreamBuf(); + ~StringListStreamBuf() override; void nothing_more_to_write(); }; @@ -64,7 +64,7 @@ namespace paludis { public: StringListStream(); - ~StringListStream() = default; + ~StringListStream() override = default; void nothing_more_to_write(); }; diff --git a/paludis/util/tail_output_stream.hh b/paludis/util/tail_output_stream.hh index baa08d6fe..a93c35485 100644 --- a/paludis/util/tail_output_stream.hh +++ b/paludis/util/tail_output_stream.hh @@ -38,15 +38,15 @@ namespace paludis void _append(const std::string &); protected: - virtual int_type - overflow(int_type c); + int_type + overflow(int_type c) override; - virtual std::streamsize - xsputn(const char * s, std::streamsize num); + std::streamsize + xsputn(const char * s, std::streamsize num) override; public: TailOutputStreamBuf(const unsigned n); - ~TailOutputStreamBuf(); + ~TailOutputStreamBuf() override; const std::shared_ptr<const Sequence<std::string> > tail(const bool clear); }; diff --git a/paludis/util/tee_output_stream.hh b/paludis/util/tee_output_stream.hh index 7a2b6e872..e11834b29 100644 --- a/paludis/util/tee_output_stream.hh +++ b/paludis/util/tee_output_stream.hh @@ -34,17 +34,17 @@ namespace paludis Pimp<TeeOutputStreamBuf> _imp; protected: - virtual int_type - overflow(int_type c); + int_type + overflow(int_type c) override; - virtual int sync(); + int sync() override; - virtual std::streamsize - xsputn(const char * s, std::streamsize num); + std::streamsize + xsputn(const char * s, std::streamsize num) override; public: TeeOutputStreamBuf(); - ~TeeOutputStreamBuf(); + ~TeeOutputStreamBuf() override; void add_stream(std::ostream * const); }; diff --git a/paludis/util/visitor.hh b/paludis/util/visitor.hh index 4757c0b68..b6622af4c 100644 --- a/paludis/util/visitor.hh +++ b/paludis/util/visitor.hh @@ -269,7 +269,7 @@ namespace paludis public: using ImplementVisitMethods<RealClass_, typename TypeList_::Tail>::forward_visit; - virtual void forward_visit(typename TypeList_::Item & n) + void forward_visit(typename TypeList_::Item & n) override { static_cast<RealClass_ *>(this)->perform_visit(n); } @@ -410,12 +410,12 @@ namespace paludis public virtual DeclareAbstractAcceptMethods<BaseClass_, typename BaseClass_::VisitableTypeList> { private: - void _real_accept(WrappedVisitorBase<typename BaseClass_::VisitableTypeList> & v) + void _real_accept(WrappedVisitorBase<typename BaseClass_::VisitableTypeList> & v) override { v.forward_visit(*static_cast<RealClass_ *>(this)); }; - void _real_accept_const(WrappedVisitorBase<typename MakeTypeListConst<typename BaseClass_::VisitableTypeList>::Type> & v) const + void _real_accept_const(WrappedVisitorBase<typename MakeTypeListConst<typename BaseClass_::VisitableTypeList>::Type> & v) const override { v.forward_visit(*static_cast<const RealClass_ *>(this)); }; diff --git a/python/dep_spec.hh b/python/dep_spec.hh index bd4825193..50ee9c119 100644 --- a/python/dep_spec.hh +++ b/python/dep_spec.hh @@ -86,7 +86,7 @@ namespace paludis PythonCompositeDepSpec(); public: - ~PythonCompositeDepSpec(); + ~PythonCompositeDepSpec() override; void add_child(const std::shared_ptr<const PythonDepSpec>); @@ -160,7 +160,7 @@ namespace paludis protected: PythonStringDepSpec(const std::string &); PythonStringDepSpec(const StringDepSpec &); - ~PythonStringDepSpec(); + ~PythonStringDepSpec() override; void set_text(const std::string &); @@ -178,7 +178,7 @@ namespace paludis public: PythonPackageDepSpec(const PackageDepSpec &); PythonPackageDepSpec(const PythonPackageDepSpec &); - ~PythonPackageDepSpec(); + ~PythonPackageDepSpec() override; operator PackageDepSpec() const; operator std::shared_ptr<PackageDepSpec>() const; diff --git a/python/environment.cc b/python/environment.cc index 8fe93574e..3d4af9e30 100644 --- a/python/environment.cc +++ b/python/environment.cc @@ -54,7 +54,7 @@ class EnvironmentImplementationWrapper : { } - virtual void populate_sets() const + void populate_sets() const override { std::unique_lock<std::recursive_mutex> l(get_mutex()); @@ -64,8 +64,8 @@ class EnvironmentImplementationWrapper : throw PythonMethodNotImplemented("EnvironmentImplementation", "populate_sets"); } - virtual bool accept_license(const std::string & s, const std::shared_ptr<const PackageID> & p) const - PALUDIS_ATTRIBUTE((warn_unused_result)) + bool accept_license(const std::string & s, const std::shared_ptr<const PackageID> & p) const + override PALUDIS_ATTRIBUTE((warn_unused_result)) { std::unique_lock<std::recursive_mutex> l(get_mutex()); @@ -75,8 +75,8 @@ class EnvironmentImplementationWrapper : throw PythonMethodNotImplemented("EnvironmentImplementation", "accept_license"); } - virtual bool accept_keywords(const std::shared_ptr<const KeywordNameSet> & k, const std::shared_ptr<const PackageID> & p) const - PALUDIS_ATTRIBUTE((warn_unused_result)) + bool accept_keywords(const std::shared_ptr<const KeywordNameSet> & k, const std::shared_ptr<const PackageID> & p) const + override PALUDIS_ATTRIBUTE((warn_unused_result)) { std::unique_lock<std::recursive_mutex> l(get_mutex()); @@ -86,8 +86,8 @@ class EnvironmentImplementationWrapper : throw PythonMethodNotImplemented("EnvironmentImplementation", "accept_keywords"); } - virtual const std::shared_ptr<const Mask> mask_for_user(const std::shared_ptr<const PackageID> & p, const bool b) const - PALUDIS_ATTRIBUTE((warn_unused_result)) + const std::shared_ptr<const Mask> mask_for_user(const std::shared_ptr<const PackageID> & p, const bool b) const + override PALUDIS_ATTRIBUTE((warn_unused_result)) { std::unique_lock<std::recursive_mutex> l(get_mutex()); @@ -97,8 +97,8 @@ class EnvironmentImplementationWrapper : throw PythonMethodNotImplemented("EnvironmentImplementation", "mask_for_user"); } - virtual bool unmasked_by_user(const std::shared_ptr<const PackageID> & p, const std::string & s) const - PALUDIS_ATTRIBUTE((warn_unused_result)) + bool unmasked_by_user(const std::shared_ptr<const PackageID> & p, const std::string & s) const + override PALUDIS_ATTRIBUTE((warn_unused_result)) { std::unique_lock<std::recursive_mutex> l(get_mutex()); @@ -108,8 +108,8 @@ class EnvironmentImplementationWrapper : throw PythonMethodNotImplemented("EnvironmentImplementation", "unmasked_by_user"); } - virtual std::shared_ptr<const FSPathSequence> bashrc_files() const - PALUDIS_ATTRIBUTE((warn_unused_result)) + std::shared_ptr<const FSPathSequence> bashrc_files() const + override PALUDIS_ATTRIBUTE((warn_unused_result)) { std::unique_lock<std::recursive_mutex> l(get_mutex()); @@ -124,8 +124,8 @@ class EnvironmentImplementationWrapper : return EnvironmentImplementation::bashrc_files(); } - virtual std::shared_ptr<const FSPathSequence> syncers_dirs() const - PALUDIS_ATTRIBUTE((warn_unused_result)) + std::shared_ptr<const FSPathSequence> syncers_dirs() const + override PALUDIS_ATTRIBUTE((warn_unused_result)) { std::unique_lock<std::recursive_mutex> l(get_mutex()); @@ -140,8 +140,8 @@ class EnvironmentImplementationWrapper : return EnvironmentImplementation::syncers_dirs(); } - virtual std::shared_ptr<const FSPathSequence> fetchers_dirs() const - PALUDIS_ATTRIBUTE((warn_unused_result)) + std::shared_ptr<const FSPathSequence> fetchers_dirs() const + override PALUDIS_ATTRIBUTE((warn_unused_result)) { std::unique_lock<std::recursive_mutex> l(get_mutex()); @@ -156,8 +156,8 @@ class EnvironmentImplementationWrapper : return EnvironmentImplementation::fetchers_dirs(); } - virtual std::shared_ptr<const FSPathSequence> hook_dirs() const - PALUDIS_ATTRIBUTE((warn_unused_result)) + std::shared_ptr<const FSPathSequence> hook_dirs() const + override PALUDIS_ATTRIBUTE((warn_unused_result)) { std::unique_lock<std::recursive_mutex> l(get_mutex()); @@ -167,7 +167,7 @@ class EnvironmentImplementationWrapper : throw PythonMethodNotImplemented("EnvironmentImplementation", "hook_dirs"); } - virtual std::string reduced_username() const + std::string reduced_username() const override { std::unique_lock<std::recursive_mutex> l(get_mutex()); @@ -177,7 +177,7 @@ class EnvironmentImplementationWrapper : throw PythonMethodNotImplemented("EnvironmentImplementation", "reduced_username"); } - virtual uid_t reduced_uid() const + uid_t reduced_uid() const override { std::unique_lock<std::recursive_mutex> l(get_mutex()); @@ -187,7 +187,7 @@ class EnvironmentImplementationWrapper : throw PythonMethodNotImplemented("EnvironmentImplementation", "reduced_uid"); } - virtual gid_t reduced_gid() const + gid_t reduced_gid() const override { std::unique_lock<std::recursive_mutex> l(get_mutex()); @@ -198,8 +198,8 @@ class EnvironmentImplementationWrapper : } - virtual std::shared_ptr<const MirrorsSequence> mirrors(const std::string & s) const - PALUDIS_ATTRIBUTE((warn_unused_result)) + std::shared_ptr<const MirrorsSequence> mirrors(const std::string & s) const + override PALUDIS_ATTRIBUTE((warn_unused_result)) { std::unique_lock<std::recursive_mutex> l(get_mutex()); @@ -209,8 +209,8 @@ class EnvironmentImplementationWrapper : throw PythonMethodNotImplemented("EnvironmentImplementation", "mirrors"); } - virtual std::shared_ptr<const SetNameSet> set_names() const - PALUDIS_ATTRIBUTE((warn_unused_result)) + std::shared_ptr<const SetNameSet> set_names() const + override PALUDIS_ATTRIBUTE((warn_unused_result)) { std::unique_lock<std::recursive_mutex> l(get_mutex()); @@ -225,8 +225,8 @@ class EnvironmentImplementationWrapper : return EnvironmentImplementation::set_names(); } - virtual const std::shared_ptr<const SetSpecTree> set(const SetName & s) const - PALUDIS_ATTRIBUTE((warn_unused_result)) + const std::shared_ptr<const SetSpecTree> set(const SetName & s) const + override PALUDIS_ATTRIBUTE((warn_unused_result)) { std::unique_lock<std::recursive_mutex> l(get_mutex()); @@ -242,14 +242,14 @@ class EnvironmentImplementationWrapper : } // FIXME - Hooks are not exposed - virtual HookResult perform_hook(const Hook &, const std::shared_ptr<OutputManager> &) const - PALUDIS_ATTRIBUTE((warn_unused_result)) + HookResult perform_hook(const Hook &, const std::shared_ptr<OutputManager> &) const + override PALUDIS_ATTRIBUTE((warn_unused_result)) { return make_named_values<HookResult>(n::max_exit_status() = 0, n::output() = ""); } - virtual std::string distribution() const - PALUDIS_ATTRIBUTE((warn_unused_result)) + std::string distribution() const + override PALUDIS_ATTRIBUTE((warn_unused_result)) { std::unique_lock<std::recursive_mutex> l(get_mutex()); @@ -264,7 +264,7 @@ class EnvironmentImplementationWrapper : return EnvironmentImplementation::distribution(); } - virtual bool add_to_world(const QualifiedPackageName & s) const + bool add_to_world(const QualifiedPackageName & s) const override { std::unique_lock<std::recursive_mutex> l(get_mutex()); if (bp::override f = get_override("add_to_world")) @@ -273,7 +273,7 @@ class EnvironmentImplementationWrapper : throw PythonMethodNotImplemented("EnvironmentImplementation", "add_to_world"); } - virtual bool add_to_world(const SetName & s) const + bool add_to_world(const SetName & s) const override { std::unique_lock<std::recursive_mutex> l(get_mutex()); if (bp::override f = get_override("add_to_world")) @@ -282,7 +282,7 @@ class EnvironmentImplementationWrapper : throw PythonMethodNotImplemented("EnvironmentImplementation", "add_to_world"); } - virtual bool remove_from_world(const QualifiedPackageName & s) const + bool remove_from_world(const QualifiedPackageName & s) const override { std::unique_lock<std::recursive_mutex> l(get_mutex()); if (bp::override f = get_override("remove_from_world")) @@ -291,7 +291,7 @@ class EnvironmentImplementationWrapper : throw PythonMethodNotImplemented("EnvironmentImplementation", "remove_from_world"); } - virtual bool remove_from_world(const SetName & s) const + bool remove_from_world(const SetName & s) const override { std::unique_lock<std::recursive_mutex> l(get_mutex()); if (bp::override f = get_override("remove_from_world")) @@ -300,8 +300,8 @@ class EnvironmentImplementationWrapper : throw PythonMethodNotImplemented("EnvironmentImplementation", "remove_from_world"); } - virtual std::shared_ptr<PackageIDSequence> operator[] (const Selection & fg) const - PALUDIS_ATTRIBUTE((warn_unused_result)) + std::shared_ptr<PackageIDSequence> operator[] (const Selection & fg) const + override PALUDIS_ATTRIBUTE((warn_unused_result)) { std::unique_lock<std::recursive_mutex> l(get_mutex()); @@ -316,7 +316,7 @@ class EnvironmentImplementationWrapper : return EnvironmentImplementation::operator[] (fg); } - virtual void need_keys_added() const + void need_keys_added() const override { std::unique_lock<std::recursive_mutex> l(get_mutex()); @@ -326,7 +326,7 @@ class EnvironmentImplementationWrapper : throw PythonMethodNotImplemented("EnvironmentImplementation", "need_keys_added"); } - virtual const std::shared_ptr<const MetadataValueKey<std::string> > format_key() const + const std::shared_ptr<const MetadataValueKey<std::string> > format_key() const override { std::unique_lock<std::recursive_mutex> l(get_mutex()); @@ -336,7 +336,7 @@ class EnvironmentImplementationWrapper : throw PythonMethodNotImplemented("EnvironmentImplementation", "format_key"); } - virtual const std::shared_ptr<const MetadataValueKey<FSPath> > config_location_key() const + const std::shared_ptr<const MetadataValueKey<FSPath> > config_location_key() const override { std::unique_lock<std::recursive_mutex> l(get_mutex()); @@ -346,7 +346,7 @@ class EnvironmentImplementationWrapper : throw PythonMethodNotImplemented("EnvironmentImplementation", "config_location_key"); } - virtual const std::shared_ptr<const MetadataValueKey<FSPath> > preferred_root_key() const + const std::shared_ptr<const MetadataValueKey<FSPath> > preferred_root_key() const override { std::unique_lock<std::recursive_mutex> l(get_mutex()); @@ -356,7 +356,7 @@ class EnvironmentImplementationWrapper : throw PythonMethodNotImplemented("EnvironmentImplementation", "preferred_root_key"); } - virtual const std::shared_ptr<const MetadataValueKey<FSPath> > system_root_key() const + const std::shared_ptr<const MetadataValueKey<FSPath> > system_root_key() const override { std::unique_lock<std::recursive_mutex> l(get_mutex()); @@ -366,59 +366,59 @@ class EnvironmentImplementationWrapper : throw PythonMethodNotImplemented("EnvironmentImplementation", "system_root_key"); } - virtual Tribool interest_in_suggestion( + Tribool interest_in_suggestion( const std::shared_ptr<const PackageID> &, - const PackageDepSpec &) const + const PackageDepSpec &) const override { throw PythonMethodNotImplemented("EnvironmentImplementation", "interest_in_suggestion"); } - virtual const Tribool want_choice_enabled( + const Tribool want_choice_enabled( const std::shared_ptr<const PackageID> &, const std::shared_ptr<const Choice> &, const UnprefixedChoiceName & - ) const + ) const override { throw PythonMethodNotImplemented("EnvironmentImplementation", "want_choice_enabled"); } - virtual const std::string value_for_choice_parameter( + const std::string value_for_choice_parameter( const std::shared_ptr<const PackageID> &, const std::shared_ptr<const Choice> &, const UnprefixedChoiceName & - ) const + ) const override { throw PythonMethodNotImplemented("EnvironmentImplementation", "value_for_choice_parameter"); } - virtual std::shared_ptr<const Set<UnprefixedChoiceName> > known_choice_value_names( + std::shared_ptr<const Set<UnprefixedChoiceName> > known_choice_value_names( const std::shared_ptr<const PackageID> &, const std::shared_ptr<const Choice> & - ) const + ) const override { throw PythonMethodNotImplemented("EnvironmentImplementation", "known_choice_value_names"); } - virtual const std::shared_ptr<OutputManager> create_output_manager( - const CreateOutputManagerInfo &) const + const std::shared_ptr<OutputManager> create_output_manager( + const CreateOutputManagerInfo &) const override { return std::make_shared<StandardOutputManager>(); } - virtual const std::shared_ptr<Repository> repository_from_new_config_file( - const FSPath &) + const std::shared_ptr<Repository> repository_from_new_config_file( + const FSPath &) override { throw PythonMethodNotImplemented("EnvironmentImplementation", "repository_from_new_config_file"); } - virtual void update_config_files_for_package_move( - const PackageDepSpec &, const QualifiedPackageName &) const + void update_config_files_for_package_move( + const PackageDepSpec &, const QualifiedPackageName &) const override { throw PythonMethodNotImplemented("EnvironmentImplementation", "update_config_files_for_package_move"); } - virtual QualifiedPackageName fetch_unique_qualified_package_name( - const PackageNamePart &, const Filter & = all_filter(), const bool /*disambiguate*/ = true) const + QualifiedPackageName fetch_unique_qualified_package_name( + const PackageNamePart &, const Filter & = all_filter(), const bool /*disambiguate*/ = true) const override { throw PythonMethodNotImplemented("EnvironmentImplementation", "fetch_unique_qualified_package_name"); } diff --git a/python/exception.hh b/python/exception.hh index b1d23c2c9..fa6b3dc9a 100644 --- a/python/exception.hh +++ b/python/exception.hh @@ -54,7 +54,7 @@ namespace paludis void translator(const Ex_ & x) const; PyObject * - get_py_exception() const + get_py_exception() const override { return _e; } diff --git a/python/mask.cc b/python/mask.cc index 4a3fea6ed..aaa781f1b 100644 --- a/python/mask.cc +++ b/python/mask.cc @@ -82,7 +82,7 @@ struct MaskWrapper : Mask, bp::wrapper<Mask> { - virtual char key() const + char key() const override { std::unique_lock<std::recursive_mutex> l(get_mutex()); @@ -92,7 +92,7 @@ struct MaskWrapper : throw PythonMethodNotImplemented("Mask", "key"); } - virtual const std::string description() const + const std::string description() const override { std::unique_lock<std::recursive_mutex> l(get_mutex()); @@ -107,7 +107,7 @@ struct UserMaskWrapper : UserMask, bp::wrapper<UserMask> { - virtual char key() const + char key() const override { std::unique_lock<std::recursive_mutex> l(get_mutex()); @@ -117,7 +117,7 @@ struct UserMaskWrapper : throw PythonMethodNotImplemented("UserMask", "key"); } - virtual const std::string description() const + const std::string description() const override { std::unique_lock<std::recursive_mutex> l(get_mutex()); @@ -132,7 +132,7 @@ struct UnacceptedMaskWrapper : UnacceptedMask, bp::wrapper<UnacceptedMask> { - virtual const std::string unaccepted_key_name() const + const std::string unaccepted_key_name() const override { std::unique_lock<std::recursive_mutex> l(get_mutex()); @@ -142,7 +142,7 @@ struct UnacceptedMaskWrapper : throw PythonMethodNotImplemented("UnacceptedMask", "unaccepted_key_name"); } - virtual char key() const + char key() const override { std::unique_lock<std::recursive_mutex> l(get_mutex()); @@ -152,7 +152,7 @@ struct UnacceptedMaskWrapper : throw PythonMethodNotImplemented("UnacceptedMask", "key"); } - virtual const std::string description() const + const std::string description() const override { std::unique_lock<std::recursive_mutex> l(get_mutex()); @@ -177,7 +177,7 @@ struct RepositoryMaskWrapper : throw PythonMethodNotImplemented("RepositoryMask", "mask_key_name"); } - virtual char key() const + char key() const override { std::unique_lock<std::recursive_mutex> l(get_mutex()); @@ -187,7 +187,7 @@ struct RepositoryMaskWrapper : throw PythonMethodNotImplemented("RepositoryMask", "key"); } - virtual const std::string description() const + const std::string description() const override { std::unique_lock<std::recursive_mutex> l(get_mutex()); @@ -197,7 +197,7 @@ struct RepositoryMaskWrapper : throw PythonMethodNotImplemented("RepositoryMask", "description"); } - virtual const std::string comment() const + const std::string comment() const override { std::unique_lock<std::recursive_mutex> l(get_mutex()); @@ -207,7 +207,7 @@ struct RepositoryMaskWrapper : throw PythonMethodNotImplemented("RepositoryMask", "comment"); } - virtual const std::string token() const + const std::string token() const override { std::unique_lock<std::recursive_mutex> l(get_mutex()); @@ -217,7 +217,7 @@ struct RepositoryMaskWrapper : throw PythonMethodNotImplemented("RepositoryMask", "token"); } - virtual const FSPath mask_file() const + const FSPath mask_file() const override { std::unique_lock<std::recursive_mutex> l(get_mutex()); @@ -232,7 +232,7 @@ struct UnsupportedMaskWrapper : UnsupportedMask, bp::wrapper<UnsupportedMask> { - virtual const std::string explanation() const + const std::string explanation() const override { std::unique_lock<std::recursive_mutex> l(get_mutex()); @@ -242,7 +242,7 @@ struct UnsupportedMaskWrapper : throw PythonMethodNotImplemented("UnsupportedMask", "explanation"); } - virtual char key() const + char key() const override { std::unique_lock<std::recursive_mutex> l(get_mutex()); @@ -252,7 +252,7 @@ struct UnsupportedMaskWrapper : throw PythonMethodNotImplemented("UnsupportedMask", "key"); } - virtual const std::string description() const + const std::string description() const override { std::unique_lock<std::recursive_mutex> l(get_mutex()); diff --git a/python/metadata_key.cc b/python/metadata_key.cc index 4a5f20dad..6f79bebcd 100644 --- a/python/metadata_key.cc +++ b/python/metadata_key.cc @@ -181,8 +181,8 @@ struct MetadataPackageIDKeyWrapper : MetadataValueKey<std::shared_ptr<const PackageID> > , bp::wrapper<MetadataValueKey<std::shared_ptr<const PackageID> > > { - virtual const std::shared_ptr<const PackageID> parse_value() const - PALUDIS_ATTRIBUTE((warn_unused_result)) + const std::shared_ptr<const PackageID> parse_value() const + override PALUDIS_ATTRIBUTE((warn_unused_result)) { std::unique_lock<std::recursive_mutex> l(get_mutex()); @@ -192,7 +192,7 @@ struct MetadataPackageIDKeyWrapper : throw PythonMethodNotImplemented("MetadataPackageIDKey", "parse_value"); } - virtual const std::string raw_name() const + const std::string raw_name() const override { std::unique_lock<std::recursive_mutex> l(get_mutex()); @@ -202,7 +202,7 @@ struct MetadataPackageIDKeyWrapper : throw PythonMethodNotImplemented("MetadataPackageIDKey", "raw_name"); } - virtual const std::string human_name() const + const std::string human_name() const override { std::unique_lock<std::recursive_mutex> l(get_mutex()); @@ -212,7 +212,7 @@ struct MetadataPackageIDKeyWrapper : throw PythonMethodNotImplemented("MetadataPackageIDKey", "human_name"); } - virtual MetadataKeyType type() const + MetadataKeyType type() const override { std::unique_lock<std::recursive_mutex> l(get_mutex()); @@ -222,9 +222,9 @@ struct MetadataPackageIDKeyWrapper : throw PythonMethodNotImplemented("MetadataPackageIDKey", "type"); } - virtual const std::string pretty_print_value( + const std::string pretty_print_value( const PrettyPrinter &, - const PrettyPrintOptions &) const + const PrettyPrintOptions &) const override { throw PythonMethodNotImplemented("MetadataPackageIDKey", "pretty_print_value"); } @@ -234,8 +234,8 @@ struct MetadataStringKeyWrapper : MetadataValueKey<std::string> , bp::wrapper<MetadataValueKey<std::string> > { - virtual const std::string parse_value() const - PALUDIS_ATTRIBUTE((warn_unused_result)) + const std::string parse_value() const + override PALUDIS_ATTRIBUTE((warn_unused_result)) { std::unique_lock<std::recursive_mutex> l(get_mutex()); @@ -245,7 +245,7 @@ struct MetadataStringKeyWrapper : throw PythonMethodNotImplemented("MetadataStringKey", "parse_value"); } - virtual const std::string raw_name() const + const std::string raw_name() const override { std::unique_lock<std::recursive_mutex> l(get_mutex()); @@ -255,7 +255,7 @@ struct MetadataStringKeyWrapper : throw PythonMethodNotImplemented("MetadataStringKey", "raw_name"); } - virtual const std::string human_name() const + const std::string human_name() const override { std::unique_lock<std::recursive_mutex> l(get_mutex()); @@ -265,7 +265,7 @@ struct MetadataStringKeyWrapper : throw PythonMethodNotImplemented("MetadataStringKey", "human_name"); } - virtual MetadataKeyType type() const + MetadataKeyType type() const override { std::unique_lock<std::recursive_mutex> l(get_mutex()); @@ -280,8 +280,8 @@ struct MetadataSlotNameKeyWrapper : MetadataValueKey<Slot> , bp::wrapper<MetadataValueKey<Slot> > { - virtual const Slot parse_value() const - PALUDIS_ATTRIBUTE((warn_unused_result)) + const Slot parse_value() const + override PALUDIS_ATTRIBUTE((warn_unused_result)) { std::unique_lock<std::recursive_mutex> l(get_mutex()); @@ -291,7 +291,7 @@ struct MetadataSlotNameKeyWrapper : throw PythonMethodNotImplemented("MetadataSlotNameKey", "parse_value"); } - virtual const std::string raw_name() const + const std::string raw_name() const override { std::unique_lock<std::recursive_mutex> l(get_mutex()); @@ -301,7 +301,7 @@ struct MetadataSlotNameKeyWrapper : throw PythonMethodNotImplemented("MetadataSlotNameKey", "raw_name"); } - virtual const std::string human_name() const + const std::string human_name() const override { std::unique_lock<std::recursive_mutex> l(get_mutex()); @@ -311,7 +311,7 @@ struct MetadataSlotNameKeyWrapper : throw PythonMethodNotImplemented("MetadataSlotNameKey", "human_name"); } - virtual MetadataKeyType type() const + MetadataKeyType type() const override { std::unique_lock<std::recursive_mutex> l(get_mutex()); @@ -336,7 +336,7 @@ struct MetadataSectionKeyWrapper : return Py_None; } - virtual void need_keys_added() const + void need_keys_added() const override { std::unique_lock<std::recursive_mutex> l(get_mutex()); @@ -356,7 +356,7 @@ struct MetadataSectionKeyWrapper : throw PythonMethodNotImplemented("MetadataSectionKey", "title_key"); } - virtual const std::string raw_name() const + const std::string raw_name() const override { std::unique_lock<std::recursive_mutex> l(get_mutex()); @@ -366,7 +366,7 @@ struct MetadataSectionKeyWrapper : throw PythonMethodNotImplemented("MetadataSectionKey", "raw_name"); } - virtual const std::string human_name() const + const std::string human_name() const override { std::unique_lock<std::recursive_mutex> l(get_mutex()); @@ -376,7 +376,7 @@ struct MetadataSectionKeyWrapper : throw PythonMethodNotImplemented("MetadataSectionKey", "human_name"); } - virtual MetadataKeyType type() const + MetadataKeyType type() const override { std::unique_lock<std::recursive_mutex> l(get_mutex()); @@ -391,8 +391,8 @@ struct MetadataTimeKeyWrapper : MetadataTimeKey, bp::wrapper<MetadataTimeKey> { - virtual Timestamp parse_value() const - PALUDIS_ATTRIBUTE((warn_unused_result)) + Timestamp parse_value() const + override PALUDIS_ATTRIBUTE((warn_unused_result)) { std::unique_lock<std::recursive_mutex> l(get_mutex()); @@ -402,7 +402,7 @@ struct MetadataTimeKeyWrapper : throw PythonMethodNotImplemented("MetadataTimeKey", "parse_value"); } - virtual const std::string raw_name() const + const std::string raw_name() const override { std::unique_lock<std::recursive_mutex> l(get_mutex()); @@ -412,7 +412,7 @@ struct MetadataTimeKeyWrapper : throw PythonMethodNotImplemented("MetadataTimeKey", "raw_name"); } - virtual const std::string human_name() const + const std::string human_name() const override { std::unique_lock<std::recursive_mutex> l(get_mutex()); @@ -422,7 +422,7 @@ struct MetadataTimeKeyWrapper : throw PythonMethodNotImplemented("MetadataTimeKey", "human_name"); } - virtual MetadataKeyType type() const + MetadataKeyType type() const override { std::unique_lock<std::recursive_mutex> l(get_mutex()); @@ -437,8 +437,8 @@ struct MetadataChoicesKeyWrapper : MetadataValueKey<std::shared_ptr<const Choices> > , bp::wrapper<MetadataValueKey<std::shared_ptr<const Choices> > > { - virtual const std::shared_ptr<const Choices> parse_value() const - PALUDIS_ATTRIBUTE((warn_unused_result)) + const std::shared_ptr<const Choices> parse_value() const + override PALUDIS_ATTRIBUTE((warn_unused_result)) { std::unique_lock<std::recursive_mutex> l(get_mutex()); @@ -448,7 +448,7 @@ struct MetadataChoicesKeyWrapper : throw PythonMethodNotImplemented("MetadataChoicesKey", "parse_value"); } - virtual const std::string raw_name() const + const std::string raw_name() const override { std::unique_lock<std::recursive_mutex> l(get_mutex()); @@ -458,7 +458,7 @@ struct MetadataChoicesKeyWrapper : throw PythonMethodNotImplemented("MetadataChoicesKey", "raw_name"); } - virtual const std::string human_name() const + const std::string human_name() const override { std::unique_lock<std::recursive_mutex> l(get_mutex()); @@ -468,7 +468,7 @@ struct MetadataChoicesKeyWrapper : throw PythonMethodNotImplemented("MetadataChoicesKey", "human_name"); } - virtual MetadataKeyType type() const + MetadataKeyType type() const override { std::unique_lock<std::recursive_mutex> l(get_mutex()); @@ -483,8 +483,8 @@ struct MetadataFSPathKeyWrapper : MetadataValueKey<FSPath> , bp::wrapper<MetadataValueKey<FSPath> > { - virtual const FSPath parse_value() const - PALUDIS_ATTRIBUTE((warn_unused_result)) + const FSPath parse_value() const + override PALUDIS_ATTRIBUTE((warn_unused_result)) { std::unique_lock<std::recursive_mutex> l(get_mutex()); @@ -494,7 +494,7 @@ struct MetadataFSPathKeyWrapper : throw PythonMethodNotImplemented("MetadataValueKey<FSPath> ", "parse_value"); } - virtual const std::string raw_name() const + const std::string raw_name() const override { std::unique_lock<std::recursive_mutex> l(get_mutex()); @@ -504,7 +504,7 @@ struct MetadataFSPathKeyWrapper : throw PythonMethodNotImplemented("MetadataFSPathKey", "raw_name"); } - virtual const std::string human_name() const + const std::string human_name() const override { std::unique_lock<std::recursive_mutex> l(get_mutex()); @@ -514,7 +514,7 @@ struct MetadataFSPathKeyWrapper : throw PythonMethodNotImplemented("MetadataFSPathKey", "human_name"); } - virtual MetadataKeyType type() const + MetadataKeyType type() const override { std::unique_lock<std::recursive_mutex> l(get_mutex()); @@ -530,8 +530,8 @@ struct MetadataCollectionKeyWrapper : MetadataCollectionKey<C_>, bp::wrapper<MetadataCollectionKey<C_> > { - virtual const std::shared_ptr<const C_> parse_value() const - PALUDIS_ATTRIBUTE((warn_unused_result)) + const std::shared_ptr<const C_> parse_value() const + override PALUDIS_ATTRIBUTE((warn_unused_result)) { std::unique_lock<std::recursive_mutex> l(get_mutex()); @@ -541,7 +541,7 @@ struct MetadataCollectionKeyWrapper : throw PythonMethodNotImplemented("MetadataCollectionKey", "parse_value"); } - virtual const std::string raw_name() const + const std::string raw_name() const override { std::unique_lock<std::recursive_mutex> l(get_mutex()); @@ -551,7 +551,7 @@ struct MetadataCollectionKeyWrapper : throw PythonMethodNotImplemented("MetadataCollectionKey", "raw_name"); } - virtual const std::string human_name() const + const std::string human_name() const override { std::unique_lock<std::recursive_mutex> l(get_mutex()); @@ -561,7 +561,7 @@ struct MetadataCollectionKeyWrapper : throw PythonMethodNotImplemented("MetadataCollectionKey", "human_name"); } - virtual MetadataKeyType type() const + MetadataKeyType type() const override { std::unique_lock<std::recursive_mutex> l(get_mutex()); @@ -571,9 +571,9 @@ struct MetadataCollectionKeyWrapper : throw PythonMethodNotImplemented("MetadataCollectionKey", "type"); } - virtual const std::string pretty_print_value( + const std::string pretty_print_value( const PrettyPrinter &, - const PrettyPrintOptions &) const + const PrettyPrintOptions &) const override { throw PythonMethodNotImplemented("MetadataCollectionKey", "pretty_print_value"); } @@ -584,8 +584,8 @@ struct MetadataSpecTreeKeyWrapper : MetadataSpecTreeKey<C_>, bp::wrapper<MetadataSpecTreeKey<C_> > { - virtual const std::shared_ptr<const C_> parse_value() const - PALUDIS_ATTRIBUTE((warn_unused_result)) + const std::shared_ptr<const C_> parse_value() const + override PALUDIS_ATTRIBUTE((warn_unused_result)) { std::unique_lock<std::recursive_mutex> l(get_mutex()); @@ -595,7 +595,7 @@ struct MetadataSpecTreeKeyWrapper : throw PythonMethodNotImplemented("MetadataSpecTreeKey", "parse_value"); } - virtual const std::string raw_name() const + const std::string raw_name() const override { std::unique_lock<std::recursive_mutex> l(get_mutex()); @@ -605,7 +605,7 @@ struct MetadataSpecTreeKeyWrapper : throw PythonMethodNotImplemented("MetadataSpecTreeKey", "raw_name"); } - virtual const std::string human_name() const + const std::string human_name() const override { std::unique_lock<std::recursive_mutex> l(get_mutex()); @@ -615,7 +615,7 @@ struct MetadataSpecTreeKeyWrapper : throw PythonMethodNotImplemented("MetadataSpecTreeKey", "human_name"); } - virtual MetadataKeyType type() const + MetadataKeyType type() const override { std::unique_lock<std::recursive_mutex> l(get_mutex()); @@ -625,9 +625,9 @@ struct MetadataSpecTreeKeyWrapper : throw PythonMethodNotImplemented("MetadataSpecTreeKey", "type"); } - virtual const std::string pretty_print_value( + const std::string pretty_print_value( const PrettyPrinter &, - const PrettyPrintOptions &) const + const PrettyPrintOptions &) const override { throw PythonMethodNotImplemented("MetadataSpecTreeKey", "pretty_print_value"); } @@ -638,8 +638,8 @@ struct MetadataSpecTreeKeyWrapper<FetchableURISpecTree> : MetadataSpecTreeKey<FetchableURISpecTree>, bp::wrapper<MetadataSpecTreeKey<FetchableURISpecTree> > { - virtual const std::shared_ptr<const FetchableURISpecTree> parse_value() const - PALUDIS_ATTRIBUTE((warn_unused_result)) + const std::shared_ptr<const FetchableURISpecTree> parse_value() const + override PALUDIS_ATTRIBUTE((warn_unused_result)) { std::unique_lock<std::recursive_mutex> l(get_mutex()); @@ -649,8 +649,8 @@ struct MetadataSpecTreeKeyWrapper<FetchableURISpecTree> : throw PythonMethodNotImplemented("MetadataSpecTreeKey", "parse_value"); } - virtual const std::shared_ptr<const URILabel> initial_label() const - PALUDIS_ATTRIBUTE((warn_unused_result)) + const std::shared_ptr<const URILabel> initial_label() const + override PALUDIS_ATTRIBUTE((warn_unused_result)) { std::unique_lock<std::recursive_mutex> l(get_mutex()); @@ -660,7 +660,7 @@ struct MetadataSpecTreeKeyWrapper<FetchableURISpecTree> : throw PythonMethodNotImplemented("MetadataSpecTreeKey", "initial_label"); } - virtual const std::string raw_name() const + const std::string raw_name() const override { std::unique_lock<std::recursive_mutex> l(get_mutex()); @@ -670,7 +670,7 @@ struct MetadataSpecTreeKeyWrapper<FetchableURISpecTree> : throw PythonMethodNotImplemented("MetadataSpecTreeKey", "raw_name"); } - virtual const std::string human_name() const + const std::string human_name() const override { std::unique_lock<std::recursive_mutex> l(get_mutex()); @@ -680,7 +680,7 @@ struct MetadataSpecTreeKeyWrapper<FetchableURISpecTree> : throw PythonMethodNotImplemented("MetadataSpecTreeKey", "human_name"); } - virtual MetadataKeyType type() const + MetadataKeyType type() const override { std::unique_lock<std::recursive_mutex> l(get_mutex()); @@ -690,9 +690,9 @@ struct MetadataSpecTreeKeyWrapper<FetchableURISpecTree> : throw PythonMethodNotImplemented("MetadataSpecTreeKey", "type"); } - virtual const std::string pretty_print_value( + const std::string pretty_print_value( const PrettyPrinter &, - const PrettyPrintOptions &) const + const PrettyPrintOptions &) const override { throw PythonMethodNotImplemented("MetadataSpecTreeKey", "pretty_print_value"); } @@ -703,8 +703,8 @@ struct MetadataSpecTreeKeyWrapper<DependencySpecTree> : MetadataSpecTreeKey<DependencySpecTree>, bp::wrapper<MetadataSpecTreeKey<DependencySpecTree> > { - virtual const std::shared_ptr<const DependencySpecTree> parse_value() const - PALUDIS_ATTRIBUTE((warn_unused_result)) + const std::shared_ptr<const DependencySpecTree> parse_value() const + override PALUDIS_ATTRIBUTE((warn_unused_result)) { std::unique_lock<std::recursive_mutex> l(get_mutex()); @@ -714,8 +714,8 @@ struct MetadataSpecTreeKeyWrapper<DependencySpecTree> : throw PythonMethodNotImplemented("MetadataSpecTreeKey", "parse_value"); } - virtual const std::shared_ptr<const DependenciesLabelSequence> initial_labels() const - PALUDIS_ATTRIBUTE((warn_unused_result)) + const std::shared_ptr<const DependenciesLabelSequence> initial_labels() const + override PALUDIS_ATTRIBUTE((warn_unused_result)) { std::unique_lock<std::recursive_mutex> l(get_mutex()); @@ -725,7 +725,7 @@ struct MetadataSpecTreeKeyWrapper<DependencySpecTree> : throw PythonMethodNotImplemented("MetadataSpecTreeKey", "initial_labels"); } - virtual const std::string raw_name() const + const std::string raw_name() const override { std::unique_lock<std::recursive_mutex> l(get_mutex()); @@ -735,7 +735,7 @@ struct MetadataSpecTreeKeyWrapper<DependencySpecTree> : throw PythonMethodNotImplemented("MetadataSpecTreeKey", "raw_name"); } - virtual const std::string human_name() const + const std::string human_name() const override { std::unique_lock<std::recursive_mutex> l(get_mutex()); @@ -745,7 +745,7 @@ struct MetadataSpecTreeKeyWrapper<DependencySpecTree> : throw PythonMethodNotImplemented("MetadataSpecTreeKey", "human_name"); } - virtual MetadataKeyType type() const + MetadataKeyType type() const override { std::unique_lock<std::recursive_mutex> l(get_mutex()); @@ -755,9 +755,9 @@ struct MetadataSpecTreeKeyWrapper<DependencySpecTree> : throw PythonMethodNotImplemented("MetadataSpecTreeKey", "type"); } - virtual const std::string pretty_print_value( + const std::string pretty_print_value( const PrettyPrinter &, - const PrettyPrintOptions &) const + const PrettyPrintOptions &) const override { throw PythonMethodNotImplemented("MetadataSpecTreeKey", "pretty_print_value"); } diff --git a/ruby/dep_spec.cc b/ruby/dep_spec.cc index 77d0886ca..52d7cdf3a 100644 --- a/ruby/dep_spec.cc +++ b/ruby/dep_spec.cc @@ -181,7 +181,7 @@ namespace { } - virtual const std::shared_ptr<const DepSpec> base_spec() const + const std::shared_ptr<const DepSpec> base_spec() const override { return _spec; } @@ -199,7 +199,7 @@ namespace template <typename Iter_> WrappedSpec * add_children(Iter_ cur, const Iter_ end); - virtual const std::shared_ptr<const Children> children() const + const std::shared_ptr<const Children> children() const override { return _children; } diff --git a/src/clients/cave/cmd_config.hh b/src/clients/cave/cmd_config.hh index 9cf362a90..8ad4790fc 100644 --- a/src/clients/cave/cmd_config.hh +++ b/src/clients/cave/cmd_config.hh @@ -30,14 +30,14 @@ namespace paludis public Command { public: - virtual CommandImportance importance() const PALUDIS_ATTRIBUTE((warn_unused_result)); + CommandImportance importance() const override PALUDIS_ATTRIBUTE((warn_unused_result)); int run( const std::shared_ptr<Environment> &, const std::shared_ptr<const Sequence<std::string > > & args - ); + ) override; - std::shared_ptr<args::ArgsHandler> make_doc_cmdline(); + std::shared_ptr<args::ArgsHandler> make_doc_cmdline() override; }; } } diff --git a/src/clients/cave/cmd_contents.hh b/src/clients/cave/cmd_contents.hh index 1dddb9f5f..2a6da4c8f 100644 --- a/src/clients/cave/cmd_contents.hh +++ b/src/clients/cave/cmd_contents.hh @@ -30,14 +30,14 @@ namespace paludis public Command { public: - virtual CommandImportance importance() const PALUDIS_ATTRIBUTE((warn_unused_result)); + CommandImportance importance() const override PALUDIS_ATTRIBUTE((warn_unused_result)); int run( const std::shared_ptr<Environment> &, const std::shared_ptr<const Sequence<std::string > > & args - ); + ) override; - std::shared_ptr<args::ArgsHandler> make_doc_cmdline(); + std::shared_ptr<args::ArgsHandler> make_doc_cmdline() override; }; } } diff --git a/src/clients/cave/cmd_digest.hh b/src/clients/cave/cmd_digest.hh index bf50cc3d5..de144bccd 100644 --- a/src/clients/cave/cmd_digest.hh +++ b/src/clients/cave/cmd_digest.hh @@ -30,14 +30,14 @@ namespace paludis public Command { public: - virtual CommandImportance importance() const PALUDIS_ATTRIBUTE((warn_unused_result)); + CommandImportance importance() const override PALUDIS_ATTRIBUTE((warn_unused_result)); int run( const std::shared_ptr<Environment> &, const std::shared_ptr<const Sequence<std::string > > & args - ); + ) override; - std::shared_ptr<args::ArgsHandler> make_doc_cmdline(); + std::shared_ptr<args::ArgsHandler> make_doc_cmdline() override; }; } } diff --git a/src/clients/cave/cmd_display_resolution.hh b/src/clients/cave/cmd_display_resolution.hh index c22ff8e42..995424087 100644 --- a/src/clients/cave/cmd_display_resolution.hh +++ b/src/clients/cave/cmd_display_resolution.hh @@ -31,12 +31,12 @@ namespace paludis public Command { public: - virtual CommandImportance importance() const PALUDIS_ATTRIBUTE((warn_unused_result)); + CommandImportance importance() const override PALUDIS_ATTRIBUTE((warn_unused_result)); int run( const std::shared_ptr<Environment> &, const std::shared_ptr<const Sequence<std::string > > & args - ); + ) override; int run( const std::shared_ptr<Environment> &, @@ -44,7 +44,7 @@ namespace paludis const std::shared_ptr<const resolver::Resolved> & maybe_resolved ); - std::shared_ptr<args::ArgsHandler> make_doc_cmdline(); + std::shared_ptr<args::ArgsHandler> make_doc_cmdline() override; }; } } diff --git a/src/clients/cave/cmd_dump_cave_formats_conf.hh b/src/clients/cave/cmd_dump_cave_formats_conf.hh index 77fa4a3d6..bf5085886 100644 --- a/src/clients/cave/cmd_dump_cave_formats_conf.hh +++ b/src/clients/cave/cmd_dump_cave_formats_conf.hh @@ -30,14 +30,14 @@ namespace paludis public Command { public: - virtual CommandImportance importance() const PALUDIS_ATTRIBUTE((warn_unused_result)); + CommandImportance importance() const override PALUDIS_ATTRIBUTE((warn_unused_result)); int run( const std::shared_ptr<Environment> &, const std::shared_ptr<const Sequence<std::string > > & args - ); + ) override; - std::shared_ptr<args::ArgsHandler> make_doc_cmdline(); + std::shared_ptr<args::ArgsHandler> make_doc_cmdline() override; }; } } diff --git a/src/clients/cave/cmd_executables.hh b/src/clients/cave/cmd_executables.hh index 097190347..03f0c6c8d 100644 --- a/src/clients/cave/cmd_executables.hh +++ b/src/clients/cave/cmd_executables.hh @@ -31,14 +31,14 @@ namespace paludis public Command { public: - virtual CommandImportance importance() const PALUDIS_ATTRIBUTE((warn_unused_result)); + CommandImportance importance() const override PALUDIS_ATTRIBUTE((warn_unused_result)); int run( const std::shared_ptr<Environment> &, const std::shared_ptr<const Sequence<std::string > > & args - ); + ) override; - std::shared_ptr<args::ArgsHandler> make_doc_cmdline(); + std::shared_ptr<args::ArgsHandler> make_doc_cmdline() override; }; } } diff --git a/src/clients/cave/cmd_execute_resolution.hh b/src/clients/cave/cmd_execute_resolution.hh index 63c669dbc..ec149459b 100644 --- a/src/clients/cave/cmd_execute_resolution.hh +++ b/src/clients/cave/cmd_execute_resolution.hh @@ -31,19 +31,19 @@ namespace paludis public Command { public: - virtual CommandImportance importance() const PALUDIS_ATTRIBUTE((warn_unused_result)); + CommandImportance importance() const override PALUDIS_ATTRIBUTE((warn_unused_result)); int run( const std::shared_ptr<Environment> &, const std::shared_ptr<const Sequence<std::string > > & args - ); + ) override; int run( const std::shared_ptr<Environment> &, const std::shared_ptr<const Sequence<std::string > > & args, const std::shared_ptr<resolver::JobLists> & maybe_job_lists); - std::shared_ptr<args::ArgsHandler> make_doc_cmdline(); + std::shared_ptr<args::ArgsHandler> make_doc_cmdline() override; }; } } diff --git a/src/clients/cave/cmd_find_candidates.hh b/src/clients/cave/cmd_find_candidates.hh index 716d3f1d4..019606fab 100644 --- a/src/clients/cave/cmd_find_candidates.hh +++ b/src/clients/cave/cmd_find_candidates.hh @@ -34,12 +34,12 @@ namespace paludis public Command { public: - virtual CommandImportance importance() const PALUDIS_ATTRIBUTE((warn_unused_result)); + CommandImportance importance() const override PALUDIS_ATTRIBUTE((warn_unused_result)); int run( const std::shared_ptr<Environment> &, const std::shared_ptr<const Sequence<std::string > > & args - ); + ) override; int run_hosted( const std::shared_ptr<Environment> &, @@ -50,7 +50,7 @@ namespace paludis const std::function<void (const PackageDepSpec &)> &, const std::function<void (const std::string &)> &) PALUDIS_ATTRIBUTE((warn_unused_result)); - std::shared_ptr<args::ArgsHandler> make_doc_cmdline(); + std::shared_ptr<args::ArgsHandler> make_doc_cmdline() override; }; } } diff --git a/src/clients/cave/cmd_fix_cache.hh b/src/clients/cave/cmd_fix_cache.hh index 01b0f00ae..7b17ec609 100644 --- a/src/clients/cave/cmd_fix_cache.hh +++ b/src/clients/cave/cmd_fix_cache.hh @@ -30,14 +30,14 @@ namespace paludis public Command { public: - virtual CommandImportance importance() const PALUDIS_ATTRIBUTE((warn_unused_result)); + CommandImportance importance() const override PALUDIS_ATTRIBUTE((warn_unused_result)); int run( const std::shared_ptr<Environment> &, const std::shared_ptr<const Sequence<std::string > > & args - ); + ) override; - std::shared_ptr<args::ArgsHandler> make_doc_cmdline(); + std::shared_ptr<args::ArgsHandler> make_doc_cmdline() override; }; } } diff --git a/src/clients/cave/cmd_fix_linkage.hh b/src/clients/cave/cmd_fix_linkage.hh index 35fbbe3e7..8e428b96c 100644 --- a/src/clients/cave/cmd_fix_linkage.hh +++ b/src/clients/cave/cmd_fix_linkage.hh @@ -30,14 +30,14 @@ namespace paludis public Command { public: - virtual CommandImportance importance() const PALUDIS_ATTRIBUTE((warn_unused_result)); + CommandImportance importance() const override PALUDIS_ATTRIBUTE((warn_unused_result)); int run( const std::shared_ptr<Environment> &, const std::shared_ptr<const Sequence<std::string > > & args - ); + ) override; - std::shared_ptr<args::ArgsHandler> make_doc_cmdline(); + std::shared_ptr<args::ArgsHandler> make_doc_cmdline() override; }; } } diff --git a/src/clients/cave/cmd_generate_metadata.hh b/src/clients/cave/cmd_generate_metadata.hh index ac86ce19b..3e65da25c 100644 --- a/src/clients/cave/cmd_generate_metadata.hh +++ b/src/clients/cave/cmd_generate_metadata.hh @@ -30,14 +30,14 @@ namespace paludis public Command { public: - virtual CommandImportance importance() const PALUDIS_ATTRIBUTE((warn_unused_result)); + CommandImportance importance() const override PALUDIS_ATTRIBUTE((warn_unused_result)); int run( const std::shared_ptr<Environment> &, const std::shared_ptr<const Sequence<std::string > > & args - ); + ) override; - std::shared_ptr<args::ArgsHandler> make_doc_cmdline(); + std::shared_ptr<args::ArgsHandler> make_doc_cmdline() override; }; } } diff --git a/src/clients/cave/cmd_graph_jobs.hh b/src/clients/cave/cmd_graph_jobs.hh index d0786a777..3dcc18fe6 100644 --- a/src/clients/cave/cmd_graph_jobs.hh +++ b/src/clients/cave/cmd_graph_jobs.hh @@ -31,12 +31,12 @@ namespace paludis public Command { public: - virtual CommandImportance importance() const PALUDIS_ATTRIBUTE((warn_unused_result)); + CommandImportance importance() const override PALUDIS_ATTRIBUTE((warn_unused_result)); int run( const std::shared_ptr<Environment> &, const std::shared_ptr<const Sequence<std::string > > & args - ); + ) override; int run( const std::shared_ptr<Environment> &, @@ -44,7 +44,7 @@ namespace paludis const std::shared_ptr<const resolver::Resolved> & maybe_resolved ); - std::shared_ptr<args::ArgsHandler> make_doc_cmdline(); + std::shared_ptr<args::ArgsHandler> make_doc_cmdline() override; }; } } diff --git a/src/clients/cave/cmd_has_version.hh b/src/clients/cave/cmd_has_version.hh index a30690255..6bbcc6f44 100644 --- a/src/clients/cave/cmd_has_version.hh +++ b/src/clients/cave/cmd_has_version.hh @@ -30,14 +30,14 @@ namespace paludis public Command { public: - virtual CommandImportance importance() const PALUDIS_ATTRIBUTE((warn_unused_result)); + CommandImportance importance() const override PALUDIS_ATTRIBUTE((warn_unused_result)); int run( const std::shared_ptr<Environment> &, const std::shared_ptr<const Sequence<std::string > > & args - ); + ) override; - std::shared_ptr<args::ArgsHandler> make_doc_cmdline(); + std::shared_ptr<args::ArgsHandler> make_doc_cmdline() override; }; } } diff --git a/src/clients/cave/cmd_help.hh b/src/clients/cave/cmd_help.hh index a903b6ea5..96b2ec732 100644 --- a/src/clients/cave/cmd_help.hh +++ b/src/clients/cave/cmd_help.hh @@ -29,12 +29,12 @@ namespace paludis public Command { public: - virtual CommandImportance importance() const PALUDIS_ATTRIBUTE((warn_unused_result)); + CommandImportance importance() const override PALUDIS_ATTRIBUTE((warn_unused_result)); int run(const std::shared_ptr<Environment> &, - const std::shared_ptr< const Sequence<std::string> > & args); + const std::shared_ptr< const Sequence<std::string> > & args) override; - std::shared_ptr<args::ArgsHandler> make_doc_cmdline(); + std::shared_ptr<args::ArgsHandler> make_doc_cmdline() override; }; } } diff --git a/src/clients/cave/cmd_import.hh b/src/clients/cave/cmd_import.hh index 72c7f4d51..37c7ebe9e 100644 --- a/src/clients/cave/cmd_import.hh +++ b/src/clients/cave/cmd_import.hh @@ -30,14 +30,14 @@ namespace paludis public Command { public: - virtual CommandImportance importance() const PALUDIS_ATTRIBUTE((warn_unused_result)); + CommandImportance importance() const override PALUDIS_ATTRIBUTE((warn_unused_result)); int run( const std::shared_ptr<Environment> &, const std::shared_ptr<const Sequence<std::string > > & args - ); + ) override; - std::shared_ptr<args::ArgsHandler> make_doc_cmdline(); + std::shared_ptr<args::ArgsHandler> make_doc_cmdline() override; }; } } diff --git a/src/clients/cave/cmd_info.hh b/src/clients/cave/cmd_info.hh index ad6e113e9..033c5e070 100644 --- a/src/clients/cave/cmd_info.hh +++ b/src/clients/cave/cmd_info.hh @@ -30,14 +30,14 @@ namespace paludis public Command { public: - virtual CommandImportance importance() const PALUDIS_ATTRIBUTE((warn_unused_result)); + CommandImportance importance() const override PALUDIS_ATTRIBUTE((warn_unused_result)); int run( const std::shared_ptr<Environment> &, const std::shared_ptr<const Sequence<std::string > > & args - ); + ) override; - std::shared_ptr<args::ArgsHandler> make_doc_cmdline(); + std::shared_ptr<args::ArgsHandler> make_doc_cmdline() override; }; } } diff --git a/src/clients/cave/cmd_manage_search_index.hh b/src/clients/cave/cmd_manage_search_index.hh index 5bfa632a6..8cf604acf 100644 --- a/src/clients/cave/cmd_manage_search_index.hh +++ b/src/clients/cave/cmd_manage_search_index.hh @@ -30,14 +30,14 @@ namespace paludis public Command { public: - virtual CommandImportance importance() const PALUDIS_ATTRIBUTE((warn_unused_result)); + CommandImportance importance() const override PALUDIS_ATTRIBUTE((warn_unused_result)); int run( const std::shared_ptr<Environment> &, const std::shared_ptr<const Sequence<std::string > > & args - ); + ) override; - std::shared_ptr<args::ArgsHandler> make_doc_cmdline(); + std::shared_ptr<args::ArgsHandler> make_doc_cmdline() override; }; } } diff --git a/src/clients/cave/cmd_match.hh b/src/clients/cave/cmd_match.hh index 4d72bb198..310986f8c 100644 --- a/src/clients/cave/cmd_match.hh +++ b/src/clients/cave/cmd_match.hh @@ -34,12 +34,12 @@ namespace paludis public Command { public: - virtual CommandImportance importance() const PALUDIS_ATTRIBUTE((warn_unused_result)); + CommandImportance importance() const override PALUDIS_ATTRIBUTE((warn_unused_result)); int run( const std::shared_ptr<Environment> &, const std::shared_ptr<const Sequence<std::string > > & args - ); + ) override; bool run_hosted( const std::shared_ptr<Environment> &, @@ -47,7 +47,7 @@ namespace paludis const std::shared_ptr<const Set<std::string> > &, const PackageDepSpec &); - std::shared_ptr<args::ArgsHandler> make_doc_cmdline(); + std::shared_ptr<args::ArgsHandler> make_doc_cmdline() override; }; } } diff --git a/src/clients/cave/cmd_mirror.hh b/src/clients/cave/cmd_mirror.hh index 6b56e5b7d..bcdc0bb12 100644 --- a/src/clients/cave/cmd_mirror.hh +++ b/src/clients/cave/cmd_mirror.hh @@ -31,14 +31,14 @@ namespace paludis public Command { public: - virtual CommandImportance importance() const PALUDIS_ATTRIBUTE((warn_unused_result)); + CommandImportance importance() const override PALUDIS_ATTRIBUTE((warn_unused_result)); int run( const std::shared_ptr<Environment> &, const std::shared_ptr<const Sequence<std::string > > & args - ); + ) override; - std::shared_ptr<args::ArgsHandler> make_doc_cmdline(); + std::shared_ptr<args::ArgsHandler> make_doc_cmdline() override; }; } } diff --git a/src/clients/cave/cmd_owner.hh b/src/clients/cave/cmd_owner.hh index ed300f2ed..97a530748 100644 --- a/src/clients/cave/cmd_owner.hh +++ b/src/clients/cave/cmd_owner.hh @@ -31,14 +31,14 @@ namespace paludis public Command { public: - virtual CommandImportance importance() const PALUDIS_ATTRIBUTE((warn_unused_result)); + CommandImportance importance() const override PALUDIS_ATTRIBUTE((warn_unused_result)); int run( const std::shared_ptr<Environment> &, const std::shared_ptr<const Sequence<std::string > > & args - ); + ) override; - std::shared_ptr<args::ArgsHandler> make_doc_cmdline(); + std::shared_ptr<args::ArgsHandler> make_doc_cmdline() override; }; } } diff --git a/src/clients/cave/cmd_perform.hh b/src/clients/cave/cmd_perform.hh index 111cb2fe3..3148d9c03 100644 --- a/src/clients/cave/cmd_perform.hh +++ b/src/clients/cave/cmd_perform.hh @@ -30,14 +30,14 @@ namespace paludis public Command { public: - virtual CommandImportance importance() const PALUDIS_ATTRIBUTE((warn_unused_result)); + CommandImportance importance() const override PALUDIS_ATTRIBUTE((warn_unused_result)); int run( const std::shared_ptr<Environment> &, const std::shared_ptr<const Sequence<std::string > > & args - ); + ) override; - std::shared_ptr<args::ArgsHandler> make_doc_cmdline(); + std::shared_ptr<args::ArgsHandler> make_doc_cmdline() override; }; } } diff --git a/src/clients/cave/cmd_print_best_version.hh b/src/clients/cave/cmd_print_best_version.hh index e33de22b6..2c55aef54 100644 --- a/src/clients/cave/cmd_print_best_version.hh +++ b/src/clients/cave/cmd_print_best_version.hh @@ -30,14 +30,14 @@ namespace paludis public Command { public: - virtual CommandImportance importance() const PALUDIS_ATTRIBUTE((warn_unused_result)); + CommandImportance importance() const override PALUDIS_ATTRIBUTE((warn_unused_result)); int run( const std::shared_ptr<Environment> &, const std::shared_ptr<const Sequence<std::string > > & args - ); + ) override; - std::shared_ptr<args::ArgsHandler> make_doc_cmdline(); + std::shared_ptr<args::ArgsHandler> make_doc_cmdline() override; }; } } diff --git a/src/clients/cave/cmd_print_categories.hh b/src/clients/cave/cmd_print_categories.hh index cb31dc410..a97d86d3d 100644 --- a/src/clients/cave/cmd_print_categories.hh +++ b/src/clients/cave/cmd_print_categories.hh @@ -30,14 +30,14 @@ namespace paludis public Command { public: - virtual CommandImportance importance() const PALUDIS_ATTRIBUTE((warn_unused_result)); + CommandImportance importance() const override PALUDIS_ATTRIBUTE((warn_unused_result)); int run( const std::shared_ptr<Environment> &, const std::shared_ptr<const Sequence<std::string > > & args - ); + ) override; - std::shared_ptr<args::ArgsHandler> make_doc_cmdline(); + std::shared_ptr<args::ArgsHandler> make_doc_cmdline() override; }; } } diff --git a/src/clients/cave/cmd_print_checksum.hh b/src/clients/cave/cmd_print_checksum.hh index cba0b5fc2..01b4a8e32 100644 --- a/src/clients/cave/cmd_print_checksum.hh +++ b/src/clients/cave/cmd_print_checksum.hh @@ -30,12 +30,12 @@ namespace paludis public Command { public: - virtual CommandImportance importance() const PALUDIS_ATTRIBUTE((warn_unused_result)); + CommandImportance importance() const override PALUDIS_ATTRIBUTE((warn_unused_result)); int run(const std::shared_ptr<Environment> &, - const std::shared_ptr<const Sequence<std::string> > & args); + const std::shared_ptr<const Sequence<std::string> > & args) override; - std::shared_ptr<args::ArgsHandler> make_doc_cmdline(); + std::shared_ptr<args::ArgsHandler> make_doc_cmdline() override; }; } } diff --git a/src/clients/cave/cmd_print_checksum_algorithms.hh b/src/clients/cave/cmd_print_checksum_algorithms.hh index 2c1105623..6e84bbf0b 100644 --- a/src/clients/cave/cmd_print_checksum_algorithms.hh +++ b/src/clients/cave/cmd_print_checksum_algorithms.hh @@ -30,12 +30,12 @@ namespace paludis public Command { public: - virtual CommandImportance importance() const PALUDIS_ATTRIBUTE((warn_unused_result)); + CommandImportance importance() const override PALUDIS_ATTRIBUTE((warn_unused_result)); int run(const std::shared_ptr<Environment> &, - const std::shared_ptr<const Sequence<std::string> > & args); + const std::shared_ptr<const Sequence<std::string> > & args) override; - std::shared_ptr<args::ArgsHandler> make_doc_cmdline(); + std::shared_ptr<args::ArgsHandler> make_doc_cmdline() override; }; } } diff --git a/src/clients/cave/cmd_print_commands.hh b/src/clients/cave/cmd_print_commands.hh index f6049a0d3..6fc3c3cb9 100644 --- a/src/clients/cave/cmd_print_commands.hh +++ b/src/clients/cave/cmd_print_commands.hh @@ -30,14 +30,14 @@ namespace paludis public Command { public: - virtual CommandImportance importance() const PALUDIS_ATTRIBUTE((warn_unused_result)); + CommandImportance importance() const override PALUDIS_ATTRIBUTE((warn_unused_result)); int run( const std::shared_ptr<Environment> &, const std::shared_ptr<const Sequence<std::string > > & args - ); + ) override; - std::shared_ptr<args::ArgsHandler> make_doc_cmdline(); + std::shared_ptr<args::ArgsHandler> make_doc_cmdline() override; }; } } diff --git a/src/clients/cave/cmd_print_dependent_ids.hh b/src/clients/cave/cmd_print_dependent_ids.hh index 86dbe7605..cf5f7c847 100644 --- a/src/clients/cave/cmd_print_dependent_ids.hh +++ b/src/clients/cave/cmd_print_dependent_ids.hh @@ -30,14 +30,14 @@ namespace paludis public Command { public: - virtual CommandImportance importance() const PALUDIS_ATTRIBUTE((warn_unused_result)); + CommandImportance importance() const override PALUDIS_ATTRIBUTE((warn_unused_result)); int run( const std::shared_ptr<Environment> &, const std::shared_ptr<const Sequence<std::string > > & args - ); + ) override; - std::shared_ptr<args::ArgsHandler> make_doc_cmdline(); + std::shared_ptr<args::ArgsHandler> make_doc_cmdline() override; }; } } diff --git a/src/clients/cave/cmd_print_environment_metadata.hh b/src/clients/cave/cmd_print_environment_metadata.hh index 43f071352..55fc72233 100644 --- a/src/clients/cave/cmd_print_environment_metadata.hh +++ b/src/clients/cave/cmd_print_environment_metadata.hh @@ -30,14 +30,14 @@ namespace paludis public Command { public: - virtual CommandImportance importance() const PALUDIS_ATTRIBUTE((warn_unused_result)); + CommandImportance importance() const override PALUDIS_ATTRIBUTE((warn_unused_result)); int run( const std::shared_ptr<Environment> &, const std::shared_ptr<const Sequence<std::string > > & args - ); + ) override; - std::shared_ptr<args::ArgsHandler> make_doc_cmdline(); + std::shared_ptr<args::ArgsHandler> make_doc_cmdline() override; }; } } diff --git a/src/clients/cave/cmd_print_id_actions.hh b/src/clients/cave/cmd_print_id_actions.hh index 32e155c5e..ae582a250 100644 --- a/src/clients/cave/cmd_print_id_actions.hh +++ b/src/clients/cave/cmd_print_id_actions.hh @@ -30,14 +30,14 @@ namespace paludis public Command { public: - virtual CommandImportance importance() const PALUDIS_ATTRIBUTE((warn_unused_result)); + CommandImportance importance() const override PALUDIS_ATTRIBUTE((warn_unused_result)); int run( const std::shared_ptr<Environment> &, const std::shared_ptr<const Sequence<std::string > > & args - ); + ) override; - std::shared_ptr<args::ArgsHandler> make_doc_cmdline(); + std::shared_ptr<args::ArgsHandler> make_doc_cmdline() override; }; } } diff --git a/src/clients/cave/cmd_print_id_contents.hh b/src/clients/cave/cmd_print_id_contents.hh index aabde60b2..10778c49f 100644 --- a/src/clients/cave/cmd_print_id_contents.hh +++ b/src/clients/cave/cmd_print_id_contents.hh @@ -30,14 +30,14 @@ namespace paludis public Command { public: - virtual CommandImportance importance() const PALUDIS_ATTRIBUTE((warn_unused_result)); + CommandImportance importance() const override PALUDIS_ATTRIBUTE((warn_unused_result)); int run( const std::shared_ptr<Environment> &, const std::shared_ptr<const Sequence<std::string > > & args - ); + ) override; - std::shared_ptr<args::ArgsHandler> make_doc_cmdline(); + std::shared_ptr<args::ArgsHandler> make_doc_cmdline() override; }; } } diff --git a/src/clients/cave/cmd_print_id_environment_variable.hh b/src/clients/cave/cmd_print_id_environment_variable.hh index 26bbda466..611e97a83 100644 --- a/src/clients/cave/cmd_print_id_environment_variable.hh +++ b/src/clients/cave/cmd_print_id_environment_variable.hh @@ -30,14 +30,14 @@ namespace paludis public Command { public: - virtual CommandImportance importance() const PALUDIS_ATTRIBUTE((warn_unused_result)); + CommandImportance importance() const override PALUDIS_ATTRIBUTE((warn_unused_result)); int run( const std::shared_ptr<Environment> &, const std::shared_ptr<const Sequence<std::string > > & args - ); + ) override; - std::shared_ptr<args::ArgsHandler> make_doc_cmdline(); + std::shared_ptr<args::ArgsHandler> make_doc_cmdline() override; }; } } diff --git a/src/clients/cave/cmd_print_id_executables.hh b/src/clients/cave/cmd_print_id_executables.hh index 0eaea9f04..4d0e5150c 100644 --- a/src/clients/cave/cmd_print_id_executables.hh +++ b/src/clients/cave/cmd_print_id_executables.hh @@ -30,14 +30,14 @@ namespace paludis public Command { public: - virtual CommandImportance importance() const PALUDIS_ATTRIBUTE((warn_unused_result)); + CommandImportance importance() const override PALUDIS_ATTRIBUTE((warn_unused_result)); int run( const std::shared_ptr<Environment> &, const std::shared_ptr<const Sequence<std::string > > & args - ); + ) override; - std::shared_ptr<args::ArgsHandler> make_doc_cmdline(); + std::shared_ptr<args::ArgsHandler> make_doc_cmdline() override; }; } } diff --git a/src/clients/cave/cmd_print_id_masks.hh b/src/clients/cave/cmd_print_id_masks.hh index d005ef66f..e734b9125 100644 --- a/src/clients/cave/cmd_print_id_masks.hh +++ b/src/clients/cave/cmd_print_id_masks.hh @@ -30,14 +30,14 @@ namespace paludis public Command { public: - virtual CommandImportance importance() const PALUDIS_ATTRIBUTE((warn_unused_result)); + CommandImportance importance() const override PALUDIS_ATTRIBUTE((warn_unused_result)); int run( const std::shared_ptr<Environment> &, const std::shared_ptr<const Sequence<std::string > > & args - ); + ) override; - std::shared_ptr<args::ArgsHandler> make_doc_cmdline(); + std::shared_ptr<args::ArgsHandler> make_doc_cmdline() override; }; } } diff --git a/src/clients/cave/cmd_print_id_metadata.hh b/src/clients/cave/cmd_print_id_metadata.hh index bc9fa40c5..f7a8fde98 100644 --- a/src/clients/cave/cmd_print_id_metadata.hh +++ b/src/clients/cave/cmd_print_id_metadata.hh @@ -30,14 +30,14 @@ namespace paludis public Command { public: - virtual CommandImportance importance() const PALUDIS_ATTRIBUTE((warn_unused_result)); + CommandImportance importance() const override PALUDIS_ATTRIBUTE((warn_unused_result)); int run( const std::shared_ptr<Environment> &, const std::shared_ptr<const Sequence<std::string > > & args - ); + ) override; - std::shared_ptr<args::ArgsHandler> make_doc_cmdline(); + std::shared_ptr<args::ArgsHandler> make_doc_cmdline() override; }; } } diff --git a/src/clients/cave/cmd_print_id_size.hh b/src/clients/cave/cmd_print_id_size.hh index 1e31953d8..bcddb3fb1 100644 --- a/src/clients/cave/cmd_print_id_size.hh +++ b/src/clients/cave/cmd_print_id_size.hh @@ -30,14 +30,14 @@ namespace paludis public Command { public: - virtual CommandImportance importance() const PALUDIS_ATTRIBUTE((warn_unused_result)); + CommandImportance importance() const override PALUDIS_ATTRIBUTE((warn_unused_result)); int run( const std::shared_ptr<Environment> &, const std::shared_ptr<const Sequence<std::string > > & args - ); + ) override; - std::shared_ptr<args::ArgsHandler> make_doc_cmdline(); + std::shared_ptr<args::ArgsHandler> make_doc_cmdline() override; }; } } diff --git a/src/clients/cave/cmd_print_ids.hh b/src/clients/cave/cmd_print_ids.hh index 3cbb7ff36..32af5068a 100644 --- a/src/clients/cave/cmd_print_ids.hh +++ b/src/clients/cave/cmd_print_ids.hh @@ -30,14 +30,14 @@ namespace paludis public Command { public: - virtual CommandImportance importance() const PALUDIS_ATTRIBUTE((warn_unused_result)); + CommandImportance importance() const override PALUDIS_ATTRIBUTE((warn_unused_result)); int run( const std::shared_ptr<Environment> &, const std::shared_ptr<const Sequence<std::string > > & args - ); + ) override; - std::shared_ptr<args::ArgsHandler> make_doc_cmdline(); + std::shared_ptr<args::ArgsHandler> make_doc_cmdline() override; }; } } diff --git a/src/clients/cave/cmd_print_owners.hh b/src/clients/cave/cmd_print_owners.hh index 9b52ec9b0..c555145c7 100644 --- a/src/clients/cave/cmd_print_owners.hh +++ b/src/clients/cave/cmd_print_owners.hh @@ -30,14 +30,14 @@ namespace paludis public Command { public: - virtual CommandImportance importance() const PALUDIS_ATTRIBUTE((warn_unused_result)); + CommandImportance importance() const override PALUDIS_ATTRIBUTE((warn_unused_result)); int run( const std::shared_ptr<Environment> &, const std::shared_ptr<const Sequence<std::string > > & args - ); + ) override; - std::shared_ptr<args::ArgsHandler> make_doc_cmdline(); + std::shared_ptr<args::ArgsHandler> make_doc_cmdline() override; }; } } diff --git a/src/clients/cave/cmd_print_packages.hh b/src/clients/cave/cmd_print_packages.hh index 0628663df..b6663d332 100644 --- a/src/clients/cave/cmd_print_packages.hh +++ b/src/clients/cave/cmd_print_packages.hh @@ -30,14 +30,14 @@ namespace paludis public Command { public: - virtual CommandImportance importance() const PALUDIS_ATTRIBUTE((warn_unused_result)); + CommandImportance importance() const override PALUDIS_ATTRIBUTE((warn_unused_result)); int run( const std::shared_ptr<Environment> &, const std::shared_ptr<const Sequence<std::string > > & args - ); + ) override; - std::shared_ptr<args::ArgsHandler> make_doc_cmdline(); + std::shared_ptr<args::ArgsHandler> make_doc_cmdline() override; }; } } diff --git a/src/clients/cave/cmd_print_repositories.hh b/src/clients/cave/cmd_print_repositories.hh index 9f20fd088..46c595b22 100644 --- a/src/clients/cave/cmd_print_repositories.hh +++ b/src/clients/cave/cmd_print_repositories.hh @@ -30,14 +30,14 @@ namespace paludis public Command { public: - virtual CommandImportance importance() const PALUDIS_ATTRIBUTE((warn_unused_result)); + CommandImportance importance() const override PALUDIS_ATTRIBUTE((warn_unused_result)); int run( const std::shared_ptr<Environment> &, const std::shared_ptr<const Sequence<std::string > > & args - ); + ) override; - std::shared_ptr<args::ArgsHandler> make_doc_cmdline(); + std::shared_ptr<args::ArgsHandler> make_doc_cmdline() override; }; } } diff --git a/src/clients/cave/cmd_print_repository_formats.hh b/src/clients/cave/cmd_print_repository_formats.hh index 71ca24456..981a38c0b 100644 --- a/src/clients/cave/cmd_print_repository_formats.hh +++ b/src/clients/cave/cmd_print_repository_formats.hh @@ -30,14 +30,14 @@ namespace paludis public Command { public: - virtual CommandImportance importance() const PALUDIS_ATTRIBUTE((warn_unused_result)); + CommandImportance importance() const override PALUDIS_ATTRIBUTE((warn_unused_result)); int run( const std::shared_ptr<Environment> &, const std::shared_ptr<const Sequence<std::string > > & args - ); + ) override; - std::shared_ptr<args::ArgsHandler> make_doc_cmdline(); + std::shared_ptr<args::ArgsHandler> make_doc_cmdline() override; }; } } diff --git a/src/clients/cave/cmd_print_repository_metadata.hh b/src/clients/cave/cmd_print_repository_metadata.hh index e07b70d1e..29234e7d2 100644 --- a/src/clients/cave/cmd_print_repository_metadata.hh +++ b/src/clients/cave/cmd_print_repository_metadata.hh @@ -30,14 +30,14 @@ namespace paludis public Command { public: - virtual CommandImportance importance() const PALUDIS_ATTRIBUTE((warn_unused_result)); + CommandImportance importance() const override PALUDIS_ATTRIBUTE((warn_unused_result)); int run( const std::shared_ptr<Environment> &, const std::shared_ptr<const Sequence<std::string > > & args - ); + ) override; - std::shared_ptr<args::ArgsHandler> make_doc_cmdline(); + std::shared_ptr<args::ArgsHandler> make_doc_cmdline() override; }; } } diff --git a/src/clients/cave/cmd_print_resolution_required_confirmations.hh b/src/clients/cave/cmd_print_resolution_required_confirmations.hh index 1dced261d..3c4a8bba8 100644 --- a/src/clients/cave/cmd_print_resolution_required_confirmations.hh +++ b/src/clients/cave/cmd_print_resolution_required_confirmations.hh @@ -31,12 +31,12 @@ namespace paludis public Command { public: - virtual CommandImportance importance() const PALUDIS_ATTRIBUTE((warn_unused_result)); + CommandImportance importance() const override PALUDIS_ATTRIBUTE((warn_unused_result)); int run( const std::shared_ptr<Environment> &, const std::shared_ptr<const Sequence<std::string > > & args - ); + ) override; int run( const std::shared_ptr<Environment> &, @@ -44,7 +44,7 @@ namespace paludis const std::shared_ptr<const resolver::Resolved> & maybe_resolved ); - std::shared_ptr<args::ArgsHandler> make_doc_cmdline(); + std::shared_ptr<args::ArgsHandler> make_doc_cmdline() override; }; } } diff --git a/src/clients/cave/cmd_print_set.hh b/src/clients/cave/cmd_print_set.hh index 270937df9..868aa064b 100644 --- a/src/clients/cave/cmd_print_set.hh +++ b/src/clients/cave/cmd_print_set.hh @@ -30,14 +30,14 @@ namespace paludis public Command { public: - virtual CommandImportance importance() const PALUDIS_ATTRIBUTE((warn_unused_result)); + CommandImportance importance() const override PALUDIS_ATTRIBUTE((warn_unused_result)); int run( const std::shared_ptr<Environment> &, const std::shared_ptr<const Sequence<std::string > > & args - ); + ) override; - std::shared_ptr<args::ArgsHandler> make_doc_cmdline(); + std::shared_ptr<args::ArgsHandler> make_doc_cmdline() override; }; } } diff --git a/src/clients/cave/cmd_print_sets.hh b/src/clients/cave/cmd_print_sets.hh index 4a4c33f2a..c44a71060 100644 --- a/src/clients/cave/cmd_print_sets.hh +++ b/src/clients/cave/cmd_print_sets.hh @@ -30,14 +30,14 @@ namespace paludis public Command { public: - virtual CommandImportance importance() const PALUDIS_ATTRIBUTE((warn_unused_result)); + CommandImportance importance() const override PALUDIS_ATTRIBUTE((warn_unused_result)); int run( const std::shared_ptr<Environment> &, const std::shared_ptr<const Sequence<std::string > > & args - ); + ) override; - std::shared_ptr<args::ArgsHandler> make_doc_cmdline(); + std::shared_ptr<args::ArgsHandler> make_doc_cmdline() override; }; } } diff --git a/src/clients/cave/cmd_print_spec.hh b/src/clients/cave/cmd_print_spec.hh index b5be4cf97..cca0f1e61 100644 --- a/src/clients/cave/cmd_print_spec.hh +++ b/src/clients/cave/cmd_print_spec.hh @@ -30,14 +30,14 @@ namespace paludis public Command { public: - virtual CommandImportance importance() const PALUDIS_ATTRIBUTE((warn_unused_result)); + CommandImportance importance() const override PALUDIS_ATTRIBUTE((warn_unused_result)); int run( const std::shared_ptr<Environment> &, const std::shared_ptr<const Sequence<std::string > > & args - ); + ) override; - std::shared_ptr<args::ArgsHandler> make_doc_cmdline(); + std::shared_ptr<args::ArgsHandler> make_doc_cmdline() override; }; } } diff --git a/src/clients/cave/cmd_print_sync_protocols.hh b/src/clients/cave/cmd_print_sync_protocols.hh index 2287b61cb..bdbdae43a 100644 --- a/src/clients/cave/cmd_print_sync_protocols.hh +++ b/src/clients/cave/cmd_print_sync_protocols.hh @@ -30,14 +30,14 @@ namespace paludis public Command { public: - virtual CommandImportance importance() const PALUDIS_ATTRIBUTE((warn_unused_result)); + CommandImportance importance() const override PALUDIS_ATTRIBUTE((warn_unused_result)); int run( const std::shared_ptr<Environment> &, const std::shared_ptr<const Sequence<std::string > > & args - ); + ) override; - std::shared_ptr<args::ArgsHandler> make_doc_cmdline(); + std::shared_ptr<args::ArgsHandler> make_doc_cmdline() override; }; } } diff --git a/src/clients/cave/cmd_print_unmanaged_files.hh b/src/clients/cave/cmd_print_unmanaged_files.hh index 2f4081aa7..3ea41fcc7 100644 --- a/src/clients/cave/cmd_print_unmanaged_files.hh +++ b/src/clients/cave/cmd_print_unmanaged_files.hh @@ -29,12 +29,12 @@ namespace paludis public Command { public: - virtual CommandImportance importance() const PALUDIS_ATTRIBUTE((warn_unused_result)); + CommandImportance importance() const override PALUDIS_ATTRIBUTE((warn_unused_result)); int run(const std::shared_ptr<Environment> &, - const std::shared_ptr< const Sequence<std::string> > & args); + const std::shared_ptr< const Sequence<std::string> > & args) override; - std::shared_ptr<args::ArgsHandler> make_doc_cmdline(); + std::shared_ptr<args::ArgsHandler> make_doc_cmdline() override; }; } } diff --git a/src/clients/cave/cmd_print_unused_distfiles.hh b/src/clients/cave/cmd_print_unused_distfiles.hh index 2eb082762..a6332a64a 100644 --- a/src/clients/cave/cmd_print_unused_distfiles.hh +++ b/src/clients/cave/cmd_print_unused_distfiles.hh @@ -30,14 +30,14 @@ namespace paludis public Command { public: - virtual CommandImportance importance() const PALUDIS_ATTRIBUTE((warn_unused_result)); + CommandImportance importance() const override PALUDIS_ATTRIBUTE((warn_unused_result)); int run( const std::shared_ptr<Environment> &, const std::shared_ptr<const Sequence<std::string > > & args - ); + ) override; - std::shared_ptr<args::ArgsHandler> make_doc_cmdline(); + std::shared_ptr<args::ArgsHandler> make_doc_cmdline() override; }; } } diff --git a/src/clients/cave/cmd_purge.hh b/src/clients/cave/cmd_purge.hh index 52e261d03..8dd1fe5da 100644 --- a/src/clients/cave/cmd_purge.hh +++ b/src/clients/cave/cmd_purge.hh @@ -30,14 +30,14 @@ namespace paludis public Command { public: - virtual CommandImportance importance() const PALUDIS_ATTRIBUTE((warn_unused_result)); + CommandImportance importance() const override PALUDIS_ATTRIBUTE((warn_unused_result)); int run( const std::shared_ptr<Environment> &, const std::shared_ptr<const Sequence<std::string > > & args - ); + ) override; - std::shared_ptr<args::ArgsHandler> make_doc_cmdline(); + std::shared_ptr<args::ArgsHandler> make_doc_cmdline() override; }; } } diff --git a/src/clients/cave/cmd_report.hh b/src/clients/cave/cmd_report.hh index dcbc57d03..e47aeb862 100644 --- a/src/clients/cave/cmd_report.hh +++ b/src/clients/cave/cmd_report.hh @@ -30,14 +30,14 @@ namespace paludis public Command { public: - virtual CommandImportance importance() const PALUDIS_ATTRIBUTE((warn_unused_result)); + CommandImportance importance() const override PALUDIS_ATTRIBUTE((warn_unused_result)); int run( const std::shared_ptr<Environment> &, const std::shared_ptr<const Sequence<std::string > > & args - ); + ) override; - std::shared_ptr<args::ArgsHandler> make_doc_cmdline(); + std::shared_ptr<args::ArgsHandler> make_doc_cmdline() override; }; } } diff --git a/src/clients/cave/cmd_resolve.hh b/src/clients/cave/cmd_resolve.hh index 4903f8c9b..f85ce3617 100644 --- a/src/clients/cave/cmd_resolve.hh +++ b/src/clients/cave/cmd_resolve.hh @@ -30,14 +30,14 @@ namespace paludis public Command { public: - virtual CommandImportance importance() const PALUDIS_ATTRIBUTE((warn_unused_result)); + CommandImportance importance() const override PALUDIS_ATTRIBUTE((warn_unused_result)); int run( const std::shared_ptr<Environment> &, const std::shared_ptr<const Sequence<std::string > > & args - ); + ) override; - std::shared_ptr<args::ArgsHandler> make_doc_cmdline(); + std::shared_ptr<args::ArgsHandler> make_doc_cmdline() override; }; } } diff --git a/src/clients/cave/cmd_resume.hh b/src/clients/cave/cmd_resume.hh index 463ee5fc9..e4bd60c0f 100644 --- a/src/clients/cave/cmd_resume.hh +++ b/src/clients/cave/cmd_resume.hh @@ -31,14 +31,14 @@ namespace paludis public Command { public: - virtual CommandImportance importance() const PALUDIS_ATTRIBUTE((warn_unused_result)); + CommandImportance importance() const override PALUDIS_ATTRIBUTE((warn_unused_result)); int run( const std::shared_ptr<Environment> &, const std::shared_ptr<const Sequence<std::string > > & args - ); + ) override; - std::shared_ptr<args::ArgsHandler> make_doc_cmdline(); + std::shared_ptr<args::ArgsHandler> make_doc_cmdline() override; }; } } diff --git a/src/clients/cave/cmd_search.hh b/src/clients/cave/cmd_search.hh index 00a1adede..3e74cccad 100644 --- a/src/clients/cave/cmd_search.hh +++ b/src/clients/cave/cmd_search.hh @@ -30,14 +30,14 @@ namespace paludis public Command { public: - virtual CommandImportance importance() const PALUDIS_ATTRIBUTE((warn_unused_result)); + CommandImportance importance() const override PALUDIS_ATTRIBUTE((warn_unused_result)); int run( const std::shared_ptr<Environment> &, const std::shared_ptr<const Sequence<std::string > > & args - ); + ) override; - std::shared_ptr<args::ArgsHandler> make_doc_cmdline(); + std::shared_ptr<args::ArgsHandler> make_doc_cmdline() override; }; } } diff --git a/src/clients/cave/cmd_show.hh b/src/clients/cave/cmd_show.hh index 13029d57c..9b61bf14a 100644 --- a/src/clients/cave/cmd_show.hh +++ b/src/clients/cave/cmd_show.hh @@ -30,14 +30,14 @@ namespace paludis public Command { public: - virtual CommandImportance importance() const PALUDIS_ATTRIBUTE((warn_unused_result)); + CommandImportance importance() const override PALUDIS_ATTRIBUTE((warn_unused_result)); int run( const std::shared_ptr<Environment> &, const std::shared_ptr<const Sequence<std::string > > & args - ); + ) override; - std::shared_ptr<args::ArgsHandler> make_doc_cmdline(); + std::shared_ptr<args::ArgsHandler> make_doc_cmdline() override; }; } } diff --git a/src/clients/cave/cmd_size.hh b/src/clients/cave/cmd_size.hh index b4970de97..d7cde2aaf 100644 --- a/src/clients/cave/cmd_size.hh +++ b/src/clients/cave/cmd_size.hh @@ -30,14 +30,14 @@ namespace paludis public Command { public: - virtual CommandImportance importance() const PALUDIS_ATTRIBUTE((warn_unused_result)); + CommandImportance importance() const override PALUDIS_ATTRIBUTE((warn_unused_result)); int run( const std::shared_ptr<Environment> &, const std::shared_ptr<const Sequence<std::string > > & args - ); + ) override; - std::shared_ptr<args::ArgsHandler> make_doc_cmdline(); + std::shared_ptr<args::ArgsHandler> make_doc_cmdline() override; }; } } diff --git a/src/clients/cave/cmd_sync.hh b/src/clients/cave/cmd_sync.hh index 7b189603a..cae539121 100644 --- a/src/clients/cave/cmd_sync.hh +++ b/src/clients/cave/cmd_sync.hh @@ -30,14 +30,14 @@ namespace paludis public Command { public: - virtual CommandImportance importance() const PALUDIS_ATTRIBUTE((warn_unused_result)); + CommandImportance importance() const override PALUDIS_ATTRIBUTE((warn_unused_result)); int run( const std::shared_ptr<Environment> &, const std::shared_ptr<const Sequence<std::string > > & args - ); + ) override; - std::shared_ptr<args::ArgsHandler> make_doc_cmdline(); + std::shared_ptr<args::ArgsHandler> make_doc_cmdline() override; }; } } diff --git a/src/clients/cave/cmd_sync_protocol_options.hh b/src/clients/cave/cmd_sync_protocol_options.hh index 00ba25996..3cfab93f6 100644 --- a/src/clients/cave/cmd_sync_protocol_options.hh +++ b/src/clients/cave/cmd_sync_protocol_options.hh @@ -30,14 +30,14 @@ namespace paludis public Command { public: - virtual CommandImportance importance() const PALUDIS_ATTRIBUTE((warn_unused_result)); + CommandImportance importance() const override PALUDIS_ATTRIBUTE((warn_unused_result)); int run( const std::shared_ptr<Environment> &, const std::shared_ptr<const Sequence<std::string > > & args - ); + ) override; - std::shared_ptr<args::ArgsHandler> make_doc_cmdline(); + std::shared_ptr<args::ArgsHandler> make_doc_cmdline() override; }; } } diff --git a/src/clients/cave/cmd_uninstall.hh b/src/clients/cave/cmd_uninstall.hh index e9f5c4024..3e8870d8e 100644 --- a/src/clients/cave/cmd_uninstall.hh +++ b/src/clients/cave/cmd_uninstall.hh @@ -30,14 +30,14 @@ namespace paludis public Command { public: - virtual CommandImportance importance() const PALUDIS_ATTRIBUTE((warn_unused_result)); + CommandImportance importance() const override PALUDIS_ATTRIBUTE((warn_unused_result)); int run( const std::shared_ptr<Environment> &, const std::shared_ptr<const Sequence<std::string > > & args - ); + ) override; - std::shared_ptr<args::ArgsHandler> make_doc_cmdline(); + std::shared_ptr<args::ArgsHandler> make_doc_cmdline() override; }; } } diff --git a/src/clients/cave/cmd_update_world.hh b/src/clients/cave/cmd_update_world.hh index c70352edb..3b00f736a 100644 --- a/src/clients/cave/cmd_update_world.hh +++ b/src/clients/cave/cmd_update_world.hh @@ -30,14 +30,14 @@ namespace paludis public Command { public: - virtual CommandImportance importance() const PALUDIS_ATTRIBUTE((warn_unused_result)); + CommandImportance importance() const override PALUDIS_ATTRIBUTE((warn_unused_result)); int run( const std::shared_ptr<Environment> &, const std::shared_ptr<const Sequence<std::string > > & args - ); + ) override; - std::shared_ptr<args::ArgsHandler> make_doc_cmdline(); + std::shared_ptr<args::ArgsHandler> make_doc_cmdline() override; }; } } diff --git a/src/clients/cave/cmd_verify.hh b/src/clients/cave/cmd_verify.hh index 8579214e7..564699409 100644 --- a/src/clients/cave/cmd_verify.hh +++ b/src/clients/cave/cmd_verify.hh @@ -30,14 +30,14 @@ namespace paludis public Command { public: - virtual CommandImportance importance() const PALUDIS_ATTRIBUTE((warn_unused_result)); + CommandImportance importance() const override PALUDIS_ATTRIBUTE((warn_unused_result)); int run( const std::shared_ptr<Environment> &, const std::shared_ptr<const Sequence<std::string > > & args - ); + ) override; - std::shared_ptr<args::ArgsHandler> make_doc_cmdline(); + std::shared_ptr<args::ArgsHandler> make_doc_cmdline() override; }; } } diff --git a/src/clients/cave/colour_pretty_printer.hh b/src/clients/cave/colour_pretty_printer.hh index f49befb62..c5bc3babf 100644 --- a/src/clients/cave/colour_pretty_printer.hh +++ b/src/clients/cave/colour_pretty_printer.hh @@ -34,12 +34,12 @@ namespace paludis int _initial_indent; protected: - virtual const std::string format_enabled(const std::string &) const; - virtual const std::string format_disabled(const std::string &) const; - virtual const std::string format_installed(const std::string &) const; - virtual const std::string format_installable(const std::string &) const; - virtual const std::string format_masked(const std::string &) const; - virtual const std::string format_plain(const std::string &) const; + const std::string format_enabled(const std::string &) const override; + const std::string format_disabled(const std::string &) const override; + const std::string format_installed(const std::string &) const override; + const std::string format_installable(const std::string &) const override; + const std::string format_masked(const std::string &) const override; + const std::string format_plain(const std::string &) const override; public: ColourPrettyPrinter( @@ -47,8 +47,8 @@ namespace paludis const std::shared_ptr<const PackageID> & id, const int initial_indent); - virtual const std::string indentify(const int) const; - virtual const std::string newline() const; + const std::string indentify(const int) const override; + const std::string newline() const override; const std::string prettify_choice_value_forced(const std::shared_ptr<const ChoiceValue> &) const; const std::string prettify_choice_value_enabled(const std::shared_ptr<const ChoiceValue> &) const; diff --git a/src/clients/cave/command_line.hh b/src/clients/cave/command_line.hh index e18fbcf68..0aa7f2762 100644 --- a/src/clients/cave/command_line.hh +++ b/src/clients/cave/command_line.hh @@ -30,17 +30,17 @@ namespace paludis struct CaveCommandLine : args::ArgsHandler { - virtual std::string app_name() const + std::string app_name() const override { return "cave"; } - virtual std::string app_synopsis() const + std::string app_synopsis() const override { return "A commandline client for the other package mangler."; } - virtual std::string app_description() const + std::string app_description() const override { return "The front-end to a number of commands."; } diff --git a/src/clients/cave/script_command.hh b/src/clients/cave/script_command.hh index 39132fc48..067b4ae18 100644 --- a/src/clients/cave/script_command.hh +++ b/src/clients/cave/script_command.hh @@ -36,16 +36,16 @@ namespace paludis public: ScriptCommand(const std::string &, const FSPath &); - ~ScriptCommand(); + ~ScriptCommand() override; int run( const std::shared_ptr<Environment> &, const std::shared_ptr<const Sequence<std::string > > & args - ) PALUDIS_ATTRIBUTE((noreturn)); + ) override PALUDIS_ATTRIBUTE((noreturn)); - virtual CommandImportance importance() const; + CommandImportance importance() const override; - std::shared_ptr<args::ArgsHandler> make_doc_cmdline() PALUDIS_ATTRIBUTE((noreturn)); + std::shared_ptr<args::ArgsHandler> make_doc_cmdline() override PALUDIS_ATTRIBUTE((noreturn)); }; } } diff --git a/src/output/colour_pretty_printer.hh b/src/output/colour_pretty_printer.hh index a300b53ed..903e8a79d 100644 --- a/src/output/colour_pretty_printer.hh +++ b/src/output/colour_pretty_printer.hh @@ -29,19 +29,19 @@ class ColourPrettyPrinter : public paludis::FormattedPrettyPrinter { protected: - virtual const std::string format_enabled(const std::string &) const; - virtual const std::string format_disabled(const std::string &) const; - virtual const std::string format_installed(const std::string &) const; - virtual const std::string format_installable(const std::string &) const; - virtual const std::string format_masked(const std::string &) const; - virtual const std::string format_plain(const std::string &) const; + const std::string format_enabled(const std::string &) const override; + const std::string format_disabled(const std::string &) const override; + const std::string format_installed(const std::string &) const override; + const std::string format_installable(const std::string &) const override; + const std::string format_masked(const std::string &) const override; + const std::string format_plain(const std::string &) const override; public: ColourPrettyPrinter(const paludis::Environment * const, const std::shared_ptr<const paludis::PackageID> &); - ~ColourPrettyPrinter(); + ~ColourPrettyPrinter() override; - virtual const std::string indentify(const int) const; - virtual const std::string newline() const; + const std::string indentify(const int) const override; + const std::string newline() const override; using FormattedPrettyPrinter::prettify; |