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

[Daniel Burrows]

Author: dburrows
Date: Sat Jul  2 13:23:44 2005
New Revision: 3528

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/pkg_ver_item.cc
   branches/aptitude-0.3/aptitude/src/pkg_ver_item.h
Log:
Update the pkg_ver_item to reflect the changes in the vscreen API.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Sat Jul  2 13:23:44 2005
@@ -1,5 +1,10 @@
 2005-07-02  Daniel Burrows  <dburrows@debian.org>
 
+	* src/pkg_ver_item.cc, src/pkg_ver_item.h:
+
+	  Update the pkg_ver_item to reflect the changes in the vscreen
+	  API.
+
 	* src/vscreen/vs_layout_item.cc:
 
 	  Make vs_layout_item less absurdly inefficient by really caching

Modified: branches/aptitude-0.3/aptitude/src/pkg_ver_item.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/pkg_ver_item.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/pkg_ver_item.cc	Sat Jul  2 13:23:44 2005
@@ -648,9 +648,9 @@
   return newtree;
 }
 
-bool pkg_ver_item::dispatch_char(chtype ch, vs_tree *owner)
+bool pkg_ver_item::dispatch_char(const key &k, vs_tree *owner)
 {
-  if(bindings->key_matches(ch, "Dependencies"))
+  if(bindings->key_matches(k, "Dependencies"))
     {
       char buf[512];
       snprintf(buf, 512, _("Dependencies of %s"), version.ParentPkg().Name());
@@ -662,7 +662,7 @@
       insert_main_widget(w, menulabel, "", tablabel);
       return true;
     }
-  else if(bindings->key_matches(ch, "ReverseDependencies"))
+  else if(bindings->key_matches(k, "ReverseDependencies"))
     {
       char buf[512];
       snprintf(buf, 512, _("Packages depending on %s"), version.ParentPkg().Name());
@@ -674,17 +674,17 @@
       insert_main_widget(w, menulabel, "", tablabel);
       return true;
     }
-  else if(bindings->key_matches(ch, "InfoScreen"))
+  else if(bindings->key_matches(k, "InfoScreen"))
     {
       show_information();
       return true;
     }
-  else if(bindings->key_matches(ch, "Changelog"))
+  else if(bindings->key_matches(k, "Changelog"))
     {
       view_changelog(version);
       return true;
     }
-  else if(bindings->key_matches(ch, "ForbidUpgrade"))
+  else if(bindings->key_matches(k, "ForbidUpgrade"))
     {
       undo_group *grp=new apt_undo_group;
       forbid_version(grp);
@@ -696,7 +696,7 @@
 
       return true;
     }
-  else if(bindings->key_matches(ch, "BugReport"))
+  else if(bindings->key_matches(k, "BugReport"))
     {
       // Try to report a bug on the package.  (ew quoting ew)
       string cmd=string("reportbug '")+version.ParentPkg().Name()+"' -V '"+version.VerStr()+"'";
@@ -716,5 +716,5 @@
       return true;
     }
   else
-    return pkg_tree_node::dispatch_char(ch, owner);
+    return pkg_tree_node::dispatch_char(k, owner);
 }

Modified: branches/aptitude-0.3/aptitude/src/pkg_ver_item.h
==============================================================================
--- branches/aptitude-0.3/aptitude/src/pkg_ver_item.h	(original)
+++ branches/aptitude-0.3/aptitude/src/pkg_ver_item.h	Sat Jul  2 13:23:44 2005
@@ -53,8 +53,8 @@
   virtual void paint(vs_tree *win, int y, bool hierarchical,
 		     const style &st);
 
-  virtual const char *tag() const;
-  virtual const char *label() const;
+  virtual const wchar_t *tag();
+  virtual const wchar_t *label();
 
   virtual void select(undo_group *undo);
   virtual void hold(undo_group *undo);
@@ -71,7 +71,7 @@
 
   void show_information();
 
-  bool dispatch_char(chtype ch, vs_tree *owner);
+  bool dispatch_key(const key &k, vs_tree *owner);
 
   pkg_ver_item *get_sig();
 
@@ -106,13 +106,13 @@
 typedef pkg_item_with_subtree<pkg_ver_item, versort> pkg_vertree;
 class pkg_vertree_generic:public vs_subtree<pkg_ver_item, versort>
 {
-  std::string name;
+  std::wstring name;
 public:
-  pkg_vertree_generic(std::string _name, bool _expanded):vs_subtree<pkg_ver_item, versort>(_expanded),name(_name) {}
+  pkg_vertree_generic(std::wstring _name, bool _expanded):vs_subtree<pkg_ver_item, versort>(_expanded),name(_name) {}
   void paint(vs_tree *win, int y, bool hierarchical, const style &st)
   {vs_subtree<pkg_ver_item, versort>::paint(win, y, hierarchical, name);}
-  const char *tag() const {return name.c_str();}
-  const char *label() const {return name.c_str();}
+  const wchar_t *tag() {return name.c_str();}
+  const wchar_t *label() {return name.c_str();}
 };
 
 // The following policy will make each package given to it into a