Author: dburrows
Date: Sat Jul 2 13:45:22 2005
New Revision: 3530
Modified:
branches/aptitude-0.3/aptitude/ChangeLog
branches/aptitude-0.3/aptitude/src/pkg_node.cc
branches/aptitude-0.3/aptitude/src/pkg_node.h
Log:
Fix the core package node class.
Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog (original)
+++ branches/aptitude-0.3/aptitude/ChangeLog Sat Jul 2 13:45:22 2005
@@ -1,5 +1,14 @@
2005-07-02 Daniel Burrows <dburrows@debian.org>
+ * src/pkg_node.cc, src/pkg_node.h:
+
+ Convert the core package node class to wide characters.
+
+ * src/pkg_item_with_subtree.h, src/pkg_item.h, src/pkg_ver_item.cc, src/pkg_ver_item.h:
+
+ Fix some more tree items, to the point that pkg_ver_item now
+ compiles.
+
* src/pkg_ver_item.cc, src/pkg_ver_item.h:
Update the pkg_ver_item to reflect the changes in the vscreen
Modified: branches/aptitude-0.3/aptitude/src/pkg_node.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/pkg_node.cc (original)
+++ branches/aptitude-0.3/aptitude/src/pkg_node.cc Sat Jul 2 13:45:22 2005
@@ -1,6 +1,6 @@
// pkg_node.cc
//
-// Copyright 1999 Daniel Burrows
+// Copyright 1999, 2000, 2002, 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
@@ -41,25 +41,25 @@
// FIXME: add a do_action() command that takes a function pointer and does all
// the extra junk below.
-bool pkg_tree_node::dispatch_char(chtype ch, vs_tree *owner)
+bool pkg_tree_node::dispatch_key(const key &k, vs_tree *owner)
{
undo_group *grp=new apt_undo_group;
- if(bindings->key_matches(ch, "Install"))
+ if(bindings->key_matches(k, "Install"))
select(grp);
- else if(bindings->key_matches(ch, "Remove"))
+ else if(bindings->key_matches(k, "Remove"))
remove(grp);
- else if(bindings->key_matches(ch, "Hold"))
+ else if(bindings->key_matches(k, "Hold"))
hold(grp);
- else if(bindings->key_matches(ch, "Keep"))
+ else if(bindings->key_matches(k, "Keep"))
keep(grp);
- else if(bindings->key_matches(ch, "Purge"))
+ else if(bindings->key_matches(k, "Purge"))
purge(grp);
- else if(bindings->key_matches(ch, "Reinstall"))
+ else if(bindings->key_matches(k, "Reinstall"))
reinstall(grp);
- else if(bindings->key_matches(ch, "SetAuto"))
+ else if(bindings->key_matches(k, "SetAuto"))
set_auto(true, grp);
- else if(bindings->key_matches(ch, "ClearAuto"))
+ else if(bindings->key_matches(k, "ClearAuto"))
set_auto(false, grp);
else
{
Modified: branches/aptitude-0.3/aptitude/src/pkg_node.h
==============================================================================
--- branches/aptitude-0.3/aptitude/src/pkg_node.h (original)
+++ branches/aptitude-0.3/aptitude/src/pkg_node.h Sat Jul 2 13:45:22 2005
@@ -1,6 +1,6 @@
// pkg_node.h -*-c++-*-
//
-// Copyright 1999 Daniel Burrows
+// Copyright 1999-2000, 2002, 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
@@ -45,7 +45,7 @@
void mark_auto(undo_group *undo) {set_auto(true, undo);}
void unmark_auto(undo_group *undo) {set_auto(false, undo);}
- bool dispatch_char(chtype ch, vs_tree *owner);
+ bool dispatch_key(const key &k, vs_tree *owner);
// IMPORTANT NOTE: pkg_tree_node::dispatch_char() does NOT call
// vs_treeitem::dispatch_char!