[sword-cvs] sword/include swlocale.h,1.14,1.15

[sword at www.crosswire.org]

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

Modified Files:
	swlocale.h 
Log Message:

dglassey: some VK2 specific methods


Index: swlocale.h
===================================================================
RCS file: /cvs/core/sword/include/swlocale.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- swlocale.h	12 Apr 2004 13:49:12 -0000	1.14
+++ swlocale.h	7 May 2004 18:03:36 -0000	1.15
@@ -35,6 +35,7 @@
 #include <defs.h>
 
 SWORD_NAMESPACE_START
+#define ENDOFABBREVS -2
 
 typedef std::map < SWBuf, SWBuf, std::less < SWBuf > >LookupMap;
 
@@ -55,7 +56,7 @@
 	struct sbook **books;
 	#ifdef SPLITLIB
 	struct sbook2 **books2;
-	char *BMAX2;
+	struct abbrev2 *bookAbbrevs2;
 	#endif
 
 public:
@@ -76,13 +77,10 @@
 	virtual void augment(SWLocale &addFrom);
 	virtual SWLocale & operator +=(SWLocale &addFrom) { augment(addFrom); return *this; }
 	virtual const struct abbrev *getBookAbbrevs();
-	#ifdef VK2
-	virtual void getBooks(char **iBMAX, struct sbook ***ibooks, VerseKey *vk);
-	#else
 	virtual void getBooks(char **iBMAX, struct sbook ***ibooks);
-	#endif
 	#ifdef SPLITLIB
-	virtual void getBooks2(char **iBMAX, struct sbook2 ***ibooks, VerseKey2 *vk);
+	virtual void getBooks2(struct sbook2 ***ibooks, VerseKey2 *vk);
+	virtual const struct abbrev2 *getBookAbbrevs2();
 	#endif
 };