cw::key -> cw::config::key.

12 files changed, 14 insertions, 14 deletions

diff --git a/src/download_screen.cc b/src/download_screen.cc
index 2c5c3c06..b376fdc0 100644
--- a/src/download_screen.cc
+++ b/src/download_screen.cc
@@ -236,7 +236,7 @@ void download_screen::paint_status()
 }
 #endif
 
-bool download_screen::handle_key(const cw::key &k)
+bool download_screen::handle_key(const cw::config::key &k)
 {
   cw::widget_ref tmpref(this);
 
diff --git a/src/edit_pkg_hier.cc b/src/edit_pkg_hier.cc
index 6793de03..9a88a216 100644
--- a/src/edit_pkg_hier.cc
+++ b/src/edit_pkg_hier.cc
@@ -55,7 +55,7 @@ public:
     set_item(_item);
   }
 
-  bool dispatch_key(const cw::key &k, cw::tree *owner)
+  bool dispatch_key(const cw::config::key &k, cw::tree *owner)
   {
     if(cw::config::global_bindings.key_matches(k, "PushButton") ||
        cw::config::global_bindings.key_matches(k, "Confirm"))
@@ -319,7 +319,7 @@ void cw::hier_editor::save_hier(string file)
   fclose(f);
 }
 
-bool cw::hier_editor::handle_key(const cw::key &k)
+bool cw::hier_editor::handle_key(const cw::config::key &k)
 {
   if(cw::config::global_bindings.key_matches(k, "SaveHier"))
     {
diff --git a/src/menu_text_layout.cc b/src/menu_text_layout.cc
index 079b8752..75a16561 100644
--- a/src/menu_text_layout.cc
+++ b/src/menu_text_layout.cc
@@ -123,7 +123,7 @@ bool menu_text_layout::find_repeat_search_back()
 }
 
 
-bool menu_text_layout::handle_key(const cw::key &k)
+bool menu_text_layout::handle_key(const cw::config::key &k)
 {
   if(cw::config::global_bindings.key_matches(k, "Search"))
     find_search();
diff --git a/src/menu_tree.cc b/src/menu_tree.cc
index 96184e6e..0e436483 100644
--- a/src/menu_tree.cc
+++ b/src/menu_tree.cc
@@ -388,7 +388,7 @@ void menu_tree::reset_incsearch()
   pre_incsearch_selected=get_end();
 }
 
-bool menu_tree::handle_key(const cw::key &k)
+bool menu_tree::handle_key(const cw::config::key &k)
 {
   // ick -- but having our own bindings is also ugly. hm.
   if(pkg_tree::bindings->key_matches(k, "Search"))
diff --git a/src/pkg_item.cc b/src/pkg_item.cc
index fd0e5a2e..178832a2 100644
--- a/src/pkg_item.cc
+++ b/src/pkg_item.cc
@@ -313,7 +313,7 @@ void pkg_item::paint(cw::tree *win, int y, bool hierarchical, const cw::style co
   win->mvaddnstr(y, 0, disp.c_str(), width);
 }
 
-bool pkg_item::dispatch_key(const cw::key &k, cw::tree *owner)
+bool pkg_item::dispatch_key(const cw::config::key &k, cw::tree *owner)
 {
   if(bindings->key_matches(k, "Versions"))
     {
diff --git a/src/pkg_node.cc b/src/pkg_node.cc
index 8031cddc..85abbe9e 100644
--- a/src/pkg_node.cc
+++ b/src/pkg_node.cc
@@ -42,7 +42,7 @@ void pkg_tree_node::init_bindings()
 
 // FIXME: add a do_action() command that takes a function pointer and does all
 // the extra junk below.
-bool pkg_tree_node::dispatch_key(const cw::key &k, cw::tree *owner)
+bool pkg_tree_node::dispatch_key(const cw::config::key &k, cw::tree *owner)
 {
   undo_group *grp=new apt_undo_group;
 
diff --git a/src/pkg_subtree.cc b/src/pkg_subtree.cc
index 1fc80f03..f1275908 100644
--- a/src/pkg_subtree.cc
+++ b/src/pkg_subtree.cc
@@ -41,7 +41,7 @@ const wchar_t *pkg_subtree::label()
   return name.c_str();
 }
 
-bool pkg_subtree::dispatch_key(const cw::key &k, cw::tree *owner)
+bool pkg_subtree::dispatch_key(const cw::config::key &k, cw::tree *owner)
 {
   if(pkg_tree_node::dispatch_key(k, owner))
     return true;
diff --git a/src/pkg_tree.cc b/src/pkg_tree.cc
index 19148de9..b3716777 100644
--- a/src/pkg_tree.cc
+++ b/src/pkg_tree.cc
@@ -285,7 +285,7 @@ bool pkg_tree::find_reset_limit()
   return true;
 }
 
-bool pkg_tree::handle_key(const cw::key &k)
+bool pkg_tree::handle_key(const cw::config::key &k)
 {
   if(bindings->key_matches(k, "ChangePkgTreeLimit"))
     find_limit();
diff --git a/src/pkg_ver_item.cc b/src/pkg_ver_item.cc
index 3b26ca45..d3151ec7 100644
--- a/src/pkg_ver_item.cc
+++ b/src/pkg_ver_item.cc
@@ -678,7 +678,7 @@ cw::treeitem *pkg_ver_screen::setup_new_root(const pkgCache::PkgIterator &pkg,
   return newtree;
 }
 
-bool pkg_ver_item::dispatch_key(const cw::key &k, cw::tree *owner)
+bool pkg_ver_item::dispatch_key(const cw::config::key &k, cw::tree *owner)
 {
   if(bindings->key_matches(k, "Dependencies"))
     {
diff --git a/src/solution_item.cc b/src/solution_item.cc
index ed25e3a8..8bf964c9 100644
--- a/src/solution_item.cc
+++ b/src/solution_item.cc
@@ -160,7 +160,7 @@ style solution_item::get_normal_style()
     return style();
 }
 
-bool solution_item::dispatch_key(const cw::key &k, cw::tree *owner)
+bool solution_item::dispatch_key(const cw::config::key &k, cw::tree *owner)
 {
   if(cw::config::global_bindings.key_matches(k, "SolutionActionReject"))
     {
@@ -293,7 +293,7 @@ void solution_act_item::show_target_info()
 		     ssprintf(_("Information about %s"), pkg.Name()));
 }
 
-bool solution_act_item::dispatch_key(const cw::key &k, cw::tree *owner)
+bool solution_act_item::dispatch_key(const cw::config::key &k, cw::tree *owner)
 {
   if(cw::config::global_bindings.key_matches(k, "InfoScreen"))
     {
diff --git a/src/solution_screen.cc b/src/solution_screen.cc
index 4ca6fc41..c5b22490 100644
--- a/src/solution_screen.cc
+++ b/src/solution_screen.cc
@@ -421,7 +421,7 @@ protected:
     cw::toplevel::post_event(new slot_event(sigc::mem_fun(this, &solution_examiner::update)));
   }
 
-  bool handle_key(const cw::key &k)
+  bool handle_key(const cw::config::key &k)
   {
     cw::widget_ref tmpref(this);
 
diff --git a/src/ui.cc b/src/ui.cc
index 1775266d..cd468274 100644
--- a/src/ui.cc
+++ b/src/ui.cc
@@ -2991,7 +2991,7 @@ protected:
   }
 
 public:
-  bool handle_key(const cw::key &k)
+  bool handle_key(const cw::config::key &k)
   {
     if(!cw::text_layout::focus_me() ||
        !cw::text_layout::handle_key(k))