rename

14 files changed, 16 insertions, 16 deletions

diff --git a/src/clients/cave/Makefile.am b/src/clients/cave/Makefile.am
index c9ce9ec87..3a2601e1a 100644
--- a/src/clients/cave/Makefile.am
+++ b/src/clients/cave/Makefile.am
@@ -165,7 +165,6 @@ libcave_a_SOURCES = \
 	cmd_purge.cc cmd_purge.hh \
 	cmd_report.cc cmd_report.hh cmd_report-fmt.hh \
 	cmd_resolve.cc cmd_resolve.hh \
-	cmd_resolve_cmdline.cc cmd_resolve_cmdline.hh \
 	cmd_resolve_display_callback.cc cmd_resolve_display_callback.hh \
 	cmd_resolve_dump.cc cmd_resolve_dump.hh \
 	cmd_resume.cc cmd_resume.hh \
@@ -189,6 +188,7 @@ libcave_a_SOURCES = \
 	search_extras_handle.cc search_extras_handle.hh \
 	select_format_for_spec.cc select_format_for_spec.hh \
 	owner_common.cc owner_common.hh \
+	resolve_cmdline.cc resolve_cmdline.hh \
 	resolve_common.cc resolve_common.hh \
 	resume_data.cc resume_data.hh \
 	size_common.cc size_common.hh
diff --git a/src/clients/cave/cmd_display_resolution.cc b/src/clients/cave/cmd_display_resolution.cc
index 6d7c0917d..d6b4884f7 100755
--- a/src/clients/cave/cmd_display_resolution.cc
+++ b/src/clients/cave/cmd_display_resolution.cc
@@ -18,7 +18,7 @@
  */
 
 #include "cmd_display_resolution.hh"
-#include "cmd_resolve_cmdline.hh"
+#include "resolve_cmdline.hh"
 #include "exceptions.hh"
 #include "command_command_line.hh"
 #include "colours.hh"
diff --git a/src/clients/cave/cmd_execute_resolution.cc b/src/clients/cave/cmd_execute_resolution.cc
index 723279073..a775bf56e 100644
--- a/src/clients/cave/cmd_execute_resolution.cc
+++ b/src/clients/cave/cmd_execute_resolution.cc
@@ -18,7 +18,7 @@
  */
 
 #include "cmd_execute_resolution.hh"
-#include "cmd_resolve_cmdline.hh"
+#include "resolve_cmdline.hh"
 #include "cmd_perform.hh"
 #include "exceptions.hh"
 #include "command_command_line.hh"
diff --git a/src/clients/cave/cmd_fix_linkage.cc b/src/clients/cave/cmd_fix_linkage.cc
index 01e8a110b..95c753536 100644
--- a/src/clients/cave/cmd_fix_linkage.cc
+++ b/src/clients/cave/cmd_fix_linkage.cc
@@ -18,7 +18,7 @@
  */
 
 #include "cmd_fix_linkage.hh"
-#include "cmd_resolve_cmdline.hh"
+#include "resolve_cmdline.hh"
 #include "cmd_resolve_display_callback.hh"
 #include "resolve_common.hh"
 
diff --git a/src/clients/cave/cmd_graph_jobs.cc b/src/clients/cave/cmd_graph_jobs.cc
index 6ba23eaed..199378299 100644
--- a/src/clients/cave/cmd_graph_jobs.cc
+++ b/src/clients/cave/cmd_graph_jobs.cc
@@ -18,7 +18,7 @@
  */
 
 #include "cmd_graph_jobs.hh"
-#include "cmd_resolve_cmdline.hh"
+#include "resolve_cmdline.hh"
 #include "exceptions.hh"
 #include "command_command_line.hh"
 #include <paludis/args/do_help.hh>
diff --git a/src/clients/cave/cmd_perform.cc b/src/clients/cave/cmd_perform.cc
index acfcd79cf..5105778af 100644
--- a/src/clients/cave/cmd_perform.cc
+++ b/src/clients/cave/cmd_perform.cc
@@ -18,7 +18,7 @@
  */
 
 #include "cmd_perform.hh"
-#include "cmd_resolve_cmdline.hh"
+#include "resolve_cmdline.hh"
 #include "exceptions.hh"
 #include "format_user_config.hh"
 #include <paludis/args/args.hh>
diff --git a/src/clients/cave/cmd_purge.cc b/src/clients/cave/cmd_purge.cc
index 704601502..737df7031 100644
--- a/src/clients/cave/cmd_purge.cc
+++ b/src/clients/cave/cmd_purge.cc
@@ -18,7 +18,7 @@
  */
 
 #include "cmd_purge.hh"
-#include "cmd_resolve_cmdline.hh"
+#include "resolve_cmdline.hh"
 #include "resolve_common.hh"
 #include "exceptions.hh"
 
diff --git a/src/clients/cave/cmd_resolve.cc b/src/clients/cave/cmd_resolve.cc
index 7d01f1d46..7845acb46 100644
--- a/src/clients/cave/cmd_resolve.cc
+++ b/src/clients/cave/cmd_resolve.cc
@@ -18,7 +18,7 @@
  */
 
 #include "cmd_resolve.hh"
-#include "cmd_resolve_cmdline.hh"
+#include "resolve_cmdline.hh"
 #include "resolve_common.hh"
 #include <paludis/util/make_null_shared_ptr.hh>
 
diff --git a/src/clients/cave/cmd_resolve_dump.hh b/src/clients/cave/cmd_resolve_dump.hh
index 17eaa8bde..3ae97987d 100644
--- a/src/clients/cave/cmd_resolve_dump.hh
+++ b/src/clients/cave/cmd_resolve_dump.hh
@@ -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
@@ -22,7 +22,7 @@
 
 #include <paludis/environment-fwd.hh>
 #include <paludis/resolver/resolver-fwd.hh>
-#include "cmd_resolve_cmdline.hh"
+#include "resolve_cmdline.hh"
 
 namespace paludis
 {
diff --git a/src/clients/cave/cmd_resume.cc b/src/clients/cave/cmd_resume.cc
index 6eceb79cf..0a2fa8f72 100644
--- a/src/clients/cave/cmd_resume.cc
+++ b/src/clients/cave/cmd_resume.cc
@@ -18,8 +18,8 @@
  */
 
 #include "cmd_resume.hh"
-#include "cmd_resolve_cmdline.hh"
 #include "cmd_execute_resolution.hh"
+#include "resolve_cmdline.hh"
 #include "exceptions.hh"
 #include "command_command_line.hh"
 #include "colours.hh"
diff --git a/src/clients/cave/cmd_uninstall.cc b/src/clients/cave/cmd_uninstall.cc
index 4510de0c9..78a000309 100644
--- a/src/clients/cave/cmd_uninstall.cc
+++ b/src/clients/cave/cmd_uninstall.cc
@@ -18,7 +18,7 @@
  */
 
 #include "cmd_uninstall.hh"
-#include "cmd_resolve_cmdline.hh"
+#include "resolve_cmdline.hh"
 #include "resolve_common.hh"
 #include "exceptions.hh"
 
diff --git a/src/clients/cave/cmd_resolve_cmdline.cc b/src/clients/cave/resolve_cmdline.cc
index dde371d17..29531a506 100644
--- a/src/clients/cave/cmd_resolve_cmdline.cc
+++ b/src/clients/cave/resolve_cmdline.cc
@@ -17,7 +17,7 @@
  * Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "cmd_resolve_cmdline.hh"
+#include "resolve_cmdline.hh"
 #include <paludis/args/do_help.hh>
 #include <paludis/repository.hh>
 #include <paludis/environment.hh>
diff --git a/src/clients/cave/cmd_resolve_cmdline.hh b/src/clients/cave/resolve_cmdline.hh
index 67d0663ab..41f441fa4 100644
--- a/src/clients/cave/cmd_resolve_cmdline.hh
+++ b/src/clients/cave/resolve_cmdline.hh
@@ -17,8 +17,8 @@
  * Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef PALUDIS_GUARD_SRC_CLIENTS_CAVE_CMD_RESOLVE_CMDLINE_HH
-#define PALUDIS_GUARD_SRC_CLIENTS_CAVE_CMD_RESOLVE_CMDLINE_HH 1
+#ifndef PALUDIS_GUARD_SRC_CLIENTS_CAVE_RESOLVE_CMDLINE_HH
+#define PALUDIS_GUARD_SRC_CLIENTS_CAVE_RESOLVE_CMDLINE_HH 1
 
 #include "command_command_line.hh"
 #include <paludis/environment-fwd.hh>
diff --git a/src/clients/cave/resolve_common.hh b/src/clients/cave/resolve_common.hh
index 1a7aa8f13..07812af32 100644
--- a/src/clients/cave/resolve_common.hh
+++ b/src/clients/cave/resolve_common.hh
@@ -24,7 +24,7 @@
 #include <paludis/util/sequence-fwd.hh>
 #include <paludis/util/map-fwd.hh>
 #include <memory>
-#include "cmd_resolve_cmdline.hh"
+#include "resolve_cmdline.hh"
 
 namespace paludis
 {