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

[Daniel Burrows]

Author: dburrows
Date: Sat Jul  2 18:19:35 2005
New Revision: 3565

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/apt_info_tree.cc
   branches/aptitude-0.3/aptitude/src/apt_info_tree.h
Log:
Make the parameter of apt_info_tree's desc_signal a wstring.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Sat Jul  2 18:19:35 2005
@@ -1,5 +1,9 @@
 2005-07-02  Daniel Burrows  <dburrows@debian.org>
 
+	* src/apt_info_tree.cc, src/apt_info_tree.h:
+
+	  Make the desc_signal of apt_info_trees accept a wide string.
+
 	* src/solution_fragment.cc:
 
 	  Pass a wchar_t* to join_fragment instead of a char*.

Modified: branches/aptitude-0.3/aptitude/src/apt_info_tree.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/apt_info_tree.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/apt_info_tree.cc	Sat Jul  2 18:19:35 2005
@@ -8,7 +8,7 @@
 
 #include <sigc++/functors/mem_fun.h>
 
-apt_info_tree::apt_info_tree(string _package, string _version)
+apt_info_tree::apt_info_tree(const string &_package, const string &_version)
   :package(_package), version(_version)
 {
   cache_closed.connect(sigc::mem_fun(*this, &apt_info_tree::handle_cache_close));

Modified: branches/aptitude-0.3/aptitude/src/apt_info_tree.h
==============================================================================
--- branches/aptitude-0.3/aptitude/src/apt_info_tree.h	(original)
+++ branches/aptitude-0.3/aptitude/src/apt_info_tree.h	Sat Jul  2 18:19:35 2005
@@ -27,7 +27,7 @@
   // Stored so we can cleanly handle list updates
 
   sigc::signal2<void, const pkgCache::PkgIterator &, const pkgCache::VerIterator &> sig;
-  sigc::signal1<void, std::string> desc_sig;
+  sigc::signal1<void, std::wstring> desc_sig;
 
   void handle_cache_close();
 protected:
@@ -36,9 +36,9 @@
 				      const pkgCache::VerIterator &ver)=0;
 public:
   sigc::signal2<void, const pkgCache::PkgIterator &, const pkgCache::VerIterator &> *get_sig() {return &sig;}
-  sigc::signal1<void, std::string> *get_desc_sig() {return &desc_sig;}
+  sigc::signal1<void, std::wstring> *get_desc_sig() {return &desc_sig;}
 
-  apt_info_tree(std::string _package, std::string _version);
+  apt_info_tree(const std::string &_package, const std::string &_version);
 
   /** Repeats the 'highlighted' signal of the currently selected item.
    *  Call this after connecting the two signals above.