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

[Daniel Burrows]

Author: dburrows
Date: Tue May 10 13:11:55 2005
New Revision: 3279

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/vscreen/fragment.cc
Log:
Fix compile errors in the fragment code.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Tue May 10 13:11:55 2005
@@ -1,5 +1,9 @@
 2005-05-10  Daniel Burrows  <dburrows@debian.org>
 
+	* src/vscreen/fragment.cc:
+
+	Fix compile errors.
+
 	* src/vscreen/curses++.cc, src/vscreen/curses++.h:
 
 	Add some new constructors to chstring that will be needed later;

Modified: branches/aptitude-0.3/aptitude/src/vscreen/fragment.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/vscreen/fragment.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/vscreen/fragment.cc	Tue May 10 13:11:55 2005
@@ -65,7 +65,7 @@
 public:
   _newline_fragment() {}
 
-  fragment_contents layout(size_t firstw, size_t restw)
+  fragment_contents layout(size_t firstw, size_t restw, const style &st)
   {
     fragment_contents rval;
     rval.set_final_nl(true);
@@ -96,16 +96,16 @@
 class _style_fragment:public fragment
 {
 public:
-  _style_fragment(const style &_s, const fragment *_contents)
-    :st(_st), contents(_contents)
+  _style_fragment(fragment *_contents, const style &_st)
+    :contents(_contents), st(_st)
   {
   }
   ~_style_fragment() {delete contents;}
 
   fragment_contents layout(size_t firstw, size_t restw,
-			   const style &s2)
+			   const style &st2)
   {
-    return contents->layout(firstw, restw, s+s2);
+    return contents->layout(firstw, restw, st+st2);
   }
 
   size_t max_width(size_t first_indent, size_t rest_indent) const
@@ -118,14 +118,14 @@
     return contents->trailing_width(first_indent, rest_indent);
   }
 
-  bool final_nl() const
+  bool final_newline() const
   {
-    return contents->final_nl();
+    return contents->final_newline();
   }
 private:
   fragment *contents;
   style st;
-}
+};
 
 fragment *style_fragment(fragment *f,
 			 const style &st)
@@ -891,7 +891,7 @@
 	      {
 		string s="Internal error: bad character in positional argument: '"+char_to_str(*endptr)+"'";
 
-		return text_fragment(s, get_color("Error"));
+		return text_fragment(s, get_style("Error"));
 	      }
 
 	    posargcount=max(posargcount, pos);
@@ -919,7 +919,7 @@
 	  break;
 	default:
 	  return text_fragment("Internal error: bad format string code '"+char_to_str(*(nextpercent+1))+"'",
-			       get_color("Error"));
+			       get_style("Error"));
 	}
 
       nextpercent=strchr(start, '%');
@@ -956,7 +956,7 @@
 	    // if we saw it before it had better be the same type.
 	    if(arguments[pos].format!=0 && arguments[pos].format!=*(endptr+1))
 	      return text_fragment("Bad argument string to fragf: inconsistent positional parameter types!",
-				   get_color("Error"));
+				   get_style("Error"));
 
 	    arguments[pos].format=*(endptr+1);
 
@@ -979,7 +979,7 @@
 	case 'S':
 	  if(arguments[argcount].format!=0 && arguments[argcount].format!=*(nextpercent+1))
 	    return text_fragment("Bad argument string to fragf: inconsistent parameter types!",
-				 get_color("Error"));
+				 get_style("Error"));
 
 	  arguments[argcount].format=*(nextpercent+1);
 
@@ -988,7 +988,7 @@
 	  break;
 	default:
 	  return text_fragment("Internal error: bad format string code '"+char_to_str(*(nextpercent+1))+"'",
-			       get_color("Error"));
+			       get_style("Error"));
 	}
 
       nextpercent=strchr(start, '%');
@@ -1016,7 +1016,7 @@
 	  break;
 	default:
 	  return text_fragment("Internal error: bad argument format '"+char_to_str(arguments[i].format)+"'",
-			       get_color("Error"));
+			       get_style("Error"));
 	}
     }
 
@@ -1053,22 +1053,22 @@
 	  curstr+=chstring(string("%"), st);
 	  break;
 	case 'B':
-	  st.attr_flip(A_BOLD);
+	  st.attrs_flip(A_BOLD);
 	  break;
 	case 'b':
-	  st.attr_flip(A_BOLD);
+	  st.attrs_flip(A_BOLD);
 	  break;
 	case 'R':
-	  st.attr_flip(A_REVERSE);
+	  st.attrs_flip(A_REVERSE);
 	  break;
 	case 'r':
-	  st.attr_flip(A_REVERSE);
+	  st.attrs_flip(A_REVERSE);
 	  break;
 	case 'D':
-	  st.attr_flip(A_DIM);
+	  st.attrs_flip(A_DIM);
 	  break;
 	case 'd':
-	  st.attr_flip(A_DIM);
+	  st.attrs_flip(A_DIM);
 	  break;
 	case 'n':
 	  if(!curstr.empty())
@@ -1095,7 +1095,7 @@
 	  // should have been verified above.
 	  assert(arguments[argcount].format=='s');
 
-	  curstr+=chstring(arguments[argcount].s, attr);
+	  curstr+=chstring(arguments[argcount].s, st);
 	  ++argcount;
 	  break;
 	case 'S':
@@ -1133,7 +1133,7 @@
 		rval.push_back(arguments[pos].F);
 		break;
 	      case 's':
-		curstr+=chstring(arguments[pos].s, attr);
+		curstr+=chstring(arguments[pos].s, st);
 		break;
 	      case 'S':
 		st+=get_style(arguments[pos].s);