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

[Daniel Burrows]

Author: dburrows
Date: Tue Jun  7 02:54:50 2005
New Revision: 3346

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/cmdline/cmdline_prompt.cc
   branches/aptitude-0.3/aptitude/src/cmdline/cmdline_resolver.cc
   branches/aptitude-0.3/aptitude/src/cmdline/cmdline_show.cc
Log:
Make the command-line code compile again.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Tue Jun  7 02:54:50 2005
@@ -1,5 +1,11 @@
 2005-06-06  Daniel Burrows  <dburrows@debian.org>
 
+	* src/cmdline/cmdline_prompt.cc, src/cmdline/cmdline_resolver.cc, src/cmdline/cmdline_show.cc:
+
+	Adjust the command-line code to work properly with the new
+	fragment API (note: arguably a better approach is to add a routine
+	that does the layout and output of a fragment in one step).
+
 	* src/vscreen/vscreen_widget.cc:
 
 	Change both the widget's attributes and its background in

Modified: branches/aptitude-0.3/aptitude/src/cmdline/cmdline_prompt.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/cmdline/cmdline_prompt.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/cmdline/cmdline_prompt.cc	Tue Jun  7 02:54:50 2005
@@ -675,7 +675,7 @@
 					    fragf(_("'&m' to mark packages as manually installed")))));
 
   out << _("Commands:") << endl;
-  out << f->layout(screen_width, screen_width);
+  out << f->layout(screen_width, screen_width, style());
   delete f;
 }
 

Modified: branches/aptitude-0.3/aptitude/src/cmdline/cmdline_resolver.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/cmdline/cmdline_resolver.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/cmdline/cmdline_resolver.cc	Tue Jun  7 02:54:50 2005
@@ -135,7 +135,7 @@
 			      flowindentbox(0, 3,
 					    fragf(_("Adjustments will cause the current solution to be discarded and recalculated as necessary.")))));
 
-  out << f->layout(screen_width, screen_width);
+  out << f->layout(screen_width, screen_width, style());
   delete f;
 }
 
@@ -173,7 +173,7 @@
 
 		    update_screen_width();
 
-		    fragment_contents lines=f->layout(screen_width, screen_width);
+		    fragment_contents lines=f->layout(screen_width, screen_width, style());
 
 		    delete f;
 

Modified: branches/aptitude-0.3/aptitude/src/cmdline/cmdline_show.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/cmdline/cmdline_show.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/cmdline/cmdline_show.cc	Tue Jun  7 02:54:50 2005
@@ -238,7 +238,7 @@
 
   fragment *f=sequence_fragment(fragments);
 
-  cout << f->layout(screen_width, screen_width);
+  cout << f->layout(screen_width, screen_width, style());
 
   delete f;
 }
@@ -330,7 +330,7 @@
     {
       fragment *f=version_file_fragment(ver, ver.FileList(), verbose);
 
-      cout << f->layout(screen_width, screen_width);
+      cout << f->layout(screen_width, screen_width, style());
 
       delete f;
     }
@@ -340,7 +340,7 @@
 	{
 	  fragment *f=version_file_fragment(ver, vf, verbose);
 
-	  cout << f->layout(screen_width, screen_width) << endl;
+	  cout << f->layout(screen_width, screen_width, style()) << endl;
 
 	  delete f;