build fixes for member funcs
This commit is contained in:
parent
656f2fbecf
commit
624a06fdff
1 changed files with 3 additions and 3 deletions
|
@ -149,7 +149,7 @@ static void assimilate(BindingTree *parent, BindingTree *node)
|
||||||
|
|
||||||
int OBBindings::find(BindingTree *search) {
|
int OBBindings::find(BindingTree *search) {
|
||||||
BindingTree *a, *b;
|
BindingTree *a, *b;
|
||||||
a = _tree;
|
a = _tree.first_child;
|
||||||
b = search;
|
b = search;
|
||||||
while (a && b) {
|
while (a && b) {
|
||||||
if (a->binding != b->binding) {
|
if (a->binding != b->binding) {
|
||||||
|
@ -206,7 +206,7 @@ bool OBBindings::add(const StringVect &keylist, int id)
|
||||||
if (!(tree = buildtree(keylist, id)))
|
if (!(tree = buildtree(keylist, id)))
|
||||||
return false; // invalid binding requested
|
return false; // invalid binding requested
|
||||||
|
|
||||||
if (find_bind(_tree.first_child, tree) < -1) {
|
if (find(tree) < -1) {
|
||||||
// conflicts with another binding
|
// conflicts with another binding
|
||||||
destroytree(tree);
|
destroytree(tree);
|
||||||
return false;
|
return false;
|
||||||
|
@ -226,7 +226,7 @@ int OBBindings::find(const StringVect &keylist)
|
||||||
if (!(tree = buildtree(keylist, 0)))
|
if (!(tree = buildtree(keylist, 0)))
|
||||||
return false; // invalid binding requested
|
return false; // invalid binding requested
|
||||||
|
|
||||||
ret = find_bind(_tree.first_child, tree) >= 0;
|
ret = find(tree) >= 0;
|
||||||
|
|
||||||
destroytree(tree);
|
destroytree(tree);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue