aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-08-17 13:58:12 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-08-17 13:58:12 +0100
commit3780f1d8de0d2e19810a2554099f636ad22d7832 (patch)
treeded0f1c7c246d1ece8da56fc60e9687da31c65ef
parent3372140db0ca43d82761b7197aefa6fcfe593b81 (diff)
downloadpaludis-3780f1d8de0d2e19810a2554099f636ad22d7832.tar.gz
paludis-3780f1d8de0d2e19810a2554099f636ad22d7832.tar.xz
formats -> colours
-rw-r--r--src/clients/cave/Makefile.am2
-rw-r--r--src/clients/cave/cmd_contents.cc2
-rw-r--r--src/clients/cave/cmd_display_resolution.cc2
-rw-r--r--src/clients/cave/cmd_executables.cc2
-rw-r--r--src/clients/cave/cmd_execute_resolution.cc2
-rw-r--r--src/clients/cave/cmd_fix_cache.cc2
-rw-r--r--src/clients/cave/cmd_info.cc2
-rw-r--r--src/clients/cave/cmd_owner.cc2
-rw-r--r--src/clients/cave/cmd_report.cc2
-rw-r--r--src/clients/cave/cmd_resume.cc2
-rw-r--r--src/clients/cave/cmd_show.cc2
-rw-r--r--src/clients/cave/cmd_sync.cc2
-rw-r--r--src/clients/cave/cmd_verify.cc2
-rw-r--r--src/clients/cave/colour_formatter.cc2
-rw-r--r--src/clients/cave/colours.cc (renamed from src/clients/cave/formats.cc)2
-rw-r--r--src/clients/cave/colours.hh (renamed from src/clients/cave/formats.hh)4
16 files changed, 17 insertions, 17 deletions
diff --git a/src/clients/cave/Makefile.am b/src/clients/cave/Makefile.am
index 29f6bce..e423acc 100644
--- a/src/clients/cave/Makefile.am
+++ b/src/clients/cave/Makefile.am
@@ -159,13 +159,13 @@ libcave_a_SOURCES = \
cmd_uninstall.cc cmd_uninstall.hh \
cmd_update_world.cc cmd_update_world.hh \
cmd_verify.cc cmd_verify.hh cmd_verify-fmt.hh \
+ colours.cc colours.hh \
exceptions.cc exceptions.hh \
executables_common.cc executables_common.hh \
format_plain_contents_entry.cc format_plain_contents_entry.hh \
format_plain_metadata_key.cc format_plain_metadata_key.hh \
format_string.cc format_string.hh \
format_user_config.cc format_user_config.hh \
- formats.cc formats.hh \
script_command.cc script_command.hh \
search_extras_handle.cc search_extras_handle.hh \
select_format_for_spec.cc select_format_for_spec.hh \
diff --git a/src/clients/cave/cmd_contents.cc b/src/clients/cave/cmd_contents.cc
index 00f2c4e..6f772a8 100644
--- a/src/clients/cave/cmd_contents.cc
+++ b/src/clients/cave/cmd_contents.cc
@@ -19,7 +19,7 @@
#include "cmd_contents.hh"
#include "format_user_config.hh"
-#include "formats.hh"
+#include "colours.hh"
#include "exceptions.hh"
#include <paludis/args/args.hh>
#include <paludis/args/do_help.hh>
diff --git a/src/clients/cave/cmd_display_resolution.cc b/src/clients/cave/cmd_display_resolution.cc
index 3164058..22bb347 100644
--- a/src/clients/cave/cmd_display_resolution.cc
+++ b/src/clients/cave/cmd_display_resolution.cc
@@ -21,7 +21,7 @@
#include "cmd_resolve_cmdline.hh"
#include "exceptions.hh"
#include "command_command_line.hh"
-#include "formats.hh"
+#include "colours.hh"
#include "colour_formatter.hh"
#include <paludis/args/do_help.hh>
#include <paludis/util/safe_ifstream.hh>
diff --git a/src/clients/cave/cmd_executables.cc b/src/clients/cave/cmd_executables.cc
index 918582e..3b08eb7 100644
--- a/src/clients/cave/cmd_executables.cc
+++ b/src/clients/cave/cmd_executables.cc
@@ -21,7 +21,7 @@
#include "cmd_executables.hh"
#include "command_command_line.hh"
#include "executables_common.hh"
-#include "formats.hh"
+#include "colours.hh"
#include "format_user_config.hh"
#include <paludis/args/args.hh>
diff --git a/src/clients/cave/cmd_execute_resolution.cc b/src/clients/cave/cmd_execute_resolution.cc
index d519529..d2577dc 100644
--- a/src/clients/cave/cmd_execute_resolution.cc
+++ b/src/clients/cave/cmd_execute_resolution.cc
@@ -22,7 +22,7 @@
#include "cmd_perform.hh"
#include "exceptions.hh"
#include "command_command_line.hh"
-#include "formats.hh"
+#include "colours.hh"
#include "colour_formatter.hh"
#include "resume_data.hh"
#include <paludis/args/do_help.hh>
diff --git a/src/clients/cave/cmd_fix_cache.cc b/src/clients/cave/cmd_fix_cache.cc
index 61ae0b4..da1edef 100644
--- a/src/clients/cave/cmd_fix_cache.cc
+++ b/src/clients/cave/cmd_fix_cache.cc
@@ -18,7 +18,7 @@
*/
#include "cmd_fix_cache.hh"
-#include "formats.hh"
+#include "colours.hh"
#include "format_user_config.hh"
#include <paludis/args/args.hh>
diff --git a/src/clients/cave/cmd_info.cc b/src/clients/cave/cmd_info.cc
index 18d025c..745196b 100644
--- a/src/clients/cave/cmd_info.cc
+++ b/src/clients/cave/cmd_info.cc
@@ -20,7 +20,7 @@
#include "cmd_info.hh"
#include "cmd_perform.hh"
#include "colour_formatter.hh"
-#include "formats.hh"
+#include "colours.hh"
#include "exceptions.hh"
#include "format_user_config.hh"
diff --git a/src/clients/cave/cmd_owner.cc b/src/clients/cave/cmd_owner.cc
index aa86d1a..82abc7f 100644
--- a/src/clients/cave/cmd_owner.cc
+++ b/src/clients/cave/cmd_owner.cc
@@ -21,7 +21,7 @@
#include "cmd_owner.hh"
#include "command_command_line.hh"
#include "owner_common.hh"
-#include "formats.hh"
+#include "colours.hh"
#include "format_user_config.hh"
#include <paludis/action.hh>
diff --git a/src/clients/cave/cmd_report.cc b/src/clients/cave/cmd_report.cc
index 9ea49f0..61aac55 100644
--- a/src/clients/cave/cmd_report.cc
+++ b/src/clients/cave/cmd_report.cc
@@ -20,7 +20,7 @@
#include "cmd_report.hh"
#include "colour_formatter.hh"
#include "format_user_config.hh"
-#include "formats.hh"
+#include "colours.hh"
#include "exceptions.hh"
#include <paludis/args/args.hh>
diff --git a/src/clients/cave/cmd_resume.cc b/src/clients/cave/cmd_resume.cc
index 006360b..49478ca 100644
--- a/src/clients/cave/cmd_resume.cc
+++ b/src/clients/cave/cmd_resume.cc
@@ -22,7 +22,7 @@
#include "cmd_execute_resolution.hh"
#include "exceptions.hh"
#include "command_command_line.hh"
-#include "formats.hh"
+#include "colours.hh"
#include "colour_formatter.hh"
#include "resume_data.hh"
#include <paludis/args/do_help.hh>
diff --git a/src/clients/cave/cmd_show.cc b/src/clients/cave/cmd_show.cc
index 32d4ed0..abac637 100644
--- a/src/clients/cave/cmd_show.cc
+++ b/src/clients/cave/cmd_show.cc
@@ -19,7 +19,7 @@
#include "cmd_show.hh"
#include "colour_formatter.hh"
-#include "formats.hh"
+#include "colours.hh"
#include "exceptions.hh"
#include "select_format_for_spec.hh"
#include "format_user_config.hh"
diff --git a/src/clients/cave/cmd_sync.cc b/src/clients/cave/cmd_sync.cc
index b5e0b3f..c12a848 100644
--- a/src/clients/cave/cmd_sync.cc
+++ b/src/clients/cave/cmd_sync.cc
@@ -19,7 +19,7 @@
#include "cmd_sync.hh"
#include "exceptions.hh"
-#include "formats.hh"
+#include "colours.hh"
#include "format_user_config.hh"
#include <paludis/package_database.hh>
#include <paludis/util/action_queue.hh>
diff --git a/src/clients/cave/cmd_verify.cc b/src/clients/cave/cmd_verify.cc
index 5a93fc6..2910fb7 100644
--- a/src/clients/cave/cmd_verify.cc
+++ b/src/clients/cave/cmd_verify.cc
@@ -19,7 +19,7 @@
#include "cmd_verify.hh"
#include "format_user_config.hh"
-#include "formats.hh"
+#include "colours.hh"
#include "exceptions.hh"
#include <paludis/args/args.hh>
diff --git a/src/clients/cave/colour_formatter.cc b/src/clients/cave/colour_formatter.cc
index ae36b3d..2ecca50 100644
--- a/src/clients/cave/colour_formatter.cc
+++ b/src/clients/cave/colour_formatter.cc
@@ -18,7 +18,7 @@
*/
#include "colour_formatter.hh"
-#include "formats.hh"
+#include "colours.hh"
#include "format_user_config.hh"
#include <paludis/util/stringify.hh>
#include <paludis/name.hh>
diff --git a/src/clients/cave/formats.cc b/src/clients/cave/colours.cc
index ef2571d..87b61d9 100644
--- a/src/clients/cave/formats.cc
+++ b/src/clients/cave/colours.cc
@@ -17,7 +17,7 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "formats.hh"
+#include "colours.hh"
#include "format_user_config.hh"
#include "config.h"
diff --git a/src/clients/cave/formats.hh b/src/clients/cave/colours.hh
index aa403cf..28b7b48 100644
--- a/src/clients/cave/formats.hh
+++ b/src/clients/cave/colours.hh
@@ -17,8 +17,8 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef PALUDIS_GUARD_SRC_CLIENTS_CAVE_FORMATS_HH
-#define PALUDIS_GUARD_SRC_CLIENTS_CAVE_FORMATS_HH 1
+#ifndef PALUDIS_GUARD_SRC_CLIENTS_CAVE_COLOURS_HH
+#define PALUDIS_GUARD_SRC_CLIENTS_CAVE_COLOURS_HH 1
#include <string>