aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2008-02-04 01:23:03 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2008-02-04 01:23:03 +0000
commit3ef47f233d579b338cb5e757ee73a3c9382c87ed (patch)
tree208992cee404233edf4bc67c045feed3613d3f4b /src
parent6ef9fda358a0541b5a5f70011f70adcdc1e30134 (diff)
downloadpaludis-3ef47f233d579b338cb5e757ee73a3c9382c87ed.tar.gz
paludis-3ef47f233d579b338cb5e757ee73a3c9382c87ed.tar.xz
kc some more sr
Diffstat (limited to 'src')
-rw-r--r--src/clients/gtkpaludis/libgtkpaludis/version_info_model.cc5
-rw-r--r--src/clients/qualudis/qualudis.cc7
-rw-r--r--src/output/console_query_task.cc13
-rw-r--r--src/output/mask_displayer.cc7
4 files changed, 18 insertions, 14 deletions
diff --git a/src/clients/gtkpaludis/libgtkpaludis/version_info_model.cc b/src/clients/gtkpaludis/libgtkpaludis/version_info_model.cc
index bf154ee6d..003b5c71a 100644
--- a/src/clients/gtkpaludis/libgtkpaludis/version_info_model.cc
+++ b/src/clients/gtkpaludis/libgtkpaludis/version_info_model.cc
@@ -12,6 +12,7 @@
#include <paludis/environment.hh>
#include <paludis/package_database.hh>
#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/kc.hh>
#include <paludis/query.hh>
#include <paludis/mask.hh>
#include <paludis/metadata_key.hh>
@@ -194,8 +195,8 @@ namespace gtkpaludis
if (! k.value())
return;
- got_key(k, markup_escape(stringify(k.value()->mask_file) + ": " +
- join(k.value()->comment->begin(), k.value()->comment->end(), " ")));
+ got_key(k, markup_escape(stringify((*k.value())[k::mask_file()]) + ": " +
+ join((*k.value())[k::comment()]->begin(), (*k.value())[k::comment()]->end(), " ")));
}
void visit(const MetadataFSEntryKey & k)
diff --git a/src/clients/qualudis/qualudis.cc b/src/clients/qualudis/qualudis.cc
index 8624c3443..d87fac64a 100644
--- a/src/clients/qualudis/qualudis.cc
+++ b/src/clients/qualudis/qualudis.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007 Ciaran McCreesh
+ * Copyright (c) 2006, 2007, 2008 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
@@ -29,6 +29,7 @@
#include <paludis/util/virtual_constructor-impl.hh>
#include <paludis/util/tr1_functional.hh>
#include <paludis/util/visitor-impl.hh>
+#include <paludis/util/kc.hh>
#include <paludis/stringify_formatter.hh>
#include <paludis/environments/no_config/no_config_environment.hh>
@@ -168,8 +169,8 @@ namespace
void visit(const MetadataRepositoryMaskInfoKey & k)
{
if (k.value())
- stream << k.raw_name() << ": " << k.value()->mask_file << ": "
- << join(k.value()->comment->begin(), k.value()->comment->end(), " ") << "\n";
+ stream << k.raw_name() << ": " << (*k.value())[k::mask_file()] << ": "
+ << join((*k.value())[k::comment()]->begin(), (*k.value())[k::comment()]->end(), " ") << "\n";
else
stream << k.raw_name() << "\n";
}
diff --git a/src/output/console_query_task.cc b/src/output/console_query_task.cc
index dbd0d7f3b..6da8dcfe0 100644
--- a/src/output/console_query_task.cc
+++ b/src/output/console_query_task.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh
+ * Copyright (c) 2007, 2008 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
@@ -29,6 +29,7 @@
#include <paludis/util/map-impl.hh>
#include <paludis/util/join.hh>
#include <paludis/util/strip.hh>
+#include <paludis/util/kc.hh>
#include <paludis/query.hh>
#include <paludis/mask.hh>
#include <paludis/metadata_key.hh>
@@ -589,15 +590,15 @@ namespace
if (task->want_raw())
{
task->output_left_column(k.raw_name() + ":", in);
- task->output_right_column(stringify(k.value()->mask_file) + ": " +
- join(k.value()->comment->begin(), k.value()->comment->end(), " "));
+ task->output_right_column(stringify((*k.value())[k::mask_file()]) + ": " +
+ join((*k.value())[k::comment()]->begin(), (*k.value())[k::comment()]->end(), " "));
}
else
{
task->output_left_column(k.human_name() + ":", in);
- task->output_right_column(stringify(k.value()->mask_file) + ":");
- for (Sequence<std::string>::ConstIterator it(k.value()->comment->begin()),
- it_end(k.value()->comment->end()); it_end != it; ++it)
+ task->output_right_column(stringify((*k.value())[k::mask_file()]) + ":");
+ for (Sequence<std::string>::ConstIterator it((*k.value())[k::comment()]->begin()),
+ it_end((*k.value())[k::comment()]->end()); it_end != it; ++it)
{
task->output_left_column("", in);
task->output_right_column(*it);
diff --git a/src/output/mask_displayer.cc b/src/output/mask_displayer.cc
index 7e4c83fd2..13fa6f436 100644
--- a/src/output/mask_displayer.cc
+++ b/src/output/mask_displayer.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh
+ * Copyright (c) 2007, 2008 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
@@ -26,6 +26,7 @@
#include <paludis/util/set.hh>
#include <paludis/util/visitor-impl.hh>
#include <paludis/util/visitor-impl.hh>
+#include <paludis/util/kc.hh>
#include <paludis/metadata_key.hh>
#include <sstream>
@@ -110,8 +111,8 @@ namespace
void visit(const MetadataRepositoryMaskInfoKey & k)
{
- s << k.value()->mask_file << ": " <<
- join(k.value()->comment->begin(), k.value()->comment->end(), " ");
+ s << (*k.value())[k::mask_file()] << ": " <<
+ join((*k.value())[k::comment()]->begin(), (*k.value())[k::comment()]->end(), " ");
}
void visit(const MetadataFSEntryKey & k)