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

[Daniel Burrows]

Author: dburrows
Date: Sat Jul  2 17:51:20 2005
New Revision: 3556

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/vscreen/vs_tree.h
   branches/aptitude-0.3/aptitude/src/vscreen/vs_treeitem.h
Log:
Parameterize vs_tree searches by wide character strings.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Sat Jul  2 17:51:20 2005
@@ -1,5 +1,9 @@
 2005-07-02  Daniel Burrows  <dburrows@debian.org>
 
+	* src/vscreen/vs_tree.h, src/vscreen/vs_treeitem.h:
+
+	  Explicitly make searches take wide character strings as input.
+
 	* src/pkg_tree.cc, src/pkg_tree.h:
 
 	  Wide-character conversion of pkg_tree.

Modified: branches/aptitude-0.3/aptitude/src/vscreen/vs_tree.h
==============================================================================
--- branches/aptitude-0.3/aptitude/src/vscreen/vs_tree.h	(original)
+++ branches/aptitude-0.3/aptitude/src/vscreen/vs_tree.h	Sat Jul  2 17:51:20 2005
@@ -52,9 +52,9 @@
 
 class vs_tree_search_string:public vs_tree_search_func
 {
-  std::string s;
+  std::wstring s;
 public:
-  vs_tree_search_string(std::string _s):s(_s) {}
+  vs_tree_search_string(const std::wstring &_s):s(_s) {}
 
   virtual bool operator()(const vs_treeitem &item);
 };
@@ -136,7 +136,7 @@
   virtual ~vs_tree();
 
   void search_for(vs_tree_search_func &matches);
-  void search_for(std::string s)
+  void search_for(const std::wstring &s)
   {
     vs_tree_search_string matches(s);
     search_for(matches);

Modified: branches/aptitude-0.3/aptitude/src/vscreen/vs_treeitem.h
==============================================================================
--- branches/aptitude-0.3/aptitude/src/vscreen/vs_treeitem.h	(original)
+++ branches/aptitude-0.3/aptitude/src/vscreen/vs_treeitem.h	Sat Jul  2 17:51:20 2005
@@ -175,7 +175,7 @@
   virtual bool has_visible_children() {return false;}
   virtual bool has_children() {return false;}
 
-  virtual bool matches(std::string s) const {return false;}
+  virtual bool matches(const std::wstring &s) const {return false;}
   // Returns true if this item matches the given string.
 
   // More hackery: do what's needed to expand the children of this item.