aboutsummaryrefslogtreecommitdiff
path: root/paludis/environments
diff options
context:
space:
mode:
authorAvatar Marvin Schmidt <marv@exherbo.org> 2019-02-21 18:14:13 +0100
committerAvatar Heiko Becker <heirecka@exherbo.org> 2020-10-16 17:59:26 +0000
commit6e995e8d5f0e763b6dd6adef7b014eaf54121334 (patch)
tree9d5dd7bc7ce267d4449cfd08d850ec33caf8be67 /paludis/environments
parent3e45be57eef80ab27eba09e0249c70c2ee931573 (diff)
downloadpaludis-6e995e8d5f0e763b6dd6adef7b014eaf54121334.tar.gz
paludis-6e995e8d5f0e763b6dd6adef7b014eaf54121334.tar.xz
modernize: Mark overriding functions as such
Done using clang-tidy's `modernize-use-override` check
Diffstat (limited to 'paludis/environments')
-rw-r--r--paludis/environments/paludis/paludis_environment.hh106
-rw-r--r--paludis/environments/test/test_environment.hh84
2 files changed, 95 insertions, 95 deletions
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 &);
};