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

[Daniel Burrows]

Author: dburrows
Date: Sat Jun 25 17:18:53 2005
New Revision: 3424

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/vscreen/fragment.cc
   branches/aptitude-0.3/aptitude/src/vscreen/fragment.h
Log:
Actually, just use text_fragment to transcode.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Sat Jun 25 17:18:53 2005
@@ -1,5 +1,10 @@
 2005-06-25  Daniel Burrows  <dburrows@debian.org>
 
+	* src/vscreen/fragment.cc, src/vscreen/fragment.h:
+
+	  Instead of requiring a separate function to be called for
+	  transcoding, just overload text_fragment (NB: is this wise?).
+
 	* src/vscreen/fragment.cc, src/vscreen/fragment.h, src/vscreen/fragment_contents.h:
 
 	  Use wide character strings internally to format text fragments,

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	Sat Jun 25 17:18:53 2005
@@ -63,8 +63,8 @@
 			st);
 }
 
-fragment *transcode_fragment(const string &s,
-			     const char *encoding)
+fragment *text_fragment(const string &s,
+			const char *encoding)
 {
   wstring decoded;
 
@@ -81,11 +81,11 @@
     return text_fragment(decoded);
 }
 
-fragment *transcode_fragment(const string &s,
-			     const style &st,
-			     const char *encoding)
+fragment *text_fragment(const string &s,
+			const style &st,
+			const char *encoding)
 {
-  return style_fragment(transcode_fragment(s, encoding),
+  return style_fragment(text_fragment(s, encoding),
 			st);
 }
 

Modified: branches/aptitude-0.3/aptitude/src/vscreen/fragment.h
==============================================================================
--- branches/aptitude-0.3/aptitude/src/vscreen/fragment.h	(original)
+++ branches/aptitude-0.3/aptitude/src/vscreen/fragment.h	Sat Jun 25 17:18:53 2005
@@ -92,7 +92,7 @@
  *
  *  \return the new fragment
  */
-fragment *text_fragment(const std::string &s,
+fragment *text_fragment(const std::wstring &s,
 			const style &st);
 
 /** Create a fragment from a string of multibyte-encoded text.
@@ -103,14 +103,14 @@
  *
  *  \return the new fragment
  */
-fragment *transcode_fragment(const std::string &s,
-			     const char *encoding=NULL);
+fragment *text_fragment(const std::string &s,
+			const char *encoding=NULL);
 
 /** Create a fragment from a string of multibyte-encoded text,
  *  wrapping an implicit style_fragment around it.
  */
-fragment *transcode_fragment(const std::string &s,
-			     const style &st,
+fragment *text_fragment(const std::string &s,
+			const style &st,
 			     const char *encoding=NULL);
 
 /** Create a fragment from a string of text.  The text will simply be