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

[Daniel Burrows]

Author: dburrows
Date: Sat Jul  2 13:56:10 2005
New Revision: 3533

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/dep_item.cc
Log:
Make dep_item.cc work with wide characters.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Sat Jul  2 13:56:10 2005
@@ -1,5 +1,9 @@
 2005-07-02  Daniel Burrows  <dburrows@debian.org>
 
+	* src/dep_item.cc:
+
+	  Make dep_item.cc work with wide characters.
+
 	* src/pkg_item_with_subtree.h:
 
 	  Convert the package-item-plus-subtree class to wide characters.

Modified: branches/aptitude-0.3/aptitude/src/dep_item.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/dep_item.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/dep_item.cc	Sat Jul  2 13:56:10 2005
@@ -59,7 +59,7 @@
 };
 
 pkg_depitem::pkg_depitem(pkgCache::DepIterator &first, pkg_signal *sig):
-  pkg_subtree(""),firstdep(first),available(false)
+  pkg_subtree(L""),firstdep(first),available(false)
 {
   pkgCache::DepIterator start,end;
   first.GlobOr(start,end);
@@ -104,7 +104,7 @@
       // Bleach.  Anyone who can offer a cleaner way to do this gets a virtual cookie :)
       start++;
     } while(1);
-  pkg_subtree::set_label(currlabel.c_str());
+  pkg_subtree::set_label(transcode(currlabel, "ASCII"));
 }
 
 bool pkg_depitem::is_broken()
@@ -136,10 +136,10 @@
       // the user that.  (specifically, if there are no available packages
       // fulfilling the dependency)
 
-      string broken_str=available?_("UNSATISFIED"):_("UNAVAILABLE");
+      wstring broken_str=transcode(available?_("UNSATISFIED"):_("UNAVAILABLE"));
 
       vs_subtree<pkg_tree_node>::paint(win, y, hierarchical,
-				       get_name()+" ("+broken_str+")");
+				       get_name()+L" ("+broken_str+L")");
     }
   else
     pkg_subtree::paint(win, y, hierarchical,
@@ -260,7 +260,8 @@
       tree_map::iterator found=subtrees.find(D.DepType());
       if(found==subtrees.end())
 	{
-	  subtree=new pkg_subtree(D.DepType(), true);
+	  subtree=new pkg_subtree(transcode(D.DepType(), "ASCII"),
+				  true);
 	  subtrees[D.DepType()]=subtree;
 	  tree->add_child(subtree);
 	}
@@ -289,7 +290,9 @@
 		tree_map::iterator found=subtrees.find(D.DepType());
 		if(found==subtrees.end())
 		  {
-		    subtree=new pkg_subtree(D.DepType(), true);
+		    subtree=new pkg_subtree(transcode(D.DepType(),
+						      "ASCII"),
+					    true);
 		    subtrees[D.DepType()]=subtree;
 		    tree->add_child(subtree);
 		  }