aboutsummaryrefslogtreecommitdiff
path: root/src/clients
diff options
context:
space:
mode:
authorAvatar Saleem Abdulrasool <compnerd@compnerd.org> 2016-08-04 22:09:28 -0700
committerAvatar Saleem Abdulrasool <compnerd@compnerd.org> 2016-08-04 22:16:44 -0700
commit1ad5f5ce2025f1db0ea5dd1fcf72223430f143b4 (patch)
tree9cc653b6e2e4650168790a0dba9c86b2ce2a0ae1 /src/clients
parentd81457e4208ba6ed94b86e430c567e4c0e1f7046 (diff)
downloadpaludis-1ad5f5ce2025f1db0ea5dd1fcf72223430f143b4.tar.gz
paludis-1ad5f5ce2025f1db0ea5dd1fcf72223430f143b4.tar.xz
modernize: use override annotations
Automated addition of override to overridden functions. NFC.
Diffstat (limited to 'src/clients')
-rw-r--r--src/clients/cave/cmd_config.cc6
-rw-r--r--src/clients/cave/cmd_contents.cc6
-rw-r--r--src/clients/cave/cmd_digest.cc6
-rw-r--r--src/clients/cave/cmd_display_resolution.cc8
-rw-r--r--src/clients/cave/cmd_dump_cave_formats_conf.cc6
-rw-r--r--src/clients/cave/cmd_executables.cc6
-rw-r--r--src/clients/cave/cmd_execute_resolution.cc20
-rw-r--r--src/clients/cave/cmd_find_candidates.cc6
-rw-r--r--src/clients/cave/cmd_fix_cache.cc6
-rw-r--r--src/clients/cave/cmd_fix_linkage.cc12
-rw-r--r--src/clients/cave/cmd_generate_metadata.cc6
-rw-r--r--src/clients/cave/cmd_graph_jobs.cc6
-rw-r--r--src/clients/cave/cmd_has_version.cc6
-rw-r--r--src/clients/cave/cmd_help.cc6
-rw-r--r--src/clients/cave/cmd_import.cc12
-rw-r--r--src/clients/cave/cmd_info.cc6
-rw-r--r--src/clients/cave/cmd_manage_search_index.cc6
-rw-r--r--src/clients/cave/cmd_match.cc6
-rw-r--r--src/clients/cave/cmd_mirror.cc6
-rw-r--r--src/clients/cave/cmd_owner.cc6
-rw-r--r--src/clients/cave/cmd_perform.cc8
-rw-r--r--src/clients/cave/cmd_print_best_version.cc6
-rw-r--r--src/clients/cave/cmd_print_categories.cc6
-rw-r--r--src/clients/cave/cmd_print_checksum.cc6
-rw-r--r--src/clients/cave/cmd_print_checksum_algorithms.cc6
-rw-r--r--src/clients/cave/cmd_print_commands.cc6
-rw-r--r--src/clients/cave/cmd_print_dependent_ids.cc6
-rw-r--r--src/clients/cave/cmd_print_environment_metadata.cc6
-rw-r--r--src/clients/cave/cmd_print_id_actions.cc6
-rw-r--r--src/clients/cave/cmd_print_id_contents.cc6
-rw-r--r--src/clients/cave/cmd_print_id_environment_variable.cc6
-rw-r--r--src/clients/cave/cmd_print_id_executables.cc6
-rw-r--r--src/clients/cave/cmd_print_id_masks.cc6
-rw-r--r--src/clients/cave/cmd_print_id_metadata.cc6
-rw-r--r--src/clients/cave/cmd_print_id_size.cc6
-rw-r--r--src/clients/cave/cmd_print_ids.cc26
-rw-r--r--src/clients/cave/cmd_print_owners.cc6
-rw-r--r--src/clients/cave/cmd_print_packages.cc6
-rw-r--r--src/clients/cave/cmd_print_repositories.cc6
-rw-r--r--src/clients/cave/cmd_print_repository_formats.cc6
-rw-r--r--src/clients/cave/cmd_print_repository_metadata.cc6
-rw-r--r--src/clients/cave/cmd_print_resolution_required_confirmations.cc6
-rw-r--r--src/clients/cave/cmd_print_set.cc6
-rw-r--r--src/clients/cave/cmd_print_sets.cc6
-rw-r--r--src/clients/cave/cmd_print_spec.cc6
-rw-r--r--src/clients/cave/cmd_print_sync_protocols.cc6
-rw-r--r--src/clients/cave/cmd_print_unmanaged_files.cc6
-rw-r--r--src/clients/cave/cmd_print_unused_distfiles.cc6
-rw-r--r--src/clients/cave/cmd_purge.cc6
-rw-r--r--src/clients/cave/cmd_report.cc6
-rw-r--r--src/clients/cave/cmd_resolve.cc6
-rw-r--r--src/clients/cave/cmd_resume.cc6
-rw-r--r--src/clients/cave/cmd_search.cc6
-rw-r--r--src/clients/cave/cmd_show.cc6
-rw-r--r--src/clients/cave/cmd_size.cc6
-rw-r--r--src/clients/cave/cmd_sync.cc20
-rw-r--r--src/clients/cave/cmd_sync_protocol_options.cc6
-rw-r--r--src/clients/cave/cmd_uninstall.cc6
-rw-r--r--src/clients/cave/cmd_update_world.cc6
-rw-r--r--src/clients/cave/cmd_verify.cc6
-rw-r--r--src/clients/cave/man_cave.cc6
61 files changed, 215 insertions, 215 deletions
diff --git a/src/clients/cave/cmd_config.cc b/src/clients/cave/cmd_config.cc
index 8e4c94979..05766eab3 100644
--- a/src/clients/cave/cmd_config.cc
+++ b/src/clients/cave/cmd_config.cc
@@ -52,17 +52,17 @@ namespace
struct ConfigCommandLine :
CaveCommandCommandLine
{
- virtual std::string app_name() const
+ std::string app_name() const override
{
return "cave config";
}
- virtual std::string app_synopsis() const
+ std::string app_synopsis() const override
{
return "Perform post-install configuration on a package.";
}
- virtual std::string app_description() const
+ std::string app_description() const override
{
return "Perform post-install configuration on a package. Note that most packages do "
"not provide a post-install configuration script.";
diff --git a/src/clients/cave/cmd_contents.cc b/src/clients/cave/cmd_contents.cc
index 46e35c4fe..5af7a54ed 100644
--- a/src/clients/cave/cmd_contents.cc
+++ b/src/clients/cave/cmd_contents.cc
@@ -56,17 +56,17 @@ namespace
struct ContentsCommandLine :
CaveCommandCommandLine
{
- virtual std::string app_name() const
+ std::string app_name() const override
{
return "cave contents";
}
- virtual std::string app_synopsis() const
+ std::string app_synopsis() const override
{
return "Prints the contents of a package ID.";
}
- virtual std::string app_description() const
+ std::string app_description() const override
{
return "Display the contents of (files installed by) a given package ID.";
}
diff --git a/src/clients/cave/cmd_digest.cc b/src/clients/cave/cmd_digest.cc
index 039eb1f0e..8a64fb822 100644
--- a/src/clients/cave/cmd_digest.cc
+++ b/src/clients/cave/cmd_digest.cc
@@ -64,17 +64,17 @@ namespace
struct DigestCommandLine :
CaveCommandCommandLine
{
- virtual std::string app_name() const
+ std::string app_name() const override
{
return "cave digest";
}
- virtual std::string app_synopsis() const
+ std::string app_synopsis() const override
{
return "Generates a digest file for a particular package in a particular repository.";
}
- virtual std::string app_description() const
+ std::string app_description() const override
{
return "Generates a digest file for a particular package in a particular repository.";
}
diff --git a/src/clients/cave/cmd_display_resolution.cc b/src/clients/cave/cmd_display_resolution.cc
index 39736d53f..bd8fff5ae 100644
--- a/src/clients/cave/cmd_display_resolution.cc
+++ b/src/clients/cave/cmd_display_resolution.cc
@@ -124,17 +124,17 @@ namespace
"The file descriptor on which the serialised resolution can be found.");
}
- virtual std::string app_name() const
+ std::string app_name() const override
{
return "cave display-resolution";
}
- virtual std::string app_synopsis() const
+ std::string app_synopsis() const override
{
return "Displays a dependency resolution created using 'cave resolve'.";
}
- virtual std::string app_description() const
+ std::string app_description() const override
{
return "Displays a dependency resolution created using 'cave resolve'. Mostly for "
"internal use; most users will not use this command directly.";
@@ -1056,7 +1056,7 @@ namespace
{
}
- void will_fetch(const FSPath & destination, const unsigned long size_in_bytes)
+ void will_fetch(const FSPath & destination, const unsigned long size_in_bytes) override
{
if (totals->download_files.end() != totals->download_files.find(destination))
return;
diff --git a/src/clients/cave/cmd_dump_cave_formats_conf.cc b/src/clients/cave/cmd_dump_cave_formats_conf.cc
index c9bc557af..b9526e711 100644
--- a/src/clients/cave/cmd_dump_cave_formats_conf.cc
+++ b/src/clients/cave/cmd_dump_cave_formats_conf.cc
@@ -159,17 +159,17 @@ namespace
struct DumpCaveFormatsConfCommandLine :
CaveCommandCommandLine
{
- virtual std::string app_name() const
+ std::string app_name() const override
{
return "cave dump-cave-formats-conf";
}
- virtual std::string app_synopsis() const
+ std::string app_synopsis() const override
{
return "Output a ~/.cave/formats.conf";
}
- virtual std::string app_description() const
+ std::string app_description() const override
{
return "Outputs suitable contents for ~/.cave/formats.conf. This file can be used to "
"customise the output format for many cave commands (although not commands designed "
diff --git a/src/clients/cave/cmd_executables.cc b/src/clients/cave/cmd_executables.cc
index 4130225a6..0e6a948fc 100644
--- a/src/clients/cave/cmd_executables.cc
+++ b/src/clients/cave/cmd_executables.cc
@@ -48,17 +48,17 @@ namespace
struct ExecutablesCommandLine :
CaveCommandCommandLine
{
- virtual std::string app_name() const
+ std::string app_name() const override
{
return "cave executables";
}
- virtual std::string app_synopsis() const
+ std::string app_synopsis() const override
{
return "Display executables belonging to an ID.";
}
- virtual std::string app_description() const
+ std::string app_description() const override
{
return "Display executables belonging to an ID.";
}
diff --git a/src/clients/cave/cmd_execute_resolution.cc b/src/clients/cave/cmd_execute_resolution.cc
index 6fbc6a14a..700946144 100644
--- a/src/clients/cave/cmd_execute_resolution.cc
+++ b/src/clients/cave/cmd_execute_resolution.cc
@@ -127,17 +127,17 @@ namespace
"The file descriptor on which the serialised resolution can be found.");
}
- virtual std::string app_name() const
+ std::string app_name() const override
{
return "cave execute-resolution";
}
- virtual std::string app_synopsis() const
+ std::string app_synopsis() const override
{
return "Executes a dependency resolution created using 'cave resolve'.";
}
- virtual std::string app_description() const
+ std::string app_description() const override
{
return "Execute a dependency resolution created using 'cave resolve'. Mostly for "
"internal use; most users will not use this command directly.";
@@ -1215,7 +1215,7 @@ namespace
{
}
- std::string queue_name() const
+ std::string queue_name() const override
{
if (0 != n_fetch_jobs)
return visitor_cast<const FetchJob>(*job) ? "fetch" : "execute";
@@ -1223,7 +1223,7 @@ namespace
return "execute";
}
- std::string unique_id() const
+ std::string unique_id() const override
{
return job->make_accept_returning(
[&] (const UninstallJob & j) {
@@ -1242,7 +1242,7 @@ namespace
);
}
- bool can_run() const
+ bool can_run() const override
{
for (JobRequirements::ConstIterator r(job->requirements()->begin()), r_end(job->requirements()->end()) ;
r != r_end ; ++r)
@@ -1264,7 +1264,7 @@ namespace
return true;
}
- void pre_execute_exclusive()
+ void pre_execute_exclusive() override
{
last_flushed = Timestamp::now();
last_output = last_flushed;
@@ -1352,7 +1352,7 @@ namespace
}
}
- void execute_threaded()
+ void execute_threaded() override
{
if (want)
{
@@ -1417,7 +1417,7 @@ namespace
}
}
- void flush_threaded()
+ void flush_threaded() override
{
std::unique_lock<std::recursive_mutex> lock(job_mutex);
const std::shared_ptr<OutputManager> output_manager(
@@ -1434,7 +1434,7 @@ namespace
}
}
- void post_execute_exclusive()
+ void post_execute_exclusive() override
{
if (want)
{
diff --git a/src/clients/cave/cmd_find_candidates.cc b/src/clients/cave/cmd_find_candidates.cc
index f7b1dd39c..684a92348 100644
--- a/src/clients/cave/cmd_find_candidates.cc
+++ b/src/clients/cave/cmd_find_candidates.cc
@@ -62,17 +62,17 @@ namespace
struct FindCandidatesCommandLine :
CaveCommandCommandLine
{
- virtual std::string app_name() const
+ std::string app_name() const override
{
return "cave find-candidates";
}
- virtual std::string app_synopsis() const
+ std::string app_synopsis() const override
{
return "Find a list of candidate packages for a search.";
}
- virtual std::string app_description() const
+ std::string app_description() const override
{
return "Finds a list of candidate packages for a search. Used by 'cave search'; not generally called "
"directly by end users. Note that this command will often select candidates that do not actually "
diff --git a/src/clients/cave/cmd_fix_cache.cc b/src/clients/cave/cmd_fix_cache.cc
index 01d580b3c..cb1ac303f 100644
--- a/src/clients/cave/cmd_fix_cache.cc
+++ b/src/clients/cave/cmd_fix_cache.cc
@@ -48,17 +48,17 @@ namespace
struct FixCacheCommandLine :
CaveCommandCommandLine
{
- virtual std::string app_name() const
+ std::string app_name() const override
{
return "cave fix-cache";
}
- virtual std::string app_synopsis() const
+ std::string app_synopsis() const override
{
return "Fix on-disk caches.";
}
- virtual std::string app_description() const
+ std::string app_description() const override
{
return "Fixes on-disk caches. Normally this is handled automatically when needed (e.g. after a sync, "
"or when a package is installed), but a forced fix-cache is required after a different package "
diff --git a/src/clients/cave/cmd_fix_linkage.cc b/src/clients/cave/cmd_fix_linkage.cc
index 9bb8efa5f..bb284e82b 100644
--- a/src/clients/cave/cmd_fix_linkage.cc
+++ b/src/clients/cave/cmd_fix_linkage.cc
@@ -79,17 +79,17 @@ namespace
"override this, use '-- --no-lazy --no-preserve-world'.");
}
- std::string app_name() const
+ std::string app_name() const override
{
return "cave fix-linkage";
}
- std::string app_synopsis() const
+ std::string app_synopsis() const override
{
return "Identify packages with broken linkage that can be fixed by rebuilds.";
}
- std::string app_description() const
+ std::string app_description() const override
{
return "Identifies packages with broken linkage that can be fixed by rebuilds. "
"If instructed, then executes the relevant install and uninstall actions to "
@@ -115,17 +115,17 @@ namespace
{
}
- std::string app_name() const
+ std::string app_name() const override
{
return "";
}
- std::string app_synopsis() const
+ std::string app_synopsis() const override
{
return "";
}
- std::string app_description() const
+ std::string app_description() const override
{
return "";
}
diff --git a/src/clients/cave/cmd_generate_metadata.cc b/src/clients/cave/cmd_generate_metadata.cc
index b5b29649b..213f2b5d6 100644
--- a/src/clients/cave/cmd_generate_metadata.cc
+++ b/src/clients/cave/cmd_generate_metadata.cc
@@ -61,17 +61,17 @@ namespace
struct GenerateMetadataCommandLine :
CaveCommandCommandLine
{
- virtual std::string app_name() const
+ std::string app_name() const override
{
return "cave generate-metadata";
}
- virtual std::string app_synopsis() const
+ std::string app_synopsis() const override
{
return "Pregenerate metadata for a set of IDs.";
}
- virtual std::string app_description() const
+ std::string app_description() const override
{
return "Pregenerates metadata for a set of IDs.";
}
diff --git a/src/clients/cave/cmd_graph_jobs.cc b/src/clients/cave/cmd_graph_jobs.cc
index c01cfc114..351bbe449 100644
--- a/src/clients/cave/cmd_graph_jobs.cc
+++ b/src/clients/cave/cmd_graph_jobs.cc
@@ -67,17 +67,17 @@ namespace
"The file descriptor on which the serialised resolution can be found.");
}
- virtual std::string app_name() const
+ std::string app_name() const override
{
return "cave graph-jobs";
}
- virtual std::string app_synopsis() const
+ std::string app_synopsis() const override
{
return "Creates a Graphviz graph for jobs in a resolution created using 'cave resolve'.";
}
- virtual std::string app_description() const
+ std::string app_description() const override
{
return "Creates a Graphviz graph for jobs in a resolution created using 'cave resolve'. Mostly for "
"internal use; most users will not use this command directly.";
diff --git a/src/clients/cave/cmd_has_version.cc b/src/clients/cave/cmd_has_version.cc
index 2bf5210a2..3a3cf0919 100644
--- a/src/clients/cave/cmd_has_version.cc
+++ b/src/clients/cave/cmd_has_version.cc
@@ -53,17 +53,17 @@ namespace
struct HasVersionCommandLine :
CaveCommandCommandLine
{
- virtual std::string app_name() const
+ std::string app_name() const override
{
return "cave has-version";
}
- virtual std::string app_synopsis() const
+ std::string app_synopsis() const override
{
return "Returns success if there is an installed package matching a particular spec.";
}
- virtual std::string app_description() const
+ std::string app_description() const override
{
return "Returns success if there is an installed package matching a particular spec. Suitable "
"for use in scripts.";
diff --git a/src/clients/cave/cmd_help.cc b/src/clients/cave/cmd_help.cc
index 71cfb1aa9..68fa5c582 100644
--- a/src/clients/cave/cmd_help.cc
+++ b/src/clients/cave/cmd_help.cc
@@ -52,17 +52,17 @@ namespace
add_usage_line("[-a|--all] [COMMAND]");
}
- virtual std::string app_name() const
+ std::string app_name() const override
{
return "cave help";
}
- virtual std::string app_synopsis() const
+ std::string app_synopsis() const override
{
return "display help information";
}
- virtual std::string app_description() const
+ std::string app_description() const override
{
return "Display help information for a particular command.";
}
diff --git a/src/clients/cave/cmd_import.cc b/src/clients/cave/cmd_import.cc
index 535937f6c..b1931be40 100644
--- a/src/clients/cave/cmd_import.cc
+++ b/src/clients/cave/cmd_import.cc
@@ -54,17 +54,17 @@ namespace
struct ImportCommandLine :
CaveCommandCommandLine
{
- virtual std::string app_name() const
+ std::string app_name() const override
{
return "cave import";
}
- virtual std::string app_synopsis() const
+ std::string app_synopsis() const override
{
return "Import a package from a directory containing its image.";
}
- virtual std::string app_description() const
+ std::string app_description() const override
{
return "Import a package from a directory containing its image. A named directory "
"is treated as holding the contents to install, and a dummy package name is "
@@ -155,17 +155,17 @@ namespace
{
}
- std::string app_name() const
+ std::string app_name() const override
{
return "";
}
- std::string app_synopsis() const
+ std::string app_synopsis() const override
{
return "";
}
- std::string app_description() const
+ std::string app_description() const override
{
return "";
}
diff --git a/src/clients/cave/cmd_info.cc b/src/clients/cave/cmd_info.cc
index 6a722a044..72a755e73 100644
--- a/src/clients/cave/cmd_info.cc
+++ b/src/clients/cave/cmd_info.cc
@@ -68,17 +68,17 @@ namespace
struct InfoCommandLine :
CaveCommandCommandLine
{
- virtual std::string app_name() const
+ std::string app_name() const override
{
return "cave info";
}
- virtual std::string app_synopsis() const
+ std::string app_synopsis() const override
{
return "Display a summary of configuration and package information.";
}
- virtual std::string app_description() const
+ std::string app_description() const override
{
return "Displays a formatted summary of configuration and package information, e.g. for "
"use when submitting bug reports. The package names of any relevant packages for bug "
diff --git a/src/clients/cave/cmd_manage_search_index.cc b/src/clients/cave/cmd_manage_search_index.cc
index 58337dec8..103b090d6 100644
--- a/src/clients/cave/cmd_manage_search_index.cc
+++ b/src/clients/cave/cmd_manage_search_index.cc
@@ -199,17 +199,17 @@ namespace
args::ArgsGroup g_actions;
args::SwitchArg a_create;
- virtual std::string app_name() const
+ std::string app_name() const override
{
return "cave manage-search-index";
}
- virtual std::string app_synopsis() const
+ std::string app_synopsis() const override
{
return "Manages a search index for use by cave search.";
}
- virtual std::string app_description() const
+ std::string app_description() const override
{
return "Manages a search index for use by cave search. A search index is only valid until "
"a package is installed or uninstalled, or a sync is performed, or configuration is "
diff --git a/src/clients/cave/cmd_match.cc b/src/clients/cave/cmd_match.cc
index 60b08bb2d..adc8eefc8 100644
--- a/src/clients/cave/cmd_match.cc
+++ b/src/clients/cave/cmd_match.cc
@@ -95,17 +95,17 @@ namespace
struct MatchCommandLine :
CaveCommandCommandLine
{
- virtual std::string app_name() const
+ std::string app_name() const override
{
return "cave match";
}
- virtual std::string app_synopsis() const
+ std::string app_synopsis() const override
{
return "Determine whether a particular package version has certain properties";
}
- virtual std::string app_description() const
+ std::string app_description() const override
{
return "Determines whether a particular package version has certain properties. Mostly for "
"use by 'cave search'; not generally for use by end users.";
diff --git a/src/clients/cave/cmd_mirror.cc b/src/clients/cave/cmd_mirror.cc
index cead6747d..8655d19c0 100644
--- a/src/clients/cave/cmd_mirror.cc
+++ b/src/clients/cave/cmd_mirror.cc
@@ -65,17 +65,17 @@ namespace
struct MirrorCommandLine :
CaveCommandCommandLine
{
- virtual std::string app_name() const
+ std::string app_name() const override
{
return "cave mirror";
}
- virtual std::string app_synopsis() const
+ std::string app_synopsis() const override
{
return "Fetches files for a set of IDs.";
}
- virtual std::string app_description() const
+ std::string app_description() const override
{
return "Fetches files for a set of IDs.";
}
diff --git a/src/clients/cave/cmd_owner.cc b/src/clients/cave/cmd_owner.cc
index 5d582cd6f..ee790b328 100644
--- a/src/clients/cave/cmd_owner.cc
+++ b/src/clients/cave/cmd_owner.cc
@@ -50,17 +50,17 @@ namespace
struct OwnerCommandLine :
CaveCommandCommandLine
{
- virtual std::string app_name() const
+ std::string app_name() const override
{
return "cave owner";
}
- virtual std::string app_synopsis() const
+ std::string app_synopsis() const override
{
return "Shows package IDs owning a given file.";
}
- virtual std::string app_description() const
+ std::string app_description() const override
{
return "Shows package IDs owning a given file.";
}
diff --git a/src/clients/cave/cmd_perform.cc b/src/clients/cave/cmd_perform.cc
index 96b6eba12..cf38b80fd 100644
--- a/src/clients/cave/cmd_perform.cc
+++ b/src/clients/cave/cmd_perform.cc
@@ -62,17 +62,17 @@ namespace
struct PerformCommandLine :
CaveCommandCommandLine
{
- virtual std::string app_name() const
+ std::string app_name() const override
{
return "cave perform";
}
- virtual std::string app_synopsis() const
+ std::string app_synopsis() const override
{
return "Perform an action upon a package.";
}
- virtual std::string app_description() const
+ std::string app_description() const override
{
return "Perform an action upon a package. Not suitable for direct use, although it "
"may be useful in some more complex scripts.";
@@ -369,7 +369,7 @@ namespace
{
}
- void will_fetch(const FSPath & destination, const unsigned long size_in_bytes)
+ void will_fetch(const FSPath & destination, const unsigned long size_in_bytes) override
{
if (already_downloaded.end() != already_downloaded.find(destination))
return;
diff --git a/src/clients/cave/cmd_print_best_version.cc b/src/clients/cave/cmd_print_best_version.cc
index 41d115aed..222e9716e 100644
--- a/src/clients/cave/cmd_print_best_version.cc
+++ b/src/clients/cave/cmd_print_best_version.cc
@@ -53,17 +53,17 @@ namespace
struct PrintBestVersionCommandLine :
CaveCommandCommandLine
{
- virtual std::string app_name() const
+ std::string app_name() const override
{
return "cave print-best-version";
}
- virtual std::string app_synopsis() const
+ std::string app_synopsis() const override
{
return "Prints the best installed version matching a particular spec.";
}
- virtual std::string app_description() const
+ std::string app_description() const override
{
return "Prints the best installed version matching a particular spec. No "
"formatting is used, making the output suitable for parsing by scripts.";
diff --git a/src/clients/cave/cmd_print_categories.cc b/src/clients/cave/cmd_print_categories.cc
index 312704d03..f27693357 100644
--- a/src/clients/cave/cmd_print_categories.cc
+++ b/src/clients/cave/cmd_print_categories.cc
@@ -43,17 +43,17 @@ namespace
struct PrintCategoriesCommandLine :
CaveCommandCommandLine
{
- virtual std::string app_name() const
+ std::string app_name() const override
{
return "cave print-categories";
}
- virtual std::string app_synopsis() const
+ std::string app_synopsis() const override
{
return "Prints a list of known categories.";
}
- virtual std::string app_description() const
+ std::string app_description() const override
{
return "Prints a list of known categories. No formatting is used, making the output suitable for "
"parsing by scripts.";
diff --git a/src/clients/cave/cmd_print_checksum.cc b/src/clients/cave/cmd_print_checksum.cc
index c22624361..cc0c62279 100644
--- a/src/clients/cave/cmd_print_checksum.cc
+++ b/src/clients/cave/cmd_print_checksum.cc
@@ -56,17 +56,17 @@ namespace
add_see_also("cave-print-checksum-algorithms", 1);
}
- virtual std::string app_name() const
+ std::string app_name() const override
{
return "cave print-checksum";
}
- virtual std::string app_synopsis() const
+ std::string app_synopsis() const override
{
return "prints cryptographic checksums";
}
- virtual std::string app_description() const
+ std::string app_description() const override
{
return "Prints the checksum of the specified input using the specified algorithm. No formatting "
"is used, making the output suitable for parsing by scripts.";
diff --git a/src/clients/cave/cmd_print_checksum_algorithms.cc b/src/clients/cave/cmd_print_checksum_algorithms.cc
index a7001894b..5d95e4339 100644
--- a/src/clients/cave/cmd_print_checksum_algorithms.cc
+++ b/src/clients/cave/cmd_print_checksum_algorithms.cc
@@ -41,17 +41,17 @@ namespace
add_see_also("cave-print-checksum", 1);
}
- virtual std::string app_name() const
+ std::string app_name() const override
{
return "cave print-checksum-algorithms";
}
- virtual std::string app_synopsis() const
+ std::string app_synopsis() const override
{
return "prints supported cryptographic checksum algorithms";
}
- virtual std::string app_description() const
+ std::string app_description() const override
{
return "Prints a list of supported checksum algorithms. No formatting "
"is used, making the output suitable for parsing by scripts.";
diff --git a/src/clients/cave/cmd_print_commands.cc b/src/clients/cave/cmd_print_commands.cc
index f32c0c590..0b2e00f7d 100644
--- a/src/clients/cave/cmd_print_commands.cc
+++ b/src/clients/cave/cmd_print_commands.cc
@@ -39,17 +39,17 @@ namespace
struct PrintCommandsCommandLine :
CaveCommandCommandLine
{
- virtual std::string app_name() const
+ std::string app_name() const override
{
return "cave print-commands";
}
- virtual std::string app_synopsis() const
+ std::string app_synopsis() const override
{
return "Prints a list of known cave commands.";
}
- virtual std::string app_description() const
+ std::string app_description() const override
{
return "Prints a list of known cave commands. No formatting is used, making the output suitable for "
"parsing by scripts.";
diff --git a/src/clients/cave/cmd_print_dependent_ids.cc b/src/clients/cave/cmd_print_dependent_ids.cc
index d1fbad7b4..ba5817d4c 100644
--- a/src/clients/cave/cmd_print_dependent_ids.cc
+++ b/src/clients/cave/cmd_print_dependent_ids.cc
@@ -58,17 +58,17 @@ namespace
struct PrintDependentIDsCommandLine :
CaveCommandCommandLine
{
- virtual std::string app_name() const
+ std::string app_name() const override
{
return "cave print-dependent-ids";
}
- virtual std::string app_synopsis() const
+ std::string app_synopsis() const override
{
return "Prints a list of installed IDs that are dependent upon another installed ID.";
}
- virtual std::string app_description() const
+ std::string app_description() const override
{
return "Prints a list of installed IDs that are dependent upon another installed ID. "
"No formatting is used, making the output suitable for parsing by scripts.";
diff --git a/src/clients/cave/cmd_print_environment_metadata.cc b/src/clients/cave/cmd_print_environment_metadata.cc
index c5ee16ab1..e0e2fd832 100644
--- a/src/clients/cave/cmd_print_environment_metadata.cc
+++ b/src/clients/cave/cmd_print_environment_metadata.cc
@@ -41,17 +41,17 @@ namespace
struct PrintEnvironmentMetadataCommandLine :
CaveCommandCommandLine
{
- virtual std::string app_name() const
+ std::string app_name() const override
{
return "cave print-environment-metadata";
}
- virtual std::string app_synopsis() const
+ std::string app_synopsis() const override
{
return "Prints environment metadata.";
}
- virtual std::string app_description() const
+ std::string app_description() const override
{
return "Prints environment metadata. No formatting is used, making the output suitable for "
"parsing by scripts.";
diff --git a/src/clients/cave/cmd_print_id_actions.cc b/src/clients/cave/cmd_print_id_actions.cc
index aab4d9c3a..8bc8b1b3c 100644
--- a/src/clients/cave/cmd_print_id_actions.cc
+++ b/src/clients/cave/cmd_print_id_actions.cc
@@ -49,17 +49,17 @@ namespace
struct PrintIDActionsCommandLine :
CaveCommandCommandLine
{
- virtual std::string app_name() const
+ std::string app_name() const override
{
return "cave print-id-actions";
}
- virtual std::string app_synopsis() const
+ std::string app_synopsis() const override
{
return "Prints ID actions.";
}
- virtual std::string app_description() const
+ std::string app_description() const override
{
return "Prints ID actions. No formatting is used, making the output suitable for "
"parsing by scripts.";
diff --git a/src/clients/cave/cmd_print_id_contents.cc b/src/clients/cave/cmd_print_id_contents.cc
index e7d0aad13..f8d81f4f4 100644
--- a/src/clients/cave/cmd_print_id_contents.cc
+++ b/src/clients/cave/cmd_print_id_contents.cc
@@ -51,17 +51,17 @@ namespace
struct PrintContentsCommandLine :
CaveCommandCommandLine
{
- virtual std::string app_name() const
+ std::string app_name() const override
{
return "cave print-id-contents";
}
- virtual std::string app_synopsis() const
+ std::string app_synopsis() const override
{
return "Prints the contents of a package ID.";
}
- virtual std::string app_description() const
+ std::string app_description() const override
{
return "Prints a list of the contents of a given ID. No formatting is used, making the output suitable for "
"parsing by scripts.";
diff --git a/src/clients/cave/cmd_print_id_environment_variable.cc b/src/clients/cave/cmd_print_id_environment_variable.cc
index ae1bea63d..ad4f2bedf 100644
--- a/src/clients/cave/cmd_print_id_environment_variable.cc
+++ b/src/clients/cave/cmd_print_id_environment_variable.cc
@@ -46,17 +46,17 @@ namespace
struct PrintIDEnvironmentVariableCommandLine :
CaveCommandCommandLine
{
- virtual std::string app_name() const
+ std::string app_name() const override
{
return "cave print-id-environment-variable";
}
- virtual std::string app_synopsis() const
+ std::string app_synopsis() const override
{
return "Prints ID environment variables.";
}
- virtual std::string app_description() const
+ std::string app_description() const override
{
return "Prints ID environment variables. No formatting is used, "
"making the output suitable for parsing by scripts.";
diff --git a/src/clients/cave/cmd_print_id_executables.cc b/src/clients/cave/cmd_print_id_executables.cc
index 898e9c8cf..d7903083c 100644
--- a/src/clients/cave/cmd_print_id_executables.cc
+++ b/src/clients/cave/cmd_print_id_executables.cc
@@ -43,17 +43,17 @@ namespace
struct PrintIDExecutablesCommandLine :
CaveCommandCommandLine
{
- virtual std::string app_name() const
+ std::string app_name() const override
{
return "cave print-id-executables";
}
- virtual std::string app_synopsis() const
+ std::string app_synopsis() const override
{
return "Prints a list of executables belonging to an ID.";
}
- virtual std::string app_description() const
+ std::string app_description() const override
{
return "Prints a list of executables belonging to an ID. "
"No formating is used, making the script suitable for parsing by scripts.";
diff --git a/src/clients/cave/cmd_print_id_masks.cc b/src/clients/cave/cmd_print_id_masks.cc
index 02f735e7d..acd0a166b 100644
--- a/src/clients/cave/cmd_print_id_masks.cc
+++ b/src/clients/cave/cmd_print_id_masks.cc
@@ -53,17 +53,17 @@ namespace
struct PrintIDMasksCommandLine :
CaveCommandCommandLine
{
- virtual std::string app_name() const
+ std::string app_name() const override
{
return "cave print-id-masks";
}
- virtual std::string app_synopsis() const
+ std::string app_synopsis() const override
{
return "Prints ID masks.";
}
- virtual std::string app_description() const
+ std::string app_description() const override
{
return "Prints ID masks. No formatting is used, making the output suitable for "
"parsing by scripts.";
diff --git a/src/clients/cave/cmd_print_id_metadata.cc b/src/clients/cave/cmd_print_id_metadata.cc
index 139c4403d..e18d54658 100644
--- a/src/clients/cave/cmd_print_id_metadata.cc
+++ b/src/clients/cave/cmd_print_id_metadata.cc
@@ -49,17 +49,17 @@ namespace
struct PrintIDMetadataCommandLine :
CaveCommandCommandLine
{
- virtual std::string app_name() const
+ std::string app_name() const override
{
return "cave print-id-metadata";
}
- virtual std::string app_synopsis() const
+ std::string app_synopsis() const override
{
return "Prints ID metadata.";
}
- virtual std::string app_description() const
+ std::string app_description() const override
{
return "Prints ID metadata. No formatting is used, making the output suitable for "
"parsing by scripts.";
diff --git a/src/clients/cave/cmd_print_id_size.cc b/src/clients/cave/cmd_print_id_size.cc
index 563310d1a..d4cf34608 100644
--- a/src/clients/cave/cmd_print_id_size.cc
+++ b/src/clients/cave/cmd_print_id_size.cc
@@ -35,17 +35,17 @@ namespace
struct PrintIDSizeCommandLine :
CaveCommandCommandLine
{
- virtual std::string app_name() const
+ std::string app_name() const override
{
return "cave print-id-size";
}
- virtual std::string app_synopsis() const
+ std::string app_synopsis() const override
{
return "Prints the size of files installed by a package.";
}
- virtual std::string app_description() const
+ std::string app_description() const override
{
return "Prints the size of files installed by a package. No formatting is used, making the output suitable for parsing by scripts.";
}
diff --git a/src/clients/cave/cmd_print_ids.cc b/src/clients/cave/cmd_print_ids.cc
index 0dc3d57d7..bf8e12886 100644
--- a/src/clients/cave/cmd_print_ids.cc
+++ b/src/clients/cave/cmd_print_ids.cc
@@ -55,17 +55,17 @@ namespace
struct PrintIDsCommandLine :
CaveCommandCommandLine
{
- virtual std::string app_name() const
+ std::string app_name() const override
{
return "cave print-ids";
}
- virtual std::string app_synopsis() const
+ std::string app_synopsis() const override
{
return "Prints a list of known IDs.";
}
- virtual std::string app_description() const
+ std::string app_description() const override
{
return "Prints a list of known IDs. No formatting is used, making the output suitable for "
"parsing by scripts.";
@@ -131,42 +131,42 @@ namespace
{
}
- virtual const RepositoryContentMayExcludes may_excludes() const
+ const RepositoryContentMayExcludes may_excludes() const override
{
return { };
}
- virtual std::string as_string() const
+ std::string as_string() const override
{
return "with mask '" + mask + "'";
}
- virtual std::shared_ptr<const RepositoryNameSet> repositories(
+ std::shared_ptr<const RepositoryNameSet> repositories(
const Environment * const,
- const std::shared_ptr<const RepositoryNameSet> & r) const
+ const std::shared_ptr<const RepositoryNameSet> & r) const override
{
return r;
}
- virtual std::shared_ptr<const CategoryNamePartSet> categories(
+ std::shared_ptr<const CategoryNamePartSet> categories(
const Environment * const,
const std::shared_ptr<const RepositoryNameSet> &,
- const std::shared_ptr<const CategoryNamePartSet> & c) const
+ const std::shared_ptr<const CategoryNamePartSet> & c) const override
{
return c;
}
- virtual std::shared_ptr<const QualifiedPackageNameSet> packages(
+ std::shared_ptr<const QualifiedPackageNameSet> packages(
const Environment * const,
const std::shared_ptr<const RepositoryNameSet> &,
- const std::shared_ptr<const QualifiedPackageNameSet> & q) const
+ const std::shared_ptr<const QualifiedPackageNameSet> & q) const override
{
return q;
}
- virtual std::shared_ptr<const PackageIDSet> ids(
+ std::shared_ptr<const PackageIDSet> ids(
const Environment * const,
- const std::shared_ptr<const PackageIDSet> & c) const
+ const std::shared_ptr<const PackageIDSet> & c) const override
{
std::shared_ptr<PackageIDSet> result(std::make_shared<PackageIDSet>());
diff --git a/src/clients/cave/cmd_print_owners.cc b/src/clients/cave/cmd_print_owners.cc
index 6e24247f1..a90047cba 100644
--- a/src/clients/cave/cmd_print_owners.cc
+++ b/src/clients/cave/cmd_print_owners.cc
@@ -45,17 +45,17 @@ namespace
struct PrintOwnersCommandLine :
CaveCommandCommandLine
{
- virtual std::string app_name() const
+ std::string app_name() const override
{
return "cave print-owners";
}
- virtual std::string app_synopsis() const
+ std::string app_synopsis() const override
{
return "Prints a list of package IDs owning a given file.";
}
- virtual std::string app_description() const
+ std::string app_description() const override
{
return "Prints a list of package IDs owning a given file. No formatting is used, making the output suitable for parsing by scripts.";
}
diff --git a/src/clients/cave/cmd_print_packages.cc b/src/clients/cave/cmd_print_packages.cc
index 59ef434a2..278f2e413 100644
--- a/src/clients/cave/cmd_print_packages.cc
+++ b/src/clients/cave/cmd_print_packages.cc
@@ -44,17 +44,17 @@ namespace
struct PrintPackagesCommandLine :
CaveCommandCommandLine
{
- virtual std::string app_name() const
+ std::string app_name() const override
{
return "cave print-packages";
}
- virtual std::string app_synopsis() const
+ std::string app_synopsis() const override
{
return "Prints a list of package names.";
}
- virtual std::string app_description() const
+ std::string app_description() const override
{
return "Prints a list of package names. No formatting is used, making the output suitable for parsing by scripts.";
}
diff --git a/src/clients/cave/cmd_print_repositories.cc b/src/clients/cave/cmd_print_repositories.cc
index c5afef7b7..ea8b45412 100644
--- a/src/clients/cave/cmd_print_repositories.cc
+++ b/src/clients/cave/cmd_print_repositories.cc
@@ -45,17 +45,17 @@ namespace
struct PrintRepositoriesCommandLine :
CaveCommandCommandLine
{
- virtual std::string app_name() const
+ std::string app_name() const override
{
return "cave print-repositories";
}
- virtual std::string app_synopsis() const
+ std::string app_synopsis() const override
{
return "Prints a list of repositories.";
}
- virtual std::string app_description() const
+ std::string app_description() const override
{
return "Prints a list of repositories. No formatting is used, making the output suitable for "
"parsing by scripts.";
diff --git a/src/clients/cave/cmd_print_repository_formats.cc b/src/clients/cave/cmd_print_repository_formats.cc
index 942c9bb9d..0c7134323 100644
--- a/src/clients/cave/cmd_print_repository_formats.cc
+++ b/src/clients/cave/cmd_print_repository_formats.cc
@@ -42,17 +42,17 @@ namespace
struct PrintRepositoryFormatsCommandLine :
CaveCommandCommandLine
{
- virtual std::string app_name() const
+ std::string app_name() const override
{
return "cave print-repository-formats";
}
- virtual std::string app_synopsis() const
+ std::string app_synopsis() const override
{
return "Prints a list of available repository formats.";
}
- virtual std::string app_description() const
+ std::string app_description() const override
{
return "Prints a list of available repository formats. No formatting is used, making the output suitable for "
"parsing by scripts.";
diff --git a/src/clients/cave/cmd_print_repository_metadata.cc b/src/clients/cave/cmd_print_repository_metadata.cc
index abeed8a96..2a30d7638 100644
--- a/src/clients/cave/cmd_print_repository_metadata.cc
+++ b/src/clients/cave/cmd_print_repository_metadata.cc
@@ -44,17 +44,17 @@ namespace
struct PrintRepositoryMetadataCommandLine :
CaveCommandCommandLine
{
- virtual std::string app_name() const
+ std::string app_name() const override
{
return "cave print-repository-metadata";
}
- virtual std::string app_synopsis() const
+ std::string app_synopsis() const override
{
return "Prints repository metadata.";
}
- virtual std::string app_description() const
+ std::string app_description() const override
{
return "Prints repository metadata. No formatting is used, making the output suitable for "
"parsing by scripts.";
diff --git a/src/clients/cave/cmd_print_resolution_required_confirmations.cc b/src/clients/cave/cmd_print_resolution_required_confirmations.cc
index 9e47a69c1..f8250bf81 100644
--- a/src/clients/cave/cmd_print_resolution_required_confirmations.cc
+++ b/src/clients/cave/cmd_print_resolution_required_confirmations.cc
@@ -111,17 +111,17 @@ namespace
"The file descriptor on which the serialised resolution can be found.");
}
- virtual std::string app_name() const
+ std::string app_name() const override
{
return "cave print-resolution-required-confirmations";
}
- virtual std::string app_synopsis() const
+ std::string app_synopsis() const override
{
return "Displays a machine-readable description of changes required for a resolution created using 'cave resolve'.";
}
- virtual std::string app_description() const
+ std::string app_description() const override
{
return "Displays a a machine-readable description of changes required for a resolution created by "
"'cave resolve'. Mostly for internal use; most users will not use this command directly.";
diff --git a/src/clients/cave/cmd_print_set.cc b/src/clients/cave/cmd_print_set.cc
index 7d74578ab..63a1703f6 100644
--- a/src/clients/cave/cmd_print_set.cc
+++ b/src/clients/cave/cmd_print_set.cc
@@ -49,17 +49,17 @@ namespace
struct PrintSetCommandLine :
CaveCommandCommandLine
{
- virtual std::string app_name() const
+ std::string app_name() const override
{
return "cave print-set";
}
- virtual std::string app_synopsis() const
+ std::string app_synopsis() const override
{
return "Prints the contents of a set.";
}
- virtual std::string app_description() const
+ std::string app_description() const override
{
return "Prints the contents (packages or other sets) of a given set.";
}
diff --git a/src/clients/cave/cmd_print_sets.cc b/src/clients/cave/cmd_print_sets.cc
index 18b915cf0..572c62548 100644
--- a/src/clients/cave/cmd_print_sets.cc
+++ b/src/clients/cave/cmd_print_sets.cc
@@ -43,17 +43,17 @@ namespace
struct PrintSetsCommandLine :
CaveCommandCommandLine
{
- virtual std::string app_name() const
+ std::string app_name() const override
{
return "cave print-sets";
}
- virtual std::string app_synopsis() const
+ std::string app_synopsis() const override
{
return "Prints a list of sets.";
}
- virtual std::string app_description() const
+ std::string app_description() const override
{
return "Prints a list of sets. No formatting is used, making the output suitable for "
"parsing by scripts.";
diff --git a/src/clients/cave/cmd_print_spec.cc b/src/clients/cave/cmd_print_spec.cc
index 399e848ab..21fb4b975 100644
--- a/src/clients/cave/cmd_print_spec.cc
+++ b/src/clients/cave/cmd_print_spec.cc
@@ -54,17 +54,17 @@ namespace
struct PrintSpecCommandLine :
CaveCommandCommandLine
{
- virtual std::string app_name() const
+ std::string app_name() const override
{
return "cave print-spec";
}
- virtual std::string app_synopsis() const
+ std::string app_synopsis() const override
{
return "Prints a dependency spec.";
}
- virtual std::string app_description() const
+ std::string app_description() const override
{
return "Parses a dependency spec and prints it out, possibly after applying certain modifications. No "
"formatting is used, making the output suitable for parsing by scripts.";
diff --git a/src/clients/cave/cmd_print_sync_protocols.cc b/src/clients/cave/cmd_print_sync_protocols.cc
index 529e94f08..ce262f896 100644
--- a/src/clients/cave/cmd_print_sync_protocols.cc
+++ b/src/clients/cave/cmd_print_sync_protocols.cc
@@ -42,17 +42,17 @@ namespace
struct PrintSyncProtocolsCommandLine :
CaveCommandCommandLine
{
- virtual std::string app_name() const
+ std::string app_name() const override
{
return "cave print-sync-protocols";
}
- virtual std::string app_synopsis() const
+ std::string app_synopsis() const override
{
return "Prints a list of sync protocols.";
}
- virtual std::string app_description() const
+ std::string app_description() const override
{
return "Prints a list of sync protocols. No formatting is used, making the output suitable for "
"parsing by scripts.";
diff --git a/src/clients/cave/cmd_print_unmanaged_files.cc b/src/clients/cave/cmd_print_unmanaged_files.cc
index ce27736e8..ed3f25888 100644
--- a/src/clients/cave/cmd_print_unmanaged_files.cc
+++ b/src/clients/cave/cmd_print_unmanaged_files.cc
@@ -53,17 +53,17 @@ namespace
struct PrintUnmanagedFilesCommandLine :
CaveCommandCommandLine
{
- virtual std::string app_name() const
+ std::string app_name() const override
{
return "cave print-unmanaged-files";
}
- virtual std::string app_synopsis() const
+ std::string app_synopsis() const override
{
return "Prints a list of unmanaged files.";
}
- virtual std::string app_description() const
+ std::string app_description() const override
{
return "Prints all files under a specified root which is not owned "
"by an installed package. No formatting is used, making the "
diff --git a/src/clients/cave/cmd_print_unused_distfiles.cc b/src/clients/cave/cmd_print_unused_distfiles.cc
index 08af2718c..6bea3554a 100644
--- a/src/clients/cave/cmd_print_unused_distfiles.cc
+++ b/src/clients/cave/cmd_print_unused_distfiles.cc
@@ -57,17 +57,17 @@ namespace
struct PrintUnusedDistfilesCommandLine :
CaveCommandCommandLine
{
- virtual std::string app_name() const
+ std::string app_name() const override
{
return "cave print-unused-distfiles";
}
- virtual std::string app_synopsis() const
+ std::string app_synopsis() const override
{
return "Prints unused distfiles.";
}
- virtual std::string app_description() const
+ std::string app_description() const override
{
return "Prints all distfiles not used by any installed package. No "
"formatting is used, making the output suitable for parsing by scripts.";
diff --git a/src/clients/cave/cmd_purge.cc b/src/clients/cave/cmd_purge.cc
index 4e664cba3..ba99247d3 100644
--- a/src/clients/cave/cmd_purge.cc
+++ b/src/clients/cave/cmd_purge.cc
@@ -64,17 +64,17 @@ namespace
add_note("All options available for 'cave resolve' are also permitted. See 'man cave-resolve' for details.");
}
- std::string app_name() const
+ std::string app_name() const override
{
return "cave purge";
}
- std::string app_synopsis() const
+ std::string app_synopsis() const override
{
return "Uninstall unused packages.";
}
- std::string app_description() const
+ std::string app_description() const override
{
return "Uninstalls any package that is not either in 'world' or a dependency of a package "
"in 'world'.";
diff --git a/src/clients/cave/cmd_report.cc b/src/clients/cave/cmd_report.cc
index e25c87a09..436b30921 100644
--- a/src/clients/cave/cmd_report.cc
+++ b/src/clients/cave/cmd_report.cc
@@ -72,17 +72,17 @@ namespace
struct ReportCommandLine :
CaveCommandCommandLine
{
- virtual std::string app_name() const
+ std::string app_name() const override
{
return "cave report";
}
- virtual std::string app_synopsis() const
+ std::string app_synopsis() const override
{
return "Display a summary of potential problems with installed packages.";
}
- virtual std::string app_description() const
+ std::string app_description() const override
{
return "Displays a formatted summary of potential problems with installed packages.";
}
diff --git a/src/clients/cave/cmd_resolve.cc b/src/clients/cave/cmd_resolve.cc
index 01680e58c..53a75b7b1 100644
--- a/src/clients/cave/cmd_resolve.cc
+++ b/src/clients/cave/cmd_resolve.cc
@@ -53,18 +53,18 @@ namespace
add_usage_line("[ -x|--execute ] !spec ...");
}
- std::string app_name() const
+ std::string app_name() const override
{
return "cave resolve";
}
- std::string app_synopsis() const
+ std::string app_synopsis() const override
{
return "Display how to resolve one or more targets, and possibly then "
"perform that resolution.";
}
- std::string app_description() const
+ std::string app_description() const override
{
return "Displays how to resolve one or more targets. If instructed, then "
"executes the relevant install and uninstall actions to perform that "
diff --git a/src/clients/cave/cmd_resume.cc b/src/clients/cave/cmd_resume.cc
index 48f87df55..375ba0b02 100644
--- a/src/clients/cave/cmd_resume.cc
+++ b/src/clients/cave/cmd_resume.cc
@@ -84,17 +84,17 @@ namespace
add_usage_line("--resume-file state [ --retry-failed ] [ --retry-skipped ]");
}
- virtual std::string app_name() const
+ std::string app_name() const override
{
return "cave resume";
}
- virtual std::string app_synopsis() const
+ std::string app_synopsis() const override
{
return "Resume a failed resolution from 'cave resolve'";
}
- virtual std::string app_description() const
+ std::string app_description() const override
{
return "Resumes a failed resultion from 'cave resolve'. To enable resumes, use "
"'cave resolve --resume-file state --execute', and then if errors occur, use "
diff --git a/src/clients/cave/cmd_search.cc b/src/clients/cave/cmd_search.cc
index 89f5b038d..3679e1155 100644
--- a/src/clients/cave/cmd_search.cc
+++ b/src/clients/cave/cmd_search.cc
@@ -68,17 +68,17 @@ namespace
struct SearchCommandLine :
CaveCommandCommandLine
{
- virtual std::string app_name() const
+ std::string app_name() const override
{
return "cave search";
}
- virtual std::string app_synopsis() const
+ std::string app_synopsis() const override
{
return "Search for packages with particular characteristics.";
}
- virtual std::string app_description() const
+ std::string app_description() const override
{
return "Searches for packages with particular characteristics.";
}
diff --git a/src/clients/cave/cmd_show.cc b/src/clients/cave/cmd_show.cc
index 8fb2b6e74..966a7b28f 100644
--- a/src/clients/cave/cmd_show.cc
+++ b/src/clients/cave/cmd_show.cc
@@ -76,17 +76,17 @@ namespace
struct ShowCommandLine :
CaveCommandCommandLine
{
- virtual std::string app_name() const
+ std::string app_name() const override
{
return "cave show";
}
- virtual std::string app_synopsis() const
+ std::string app_synopsis() const override
{
return "Display a summary of a given object.";
}
- virtual std::string app_description() const
+ std::string app_description() const override
{
return "Displays a formatted summary of a given object. If the object is a set, the set's "
"contents are listed. If the object is a repository name, information about the repository "
diff --git a/src/clients/cave/cmd_size.cc b/src/clients/cave/cmd_size.cc
index fed10c289..048d63cc3 100644
--- a/src/clients/cave/cmd_size.cc
+++ b/src/clients/cave/cmd_size.cc
@@ -42,17 +42,17 @@ namespace
struct SizeCommandLine :
CaveCommandCommandLine
{
- virtual std::string app_name() const
+ std::string app_name() const override
{
return "cave size";
}
- virtual std::string app_synopsis() const
+ std::string app_synopsis() const override
{
return "Shows the size of files installed by a package.";
}
- virtual std::string app_description() const
+ std::string app_description() const override
{
return "Shows the size of files installed by a package.";
}
diff --git a/src/clients/cave/cmd_sync.cc b/src/clients/cave/cmd_sync.cc
index 2395b0ae5..5ca1f9de2 100644
--- a/src/clients/cave/cmd_sync.cc
+++ b/src/clients/cave/cmd_sync.cc
@@ -67,17 +67,17 @@ namespace
args::AliasArg a_suffix;
args::StringArg a_revision;
- virtual std::string app_name() const
+ std::string app_name() const override
{
return "cave sync";
}
- virtual std::string app_synopsis() const
+ std::string app_synopsis() const override
{
return "Sync all or specified repositories.";
}
- virtual std::string app_description() const
+ std::string app_description() const override
{
return "Syncs repositories. If any repository names are specified, these repositories "
"are synced. Otherwise, all syncable repositories are synced.";
@@ -131,7 +131,7 @@ namespace
{
}
- virtual std::string queue_name() const
+ std::string queue_name() const override
{
/* if we're sequential, there's just one queue */
if (cmdline.a_sequential.specified())
@@ -149,17 +149,17 @@ namespace
return "";
}
- virtual std::string unique_id() const
+ std::string unique_id() const override
{
return stringify(name);
}
- virtual bool can_run() const
+ bool can_run() const override
{
return true;
}
- virtual void pre_execute_exclusive()
+ void pre_execute_exclusive() override
{
try
{
@@ -196,7 +196,7 @@ namespace
}
}
- virtual void execute_threaded()
+ void execute_threaded() override
{
if (abort)
return;
@@ -247,7 +247,7 @@ namespace
}
}
- virtual void flush_threaded()
+ void flush_threaded() override
{
if (output_manager->want_to_flush())
display_active();
@@ -260,7 +260,7 @@ namespace
}
}
- virtual void post_execute_exclusive()
+ void post_execute_exclusive() override
{
try
{
diff --git a/src/clients/cave/cmd_sync_protocol_options.cc b/src/clients/cave/cmd_sync_protocol_options.cc
index 46b01c0fb..d412ec5e8 100644
--- a/src/clients/cave/cmd_sync_protocol_options.cc
+++ b/src/clients/cave/cmd_sync_protocol_options.cc
@@ -49,17 +49,17 @@ namespace
struct SyncProtocolOptionsCommandLine :
CaveCommandCommandLine
{
- virtual std::string app_name() const
+ std::string app_name() const override
{
return "cave sync-protocol-options";
}
- virtual std::string app_synopsis() const
+ std::string app_synopsis() const override
{
return "Displays options for a given sync protocol.";
}
- virtual std::string app_description() const
+ std::string app_description() const override
{
return "Displays options for a given sync protocol.";
}
diff --git a/src/clients/cave/cmd_uninstall.cc b/src/clients/cave/cmd_uninstall.cc
index 04f030d6f..de907f0e4 100644
--- a/src/clients/cave/cmd_uninstall.cc
+++ b/src/clients/cave/cmd_uninstall.cc
@@ -75,17 +75,17 @@ namespace
add_note("All options available for 'cave resolve' are also permitted. See 'man cave-resolve' for details.");
}
- std::string app_name() const
+ std::string app_name() const override
{
return "cave uninstall";
}
- std::string app_synopsis() const
+ std::string app_synopsis() const override
{
return "Uninstall one or more packages.";
}
- std::string app_description() const
+ std::string app_description() const override
{
return "Uninstalls one or more packages. Note that 'cave uninstall' simply rewrites the supplied "
"dependency specifications and then uses 'cave resolve' to do the work; 'cave uninstall foo' is "
diff --git a/src/clients/cave/cmd_update_world.cc b/src/clients/cave/cmd_update_world.cc
index afc5a26d9..2b0e975a1 100644
--- a/src/clients/cave/cmd_update_world.cc
+++ b/src/clients/cave/cmd_update_world.cc
@@ -49,17 +49,17 @@ namespace
struct UpdateWorldCommandLine :
CaveCommandCommandLine
{
- virtual std::string app_name() const
+ std::string app_name() const override
{
return "cave update-world";
}
- virtual std::string app_synopsis() const
+ std::string app_synopsis() const override
{
return "Updates the world set.";
}
- virtual std::string app_description() const
+ std::string app_description() const override
{
return "Adds or removes items from the world set. This command is only for changing the contents "
"of the world set; it does not install or uninstall anything.";
diff --git a/src/clients/cave/cmd_verify.cc b/src/clients/cave/cmd_verify.cc
index c22b7ec24..83392fc75 100644
--- a/src/clients/cave/cmd_verify.cc
+++ b/src/clients/cave/cmd_verify.cc
@@ -65,17 +65,17 @@ namespace
struct VerifyCommandLine :
CaveCommandCommandLine
{
- virtual std::string app_name() const
+ std::string app_name() const override
{
return "cave verify";
}
- virtual std::string app_synopsis() const
+ std::string app_synopsis() const override
{
return "Verify that an installed package's files haven't changed.";
}
- virtual std::string app_description() const
+ std::string app_description() const override
{
return "Verify than an installed package's files haven't changed. Note that there are "
"legitimate reasons for some files (such as configuration files) to have been "
diff --git a/src/clients/cave/man_cave.cc b/src/clients/cave/man_cave.cc
index 586d9fcf3..4adb61eb6 100644
--- a/src/clients/cave/man_cave.cc
+++ b/src/clients/cave/man_cave.cc
@@ -36,17 +36,17 @@ namespace
struct ManCommandLine :
paludis::args::ArgsHandler
{
- virtual std::string app_name() const
+ std::string app_name() const override
{
return "";
}
- virtual std::string app_description() const
+ std::string app_description() const override
{
return "";
}
- virtual std::string app_synopsis() const
+ std::string app_synopsis() const override
{
return "";
}