aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-11-16 10:02:41 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-11-16 10:02:41 +0000
commit2f7bde898437a912f36b42b94124d95ca03ee407 (patch)
treeb16ee2168c662d15c85ff02f2acbc85f8905efbe /src
parent95086f46d8f5b76f5ea14511e5bede3c27d57b3e (diff)
downloadpaludis-2f7bde898437a912f36b42b94124d95ca03ee407.tar.gz
paludis-2f7bde898437a912f36b42b94124d95ca03ee407.tar.xz
MetadataSetKey -> MetadataCollectionKey. Fixes: ticket:437
Diffstat (limited to 'src')
-rw-r--r--src/clients/gtkpaludis/libgtkpaludis/version_info_model.cc12
-rw-r--r--src/clients/inquisitio/key_extractor.cc12
-rw-r--r--src/clients/instruo/instruo.cc12
-rw-r--r--src/clients/paludis/applets.cc12
-rw-r--r--src/clients/paludis/info.cc12
-rw-r--r--src/clients/qualudis/qualudis.cc12
-rw-r--r--src/output/console_query_task.cc12
-rw-r--r--src/output/mask_displayer.cc12
8 files changed, 48 insertions, 48 deletions
diff --git a/src/clients/gtkpaludis/libgtkpaludis/version_info_model.cc b/src/clients/gtkpaludis/libgtkpaludis/version_info_model.cc
index 331f14147..155cd6223 100644
--- a/src/clients/gtkpaludis/libgtkpaludis/version_info_model.cc
+++ b/src/clients/gtkpaludis/libgtkpaludis/version_info_model.cc
@@ -104,27 +104,27 @@ namespace gtkpaludis
virtual void got_key(const MetadataKey & k, const std::string & s) = 0;
- void visit(const MetadataSetKey<IUseFlagSet> & k)
+ void visit(const MetadataCollectionKey<IUseFlagSet> & k)
{
got_key(k, k.pretty_print_flat(formatter));
}
- void visit(const MetadataSetKey<Set<std::string> > & k)
+ void visit(const MetadataCollectionKey<Set<std::string> > & k)
{
got_key(k, k.pretty_print_flat(formatter));
}
- void visit(const MetadataSetKey<FSEntrySequence> & k)
+ void visit(const MetadataCollectionKey<FSEntrySequence> & k)
{
got_key(k, k.pretty_print_flat(formatter));
}
- void visit(const MetadataSetKey<UseFlagNameSet> & k)
+ void visit(const MetadataCollectionKey<UseFlagNameSet> & k)
{
got_key(k, k.pretty_print_flat(formatter));
}
- void visit(const MetadataSetKey<KeywordNameSet> & k)
+ void visit(const MetadataCollectionKey<KeywordNameSet> & k)
{
got_key(k, k.pretty_print_flat(formatter));
}
@@ -159,7 +159,7 @@ namespace gtkpaludis
got_key(k, k.pretty_print_flat(formatter));
}
- void visit(const MetadataSetKey<PackageIDSequence> & k)
+ void visit(const MetadataCollectionKey<PackageIDSequence> & k)
{
got_key(k, k.pretty_print_flat(formatter));
}
diff --git a/src/clients/inquisitio/key_extractor.cc b/src/clients/inquisitio/key_extractor.cc
index 2c7b04c4d..ccdfa74dd 100644
--- a/src/clients/inquisitio/key_extractor.cc
+++ b/src/clients/inquisitio/key_extractor.cc
@@ -225,7 +225,7 @@ namespace
result = _m(stringify(*s.value()));
}
- void visit(const MetadataSetKey<UseFlagNameSet> & s)
+ void visit(const MetadataCollectionKey<UseFlagNameSet> & s)
{
using namespace tr1::placeholders;
@@ -236,7 +236,7 @@ namespace
tr1::bind(&Matcher::operator(), tr1::cref(_m), tr1::bind(&stringify<UseFlagName>, _1)));
}
- void visit(const MetadataSetKey<IUseFlagSet> & s)
+ void visit(const MetadataCollectionKey<IUseFlagSet> & s)
{
using namespace tr1::placeholders;
@@ -247,7 +247,7 @@ namespace
tr1::bind(&Matcher::operator(), tr1::cref(_m), tr1::bind(&stringify<IUseFlag>, _1)));
}
- void visit(const MetadataSetKey<KeywordNameSet> & s)
+ void visit(const MetadataCollectionKey<KeywordNameSet> & s)
{
using namespace tr1::placeholders;
@@ -258,7 +258,7 @@ namespace
tr1::bind(&Matcher::operator(), tr1::cref(_m), tr1::bind(&stringify<KeywordName>, _1)));
}
- void visit(const MetadataSetKey<Set<std::string> > & s)
+ void visit(const MetadataCollectionKey<Set<std::string> > & s)
{
using namespace tr1::placeholders;
@@ -269,7 +269,7 @@ namespace
tr1::bind(&Matcher::operator(), tr1::cref(_m), _1));
}
- void visit(const MetadataSetKey<FSEntrySequence> & s)
+ void visit(const MetadataCollectionKey<FSEntrySequence> & s)
{
using namespace tr1::placeholders;
@@ -280,7 +280,7 @@ namespace
tr1::bind(&Matcher::operator(), tr1::cref(_m), tr1::bind(&stringify<FSEntry>, _1)));
}
- void visit(const MetadataSetKey<PackageIDSequence> & s)
+ void visit(const MetadataCollectionKey<PackageIDSequence> & s)
{
using namespace tr1::placeholders;
diff --git a/src/clients/instruo/instruo.cc b/src/clients/instruo/instruo.cc
index 1baadb84b..526ae9f27 100644
--- a/src/clients/instruo/instruo.cc
+++ b/src/clients/instruo/instruo.cc
@@ -110,32 +110,32 @@ namespace
const tr1::shared_ptr<DependencySpecTree::ConstItem> & PALUDIS_ATTRIBUTE((unused)) t(k.value());
}
- void visit(const MetadataSetKey<PackageIDSequence> & k)
+ void visit(const MetadataCollectionKey<PackageIDSequence> & k)
{
const tr1::shared_ptr<const PackageIDSequence> & PALUDIS_ATTRIBUTE((unused)) s(k.value());
}
- void visit(const MetadataSetKey<Set<std::string> > & k)
+ void visit(const MetadataCollectionKey<Set<std::string> > & k)
{
const tr1::shared_ptr<const Set<std::string> > & PALUDIS_ATTRIBUTE((unused)) s(k.value());
}
- void visit(const MetadataSetKey<FSEntrySequence> & k)
+ void visit(const MetadataCollectionKey<FSEntrySequence> & k)
{
const tr1::shared_ptr<const FSEntrySequence> & PALUDIS_ATTRIBUTE((unused)) s(k.value());
}
- void visit(const MetadataSetKey<KeywordNameSet> & k)
+ void visit(const MetadataCollectionKey<KeywordNameSet> & k)
{
const tr1::shared_ptr<const KeywordNameSet> & PALUDIS_ATTRIBUTE((unused)) s(k.value());
}
- void visit(const MetadataSetKey<IUseFlagSet> & k)
+ void visit(const MetadataCollectionKey<IUseFlagSet> & k)
{
const tr1::shared_ptr<const IUseFlagSet> & PALUDIS_ATTRIBUTE((unused)) s(k.value());
}
- void visit(const MetadataSetKey<UseFlagNameSet> & k)
+ void visit(const MetadataCollectionKey<UseFlagNameSet> & k)
{
const tr1::shared_ptr<const UseFlagNameSet> & PALUDIS_ATTRIBUTE((unused)) s(k.value());
}
diff --git a/src/clients/paludis/applets.cc b/src/clients/paludis/applets.cc
index d4d4fe195..43dcadb87 100644
--- a/src/clients/paludis/applets.cc
+++ b/src/clients/paludis/applets.cc
@@ -116,37 +116,37 @@ namespace
std::cout << k.pretty_print_flat(f) << std::endl;
}
- void visit(const MetadataSetKey<FSEntrySequence> & k)
+ void visit(const MetadataCollectionKey<FSEntrySequence> & k)
{
StringifyFormatter f;
std::cout << k.pretty_print_flat(f) << std::endl;
}
- void visit(const MetadataSetKey<PackageIDSequence> & k)
+ void visit(const MetadataCollectionKey<PackageIDSequence> & k)
{
StringifyFormatter f;
std::cout << k.pretty_print_flat(f) << std::endl;
}
- void visit(const MetadataSetKey<KeywordNameSet> & k)
+ void visit(const MetadataCollectionKey<KeywordNameSet> & k)
{
StringifyFormatter f;
std::cout << k.pretty_print_flat(f) << std::endl;
}
- void visit(const MetadataSetKey<IUseFlagSet> & k)
+ void visit(const MetadataCollectionKey<IUseFlagSet> & k)
{
StringifyFormatter f;
std::cout << k.pretty_print_flat(f) << std::endl;
}
- void visit(const MetadataSetKey<UseFlagNameSet> & k)
+ void visit(const MetadataCollectionKey<UseFlagNameSet> & k)
{
StringifyFormatter f;
std::cout << k.pretty_print_flat(f) << std::endl;
}
- void visit(const MetadataSetKey<Set<std::string> > & k)
+ void visit(const MetadataCollectionKey<Set<std::string> > & k)
{
StringifyFormatter f;
std::cout << k.pretty_print_flat(f) << std::endl;
diff --git a/src/clients/paludis/info.cc b/src/clients/paludis/info.cc
index 70590c1f2..12eb6083d 100644
--- a/src/clients/paludis/info.cc
+++ b/src/clients/paludis/info.cc
@@ -131,37 +131,37 @@ namespace
cout << std::setw(30) << (indent + k.human_name() + ":") << " " << k.pretty_print_flat(f) << endl;
}
- void visit(const MetadataSetKey<FSEntrySequence> & k)
+ void visit(const MetadataCollectionKey<FSEntrySequence> & k)
{
ColourFormatter f;
cout << std::setw(30) << (indent + k.human_name() + ":") << " " << k.pretty_print_flat(f) << endl;
}
- void visit(const MetadataSetKey<PackageIDSequence> & k)
+ void visit(const MetadataCollectionKey<PackageIDSequence> & k)
{
ColourFormatter f;
cout << std::setw(30) << (indent + k.human_name() + ":") << " " << k.pretty_print_flat(f) << endl;
}
- void visit(const MetadataSetKey<KeywordNameSet> & k)
+ void visit(const MetadataCollectionKey<KeywordNameSet> & k)
{
ColourFormatter f;
cout << std::setw(30) << (indent + k.human_name() + ":") << " " << k.pretty_print_flat(f) << endl;
}
- void visit(const MetadataSetKey<IUseFlagSet> & k)
+ void visit(const MetadataCollectionKey<IUseFlagSet> & k)
{
ColourFormatter f;
cout << std::setw(30) << (indent + k.human_name() + ":") << " " << k.pretty_print_flat(f) << endl;
}
- void visit(const MetadataSetKey<UseFlagNameSet> & k)
+ void visit(const MetadataCollectionKey<UseFlagNameSet> & k)
{
ColourFormatter f;
cout << std::setw(30) << (indent + k.human_name() + ":") << " " << k.pretty_print_flat(f) << endl;
}
- void visit(const MetadataSetKey<Set<std::string> > & k)
+ void visit(const MetadataCollectionKey<Set<std::string> > & k)
{
ColourFormatter f;
cout << std::setw(30) << (indent + k.human_name() + ":") << " " << k.pretty_print_flat(f) << endl;
diff --git a/src/clients/qualudis/qualudis.cc b/src/clients/qualudis/qualudis.cc
index 2691cd72d..2c86442a3 100644
--- a/src/clients/qualudis/qualudis.cc
+++ b/src/clients/qualudis/qualudis.cc
@@ -59,27 +59,27 @@ namespace
std::ostringstream stream;
StringifyFormatter formatter;
- void visit(const MetadataSetKey<IUseFlagSet> & k)
+ void visit(const MetadataCollectionKey<IUseFlagSet> & k)
{
stream << k.raw_name() << ": " << join(k.value()->begin(), k.value()->end(), " ") << "\n";
}
- void visit(const MetadataSetKey<Set<std::string> > & k)
+ void visit(const MetadataCollectionKey<Set<std::string> > & k)
{
stream << k.raw_name() << ": " << join(k.value()->begin(), k.value()->end(), " ") << "\n";
}
- void visit(const MetadataSetKey<FSEntrySequence> & k)
+ void visit(const MetadataCollectionKey<FSEntrySequence> & k)
{
stream << k.raw_name() << ": " << join(k.value()->begin(), k.value()->end(), " ") << "\n";
}
- void visit(const MetadataSetKey<UseFlagNameSet> & k)
+ void visit(const MetadataCollectionKey<UseFlagNameSet> & k)
{
stream << k.raw_name() << ": " << join(k.value()->begin(), k.value()->end(), " ") << "\n";
}
- void visit(const MetadataSetKey<KeywordNameSet> & k)
+ void visit(const MetadataCollectionKey<KeywordNameSet> & k)
{
stream << k.raw_name() << ": " << join(k.value()->begin(), k.value()->end(), " ") << "\n";
}
@@ -114,7 +114,7 @@ namespace
stream << k.raw_name() << ": " << k.pretty_print_flat(formatter) << "\n";
}
- void visit(const MetadataSetKey<PackageIDSequence> & k)
+ void visit(const MetadataCollectionKey<PackageIDSequence> & k)
{
stream << k.raw_name() << ": "
<< join(indirect_iterator(k.value()->begin()), indirect_iterator(k.value()->end()), " ") << "\n";
diff --git a/src/output/console_query_task.cc b/src/output/console_query_task.cc
index 6cdef71f1..0f8887783 100644
--- a/src/output/console_query_task.cc
+++ b/src/output/console_query_task.cc
@@ -256,7 +256,7 @@ namespace
{
}
- void visit(const MetadataSetKey<IUseFlagSet> & k)
+ void visit(const MetadataCollectionKey<IUseFlagSet> & k)
{
if (k.type() == type)
{
@@ -274,7 +274,7 @@ namespace
}
}
- void visit(const MetadataSetKey<FSEntrySequence> & k)
+ void visit(const MetadataCollectionKey<FSEntrySequence> & k)
{
if (k.type() == type)
{
@@ -292,7 +292,7 @@ namespace
}
}
- void visit(const MetadataSetKey<Set<std::string> > & k)
+ void visit(const MetadataCollectionKey<Set<std::string> > & k)
{
if (k.type() == type)
{
@@ -310,7 +310,7 @@ namespace
}
}
- void visit(const MetadataSetKey<UseFlagNameSet> & k)
+ void visit(const MetadataCollectionKey<UseFlagNameSet> & k)
{
if (k.type() == type)
{
@@ -328,7 +328,7 @@ namespace
}
}
- void visit(const MetadataSetKey<KeywordNameSet> & k)
+ void visit(const MetadataCollectionKey<KeywordNameSet> & k)
{
if (k.type() == type)
{
@@ -467,7 +467,7 @@ namespace
}
}
- void visit(const MetadataSetKey<PackageIDSequence> & k)
+ void visit(const MetadataCollectionKey<PackageIDSequence> & k)
{
if (k.type() == type)
{
diff --git a/src/output/mask_displayer.cc b/src/output/mask_displayer.cc
index ea15114db..a1d0e4988 100644
--- a/src/output/mask_displayer.cc
+++ b/src/output/mask_displayer.cc
@@ -114,31 +114,31 @@ namespace
s << k.value();
}
- void visit(const MetadataSetKey<UseFlagNameSet> & k)
+ void visit(const MetadataCollectionKey<UseFlagNameSet> & k)
{
ColourFormatter formatter;
s << k.pretty_print_flat(formatter);
}
- void visit(const MetadataSetKey<IUseFlagSet> & k)
+ void visit(const MetadataCollectionKey<IUseFlagSet> & k)
{
ColourFormatter formatter;
s << k.pretty_print_flat(formatter);
}
- void visit(const MetadataSetKey<Set<std::string> > & k)
+ void visit(const MetadataCollectionKey<Set<std::string> > & k)
{
ColourFormatter formatter;
s << k.pretty_print_flat(formatter);
}
- void visit(const MetadataSetKey<FSEntrySequence> & k)
+ void visit(const MetadataCollectionKey<FSEntrySequence> & k)
{
ColourFormatter formatter;
s << k.pretty_print_flat(formatter);
}
- void visit(const MetadataSetKey<PackageIDSequence> & k)
+ void visit(const MetadataCollectionKey<PackageIDSequence> & k)
{
ColourFormatter formatter;
s << k.pretty_print_flat(formatter);
@@ -168,7 +168,7 @@ namespace
s << k.pretty_print_flat(formatter);
}
- void visit(const MetadataSetKey<KeywordNameSet> & k)
+ void visit(const MetadataCollectionKey<KeywordNameSet> & k)
{
ColourFormatter formatter;
s << k.pretty_print_flat(formatter);