summaryrefslogtreecommitdiff
path: root/src/keys/treekeyidx.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/keys/treekeyidx.cpp')
-rw-r--r--src/keys/treekeyidx.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/keys/treekeyidx.cpp b/src/keys/treekeyidx.cpp
index cc93fc0..5164277 100644
--- a/src/keys/treekeyidx.cpp
+++ b/src/keys/treekeyidx.cpp
@@ -1,9 +1,10 @@
/******************************************************************************
- * versekey.h - code for class 'versekey'- a standard Biblical verse key
*
- * $Id: treekeyidx.cpp 2280 2009-03-07 15:34:36Z scribe $
+ * treekeyidx.cpp -
*
- * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org)
+ * $Id: treekeyidx.cpp 2980 2013-09-14 21:51:47Z scribe $
+ *
+ * Copyright 2002-2013 CrossWire Bible Society (http://www.crosswire.org)
* CrossWire Bible Society
* P. O. Box 2528
* Tempe, AZ 85280-2528
@@ -32,7 +33,6 @@
SWORD_NAMESPACE_START
-static const char nl = '\n';
static const char *classes[] = {"TreeKeyIdx", "TreeKey", "SWKey", "SWObject", 0};
SWClass TreeKeyIdx::classdef(classes);
@@ -517,7 +517,7 @@ void TreeKeyIdx::setText(const char *ikey) {
SWBuf leaf = strtok(buf, "/");
leaf.trim();
root();
- while ((leaf.size()) && (!Error())) {
+ while ((leaf.size()) && (!popError())) {
bool ok, inChild = false;
error = KEYERR_OUTOFBOUNDS;
for (ok = firstChild(); ok; ok = nextSibling()) {
@@ -562,7 +562,7 @@ void TreeKeyIdx::setPosition(SW_POSITION p) {
break;
}
positionChanged();
- Error(); // clear error from normalize
+ popError(); // clear error from normalize
}