diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/rawcom.h | 10 | ||||
| -rw-r--r-- | include/rawtext.h | 11 | ||||
| -rw-r--r-- | include/zcom.h | 15 | ||||
| -rw-r--r-- | include/ztext.h | 10 |
4 files changed, 24 insertions, 22 deletions
diff --git a/include/rawcom.h b/include/rawcom.h index c5d0aff..fef7e5a 100644 --- a/include/rawcom.h +++ b/include/rawcom.h @@ -2,7 +2,7 @@ * rawcom.h - code for class 'RawCom'- a module that reads raw commentary * files: ot and nt using indexs ??.bks ??.cps ??.vss * - * $Id: rawcom.h,v 1.16 2002/10/01 19:52:40 dglassey Exp $ + * $Id: rawcom.h,v 1.17 2002/10/21 00:30:37 scribe Exp $ * * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -32,8 +32,10 @@ SWORD_NAMESPACE_START class SWDLLEXPORT RawCom:public RawVerse, public SWCom { + VerseKey &getVerseKey(); + + public: - RawCom(const char *ipath, const char *iname = 0, const char *idesc = 0, SWDisplay * idisp = 0, SWTextEncoding encoding = ENC_UNKNOWN, @@ -55,10 +57,10 @@ public: virtual void deleteEntry(); // Delete current module entry // end write interface ------------------------ - // OPERATORS ----------------------------------------------------------------- - SWMODULE_OPERATORS }; + SWORD_NAMESPACE_END + #endif diff --git a/include/rawtext.h b/include/rawtext.h index 00b2f00..528bb0c 100644 --- a/include/rawtext.h +++ b/include/rawtext.h @@ -2,7 +2,7 @@ * rawtext.h - code for class 'RawText'- a module that reads raw text files: * ot and nt using indexs ??.bks ??.cps ??.vss * - * $Id: rawtext.h,v 1.25 2002/10/01 19:52:40 dglassey Exp $ + * $Id: rawtext.h,v 1.26 2002/10/21 00:30:37 scribe Exp $ * * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -31,12 +31,14 @@ SWORD_NAMESPACE_START -class SWDLLEXPORT RawText:public SWText, public RawVerse { +class SWDLLEXPORT RawText : public SWText, public RawVerse { + RawStr *fastSearch[2]; + VerseKey &getVerseKey(); + public: - RawText(const char *ipath, const char *iname = 0, const char *idesc = 0, SWDisplay * idisp = 0, SWTextEncoding encoding = ENC_UNKNOWN, SWTextDirection dir = DIRECTION_LTR, SWTextMarkup markup = FMT_UNKNOWN, const char* ilang = 0); virtual ~RawText(); @@ -55,9 +57,6 @@ public: virtual void deleteEntry(); // Delete current module entry // end write interface ------------------------ - - // OPERATORS ----------------------------------------------------------------- - SWMODULE_OPERATORS }; diff --git a/include/zcom.h b/include/zcom.h index 618deed..135aa2f 100644 --- a/include/zcom.h +++ b/include/zcom.h @@ -2,7 +2,7 @@ * zcom.h - code for class 'zCom'- a module that reads compressed text * files: ot and nt using indexs ??.vss * - * $Id: zcom.h,v 1.17 2002/10/01 19:52:40 dglassey Exp $ + * $Id: zcom.h,v 1.18 2002/10/21 00:30:37 scribe Exp $ * * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -32,11 +32,14 @@ SWORD_NAMESPACE_START class SWDLLEXPORT zCom:public zVerse, public SWCom { + VerseKey *lastWriteKey; bool sameBlock(VerseKey * lastWriteKey, VerseKey * key); int blockType; -public: + VerseKey &getVerseKey(); + +public: zCom(const char *ipath, const char *iname = 0, const char *idesc = 0, int blockType = CHAPTERBLOCKS, SWCompress * icomp = 0, @@ -45,8 +48,8 @@ public: SWTextMarkup markup = FMT_UNKNOWN, const char* ilang = 0); virtual ~zCom(); virtual char *getRawEntry(); - virtual void increment(int steps); - virtual void decrement(int steps) { increment(-steps); } + virtual void increment(int steps = 1); + virtual void decrement(int steps = 1) { increment(-steps); } // write interface ---------------------------- virtual bool isWritable() { @@ -66,12 +69,10 @@ public: virtual void flush() { flushCache(); } // end swcacher interface ---------------------- - - // OPERATORS ----------------------------------------------------------------- - SWMODULE_OPERATORS }; SWORD_NAMESPACE_END + #endif diff --git a/include/ztext.h b/include/ztext.h index 3c9ac4e..6b4a8a4 100644 --- a/include/ztext.h +++ b/include/ztext.h @@ -2,7 +2,7 @@ * ztext.h - code for class 'zText'- a module that reads compressed text * files: ot and nt using indexs ??.vss * - * $Id: ztext.h,v 1.26 2002/10/01 19:52:40 dglassey Exp $ + * $Id: ztext.h,v 1.27 2002/10/21 00:30:37 scribe Exp $ * * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -36,11 +36,14 @@ SWORD_NAMESPACE_START * It should not be used in frontends, unless you are doing very special things. */ class SWDLLEXPORT zText:public zVerse, public SWText { + VerseKey *lastWriteKey; bool sameBlock(VerseKey * lastWriteKey, VerseKey * key); int blockType; + VerseKey &getVerseKey(); + + public: - zText(const char *ipath, const char *iname = 0, const char *idesc = 0, int blockType = CHAPTERBLOCKS, SWCompress * icomp = 0, @@ -71,9 +74,6 @@ public: virtual void flush() { flushCache(); } // end swcacher interface ---------------------- - - // OPERATORS ----------------------------------------------------------------- - SWMODULE_OPERATORS }; |