aboutsummaryrefslogtreecommitdiff
path: root/paludis/repositories/e
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/e
parent3e45be57eef80ab27eba09e0249c70c2ee931573 (diff)
downloadpaludis-master.tar.gz
paludis-master.tar.xz
modernize: Mark overriding functions as suchHEADmaster
Done using clang-tidy's `modernize-use-override` check
Diffstat (limited to 'paludis/repositories/e')
-rw-r--r--paludis/repositories/e/e_choices_key.hh10
-rw-r--r--paludis/repositories/e/e_installed_repository.hh36
-rw-r--r--paludis/repositories/e/e_installed_repository_id.hh114
-rw-r--r--paludis/repositories/e/e_key.hh130
-rw-r--r--paludis/repositories/e/e_mask.hh20
-rw-r--r--paludis/repositories/e/e_repository.hh78
-rw-r--r--paludis/repositories/e/e_stripper.hh16
-rw-r--r--paludis/repositories/e/ebuild.hh74
-rw-r--r--paludis/repositories/e/ebuild_id.hh112
-rw-r--r--paludis/repositories/e/exheres_layout.hh106
-rw-r--r--paludis/repositories/e/exheres_profile.hh64
-rw-r--r--paludis/repositories/e/exndbam_id.hh8
-rw-r--r--paludis/repositories/e/exndbam_repository.hh48
-rw-r--r--paludis/repositories/e/info_metadata_key.hh24
-rw-r--r--paludis/repositories/e/pbin_merger.hh20
-rw-r--r--paludis/repositories/e/traditional_layout.hh110
-rw-r--r--paludis/repositories/e/traditional_profile.hh64
-rw-r--r--paludis/repositories/e/vdb_id.hh8
-rw-r--r--paludis/repositories/e/vdb_merger.hh34
-rw-r--r--paludis/repositories/e/vdb_repository.hh50
-rw-r--r--paludis/repositories/e/vdb_unmerger.hh16
21 files changed, 571 insertions, 571 deletions
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;
};
}