Make some ChangeByResolvents into DependentPackageIDs

3 files changed, 13 insertions, 4 deletions

diff --git a/src/clients/cave/cmd_display_resolution.cc b/src/clients/cave/cmd_display_resolution.cc
index 31c074a8d..fa1019fc4 100755
--- a/src/clients/cave/cmd_display_resolution.cc
+++ b/src/clients/cave/cmd_display_resolution.cc
@@ -25,7 +25,9 @@
 #include "colour_pretty_printer.hh"
 #include "format_user_config.hh"
 #include "parse_spec_with_nice_error.hh"
+
 #include <paludis/args/do_help.hh>
+
 #include <paludis/util/safe_ifstream.hh>
 #include <paludis/util/system.hh>
 #include <paludis/util/destringify.hh>
@@ -42,6 +44,7 @@
 #include <paludis/util/pretty_print.hh>
 #include <paludis/util/make_null_shared_ptr.hh>
 #include <paludis/util/enum_iterator.hh>
+
 #include <paludis/resolver/resolutions_by_resolvent.hh>
 #include <paludis/resolver/reason.hh>
 #include <paludis/resolver/sanitised_dependencies.hh>
@@ -58,6 +61,8 @@
 #include <paludis/resolver/change_by_resolvent.hh>
 #include <paludis/resolver/match_qpns.hh>
 #include <paludis/resolver/why_changed_choices.hh>
+#include <paludis/resolver/collect_depped_upon.hh>
+
 #include <paludis/package_id.hh>
 #include <paludis/version_spec.hh>
 #include <paludis/metadata_key.hh>
@@ -236,7 +241,7 @@ namespace
 
         std::pair<std::string, Tribool> visit(const DependentReason & r) const
         {
-            return std::make_pair("dependent upon " + stringify(*r.id_and_resolvent_being_removed().package_id()), true);
+            return std::make_pair("dependent upon " + stringify(*r.dependent_upon().package_id()), true);
         }
 
         std::pair<std::string, Tribool> visit(const WasUsedByReason & r) const
diff --git a/src/clients/cave/cmd_resolve_dump.cc b/src/clients/cave/cmd_resolve_dump.cc
index 469f182d5..d0becbd05 100644
--- a/src/clients/cave/cmd_resolve_dump.cc
+++ b/src/clients/cave/cmd_resolve_dump.cc
@@ -1,7 +1,7 @@
 /* vim: set sw=4 sts=4 et foldmethod=syntax : */
 
 /*
- * Copyright (c) 2009, 2010 Ciaran McCreesh
+ * Copyright (c) 2009, 2010, 2011 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
@@ -18,6 +18,7 @@
  */
 
 #include "cmd_resolve_dump.hh"
+
 #include <paludis/resolver/resolver.hh>
 #include <paludis/resolver/resolvent.hh>
 #include <paludis/resolver/sanitised_dependencies.hh>
@@ -28,11 +29,14 @@
 #include <paludis/resolver/destination.hh>
 #include <paludis/resolver/resolutions_by_resolvent.hh>
 #include <paludis/resolver/change_by_resolvent.hh>
+#include <paludis/resolver/collect_depped_upon.hh>
+
 #include <paludis/util/enum_iterator.hh>
 #include <paludis/util/indirect_iterator-impl.hh>
 #include <paludis/util/join.hh>
 #include <paludis/util/stringify.hh>
 #include <paludis/util/wrapped_forward_iterator.hh>
+
 #include <iostream>
 #include <sstream>
 
@@ -179,7 +183,7 @@ namespace
 
         void visit(const DependentReason & r)
         {
-            str = "Dependent(" + stringify(*r.id_and_resolvent_being_removed().package_id()) + ")";
+            str = "Dependent(" + stringify(*r.dependent_upon().package_id()) + ")";
         }
 
         void visit(const WasUsedByReason & r)
diff --git a/src/clients/cave/resolve_common.cc b/src/clients/cave/resolve_common.cc
index 63087b146..3ddbddb33 100644
--- a/src/clients/cave/resolve_common.cc
+++ b/src/clients/cave/resolve_common.cc
@@ -539,7 +539,7 @@ namespace
 
         const std::string visit(const DependentReason & r) const
         {
-            return "from dependent " + stringify(*r.id_and_resolvent_being_removed().package_id());
+            return "from dependent " + stringify(*r.dependent_upon().package_id());
         }
 
         const std::string visit(const TargetReason & r) const