[Aptitude-svn-commit] r4236 - in branches/aptitude-0.3/aptitude: . src

[Daniel Burrows]

Author: dburrows
Date: Sat Sep 24 16:37:56 2005
New Revision: 4236

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/solution_item.cc
Log:
Make solution_unresolved_item use approved_broken instead of forced_broken.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Sat Sep 24 16:37:56 2005
@@ -1,5 +1,10 @@
 2005-09-24  Daniel Burrows  <dburrows at debian.org>
 
+	* src/solution_item.cc:
+
+	  Switch the solution_unresolved_item class to using the new
+	  approved_broken stuff instead of forced_broken.
+
 	* src/generic/problemresolver/problemresolver.h:
 
 	  Doh, of course the MUTATORS for the new structure shouldn't be

Modified: branches/aptitude-0.3/aptitude/src/solution_item.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/solution_item.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/solution_item.cc	Sat Sep 24 16:37:56 2005
@@ -503,7 +503,7 @@
 
 bool solution_unresolved_item::is_mandatory()
 {
-  return resman->is_forced_broken(d);
+  return resman->is_approved_broken(d);
 }
 
 void solution_unresolved_item::highlighted(vs_tree *win)
@@ -528,12 +528,12 @@
 
 void solution_unresolved_item::mandate()
 {
-  resman->force_break_dep(d);
+  resman->approve_broken_dep(d);
 }
 
 void solution_unresolved_item::unmandate()
 {
-  resman->unforce_break_dep(d);
+  resman->unapprove_broken_dep(d);
 }
 
 void solution_unresolved_item::paint(vs_tree *win, int y, bool hierarchical, const style &st)