aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-10-13 12:53:56 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-10-13 12:53:56 +0000
commit6202af39e927546fe5503d5bd7a0b9a25c0a8997 (patch)
tree6fc35185191e421cc3fbb873d9fb01b80107fc98
parentb2eb5ab5752e96f60632363b156cfd3fa9f58cac (diff)
downloadpaludis-6202af39e927546fe5503d5bd7a0b9a25c0a8997.tar.gz
paludis-6202af39e927546fe5503d5bd7a0b9a25c0a8997.tar.xz
The standard says we can't call it ::Formatter, since we have a Formatter at namespace level
-rw-r--r--doc/examples/example_formatter.cc2
-rw-r--r--paludis/dep_tree.hh16
-rw-r--r--paludis/metadata_key.hh8
-rw-r--r--paludis/repositories/cran/dep_spec_pretty_printer.cc6
-rw-r--r--paludis/repositories/cran/dep_spec_pretty_printer.hh2
-rw-r--r--paludis/repositories/cran/keys.cc8
-rw-r--r--paludis/repositories/cran/keys.hh8
-rw-r--r--paludis/repositories/e/dep_spec_pretty_printer.cc6
-rw-r--r--paludis/repositories/e/dep_spec_pretty_printer.hh2
-rw-r--r--paludis/repositories/e/e_key.cc24
-rw-r--r--paludis/repositories/e/e_key.hh24
-rw-r--r--paludis/repositories/fake/fake_package_id.cc8
-rw-r--r--paludis/repositories/fake/fake_package_id.hh8
-rw-r--r--paludis/repositories/virtuals/package_id.cc4
-rw-r--r--paludis/repositories/virtuals/package_id.hh4
-rw-r--r--paludis/stringify_formatter_TEST.cc2
-rw-r--r--python/metadata_key.cc8
17 files changed, 70 insertions, 70 deletions
diff --git a/doc/examples/example_formatter.cc b/doc/examples/example_formatter.cc
index 20f0aef..51582a8 100644
--- a/doc/examples/example_formatter.cc
+++ b/doc/examples/example_formatter.cc
@@ -65,7 +65,7 @@ namespace
/* This formatter outputs information about dependencies in HTML. We need
* to implement CanFormat<> for all of the things that can be found in
- * DependencySpecTree::Formatter, as well as CanSpace. */
+ * DependencySpecTree::ItemFormatter, as well as CanSpace. */
class HTMLFormatter :
public CanSpace,
public CanFormat<PackageDepSpec>,
diff --git a/paludis/dep_tree.hh b/paludis/dep_tree.hh
index 00d2c7a..ba9301e 100644
--- a/paludis/dep_tree.hh
+++ b/paludis/dep_tree.hh
@@ -87,7 +87,7 @@ namespace paludis
URILabelsDepSpec,
DependencyLabelsDepSpec,
NamedSetDepSpec
- > Formatter;
+ > ItemFormatter;
};
/**
@@ -118,7 +118,7 @@ namespace paludis
typedef Formatter<
UseDepSpec,
LicenseDepSpec
- > Formatter;
+ > ItemFormatter;
};
/**
@@ -150,7 +150,7 @@ namespace paludis
UseDepSpec,
FetchableURIDepSpec,
URILabelsDepSpec
- > Formatter;
+ > ItemFormatter;
};
/**
@@ -180,7 +180,7 @@ namespace paludis
typedef Formatter<
UseDepSpec,
SimpleURIDepSpec
- > Formatter;
+ > ItemFormatter;
};
/**
@@ -210,7 +210,7 @@ namespace paludis
typedef Formatter<
UseDepSpec,
PackageDepSpec
- > Formatter;
+ > ItemFormatter;
};
/**
@@ -240,7 +240,7 @@ namespace paludis
typedef Formatter<
UseDepSpec,
PlainTextDepSpec
- > Formatter;
+ > ItemFormatter;
};
/**
@@ -277,7 +277,7 @@ namespace paludis
BlockDepSpec,
NamedSetDepSpec,
DependencyLabelsDepSpec
- > Formatter;
+ > ItemFormatter;
};
/**
@@ -307,7 +307,7 @@ namespace paludis
typedef Formatter<
PackageDepSpec,
NamedSetDepSpec
- > Formatter;
+ > ItemFormatter;
};
}
diff --git a/paludis/metadata_key.hh b/paludis/metadata_key.hh
index 330b64e..c98f2ab 100644
--- a/paludis/metadata_key.hh
+++ b/paludis/metadata_key.hh
@@ -419,14 +419,14 @@ namespace paludis
* Return a multiline-line indented and formatted version of our
* value, using the supplied Formatter to format individual items.
*/
- virtual std::string pretty_print(const typename C_::Formatter &) const
+ virtual std::string pretty_print(const typename C_::ItemFormatter &) const
PALUDIS_ATTRIBUTE((warn_unused_result)) = 0;
/**
* Return a single-line formatted version of our value, using the
* supplied Formatter to format individual items.
*/
- virtual std::string pretty_print_flat(const typename C_::Formatter &) const
+ virtual std::string pretty_print_flat(const typename C_::ItemFormatter &) const
PALUDIS_ATTRIBUTE((warn_unused_result)) = 0;
};
@@ -465,14 +465,14 @@ namespace paludis
* Return a multiline-line indented and formatted version of our
* value, using the supplied Formatter to format individual items.
*/
- virtual std::string pretty_print(const FetchableURISpecTree::Formatter &) const
+ virtual std::string pretty_print(const FetchableURISpecTree::ItemFormatter &) const
PALUDIS_ATTRIBUTE((warn_unused_result)) = 0;
/**
* Return a single-line formatted version of our value, using the
* supplied Formatter to format individual items.
*/
- virtual std::string pretty_print_flat(const FetchableURISpecTree::Formatter &) const
+ virtual std::string pretty_print_flat(const FetchableURISpecTree::ItemFormatter &) const
PALUDIS_ATTRIBUTE((warn_unused_result)) = 0;
/**
diff --git a/paludis/repositories/cran/dep_spec_pretty_printer.cc b/paludis/repositories/cran/dep_spec_pretty_printer.cc
index 06f20ac..1eaf712 100644
--- a/paludis/repositories/cran/dep_spec_pretty_printer.cc
+++ b/paludis/repositories/cran/dep_spec_pretty_printer.cc
@@ -37,14 +37,14 @@ namespace paludis
{
std::stringstream s;
const Environment * const env;
- GenericSpecTree::Formatter formatter;
+ GenericSpecTree::ItemFormatter formatter;
const unsigned indent;
const bool multiline;
bool need_comma;
Implementation(
const Environment * const e,
- const GenericSpecTree::Formatter & f,
+ const GenericSpecTree::ItemFormatter & f,
const unsigned u,
const bool m) :
env(e),
@@ -58,7 +58,7 @@ namespace paludis
}
DepSpecPrettyPrinter::DepSpecPrettyPrinter(const Environment * const e,
- const GenericSpecTree::Formatter & f, const unsigned initial_indent, const bool multiline) :
+ const GenericSpecTree::ItemFormatter & f, const unsigned initial_indent, const bool multiline) :
PrivateImplementationPattern<DepSpecPrettyPrinter>(new Implementation<DepSpecPrettyPrinter>(e, f, initial_indent, multiline))
{
}
diff --git a/paludis/repositories/cran/dep_spec_pretty_printer.hh b/paludis/repositories/cran/dep_spec_pretty_printer.hh
index 2bb8641..b101bab 100644
--- a/paludis/repositories/cran/dep_spec_pretty_printer.hh
+++ b/paludis/repositories/cran/dep_spec_pretty_printer.hh
@@ -66,7 +66,7 @@ namespace paludis
*/
DepSpecPrettyPrinter(
const Environment * const env,
- const GenericSpecTree::Formatter & formatter,
+ const GenericSpecTree::ItemFormatter & formatter,
unsigned initial_indent,
bool use_newlines);
diff --git a/paludis/repositories/cran/keys.cc b/paludis/repositories/cran/keys.cc
index 64f9d73..37c4db6 100644
--- a/paludis/repositories/cran/keys.cc
+++ b/paludis/repositories/cran/keys.cc
@@ -48,13 +48,13 @@ SimpleURIKey::value() const
}
std::string
-SimpleURIKey::pretty_print(const SimpleURISpecTree::Formatter & f) const
+SimpleURIKey::pretty_print(const SimpleURISpecTree::ItemFormatter & f) const
{
return f.format(_v, format::Plain());
}
std::string
-SimpleURIKey::pretty_print_flat(const SimpleURISpecTree::Formatter & f) const
+SimpleURIKey::pretty_print_flat(const SimpleURISpecTree::ItemFormatter & f) const
{
return f.format(_v, format::Plain());
}
@@ -149,7 +149,7 @@ DepKey::value() const
}
std::string
-DepKey::pretty_print(const DependencySpecTree::Formatter & f) const
+DepKey::pretty_print(const DependencySpecTree::ItemFormatter & f) const
{
StringifyFormatter ff(f);
DepSpecPrettyPrinter p(_env, ff, 12, true);
@@ -158,7 +158,7 @@ DepKey::pretty_print(const DependencySpecTree::Formatter & f) const
}
std::string
-DepKey::pretty_print_flat(const DependencySpecTree::Formatter & f) const
+DepKey::pretty_print_flat(const DependencySpecTree::ItemFormatter & f) const
{
StringifyFormatter ff(f);
DepSpecPrettyPrinter p(_env, ff, 0, false);
diff --git a/paludis/repositories/cran/keys.hh b/paludis/repositories/cran/keys.hh
index d612df8..552a59d 100644
--- a/paludis/repositories/cran/keys.hh
+++ b/paludis/repositories/cran/keys.hh
@@ -43,10 +43,10 @@ namespace paludis
virtual const tr1::shared_ptr<const SimpleURISpecTree::ConstItem> value() const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual std::string pretty_print(const SimpleURISpecTree::Formatter &) const
+ virtual std::string pretty_print(const SimpleURISpecTree::ItemFormatter &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual std::string pretty_print_flat(const SimpleURISpecTree::Formatter &) const
+ virtual std::string pretty_print_flat(const SimpleURISpecTree::ItemFormatter &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
};
@@ -125,10 +125,10 @@ namespace paludis
virtual const tr1::shared_ptr<const DependencySpecTree::ConstItem> value() const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual std::string pretty_print(const DependencySpecTree::Formatter &) const
+ virtual std::string pretty_print(const DependencySpecTree::ItemFormatter &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual std::string pretty_print_flat(const DependencySpecTree::Formatter &) const
+ virtual std::string pretty_print_flat(const DependencySpecTree::ItemFormatter &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
};
}
diff --git a/paludis/repositories/e/dep_spec_pretty_printer.cc b/paludis/repositories/e/dep_spec_pretty_printer.cc
index 3fa6c97..5d46a58 100644
--- a/paludis/repositories/e/dep_spec_pretty_printer.cc
+++ b/paludis/repositories/e/dep_spec_pretty_printer.cc
@@ -49,7 +49,7 @@ namespace paludis
std::stringstream s;
const Environment * const env;
const tr1::shared_ptr<const PackageID> id;
- GenericSpecTree::Formatter formatter;
+ GenericSpecTree::ItemFormatter formatter;
unsigned indent;
bool extra_label_indent;
bool use_newlines;
@@ -59,7 +59,7 @@ namespace paludis
Implementation(
const Environment * const e,
const tr1::shared_ptr<const PackageID> & i,
- const GenericSpecTree::Formatter & f,
+ const GenericSpecTree::ItemFormatter & f,
unsigned in,
bool b) :
env(e),
@@ -78,7 +78,7 @@ namespace paludis
DepSpecPrettyPrinter::DepSpecPrettyPrinter(
const Environment * const e,
const tr1::shared_ptr<const PackageID> & id,
- const GenericSpecTree::Formatter & f,
+ const GenericSpecTree::ItemFormatter & f,
unsigned i,
bool b) :
PrivateImplementationPattern<DepSpecPrettyPrinter>(new Implementation<DepSpecPrettyPrinter>(e, id, f, i, b))
diff --git a/paludis/repositories/e/dep_spec_pretty_printer.hh b/paludis/repositories/e/dep_spec_pretty_printer.hh
index 14bc0ec..df68559 100644
--- a/paludis/repositories/e/dep_spec_pretty_printer.hh
+++ b/paludis/repositories/e/dep_spec_pretty_printer.hh
@@ -73,7 +73,7 @@ namespace paludis
DepSpecPrettyPrinter(
const Environment * const env,
const tr1::shared_ptr<const PackageID> & id,
- const GenericSpecTree::Formatter & formatter,
+ const GenericSpecTree::ItemFormatter & formatter,
unsigned initial_indent,
bool use_newlines);
diff --git a/paludis/repositories/e/e_key.cc b/paludis/repositories/e/e_key.cc
index 9ba9854..36f67bd 100644
--- a/paludis/repositories/e/e_key.cc
+++ b/paludis/repositories/e/e_key.cc
@@ -152,7 +152,7 @@ EDependenciesKey::value() const
}
std::string
-EDependenciesKey::pretty_print(const DependencySpecTree::Formatter & f) const
+EDependenciesKey::pretty_print(const DependencySpecTree::ItemFormatter & f) const
{
StringifyFormatter ff(f);
DepSpecPrettyPrinter p(_imp->env, _imp->id, ff, 0, true);
@@ -161,7 +161,7 @@ EDependenciesKey::pretty_print(const DependencySpecTree::Formatter & f) const
}
std::string
-EDependenciesKey::pretty_print_flat(const DependencySpecTree::Formatter & f) const
+EDependenciesKey::pretty_print_flat(const DependencySpecTree::ItemFormatter & f) const
{
StringifyFormatter ff(f);
DepSpecPrettyPrinter p(_imp->env, _imp->id, ff, 0, false);
@@ -250,7 +250,7 @@ ELicenseKey::value() const
}
std::string
-ELicenseKey::pretty_print(const LicenseSpecTree::Formatter & f) const
+ELicenseKey::pretty_print(const LicenseSpecTree::ItemFormatter & f) const
{
StringifyFormatter ff(f);
DepSpecPrettyPrinter p(_imp->env, _imp->id, ff, 0, true);
@@ -259,7 +259,7 @@ ELicenseKey::pretty_print(const LicenseSpecTree::Formatter & f) const
}
std::string
-ELicenseKey::pretty_print_flat(const LicenseSpecTree::Formatter & f) const
+ELicenseKey::pretty_print_flat(const LicenseSpecTree::ItemFormatter & f) const
{
StringifyFormatter ff(f);
DepSpecPrettyPrinter p(_imp->env, _imp->id, ff, 0, false);
@@ -338,7 +338,7 @@ EFetchableURIKey::value() const
}
std::string
-EFetchableURIKey::pretty_print(const FetchableURISpecTree::Formatter & f) const
+EFetchableURIKey::pretty_print(const FetchableURISpecTree::ItemFormatter & f) const
{
StringifyFormatter ff(f);
DepSpecPrettyPrinter p(_imp->env, _imp->id, ff, 0, true);
@@ -347,7 +347,7 @@ EFetchableURIKey::pretty_print(const FetchableURISpecTree::Formatter & f) const
}
std::string
-EFetchableURIKey::pretty_print_flat(const FetchableURISpecTree::Formatter & f) const
+EFetchableURIKey::pretty_print_flat(const FetchableURISpecTree::ItemFormatter & f) const
{
StringifyFormatter ff(f);
DepSpecPrettyPrinter p(_imp->env, _imp->id, ff, 0, false);
@@ -433,7 +433,7 @@ ESimpleURIKey::value() const
}
std::string
-ESimpleURIKey::pretty_print(const SimpleURISpecTree::Formatter & f) const
+ESimpleURIKey::pretty_print(const SimpleURISpecTree::ItemFormatter & f) const
{
StringifyFormatter ff(f);
DepSpecPrettyPrinter p(_imp->env, _imp->id, ff, 0, true);
@@ -442,7 +442,7 @@ ESimpleURIKey::pretty_print(const SimpleURISpecTree::Formatter & f) const
}
std::string
-ESimpleURIKey::pretty_print_flat(const SimpleURISpecTree::Formatter & f) const
+ESimpleURIKey::pretty_print_flat(const SimpleURISpecTree::ItemFormatter & f) const
{
StringifyFormatter ff(f);
DepSpecPrettyPrinter p(_imp->env, _imp->id, ff, 0, false);
@@ -497,7 +497,7 @@ ERestrictKey::value() const
}
std::string
-ERestrictKey::pretty_print(const RestrictSpecTree::Formatter & f) const
+ERestrictKey::pretty_print(const RestrictSpecTree::ItemFormatter & f) const
{
StringifyFormatter ff(f);
DepSpecPrettyPrinter p(_imp->env, _imp->id, ff, 0, true);
@@ -506,7 +506,7 @@ ERestrictKey::pretty_print(const RestrictSpecTree::Formatter & f) const
}
std::string
-ERestrictKey::pretty_print_flat(const RestrictSpecTree::Formatter & f) const
+ERestrictKey::pretty_print_flat(const RestrictSpecTree::ItemFormatter & f) const
{
StringifyFormatter ff(f);
DepSpecPrettyPrinter p(_imp->env, _imp->id, ff, 0, false);
@@ -560,7 +560,7 @@ EProvideKey::value() const
}
std::string
-EProvideKey::pretty_print(const ProvideSpecTree::Formatter & f) const
+EProvideKey::pretty_print(const ProvideSpecTree::ItemFormatter & f) const
{
StringifyFormatter ff(f);
DepSpecPrettyPrinter p(_imp->env, _imp->id, ff, 0, true);
@@ -569,7 +569,7 @@ EProvideKey::pretty_print(const ProvideSpecTree::Formatter & f) const
}
std::string
-EProvideKey::pretty_print_flat(const ProvideSpecTree::Formatter & f) const
+EProvideKey::pretty_print_flat(const ProvideSpecTree::ItemFormatter & f) const
{
StringifyFormatter ff(f);
DepSpecPrettyPrinter p(_imp->env, _imp->id, ff, 0, false);
diff --git a/paludis/repositories/e/e_key.hh b/paludis/repositories/e/e_key.hh
index 2854be3..3375333 100644
--- a/paludis/repositories/e/e_key.hh
+++ b/paludis/repositories/e/e_key.hh
@@ -80,10 +80,10 @@ namespace paludis
virtual const tr1::shared_ptr<const DependencySpecTree::ConstItem> value() const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual std::string pretty_print(const DependencySpecTree::Formatter &) const
+ virtual std::string pretty_print(const DependencySpecTree::ItemFormatter &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual std::string pretty_print_flat(const DependencySpecTree::Formatter &) const
+ virtual std::string pretty_print_flat(const DependencySpecTree::ItemFormatter &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
IdleActionResult idle_load() const;
@@ -105,10 +105,10 @@ namespace paludis
virtual const tr1::shared_ptr<const FetchableURISpecTree::ConstItem> value() const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual std::string pretty_print(const FetchableURISpecTree::Formatter &) const
+ virtual std::string pretty_print(const FetchableURISpecTree::ItemFormatter &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual std::string pretty_print_flat(const FetchableURISpecTree::Formatter &) const
+ virtual std::string pretty_print_flat(const FetchableURISpecTree::ItemFormatter &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
virtual const tr1::shared_ptr<const URILabel> initial_label() const
@@ -131,10 +131,10 @@ namespace paludis
virtual const tr1::shared_ptr<const SimpleURISpecTree::ConstItem> value() const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual std::string pretty_print(const SimpleURISpecTree::Formatter &) const
+ virtual std::string pretty_print(const SimpleURISpecTree::ItemFormatter &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual std::string pretty_print_flat(const SimpleURISpecTree::Formatter &) const
+ virtual std::string pretty_print_flat(const SimpleURISpecTree::ItemFormatter &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
};
@@ -154,10 +154,10 @@ namespace paludis
virtual const tr1::shared_ptr<const RestrictSpecTree::ConstItem> value() const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual std::string pretty_print(const RestrictSpecTree::Formatter &) const
+ virtual std::string pretty_print(const RestrictSpecTree::ItemFormatter &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual std::string pretty_print_flat(const RestrictSpecTree::Formatter &) const
+ virtual std::string pretty_print_flat(const RestrictSpecTree::ItemFormatter &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
};
@@ -177,10 +177,10 @@ namespace paludis
virtual const tr1::shared_ptr<const ProvideSpecTree::ConstItem> value() const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual std::string pretty_print(const ProvideSpecTree::Formatter &) const
+ virtual std::string pretty_print(const ProvideSpecTree::ItemFormatter &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual std::string pretty_print_flat(const ProvideSpecTree::Formatter &) const
+ virtual std::string pretty_print_flat(const ProvideSpecTree::ItemFormatter &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
};
@@ -203,10 +203,10 @@ namespace paludis
IdleActionResult idle_load() const;
- virtual std::string pretty_print(const LicenseSpecTree::Formatter &) const
+ virtual std::string pretty_print(const LicenseSpecTree::ItemFormatter &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual std::string pretty_print_flat(const LicenseSpecTree::Formatter &) const
+ virtual std::string pretty_print_flat(const LicenseSpecTree::ItemFormatter &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
};
diff --git a/paludis/repositories/fake/fake_package_id.cc b/paludis/repositories/fake/fake_package_id.cc
index 1e289d2..f097b2f 100644
--- a/paludis/repositories/fake/fake_package_id.cc
+++ b/paludis/repositories/fake/fake_package_id.cc
@@ -184,14 +184,14 @@ FakeMetadataSpecTreeKey<C_>::value() const
template <typename C_>
std::string
-FakeMetadataSpecTreeKey<C_>::pretty_print(const typename C_::Formatter &) const
+FakeMetadataSpecTreeKey<C_>::pretty_print(const typename C_::ItemFormatter &) const
{
return _imp->string_value;
}
template <typename C_>
std::string
-FakeMetadataSpecTreeKey<C_>::pretty_print_flat(const typename C_::Formatter &) const
+FakeMetadataSpecTreeKey<C_>::pretty_print_flat(const typename C_::ItemFormatter &) const
{
return _imp->string_value;
}
@@ -224,13 +224,13 @@ FakeMetadataSpecTreeKey<FetchableURISpecTree>::value() const
}
std::string
-FakeMetadataSpecTreeKey<FetchableURISpecTree>::pretty_print(const FetchableURISpecTree::Formatter &) const
+FakeMetadataSpecTreeKey<FetchableURISpecTree>::pretty_print(const FetchableURISpecTree::ItemFormatter &) const
{
return _imp->string_value;
}
std::string
-FakeMetadataSpecTreeKey<FetchableURISpecTree>::pretty_print_flat(const FetchableURISpecTree::Formatter &) const
+FakeMetadataSpecTreeKey<FetchableURISpecTree>::pretty_print_flat(const FetchableURISpecTree::ItemFormatter &) const
{
return _imp->string_value;
}
diff --git a/paludis/repositories/fake/fake_package_id.hh b/paludis/repositories/fake/fake_package_id.hh
index 786f1e3..639ba73 100644
--- a/paludis/repositories/fake/fake_package_id.hh
+++ b/paludis/repositories/fake/fake_package_id.hh
@@ -98,10 +98,10 @@ namespace paludis
void set_from_string(const std::string &);
- virtual std::string pretty_print(const typename C_::Formatter &) const
+ virtual std::string pretty_print(const typename C_::ItemFormatter &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual std::string pretty_print_flat(const typename C_::Formatter &) const
+ virtual std::string pretty_print_flat(const typename C_::ItemFormatter &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
};
@@ -124,10 +124,10 @@ namespace paludis
void set_from_string(const std::string &);
- virtual std::string pretty_print(const FetchableURISpecTree::Formatter &) const
+ virtual std::string pretty_print(const FetchableURISpecTree::ItemFormatter &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual std::string pretty_print_flat(const FetchableURISpecTree::Formatter &) const
+ virtual std::string pretty_print_flat(const FetchableURISpecTree::ItemFormatter &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
virtual const tr1::shared_ptr<const URILabel> initial_label() const
diff --git a/paludis/repositories/virtuals/package_id.cc b/paludis/repositories/virtuals/package_id.cc
index 678fc18..2889c5a 100644
--- a/paludis/repositories/virtuals/package_id.cc
+++ b/paludis/repositories/virtuals/package_id.cc
@@ -118,7 +118,7 @@ VirtualsDepKey::value() const
}
std::string
-VirtualsDepKey::pretty_print(const DependencySpecTree::Formatter & f) const
+VirtualsDepKey::pretty_print(const DependencySpecTree::ItemFormatter & f) const
{
if (_imp->env)
{
@@ -136,7 +136,7 @@ VirtualsDepKey::pretty_print(const DependencySpecTree::Formatter & f) const
}
std::string
-VirtualsDepKey::pretty_print_flat(const DependencySpecTree::Formatter & f) const
+VirtualsDepKey::pretty_print_flat(const DependencySpecTree::ItemFormatter & f) const
{
if (_imp->env)
{
diff --git a/paludis/repositories/virtuals/package_id.hh b/paludis/repositories/virtuals/package_id.hh
index 9b5e64e..9bb52d7 100644
--- a/paludis/repositories/virtuals/package_id.hh
+++ b/paludis/repositories/virtuals/package_id.hh
@@ -58,10 +58,10 @@ namespace paludis
virtual const tr1::shared_ptr<const DependencySpecTree::ConstItem> value() const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual std::string pretty_print(const DependencySpecTree::Formatter &) const
+ virtual std::string pretty_print(const DependencySpecTree::ItemFormatter &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual std::string pretty_print_flat(const DependencySpecTree::Formatter &) const
+ virtual std::string pretty_print_flat(const DependencySpecTree::ItemFormatter &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
};
diff --git a/paludis/stringify_formatter_TEST.cc b/paludis/stringify_formatter_TEST.cc
index fa4bfbf..7bd8dd8 100644
--- a/paludis/stringify_formatter_TEST.cc
+++ b/paludis/stringify_formatter_TEST.cc
@@ -37,7 +37,7 @@ namespace
}
std::string format_three(const PackageDepSpec & k, const BlockDepSpec & d, const UseDepSpec & u,
- const GenericSpecTree::Formatter & f)
+ const GenericSpecTree::ItemFormatter & f)
{
return f.format(k, format::Plain()) + " " + f.format(d, format::Plain()) + " " + f.format(u, format::Enabled());
}
diff --git a/python/metadata_key.cc b/python/metadata_key.cc
index 074fdfa..90c4dfb 100644
--- a/python/metadata_key.cc
+++ b/python/metadata_key.cc
@@ -372,7 +372,7 @@ struct MetadataSpecTreeKeyWrapper :
throw PythonMethodNotImplemented("MetadataSpecTreeKey", "value");
}
- virtual std::string pretty_print(const typename C_::Formatter &) const
+ virtual std::string pretty_print(const typename C_::ItemFormatter &) const
PALUDIS_ATTRIBUTE((warn_unused_result))
{
Lock l(get_mutex());
@@ -384,7 +384,7 @@ struct MetadataSpecTreeKeyWrapper :
throw PythonMethodNotImplemented("MetadataSpecTreeKey", "pretty_print");
}
- virtual std::string pretty_print_flat(const typename C_::Formatter &) const
+ virtual std::string pretty_print_flat(const typename C_::ItemFormatter &) const
PALUDIS_ATTRIBUTE((warn_unused_result))
{
Lock l(get_mutex());
@@ -418,7 +418,7 @@ struct MetadataSpecTreeKeyWrapper<FetchableURISpecTree> :
throw PythonMethodNotImplemented("MetadataSpecTreeKey", "value");
}
- virtual std::string pretty_print(const FetchableURISpecTree::Formatter &) const
+ virtual std::string pretty_print(const FetchableURISpecTree::ItemFormatter &) const
PALUDIS_ATTRIBUTE((warn_unused_result))
{
Lock l(get_mutex());
@@ -430,7 +430,7 @@ struct MetadataSpecTreeKeyWrapper<FetchableURISpecTree> :
throw PythonMethodNotImplemented("MetadataSpecTreeKey", "pretty_print");
}
- virtual std::string pretty_print_flat(const FetchableURISpecTree::Formatter &) const
+ virtual std::string pretty_print_flat(const FetchableURISpecTree::ItemFormatter &) const
PALUDIS_ATTRIBUTE((warn_unused_result))
{
Lock l(get_mutex());