aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-03-23 16:42:43 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-03-23 16:53:39 +0000
commit7774e20727a6be2e6cc079ef29afc2a69986e01f (patch)
tree3617d1443df0774c275d6a19eece3401c712c113
parent21e8e56a7cb657ced234c0eb0bba3253c8f02616 (diff)
downloadpaludis-7774e20727a6be2e6cc079ef29afc2a69986e01f.tar.gz
paludis-7774e20727a6be2e6cc079ef29afc2a69986e01f.tar.xz
Don't need this shared
-rw-r--r--src/clients/cave/cmd_resolve.cc43
-rw-r--r--src/clients/cave/cmd_resolve_cmdline.cc32
-rw-r--r--src/clients/cave/cmd_resolve_cmdline.hh15
3 files changed, 42 insertions, 48 deletions
diff --git a/src/clients/cave/cmd_resolve.cc b/src/clients/cave/cmd_resolve.cc
index 0002cc8..8ece545 100644
--- a/src/clients/cave/cmd_resolve.cc
+++ b/src/clients/cave/cmd_resolve.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2009 Ciaran McCreesh
+ * Copyright (c) 2009, 2010 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
@@ -32,6 +32,47 @@ using namespace cave;
using std::cout;
using std::endl;
+namespace
+{
+ struct ResolveCommandLine :
+ CaveCommandCommandLine
+ {
+ ResolveCommandLineResolutionOptions resolution_options;
+ ResolveCommandLineExecutionOptions execution_options;
+ ResolveCommandLineDisplayOptions display_options;
+ ResolveCommandLineProgramOptions program_options;
+
+ ResolveCommandLine() :
+ resolution_options(this),
+ execution_options(this),
+ display_options(this),
+ program_options(this)
+ {
+ add_usage_line("[ -x|--execute ] [ -z|--lazy or -c|--complete or -e|--everything ] spec ...");
+ add_usage_line("[ -x|--execute ] [ -z|--lazy or -c|--complete or -e|--everything ] set");
+ add_usage_line("[ -x|--execute ] !spec ...");
+ }
+
+ std::string app_name() const
+ {
+ return "cave resolve";
+ }
+
+ std::string app_synopsis() const
+ {
+ return "Display how to resolve one or more targets, and possibly then "
+ "perform that resolution.";
+ }
+
+ std::string app_description() const
+ {
+ return "Displays how to resolve one or more targets. If instructed, then "
+ "executes the relevant install and uninstall actions to perform that "
+ "resolution.";
+ }
+ };
+}
+
bool
ResolveCommand::important() const
{
diff --git a/src/clients/cave/cmd_resolve_cmdline.cc b/src/clients/cave/cmd_resolve_cmdline.cc
index 4fd3597..fb58f39 100644
--- a/src/clients/cave/cmd_resolve_cmdline.cc
+++ b/src/clients/cave/cmd_resolve_cmdline.cc
@@ -354,38 +354,6 @@ ResolveCommandLineImportOptions::apply(const std::tr1::shared_ptr<Environment> &
env->package_database()->add_repository(10, repo);
}
-ResolveCommandLine::ResolveCommandLine() :
- resolution_options(this),
- execution_options(this),
- display_options(this),
- program_options(this)
-{
- add_usage_line("[ -x|--execute ] [ -z|--lazy or -c|--complete or -e|--everything ] spec ...");
- add_usage_line("[ -x|--execute ] [ -z|--lazy or -c|--complete or -e|--everything ] set");
- add_usage_line("[ -x|--execute ] !spec ...");
-}
-
-std::string
-ResolveCommandLine::app_name() const
-{
- return "cave resolve";
-}
-
-std::string
-ResolveCommandLine::app_synopsis() const
-{
- return "Display how to resolve one or more targets, and possibly then "
- "perform that resolution.";
-}
-
-std::string
-ResolveCommandLine::app_description() const
-{
- return "Displays how to resolve one or more targets. If instructed, then "
- "executes the relevant install and uninstall actions to perform that "
- "resolution.";
-}
-
void
ResolveCommandLineResolutionOptions::apply_shortcuts()
{
diff --git a/src/clients/cave/cmd_resolve_cmdline.hh b/src/clients/cave/cmd_resolve_cmdline.hh
index de465a8..ec35856 100644
--- a/src/clients/cave/cmd_resolve_cmdline.hh
+++ b/src/clients/cave/cmd_resolve_cmdline.hh
@@ -164,21 +164,6 @@ namespace paludis
void apply(const std::tr1::shared_ptr<Environment> & env) const;
};
-
- struct ResolveCommandLine :
- CaveCommandCommandLine
- {
- virtual std::string app_name() const;
- virtual std::string app_synopsis() const;
- virtual std::string app_description() const;
-
- ResolveCommandLine();
-
- ResolveCommandLineResolutionOptions resolution_options;
- ResolveCommandLineExecutionOptions execution_options;
- ResolveCommandLineDisplayOptions display_options;
- ResolveCommandLineProgramOptions program_options;
- };
}
}