aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-02-05 14:11:40 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-02-05 14:55:18 +0000
commit6931070f404f5e381de2db9ff9dd1ade33a07631 (patch)
treefd62830166f662cfce89cb0dc55e1ecfa29c3b0d
parent6bff48083351b0fc0432b74815fc4dd9d1ae9b4c (diff)
downloadpaludis-6931070f404f5e381de2db9ff9dd1ade33a07631.tar.gz
paludis-6931070f404f5e381de2db9ff9dd1ade33a07631.tar.xz
foo_decision instead of decision when fixed type
-rw-r--r--paludis/resolver/job.cc18
-rw-r--r--paludis/resolver/job.hh6
-rw-r--r--src/clients/cave/cmd_display_resolution.cc8
-rw-r--r--src/clients/cave/cmd_execute_resolution.cc16
4 files changed, 24 insertions, 24 deletions
diff --git a/paludis/resolver/job.cc b/paludis/resolver/job.cc
index 03d3ea1..d76c12f 100644
--- a/paludis/resolver/job.cc
+++ b/paludis/resolver/job.cc
@@ -176,7 +176,7 @@ Job::deserialise(Deserialisation & d)
Deserialisator v(d, "SimpleInstallJob");
result.reset(new SimpleInstallJob(
v.member<std::tr1::shared_ptr<Resolution> >("resolution"),
- v.member<std::tr1::shared_ptr<ChangesToMakeDecision> >("decision")
+ v.member<std::tr1::shared_ptr<ChangesToMakeDecision> >("changes_to_make_decision")
));
do_arrows(result, v);
do_existing(result, v);
@@ -186,7 +186,7 @@ Job::deserialise(Deserialisation & d)
Deserialisator v(d, "FetchJob");
result.reset(new FetchJob(
v.member<std::tr1::shared_ptr<Resolution> >("resolution"),
- v.member<std::tr1::shared_ptr<ChangesToMakeDecision> >("decision")
+ v.member<std::tr1::shared_ptr<ChangesToMakeDecision> >("changes_to_make_decision")
));
do_arrows(result, v);
do_existing(result, v);
@@ -196,7 +196,7 @@ Job::deserialise(Deserialisation & d)
Deserialisator v(d, "ErrorJob");
result.reset(new ErrorJob(
v.member<std::tr1::shared_ptr<Resolution> >("resolution"),
- v.member<std::tr1::shared_ptr<UnableToMakeDecision> >("decision")
+ v.member<std::tr1::shared_ptr<UnableToMakeDecision> >("unable_to_make_decision")
));
do_arrows(result, v);
do_existing(result, v);
@@ -348,7 +348,7 @@ FetchJob::resolution() const
}
const std::tr1::shared_ptr<const ChangesToMakeDecision>
-FetchJob::decision() const
+FetchJob::changes_to_make_decision() const
{
return _imp->decision;
}
@@ -390,7 +390,7 @@ FetchJob::serialise(Serialiser & s) const
{
s.object("FetchJob")
.member(SerialiserFlags<serialise::might_be_null, serialise::container>(), "arrows", arrows())
- .member(SerialiserFlags<serialise::might_be_null>(), "decision", decision())
+ .member(SerialiserFlags<serialise::might_be_null>(), "changes_to_make_decision", changes_to_make_decision())
.member(SerialiserFlags<serialise::might_be_null>(), "resolution", resolution())
.member(SerialiserFlags<serialise::container, serialise::might_be_null>(),
"used_existing_packages_when_ordering", used_existing_packages_when_ordering())
@@ -414,7 +414,7 @@ SimpleInstallJob::resolution() const
}
const std::tr1::shared_ptr<const ChangesToMakeDecision>
-SimpleInstallJob::decision() const
+SimpleInstallJob::changes_to_make_decision() const
{
return _imp->decision;
}
@@ -456,7 +456,7 @@ SimpleInstallJob::serialise(Serialiser & s) const
{
s.object("SimpleInstallJob")
.member(SerialiserFlags<serialise::might_be_null, serialise::container>(), "arrows", arrows())
- .member(SerialiserFlags<serialise::might_be_null>(), "decision", decision())
+ .member(SerialiserFlags<serialise::might_be_null>(), "changes_to_make_decision", changes_to_make_decision())
.member(SerialiserFlags<serialise::might_be_null>(), "resolution", resolution())
.member(SerialiserFlags<serialise::container, serialise::might_be_null>(),
"used_existing_packages_when_ordering", used_existing_packages_when_ordering())
@@ -515,7 +515,7 @@ ErrorJob::serialise(Serialiser & s) const
{
s.object("ErrorJob")
.member(SerialiserFlags<serialise::might_be_null, serialise::container>(), "arrows", arrows())
- .member(SerialiserFlags<serialise::might_be_null>(), "decision", decision())
+ .member(SerialiserFlags<serialise::might_be_null>(), "unable_to_make_decision", unable_to_make_decision())
.member(SerialiserFlags<serialise::might_be_null>(), "resolution", resolution())
.member(SerialiserFlags<serialise::container, serialise::might_be_null>(),
"used_existing_packages_when_ordering", used_existing_packages_when_ordering())
@@ -523,7 +523,7 @@ ErrorJob::serialise(Serialiser & s) const
}
const std::tr1::shared_ptr<const UnableToMakeDecision>
-ErrorJob::decision() const
+ErrorJob::unable_to_make_decision() const
{
return _imp->decision;
}
diff --git a/paludis/resolver/job.hh b/paludis/resolver/job.hh
index a227ddc..8598932 100644
--- a/paludis/resolver/job.hh
+++ b/paludis/resolver/job.hh
@@ -147,7 +147,7 @@ namespace paludis
PALUDIS_ATTRIBUTE((warn_unused_result));
const std::tr1::shared_ptr<const Resolution> resolution() const PALUDIS_ATTRIBUTE((warn_unused_result));
- const std::tr1::shared_ptr<const ChangesToMakeDecision> decision() const PALUDIS_ATTRIBUTE((warn_unused_result));
+ const std::tr1::shared_ptr<const ChangesToMakeDecision> changes_to_make_decision() const PALUDIS_ATTRIBUTE((warn_unused_result));
virtual void serialise(Serialiser &) const;
};
@@ -178,7 +178,7 @@ namespace paludis
PALUDIS_ATTRIBUTE((warn_unused_result));
const std::tr1::shared_ptr<const Resolution> resolution() const PALUDIS_ATTRIBUTE((warn_unused_result));
- const std::tr1::shared_ptr<const ChangesToMakeDecision> decision() const PALUDIS_ATTRIBUTE((warn_unused_result));
+ const std::tr1::shared_ptr<const ChangesToMakeDecision> changes_to_make_decision() const PALUDIS_ATTRIBUTE((warn_unused_result));
virtual void serialise(Serialiser &) const;
};
@@ -209,7 +209,7 @@ namespace paludis
PALUDIS_ATTRIBUTE((warn_unused_result));
const std::tr1::shared_ptr<const Resolution> resolution() const PALUDIS_ATTRIBUTE((warn_unused_result));
- const std::tr1::shared_ptr<const UnableToMakeDecision> decision() const PALUDIS_ATTRIBUTE((warn_unused_result));
+ const std::tr1::shared_ptr<const UnableToMakeDecision> unable_to_make_decision() const PALUDIS_ATTRIBUTE((warn_unused_result));
virtual void serialise(Serialiser &) const;
};
diff --git a/src/clients/cave/cmd_display_resolution.cc b/src/clients/cave/cmd_display_resolution.cc
index c64f01b..6c78cf8 100644
--- a/src/clients/cave/cmd_display_resolution.cc
+++ b/src/clients/cave/cmd_display_resolution.cc
@@ -618,7 +618,7 @@ namespace
const DisplayResolutionCommandLine & cmdline,
const SimpleInstallJob & job)
{
- display_one_installish(env, cmdline, *job.decision(), job.resolution());
+ display_one_installish(env, cmdline, *job.changes_to_make_decision(), job.resolution());
}
void display_special_job_decision(
@@ -753,7 +753,7 @@ namespace
{
const std::string visit(const SimpleInstallJob & j) const
{
- return "install " + stringify(*j.decision()->origin_id());
+ return "install " + stringify(*j.changes_to_make_decision()->origin_id());
}
const std::string visit(const UsableJob & j) const
@@ -768,7 +768,7 @@ namespace
const std::string visit(const FetchJob & j) const
{
- return "fetch " + stringify(*j.decision()->origin_id());
+ return "fetch " + stringify(*j.changes_to_make_decision()->origin_id());
}
const std::string visit(const UsableGroupJob & j) const
@@ -820,7 +820,7 @@ namespace
const std::tr1::shared_ptr<const Resolution> & resolution,
const ErrorJob & j)
{
- display_unable_to_make_decision(env, resolution, *j.decision());
+ display_unable_to_make_decision(env, resolution, *j.unable_to_make_decision());
}
void display_untaken(
diff --git a/src/clients/cave/cmd_execute_resolution.cc b/src/clients/cave/cmd_execute_resolution.cc
index ae97b08..99b1028 100644
--- a/src/clients/cave/cmd_execute_resolution.cc
+++ b/src/clients/cave/cmd_execute_resolution.cc
@@ -412,7 +412,7 @@ namespace
++counts.x_installs;
/* not all of the fetch is done in the background */
- if (! do_fetch(env, cmdline, *job.decision(), counts.x_installs, counts.y_installs,
+ if (! do_fetch(env, cmdline, *job.changes_to_make_decision(), counts.x_installs, counts.y_installs,
false, fetch_output_manager_goes_here))
{
std::tr1::shared_ptr<JobFailedState> failed_state(new JobFailedState(state->job()));
@@ -423,7 +423,7 @@ namespace
}
if (! do_install(env, cmdline, job.resolution(),
- *job.decision(), counts.x_installs, counts.y_installs, install_output_manager_goes_here))
+ *job.changes_to_make_decision(), counts.x_installs, counts.y_installs, install_output_manager_goes_here))
{
std::tr1::shared_ptr<JobFailedState> failed_state(new JobFailedState(state->job()));
if (fetch_output_manager_goes_here)
@@ -450,7 +450,7 @@ namespace
std::tr1::shared_ptr<OutputManager> output_manager_goes_here;
++counts.x_fetches;
- if (! do_fetch(env, cmdline, *job.decision(), counts.x_fetches, counts.y_fetches,
+ if (! do_fetch(env, cmdline, *job.changes_to_make_decision(), counts.x_fetches, counts.y_fetches,
true, output_manager_goes_here))
{
std::tr1::shared_ptr<JobFailedState> failed_state(new JobFailedState(state->job()));
@@ -529,7 +529,7 @@ namespace
cout << endl;
cout << c::bold_blue() << counts.x_installs << " of " << counts.y_installs << ": Skipping install of "
- << *job.decision()->origin_id() << c::normal() << endl;
+ << *job.changes_to_make_decision()->origin_id() << c::normal() << endl;
cout << endl;
state.reset(new JobSkippedState(state->job()));
@@ -848,7 +848,7 @@ namespace
bool visit(const SimpleInstallJob & c) const
{
std::tr1::shared_ptr<OutputManager> output_manager_goes_here;
- return do_pretend(env, cmdline, *c.decision(), ++counts.x_installs, counts.y_installs,
+ return do_pretend(env, cmdline, *c.changes_to_make_decision(), ++counts.x_installs, counts.y_installs,
output_manager_goes_here);
}
@@ -970,8 +970,8 @@ namespace
if (want_to_flush || something_failed)
{
summary();
- cout << colour << state << c::normal() << *job.decision()->origin_id()
- << " to " << job.decision()->destination()->repository() << endl;
+ cout << colour << state << c::normal() << *job.changes_to_make_decision()->origin_id()
+ << " to " << job.changes_to_make_decision()->destination()->repository() << endl;
}
}
@@ -980,7 +980,7 @@ namespace
if (want_to_flush || this_failed)
{
summary();
- cout << colour << state << c::normal() << "fetch " << *job.decision()->origin_id() << endl;
+ cout << colour << state << c::normal() << "fetch " << *job.changes_to_make_decision()->origin_id() << endl;
}
}