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

[Daniel Burrows]

Author: dburrows
Date: Sun Jun 26 10:46:41 2005
New Revision: 3446

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/pkg_columnizer.cc
   branches/aptitude-0.3/aptitude/src/pkg_columnizer.h
Log:
Return a wstring from the column name formatter.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Sun Jun 26 10:46:41 2005
@@ -1,5 +1,9 @@
 2005-06-26  Daniel Burrows  <dburrows@debian.org>
 
+	* src/pkg_columnizer.cc, src/pkg_columnizer.h:
+
+	  Make the column name formatter return a wstring.
+
 	* src/pkg_columnizer.cc:
 
 	  Transcode column definitions before parsing.

Modified: branches/aptitude-0.3/aptitude/src/pkg_columnizer.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/pkg_columnizer.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/pkg_columnizer.cc	Sun Jun 26 10:46:41 2005
@@ -671,11 +671,9 @@
     }
 }
 
-string pkg_item::pkg_columnizer::format_column_names(unsigned int width)
+wstring pkg_item::pkg_columnizer::format_column_names(unsigned int width)
 {
   setup_columns();
 
-  string rval=pkg_genheaders(*columns).layout_columns(width);
-
-  return rval;
+  return pkg_genheaders(*columns).layout_columns(width);
 }

Modified: branches/aptitude-0.3/aptitude/src/pkg_columnizer.h
==============================================================================
--- branches/aptitude-0.3/aptitude/src/pkg_columnizer.h	(original)
+++ branches/aptitude-0.3/aptitude/src/pkg_columnizer.h	Sun Jun 26 10:46:41 2005
@@ -1,6 +1,6 @@
 // pkg_columnizer.h  -*-c++-*-
 //
-//  Copyright 1999,2000,2001 Daniel Burrows
+//  Copyright 1999-2002, 2004-2005 Daniel Burrows
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
@@ -68,7 +68,7 @@
   static void setup_columns(bool force_update=false);
   // This reads and sets up the necessary information about how to format the
   // display of packages.
-  static std::string format_column_names(unsigned int width);
+  static std::wstring format_column_names(unsigned int width);
   // Returns a string which can serve as a header for the column-name
   // information for a screen of the given width.