diff options
| author | danglassey <danglassey> | 2002-08-28 13:02:00 +0000 |
|---|---|---|
| committer | danglassey <danglassey> | 2002-08-28 13:02:00 +0000 |
| commit | 1e057d67306569fcd9896dfcea1f5353810f0a48 (patch) | |
| tree | fa0e30a5552e043e167d762300579cb96f113696 /include | |
| parent | 6178a13bb73d000bbe49587d0ecb67ea689b043f (diff) | |
| download | sword-sf-cvs-1e057d67306569fcd9896dfcea1f5353810f0a48.tar.gz | |
sync with crosswire 20020828-1300
Diffstat (limited to 'include')
| -rw-r--r-- | include/listkey.h | 3 | ||||
| -rw-r--r-- | include/swkey.h | 4 | ||||
| -rw-r--r-- | include/swmodule.h | 4 | ||||
| -rw-r--r-- | include/versekey.h | 3 |
4 files changed, 9 insertions, 5 deletions
diff --git a/include/listkey.h b/include/listkey.h index 8f1c59c..b64820f 100644 --- a/include/listkey.h +++ b/include/listkey.h @@ -4,7 +4,7 @@ * (e.g. verse, word, * place, etc.) * - * $Id: listkey.h,v 1.13 2001/08/09 10:39:51 scribe Exp $ + * $Id: listkey.h,v 1.14 2002/08/27 22:52:36 scribe Exp $ * * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -104,6 +104,7 @@ public: virtual char Traversable () { return 1; } virtual long Index () const { return arraypos; } + virtual const char *getRangeText() const; /** * Returns the index for the new one given as as parameter. diff --git a/include/swkey.h b/include/swkey.h index f9569b5..12e82ac 100644 --- a/include/swkey.h +++ b/include/swkey.h @@ -3,7 +3,7 @@ * types of keys for indexing into modules (e.g. verse, word, * place, etc.) * - * $Id: swkey.h,v 1.19 2002/08/14 09:23:17 scribe Exp $ + * $Id: swkey.h,v 1.20 2002/08/27 22:52:36 scribe Exp $ * * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -73,6 +73,7 @@ class SWDLLEXPORT SWKey : public SWObject { protected: char *keytext; + mutable char *rangeText; char persist; char error; @@ -142,6 +143,7 @@ public: */ virtual const char *getText() const; virtual const char *getShortText() const { return getText(); } + virtual const char *getRangeText() const; /** Compares another VerseKey object * diff --git a/include/swmodule.h b/include/swmodule.h index 1d92375..0a9c447 100644 --- a/include/swmodule.h +++ b/include/swmodule.h @@ -3,7 +3,7 @@ * types of modules (e.g. texts, commentaries, maps, lexicons, * etc.) * -* $Id: swmodule.h,v 1.50 2002/08/14 09:23:17 scribe Exp $ +* $Id: swmodule.h,v 1.51 2002/08/28 13:02:57 scribe Exp $ * * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -216,7 +216,7 @@ protected: * * RET: pointer to keytext */ - const char *KeyText(const char *ikeytext = 0) { + virtual const char *KeyText(const char *ikeytext = 0) { if (ikeytext) setKey(ikeytext); return *getKey(); } diff --git a/include/versekey.h b/include/versekey.h index d2a2fa0..4168f87 100644 --- a/include/versekey.h +++ b/include/versekey.h @@ -1,7 +1,7 @@ /****************************************************************************** * versekey.h - code for class 'versekey'- a standard Biblical verse key * - * $Id: versekey.h,v 1.26 2002/07/28 01:48:38 scribe Exp $ + * $Id: versekey.h,v 1.27 2002/08/27 22:52:36 scribe Exp $ * * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -370,6 +370,7 @@ public: virtual const char *getOSISRef() const; virtual ListKey ParseVerseList(const char *buf, const char *defaultKey = "Genesis 1:1", bool expandRange = false); + virtual const char *getRangeText() const; /** Compares another SWKey object * * @param ikey key to compare with this one |