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

[Daniel Burrows]

Author: dburrows
Date: Sun Jul  3 17:38:33 2005
New Revision: 3586

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/vscreen/vs_pager.cc
   branches/aptitude-0.3/aptitude/src/vscreen/vs_pager.h
Log:
Allow the encoding to be specified when a vs_pager is created with a pre-loaded file too.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Sun Jul  3 17:38:33 2005
@@ -1,5 +1,10 @@
 2005-07-03  Daniel Burrows  <dburrows@debian.org>
 
+	* src/vscreen/vs_pager.cc, src/vscreen/vs_pager.h:
+
+	  Allow the encoding to be specified when a vs_pager is created
+	  with a pre-loaded file (oops).
+
 	* src/vscreen/vs_util.cc, src/vscreen/vs_util.h:
 
 	  Allow the user to specify the encoding of the file to be loaded

Modified: branches/aptitude-0.3/aptitude/src/vscreen/vs_pager.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/vscreen/vs_pager.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/vscreen/vs_pager.cc	Sun Jul  3 17:38:33 2005
@@ -299,18 +299,21 @@
 {
 }
 
-vs_file_pager::vs_file_pager(const string &filename):vs_pager("")
+vs_file_pager::vs_file_pager(const string &filename,
+			     const char *encoding):vs_pager("")
 {
-  load_file(filename);
+  load_file(filename, encoding);
 }
 
-vs_file_pager::vs_file_pager(const wstring &filename):vs_pager("")
+vs_file_pager::vs_file_pager(const wstring &filename,
+			     const char *encoding):vs_pager("")
 {
-  load_file(filename);
+  load_file(filename, encoding);
 }
 
-vs_file_pager::vs_file_pager(const char *text, int size)
-  :vs_pager(text, size)
+vs_file_pager::vs_file_pager(const char *text, int size,
+			     const char *encoding)
+  :vs_pager(text, size, encoding)
 {
 }
 

Modified: branches/aptitude-0.3/aptitude/src/vscreen/vs_pager.h
==============================================================================
--- branches/aptitude-0.3/aptitude/src/vscreen/vs_pager.h	(original)
+++ branches/aptitude-0.3/aptitude/src/vscreen/vs_pager.h	Sun Jul  3 17:38:33 2005
@@ -162,15 +162,15 @@
 {
 public:
   vs_file_pager();
-  vs_file_pager(const std::string &filename);
+  vs_file_pager(const std::string &filename, const char *encoding=NULL);
 
   /** Attempts to convert the string to a multibyte representation and
    *  then load it; a nonconvertible string is treated as any other
    *  load failure would be.
    */
-  vs_file_pager(const std::wstring &filename);
+  vs_file_pager(const std::wstring &filename, const char *encoding=NULL);
 
-  vs_file_pager(const char *text, int len);
+  vs_file_pager(const char *text, int len, const char *encoding=NULL);
 
   /** Loads the given file into the pager.
    *