From 390d447d9ba92878fbd1a0f7955edb5f83256195 Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Mon, 30 Dec 2002 21:04:09 +0000 Subject: [PATCH] add some const --- src/bindings.cc | 24 ++++++++++++++++-------- src/bindings.hh | 6 +++--- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/src/bindings.cc b/src/bindings.cc index 95442a1e..97a0ea27 100644 --- a/src/bindings.cc +++ b/src/bindings.cc @@ -17,9 +17,9 @@ extern "C" { namespace ob { #include -static void print_branch(BindingTree *first, std::string str) +static void print_branch(const BindingTree *first, std::string str) { - BindingTree *p = first; + const BindingTree *p = first; while (p) { if (p->first_child) @@ -95,7 +95,8 @@ static bool modvalue(const std::string &mod, unsigned int *val) return true; } -bool OBBindings::translate(const std::string &str, Binding &b, bool askey) +bool OBBindings::translate(const std::string &str, Binding &b, + bool askey) const { // parse out the base key name std::string::size_type keybegin = str.find_last_of('-'); @@ -138,7 +139,7 @@ static void destroytree(BindingTree *tree) } } -BindingTree *OBBindings::buildtree(const StringVect &keylist, int id) +BindingTree *OBBindings::buildtree(const StringVect &keylist, int id) const { if (keylist.empty()) return 0; // nothing in the list.. return 0 @@ -240,8 +241,10 @@ void OBBindings::assimilate(BindingTree *node) } -int OBBindings::find_key(BindingTree *search) { +int OBBindings::find_key(BindingTree *search) const { BindingTree *a, *b; + print_branch(&_keytree, " Searching:"); + print_branch(search, " for..."); a = _keytree.first_child; b = search; while (a && b) { @@ -249,10 +252,14 @@ int OBBindings::find_key(BindingTree *search) { a = a->next_sibling; } else { if (a->chain == b->chain) { - if (!a->chain) + if (!a->chain) { + printf("Match found with %s\n", a->text.c_str()); return a->id; // found it! (return the actual id, not the search's) - } else - return -2; // the chain status' don't match (conflict!) + } + } else { + printf("Conflict found with %s\n", a->text.c_str()); + return -2; // the chain status' don't match (conflict!) + } b = b->first_child; a = a->first_child; } @@ -271,6 +278,7 @@ bool OBBindings::add_key(const StringVect &keylist, int id) if (find_key(tree) != -1) { // conflicts with another binding + printf("Conflict\n"); destroytree(tree); return false; } diff --git a/src/bindings.hh b/src/bindings.hh index be73b51f..81b7075d 100644 --- a/src/bindings.hh +++ b/src/bindings.hh @@ -51,9 +51,9 @@ private: BindingTree *_mousetree; // this tree is a list. it has only siblings - int find_key(BindingTree *search); - bool translate(const std::string &str, Binding &b, bool askey); - BindingTree *buildtree(const StringVect &keylist, int id); + int find_key(BindingTree *search) const; + bool translate(const std::string &str, Binding &b, bool askey) const; + BindingTree *buildtree(const StringVect &keylist, int id) const; void OBBindings::assimilate(BindingTree *node); public: -- 2.45.2