[sword-cvs] sword/include listkey.h, 1.19, 1.20 swkey.h, 1.26, 1.27 treekey.h, 1.4, 1.5 treekeyidx.h, 1.5, 1.6 versekey.h, 1.32, 1.33 versekey2.h, 1.6, 1.7

[sword at www.crosswire.org]

Update of /cvs/core/sword/include
In directory www:/tmp/cvs-serv25446/include

Modified Files:
	listkey.h swkey.h treekey.h treekeyidx.h versekey.h 
	versekey2.h 
Log Message:
Fixed ListKey contains function and normalized Traversable method name


Index: listkey.h
===================================================================
RCS file: /cvs/core/sword/include/listkey.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- listkey.h	31 Aug 2003 01:58:13 -0000	1.19
+++ listkey.h	8 May 2004 21:04:42 -0000	1.20
@@ -107,7 +107,7 @@
 	*/
 	virtual void increment(int step);
 
-	virtual char Traversable() { return 1; }
+	virtual bool isTraversable() { return true; }
 	virtual long Index() const { return arraypos; }
 	virtual const char *getRangeText() const;
 

Index: swkey.h
===================================================================
RCS file: /cvs/core/sword/include/swkey.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- swkey.h	6 Feb 2004 21:01:00 -0000	1.26
+++ swkey.h	8 May 2004 21:04:42 -0000	1.27
@@ -181,7 +181,12 @@
 	*/
 	virtual void increment(int steps = 1);
 
-	virtual char Traversable() { return 0; }
+	/** Increments key a number of entries
+	* deprecated, use isTraversible
+	*/
+	char Traversable() { return (isTraversable()) ? 1:0; }
+
+	virtual bool isTraversable() { return false; }
 
 	/** Use this function to get te current position withing a module.
 	* Here's a small example how to use this function and @ref Index(long).

Index: treekey.h
===================================================================
RCS file: /cvs/core/sword/include/treekey.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- treekey.h	1 Oct 2002 19:52:40 -0000	1.4
+++ treekey.h	8 May 2004 21:04:42 -0000	1.5
@@ -78,7 +78,7 @@
 	virtual int compare(const SWKey &ikey) = 0;
 	virtual void decrement(int steps = 1) = 0;
 	virtual void increment(int steps = 1) = 0;
-	virtual char Traversable () { return 1; }
+	virtual bool isTraversable() { return true; }
 	virtual long Index () const { return getOffset(); }
 	virtual long Index (long iindex) { setOffset(iindex); return getOffset(); }
 

Index: treekeyidx.h
===================================================================
RCS file: /cvs/core/sword/include/treekeyidx.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- treekeyidx.h	1 Oct 2002 19:52:40 -0000	1.5
+++ treekeyidx.h	8 May 2004 21:04:42 -0000	1.6
@@ -114,7 +114,7 @@
 	virtual int compare(const SWKey &ikey);
 	virtual void decrement(int steps = 1);
 	virtual void increment(int steps = 1);
-	virtual char Traversable () { return 1; }
+	virtual bool isTraversable() { return true; }
 
 	static signed char create(const char *path);
 };

Index: versekey.h
===================================================================
RCS file: /cvs/core/sword/include/versekey.h,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- versekey.h	7 May 2004 17:22:16 -0000	1.32
+++ versekey.h	8 May 2004 21:04:42 -0000	1.33
@@ -274,7 +274,7 @@
 	* @return *this
 	*/
 	virtual void increment(int steps);
-	virtual char Traversable() { return 1; }
+	virtual bool isTraversable() { return true; }
 
 	virtual const char *getBookName() const;
 	virtual const char *getBookAbbrev() const;

Index: versekey2.h
===================================================================
RCS file: /cvs/core/sword/include/versekey2.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- versekey2.h	7 May 2004 17:02:32 -0000	1.6
+++ versekey2.h	8 May 2004 21:04:42 -0000	1.7
@@ -250,7 +250,7 @@
 	* @return *this
 	*/
 	virtual void increment(int steps);
-	virtual char Traversable() { return 1; }
+	virtual bool isTraversable() { return true; }
 
 	virtual const char *getBookName() const;
 	virtual const char *getBookAbbrev() const;