aboutsummaryrefslogtreecommitdiff
path: root/paludis/repositories/accounts
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/repositories/accounts
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/repositories/accounts')
-rw-r--r--paludis/repositories/accounts/accounts_dep_key.hh20
-rw-r--r--paludis/repositories/accounts/accounts_id.hh62
-rw-r--r--paludis/repositories/accounts/accounts_installed_mask.hh6
-rw-r--r--paludis/repositories/accounts/accounts_repository.hh64
-rw-r--r--paludis/repositories/accounts/dummy_accounts_handler.hh2
-rw-r--r--paludis/repositories/accounts/installed_accounts_id.hh62
-rw-r--r--paludis/repositories/accounts/passwd_accounts_handler.hh2
7 files changed, 109 insertions, 109 deletions
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 &);