diff options
Diffstat (limited to 'include')
111 files changed, 452 insertions, 135 deletions
diff --git a/include/Greek2Greek.h b/include/Greek2Greek.h index 9770ea2..2704388 100644 --- a/include/Greek2Greek.h +++ b/include/Greek2Greek.h @@ -17,7 +17,7 @@ //***************************************************************************** /* * - * $Id: Greek2Greek.h,v 1.2 2001/02/09 15:38:51 jansorg Exp $ + * $Id: Greek2Greek.h,v 1.3 2002/10/01 19:52:40 dglassey Exp $ * * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -38,6 +38,9 @@ #ifndef __GREEK2GREEK #define __GREEK2GREEK +#include <defs.h> +SWORD_NAMESPACE_START + //***************************************************************************** // Used to convert a string created by using the Greek font supplied with the // Sword Project to a string that conforms to the b-Greek discussion list @@ -109,6 +112,6 @@ unsigned char getbGreekPunct (unsigned char Greek); //***************************************************************************** bool isPunctSpace (unsigned char c); - +SWORD_NAMESPACE_END #endif // __GREEK2GREEK diff --git a/include/GreekChars.h b/include/GreekChars.h index c4f94be..f0522e5 100644 --- a/include/GreekChars.h +++ b/include/GreekChars.h @@ -18,7 +18,7 @@ //***************************************************************************** /* * - * $Id: GreekChars.h,v 1.3 2001/03/18 21:04:25 scribe Exp $ + * $Id: GreekChars.h,v 1.4 2002/10/01 19:52:40 dglassey Exp $ * * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -42,6 +42,9 @@ // This enum represents the values of the characters used for the // transliteration as used on the b-greek discussion list. +#include <defs.h> +SWORD_NAMESPACE_START + enum bGreekChars { ALPHA = 65, // A @@ -146,4 +149,6 @@ enum GreekPunct gQUESTION = ';' }; +SWORD_NAMESPACE_END + #endif // __GREEKCHARS_H diff --git a/include/canon.h b/include/canon.h index 9af48af..117f5ea 100644 --- a/include/canon.h +++ b/include/canon.h @@ -1,7 +1,7 @@ /****************************************************************************** * canon.h - Canonical text information to be included by VerseKey.cpp * - * $Id: canon.h,v 1.13 2002/06/25 04:17:29 chrislit Exp $ + * $Id: canon.h,v 1.14 2002/10/01 19:52:40 dglassey Exp $ * * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -24,6 +24,9 @@ * and chapmax */ +#include <defs.h> +SWORD_NAMESPACE_START + struct sbook VerseKey::otbooks[] = { {"Genesis", "Gen", 50}, @@ -693,3 +696,5 @@ int { {sizeof (VerseKey::otbks) / 4, sizeof (VerseKey::otcps) / 4} , {sizeof (VerseKey::ntbks) / 4, sizeof (VerseKey::ntcps) / 4} }; + +SWORD_NAMESPACE_END diff --git a/include/cipherfil.h b/include/cipherfil.h index 76abd55..4dd65ac 100644 --- a/include/cipherfil.h +++ b/include/cipherfil.h @@ -1,6 +1,6 @@ /* * - * $Id: cipherfil.h,v 1.8 2002/07/28 01:48:38 scribe Exp $ + * $Id: cipherfil.h,v 1.9 2002/10/01 19:52:40 dglassey Exp $ * * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -26,6 +26,8 @@ #include <defs.h> +SWORD_NAMESPACE_START + class SWDLLEXPORT CipherFilter:public SWFilter { SWCipher *cipher; public: @@ -35,4 +37,5 @@ public: virtual SWCipher *getCipher(); }; +SWORD_NAMESPACE_END #endif diff --git a/include/defs.h b/include/defs.h index b22ed8a..db5809e 100644 --- a/include/defs.h +++ b/include/defs.h @@ -1,6 +1,19 @@ // ---------------------------------------------------------------------------- // Making or using sword as a Windows DLL // ---------------------------------------------------------------------------- +#ifndef SWORDDEFS_H +#define SWORDDEFS_H + +#ifdef NO_SWORD_NAMESPACE +#define SWORD_NAMESPACE_START +#define SWORD_NAMESPACE_END +#else +#define SWORD_NAMESPACE_START namespace sword { +#define SWORD_NAMESPACE_END } +#endif + + +SWORD_NAMESPACE_START #define FILTERPAD 80 @@ -74,3 +87,6 @@ #else # define SWDLLIMPORT #endif + +SWORD_NAMESPACE_END +#endif //SWORDDEFS_H diff --git a/include/echomod.h b/include/echomod.h index 44bedab..7641e60 100644 --- a/include/echomod.h +++ b/include/echomod.h @@ -2,7 +2,7 @@ * echomod.h - code for class 'EchoMod' - a test module that just echo back * text of key. * - * $Id: echomod.h,v 1.2 2001/02/09 15:38:51 jansorg Exp $ + * $Id: echomod.h,v 1.3 2002/10/01 19:52:40 dglassey Exp $ * * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -26,6 +26,8 @@ #include <swtext.h> #include <versekey.h> +SWORD_NAMESPACE_START + class EchoMod:public SWText { public: @@ -34,5 +36,5 @@ public: virtual operator const char *(); }; - +SWORD_NAMESPACE_END #endif diff --git a/include/encfiltmgr.h b/include/encfiltmgr.h index f082b98..cd07e34 100644 --- a/include/encfiltmgr.h +++ b/include/encfiltmgr.h @@ -24,6 +24,7 @@ #include <swfiltermgr.h> +SWORD_NAMESPACE_START /** This class is like a normal @ref SWMgr, * but you can additonally specify which encoding @@ -82,4 +83,5 @@ public: virtual void AddEncodingFilters(SWModule *module, ConfigEntMap §ion); }; +SWORD_NAMESPACE_END #endif diff --git a/include/entriesblk.h b/include/entriesblk.h index fe7ac1c..61ab35e 100644 --- a/include/entriesblk.h +++ b/include/entriesblk.h @@ -2,6 +2,9 @@ #define ENTRIESBLK_H #include <sysdata.h> +#include <defs.h> + +SWORD_NAMESPACE_START class EntriesBlock { static const int METAHEADERSIZE; @@ -27,4 +30,5 @@ public: }; +SWORD_NAMESPACE_END #endif diff --git a/include/filemgr.h b/include/filemgr.h index 111f916..d4c8860 100644 --- a/include/filemgr.h +++ b/include/filemgr.h @@ -1,7 +1,7 @@ /****************************************************************************** * filemgr.h - definition of class FileMgr used for pooling file handles * - * $Id: filemgr.h,v 1.14 2002/03/13 06:55:39 scribe Exp $ + * $Id: filemgr.h,v 1.15 2002/10/01 19:52:40 dglassey Exp $ * * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -27,6 +27,8 @@ #include <defs.h> +SWORD_NAMESPACE_START + class SWDLLEXPORT FileMgr; class SWDLLEXPORT FileDesc @@ -77,6 +79,5 @@ public: }; - - +SWORD_NAMESPACE_END #endif diff --git a/include/gbffootnotes.h b/include/gbffootnotes.h index 4262538..8c35bd7 100644 --- a/include/gbffootnotes.h +++ b/include/gbffootnotes.h @@ -1,6 +1,6 @@ /* * - * $Id: gbffootnotes.h,v 1.9 2001/12/11 22:35:10 scribe Exp $ + * $Id: gbffootnotes.h,v 1.10 2002/10/01 19:52:40 dglassey Exp $ * * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -25,6 +25,8 @@ #include <defs.h> +SWORD_NAMESPACE_START + /** This Filter shows/hides footnotes in a GBF text */ class SWDLLEXPORT GBFFootnotes:public SWFilter @@ -55,4 +57,5 @@ public: } }; +SWORD_NAMESPACE_END #endif diff --git a/include/gbfheadings.h b/include/gbfheadings.h index da86a33..249b7d5 100644 --- a/include/gbfheadings.h +++ b/include/gbfheadings.h @@ -1,6 +1,6 @@ /* * - * $Id: gbfheadings.h,v 1.2 2001/12/11 22:35:10 scribe Exp $ + * $Id: gbfheadings.h,v 1.3 2002/10/01 19:52:40 dglassey Exp $ * * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -25,6 +25,8 @@ #include <defs.h> +SWORD_NAMESPACE_START + /** This Filter shows/hides headings in a GBF text */ class SWDLLEXPORT GBFHeadings:public SWFilter @@ -55,4 +57,5 @@ public: } }; +SWORD_NAMESPACE_END #endif diff --git a/include/gbfhtml.h b/include/gbfhtml.h index 40805aa..ba0cb4b 100644 --- a/include/gbfhtml.h +++ b/include/gbfhtml.h @@ -16,8 +16,8 @@ * * ***************************************************************************/ -/* $Header: /usr/local/cvsroot/sword/include/gbfhtml.h,v 1.8 2001/12/11 22:35:10 scribe Exp $ */ -/* $Revision: 1.8 $ */ +/* $Header: /usr/local/cvsroot/sword/include/gbfhtml.h,v 1.9 2002/10/01 19:52:40 dglassey Exp $ */ +/* $Revision: 1.9 $ */ #ifndef GBFHTML_H #define GBFHTML_H @@ -26,6 +26,8 @@ #include <defs.h> +SWORD_NAMESPACE_START + /** This filter converts GBF Text into HTML */ class SWDLLEXPORT GBFHTML:public SWFilter @@ -35,4 +37,5 @@ public: virtual char ProcessText (char *text, int maxlen, const SWKey * key, const SWModule * = 0); }; +SWORD_NAMESPACE_END #endif diff --git a/include/gbfhtmlhref.h b/include/gbfhtmlhref.h index 77952a4..18694a8 100644 --- a/include/gbfhtmlhref.h +++ b/include/gbfhtmlhref.h @@ -21,6 +21,8 @@ #include <defs.h> +SWORD_NAMESPACE_START + /** this filter converts GBF text to HTML text with hrefs */ class SWDLLEXPORT GBFHTMLHREF : public SWBasicFilter { @@ -30,4 +32,6 @@ public: GBFHTMLHREF (); }; + +SWORD_NAMESPACE_END #endif diff --git a/include/gbfmorph.h b/include/gbfmorph.h index f57b3cc..3acad7c 100644 --- a/include/gbfmorph.h +++ b/include/gbfmorph.h @@ -24,6 +24,8 @@ #include <defs.h> +SWORD_NAMESPACE_START + /** This Filter shows/hides morph tags in a GBF text */ class SWDLLEXPORT GBFMorph:public SWFilter @@ -54,4 +56,5 @@ public: } }; +SWORD_NAMESPACE_END #endif diff --git a/include/gbfosis.h b/include/gbfosis.h index f0eb311..95e069b 100644 --- a/include/gbfosis.h +++ b/include/gbfosis.h @@ -20,6 +20,8 @@ #include <defs.h> #include <swfilter.h> +SWORD_NAMESPACE_START + /** this filter converts GBF text to HTML text with hrefs */ class SWDLLEXPORT GBFOSIS : public SWFilter { @@ -32,4 +34,5 @@ public: char ProcessText(char *text, int maxlen, const SWKey *, const SWModule * = 0); }; +SWORD_NAMESPACE_END #endif /* THMLOSIS_H */ diff --git a/include/gbfplain.h b/include/gbfplain.h index 5e24957..fcf7a27 100644 --- a/include/gbfplain.h +++ b/include/gbfplain.h @@ -1,6 +1,6 @@ /* * - * $Id: gbfplain.h,v 1.8 2001/12/11 22:35:10 scribe Exp $ + * $Id: gbfplain.h,v 1.9 2002/10/01 19:52:40 dglassey Exp $ * * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -25,6 +25,8 @@ #include <defs.h> +SWORD_NAMESPACE_START + /** This filter converts GBF text into plain text */ class SWDLLEXPORT GBFPlain:public SWFilter @@ -34,4 +36,5 @@ public: virtual char ProcessText (char *text, int maxlen, const SWKey *key, const SWModule * = 0); }; +SWORD_NAMESPACE_END #endif diff --git a/include/gbfrtf.h b/include/gbfrtf.h index f0bbbd6..e8b6573 100644 --- a/include/gbfrtf.h +++ b/include/gbfrtf.h @@ -1,6 +1,6 @@ /* * - * $Id: gbfrtf.h,v 1.7 2001/12/11 22:35:10 scribe Exp $ + * $Id: gbfrtf.h,v 1.8 2002/10/01 19:52:40 dglassey Exp $ * * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -25,6 +25,8 @@ #include <defs.h> +SWORD_NAMESPACE_START + /** This filter converts GBF text into RTF text */ class SWDLLEXPORT GBFRTF:public SWFilter @@ -34,4 +36,5 @@ public: virtual char ProcessText (char *text, int maxlen, const SWKey * key, const SWModule * = 0); }; +SWORD_NAMESPACE_END #endif diff --git a/include/gbfstrongs.h b/include/gbfstrongs.h index d23e267..ea3161f 100644 --- a/include/gbfstrongs.h +++ b/include/gbfstrongs.h @@ -1,6 +1,6 @@ /* * - * $Id: gbfstrongs.h,v 1.8 2001/12/11 22:35:10 scribe Exp $ + * $Id: gbfstrongs.h,v 1.9 2002/10/01 19:52:40 dglassey Exp $ * * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -25,6 +25,8 @@ #include <defs.h> +SWORD_NAMESPACE_START + /** This Filter shows/hides strong's numbers in a GBF text */ class SWDLLEXPORT GBFStrongs:public SWFilter @@ -55,4 +57,5 @@ public: } }; +SWORD_NAMESPACE_END #endif diff --git a/include/gbfthml.h b/include/gbfthml.h index f09cf92..972e762 100644 --- a/include/gbfthml.h +++ b/include/gbfthml.h @@ -22,6 +22,8 @@ #include <defs.h> +SWORD_NAMESPACE_START + /** this filter converts GBF text into ThML text */ class SWDLLEXPORT GBFThML:public SWFilter @@ -31,4 +33,5 @@ public: virtual char ProcessText (char *text, int maxlen = -1); }; +SWORD_NAMESPACE_END #endif diff --git a/include/greeklexattribs.h b/include/greeklexattribs.h index 759aa6d..33db495 100644 --- a/include/greeklexattribs.h +++ b/include/greeklexattribs.h @@ -25,6 +25,8 @@ #include <defs.h> +SWORD_NAMESPACE_START + /** this filter converts ThML text to plain text */ class SWDLLEXPORT GreekLexAttribs:public SWFilter { @@ -33,4 +35,5 @@ public: virtual char ProcessText(char *text, int maxlen, const SWKey *, const SWModule * = 0); }; +SWORD_NAMESPACE_END #endif diff --git a/include/hebrewmcim.h b/include/hebrewmcim.h index 6400bbd..499639a 100644 --- a/include/hebrewmcim.h +++ b/include/hebrewmcim.h @@ -12,6 +12,9 @@ #include <swinputmeth.h> #include <map> +#include <defs.h> +SWORD_NAMESPACE_START + class HebrewMCIM : public SWInputMethod { @@ -25,4 +28,5 @@ public: int *translate(char in); }; +SWORD_NAMESPACE_END #endif diff --git a/include/hrefcom.h b/include/hrefcom.h index 58b971b..dc76ebb 100644 --- a/include/hrefcom.h +++ b/include/hrefcom.h @@ -3,7 +3,7 @@ * pointing to actual text desired. Uses standard * files: ot and nt using indexs ??.bks ??.cps ??.vss * - * $Id: hrefcom.h,v 1.6 2002/07/28 01:48:38 scribe Exp $ + * $Id: hrefcom.h,v 1.7 2002/10/01 19:52:40 dglassey Exp $ * * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -29,6 +29,8 @@ #include <defs.h> +SWORD_NAMESPACE_START + class SWDLLEXPORT HREFCom:public RawVerse, public SWCom { char *prefix; @@ -46,5 +48,5 @@ public: }; - +SWORD_NAMESPACE_END #endif diff --git a/include/latin1utf16.h b/include/latin1utf16.h index 685adbc..beafec7 100644 --- a/include/latin1utf16.h +++ b/include/latin1utf16.h @@ -24,6 +24,8 @@ #include <defs.h> +SWORD_NAMESPACE_START + /** This filter converts Latin-1 encoded text to UTF-8 */ class SWDLLEXPORT Latin1UTF16:public SWFilter { @@ -32,4 +34,5 @@ public: virtual char ProcessText (char *text, int maxlen, const SWKey *key, const SWModule * = 0); }; +SWORD_NAMESPACE_END #endif diff --git a/include/latin1utf8.h b/include/latin1utf8.h index 9303d89..cdb5bdb 100644 --- a/include/latin1utf8.h +++ b/include/latin1utf8.h @@ -24,6 +24,8 @@ #include <defs.h> +SWORD_NAMESPACE_START + /** This filter converts Latin-1 encoded text to UTF-8 */ class SWDLLEXPORT Latin1UTF8:public SWFilter { @@ -32,4 +34,5 @@ public: virtual char ProcessText (char *text, int maxlen, const SWKey *key, const SWModule * = 0); }; +SWORD_NAMESPACE_END #endif diff --git a/include/listkey.h b/include/listkey.h index 6ea2b95..bd26e13 100644 --- a/include/listkey.h +++ b/include/listkey.h @@ -4,7 +4,7 @@ * (e.g. verse, word, * place, etc.) * - * $Id: listkey.h,v 1.15 2002/09/11 07:04:20 scribe Exp $ + * $Id: listkey.h,v 1.16 2002/10/01 19:52:40 dglassey Exp $ * * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -29,6 +29,8 @@ #include <defs.h> +SWORD_NAMESPACE_START + /** ListKey is the basis for all * types of keys that have lists of specified indexes * (e.g. a list of verses, place, etc.) @@ -117,5 +119,5 @@ public: ListKey & operator =(const ListKey &key) { copyFrom(key); return *this; } }; - +SWORD_NAMESPACE_END #endif diff --git a/include/localemgr.h b/include/localemgr.h index 2e57c03..892a3ed 100644 --- a/include/localemgr.h +++ b/include/localemgr.h @@ -2,7 +2,7 @@ * localemgr.h - definition of class LocaleMgr used to interact with * registered locales for a sword installation * - * $Id: localemgr.h,v 1.10 2002/09/30 10:34:43 dglassey Exp $ + * $Id: localemgr.h,v 1.12 2002/10/01 22:04:58 dglassey Exp $ * * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -31,8 +31,9 @@ #include <defs.h> +SWORD_NAMESPACE_START -typedef map < string, SWLocale *, less < string > >LocaleMap; +typedef std::map < std::string, SWLocale *, std::less < std::string > >LocaleMap; /** * The LocaleMgr class handles all the different locales of Sword. @@ -76,7 +77,7 @@ public: * * @ret Returns a list of strings, which contains the names of the available locales. */ - virtual list < string > getAvailableLocales (); + virtual std::list < std::string > getAvailableLocales (); /** Returns translated text. * This function uses both parameters to return the translated version of the given text. @@ -110,4 +111,6 @@ public: virtual void loadConfigDir(const char *ipath); }; + +SWORD_NAMESPACE_END #endif diff --git a/include/lzsscomprs.h b/include/lzsscomprs.h index 0f352e7..d972f88 100644 --- a/include/lzsscomprs.h +++ b/include/lzsscomprs.h @@ -1,7 +1,7 @@ /****************************************************************************** * lzsscomprs.h - definition of Class SWCompress used for data compression * - * $Id: lzsscomprs.h,v 1.3 2001/02/09 15:38:51 jansorg Exp $ + * $Id: lzsscomprs.h,v 1.4 2002/10/01 19:52:40 dglassey Exp $ * * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -26,6 +26,8 @@ #include <defs.h> +SWORD_NAMESPACE_START + // The following are constant sizes used by the compression algorithm. // // N - This is the size of the ring buffer. It is set @@ -76,4 +78,5 @@ public: virtual void Decode (void); }; +SWORD_NAMESPACE_END #endif diff --git a/include/markupfiltmgr.h b/include/markupfiltmgr.h index 7c9c3c5..2e2d775 100644 --- a/include/markupfiltmgr.h +++ b/include/markupfiltmgr.h @@ -24,6 +24,8 @@ #include <encfiltmgr.h> +SWORD_NAMESPACE_START + /** This class is like a normal @ref SWEncodingMgr, * but you can additonally specify which markup * you want to use. @@ -72,4 +74,5 @@ public: virtual void AddRenderFilters(SWModule *module, ConfigEntMap §ion); }; +SWORD_NAMESPACE_END #endif diff --git a/include/multimapwdef.h b/include/multimapwdef.h index 759818e..664e21d 100644 --- a/include/multimapwdef.h +++ b/include/multimapwdef.h @@ -3,13 +3,14 @@ #include <map> +SWORD_NAMESPACE_START // multmap that still lets you use [] to reference FIRST // entry of a key if multiples exist template <class Key, class T, class Compare> -class multimapwithdefault : public multimap<Key, T, Compare> { +class multimapwithdefault : public std::multimap<Key, T, Compare> { public: - typedef pair<const Key, T> value_type; + typedef std::pair<const Key, T> value_type; T& getWithDefault(const Key& k, const T& defaultValue) { if (find(k) == end()) { insert(value_type(k, defaultValue)); @@ -24,8 +25,8 @@ public: return (*(find(k))).second; } bool has(const Key& k, const T &val) const { - typename multimap<Key, T, Compare>::const_iterator start = lower_bound(k); - typename multimap<Key, T, Compare>::const_iterator end = upper_bound(k); + typename std::multimap<Key, T, Compare>::const_iterator start = lower_bound(k); + typename std::multimap<Key, T, Compare>::const_iterator end = upper_bound(k); for (; start!=end; start++) { if (start->second == val) return true; @@ -34,4 +35,5 @@ public: } }; +SWORD_NAMESPACE_END #endif diff --git a/include/nullim.h b/include/nullim.h index ce72090..765db0d 100644 --- a/include/nullim.h +++ b/include/nullim.h @@ -2,7 +2,8 @@ #define NULLIM_H #include <swinputmeth.h> - +#include <defs.h> +SWORD_NAMESPACE_START class NullIM : public SWInputMethod { @@ -11,4 +12,5 @@ public: int * translate(char ch); }; +SWORD_NAMESPACE_END #endif diff --git a/include/plainfootnotes.h b/include/plainfootnotes.h index 41ed3af..3ea18bd 100644 --- a/include/plainfootnotes.h +++ b/include/plainfootnotes.h @@ -15,16 +15,18 @@ * * ***************************************************************************/ -/* $Header: /usr/local/cvsroot/sword/include/plainfootnotes.h,v 1.4 2001/12/11 22:35:10 scribe Exp $ */ -/* $Revision: 1.4 $ */ +/* $Header: /usr/local/cvsroot/sword/include/plainfootnotes.h,v 1.5 2002/10/01 19:52:40 dglassey Exp $ */ +/* $Revision: 1.5 $ */ #ifndef PLAINFOOTNOTES_H #define PLAINFOOTNOTES_H #include <defs.h> -class QObject; #include <swfilter.h> + +SWORD_NAMESPACE_START + class SWKey; /**Shows or hides footnotes in plain text. @@ -59,4 +61,5 @@ public: } }; +SWORD_NAMESPACE_END #endif diff --git a/include/plainhtml.h b/include/plainhtml.h index d0eb547..4d57833 100644 --- a/include/plainhtml.h +++ b/include/plainhtml.h @@ -16,8 +16,8 @@ * * ***************************************************************************/ -/* $Header: /usr/local/cvsroot/sword/include/plainhtml.h,v 1.7 2001/12/11 22:35:10 scribe Exp $ */ -/* $Revision: 1.7 $ */ +/* $Header: /usr/local/cvsroot/sword/include/plainhtml.h,v 1.8 2002/10/01 19:52:40 dglassey Exp $ */ +/* $Revision: 1.8 $ */ #ifndef PLAINHTML_H #define PLAINHTML_H @@ -26,6 +26,8 @@ #include <defs.h> +SWORD_NAMESPACE_START + /** this filter converts plain text to HTML text */ class SWDLLEXPORT PLAINHTML:public SWFilter @@ -35,4 +37,5 @@ public: virtual char ProcessText (char *text, int maxlen, const SWKey * key, const SWModule * = 0); }; +SWORD_NAMESPACE_END #endif diff --git a/include/rawcom.h b/include/rawcom.h index aff3a77..c5d0aff 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.15 2002/07/28 01:48:38 scribe Exp $ + * $Id: rawcom.h,v 1.16 2002/10/01 19:52:40 dglassey Exp $ * * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -28,6 +28,8 @@ #include <defs.h> +SWORD_NAMESPACE_START + class SWDLLEXPORT RawCom:public RawVerse, public SWCom { public: @@ -58,4 +60,5 @@ public: SWMODULE_OPERATORS }; +SWORD_NAMESPACE_END #endif diff --git a/include/rawfiles.h b/include/rawfiles.h index cd66b13..357a64d 100644 --- a/include/rawfiles.h +++ b/include/rawfiles.h @@ -3,7 +3,7 @@ * pointing to actual text desired. Uses standard * files: ot and nt using indexs ??.bks ??.cps ??.vss * - * $Id: rawfiles.h,v 1.15 2002/07/28 01:48:38 scribe Exp $ + * $Id: rawfiles.h,v 1.16 2002/10/01 19:52:40 dglassey Exp $ * * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -29,6 +29,8 @@ #include <defs.h> +SWORD_NAMESPACE_START + class SWDLLEXPORT RawFiles : public RawVerse, public SWCom { char *getnextfilename(); @@ -82,5 +84,5 @@ public: }; - +SWORD_NAMESPACE_END #endif diff --git a/include/rawgbf.h b/include/rawgbf.h index 8634831..27e76f0 100644 --- a/include/rawgbf.h +++ b/include/rawgbf.h @@ -2,7 +2,7 @@ * rawgbf.h - code for class 'RawGBF'- a module that reads raw text files: * ot and nt using indexs ??.bks ??.cps ??.vss * - * $Id: rawgbf.h,v 1.4 2002/02/19 01:20:35 scribe Exp $ + * $Id: rawgbf.h,v 1.5 2002/10/01 19:52:40 dglassey Exp $ * * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -29,6 +29,8 @@ #include <defs.h> +SWORD_NAMESPACE_START + class SWDLLEXPORT RawGBF:public SWText, public RawVerse { @@ -41,5 +43,5 @@ public: virtual operator char *(); }; - +SWORD_NAMESPACE_END #endif diff --git a/include/rawgenbook.h b/include/rawgenbook.h index 3fa8657..79ee779 100644 --- a/include/rawgenbook.h +++ b/include/rawgenbook.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: rawgenbook.h,v 1.4 2002/07/28 01:48:38 scribe Exp $ + * $Id: rawgenbook.h,v 1.5 2002/10/01 19:52:40 dglassey Exp $ * * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -28,6 +28,8 @@ #include <defs.h> +SWORD_NAMESPACE_START + class SWDLLEXPORT RawGenBook : public SWGenBook { char *entryBuf; char *path; @@ -60,5 +62,5 @@ public: }; - +SWORD_NAMESPACE_END #endif diff --git a/include/rawld.h b/include/rawld.h index b7b6a80..f472feb 100644 --- a/include/rawld.h +++ b/include/rawld.h @@ -2,7 +2,7 @@ * rawld.cpp - code for class 'RawLD'- a module that reads raw lexicon and * dictionary files: *.dat *.idx * - * $Id: rawld.h,v 1.16 2002/07/28 01:48:38 scribe Exp $ + * $Id: rawld.h,v 1.17 2002/10/01 19:52:40 dglassey Exp $ * * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -28,6 +28,8 @@ #include <defs.h> +SWORD_NAMESPACE_START + class SWDLLEXPORT RawLD : public RawStr, public SWLD { void strongsPad(char *buf); char getEntry(long away = 0); @@ -61,5 +63,5 @@ public: }; - +SWORD_NAMESPACE_END #endif diff --git a/include/rawld4.h b/include/rawld4.h index 88b52b5..340d205 100644 --- a/include/rawld4.h +++ b/include/rawld4.h @@ -2,7 +2,7 @@ * rawld.cpp - code for class 'RawLD'- a module that reads raw lexicon and * dictionary files: *.dat *.idx * - * $Id: rawld4.h,v 1.10 2002/07/28 01:48:38 scribe Exp $ + * $Id: rawld4.h,v 1.11 2002/10/01 19:52:40 dglassey Exp $ * * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -28,6 +28,8 @@ #include <defs.h> +SWORD_NAMESPACE_START + class SWDLLEXPORT RawLD4 : public RawStr4, public SWLD { void strongsPad(char *buf); char getEntry(long away = 0); @@ -63,5 +65,5 @@ public: }; - +SWORD_NAMESPACE_END #endif diff --git a/include/rawstr.h b/include/rawstr.h index 15f1328..72bfc92 100644 --- a/include/rawstr.h +++ b/include/rawstr.h @@ -4,7 +4,7 @@ * and provides lookup and parsing functions based on * class StrKey * - * $Id: rawstr.h,v 1.14 2002/07/30 10:17:30 scribe Exp $ + * $Id: rawstr.h,v 1.15 2002/10/01 19:52:40 dglassey Exp $ * * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -29,6 +29,8 @@ #include <defs.h> +SWORD_NAMESPACE_START + class SWDLLEXPORT RawStr { static int instance; // number of instantiated RawStr objects or derivitives char *path; @@ -51,4 +53,5 @@ public: static signed char createModule(const char *path); }; +SWORD_NAMESPACE_END #endif diff --git a/include/rawstr4.h b/include/rawstr4.h index 129ca54..a065fcc 100644 --- a/include/rawstr4.h +++ b/include/rawstr4.h @@ -4,7 +4,7 @@ * and provides lookup and parsing functions based on * class StrKey * - * $Id: rawstr4.h,v 1.7 2002/07/30 10:17:30 scribe Exp $ + * $Id: rawstr4.h,v 1.8 2002/10/01 19:52:40 dglassey Exp $ * * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -29,6 +29,8 @@ #include <defs.h> +SWORD_NAMESPACE_START + class SWDLLEXPORT RawStr4 { static int instance; // number of instantiated RawStr4 objects or derivitives char *path; @@ -52,4 +54,5 @@ public: static signed char createModule(const char *path); }; +SWORD_NAMESPACE_END #endif diff --git a/include/rawtext.h b/include/rawtext.h index 01a0114..00b2f00 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.24 2002/07/28 01:48:38 scribe Exp $ + * $Id: rawtext.h,v 1.25 2002/10/01 19:52:40 dglassey Exp $ * * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -29,6 +29,8 @@ #include <defs.h> +SWORD_NAMESPACE_START + class SWDLLEXPORT RawText:public SWText, public RawVerse { RawStr *fastSearch[2]; @@ -60,5 +62,5 @@ public: }; - +SWORD_NAMESPACE_END #endif diff --git a/include/rawverse.h b/include/rawverse.h index 3917fd7..654fd0c 100644 --- a/include/rawverse.h +++ b/include/rawverse.h @@ -13,6 +13,8 @@ #include <defs.h> +SWORD_NAMESPACE_START + class SWDLLEXPORT RawVerse { static int instance; // number of instantiated RawVerse objects or derivitives protected: @@ -34,5 +36,5 @@ public: static char createModule(const char *path); }; - +SWORD_NAMESPACE_END #endif diff --git a/include/roman.h b/include/roman.h index 92665fe..7835a73 100644 --- a/include/roman.h +++ b/include/roman.h @@ -18,8 +18,13 @@ */ #ifndef ROMAN_H #define ROMAN_H + +#include <defs.h> +SWORD_NAMESPACE_START + char isroman(const char *); /* char* to_rom(int num, char *p); */ int from_rom(const char *s); +SWORD_NAMESPACE_END #endif diff --git a/include/rtfhtml.h b/include/rtfhtml.h index 54b8a9f..1e4dbf4 100644 --- a/include/rtfhtml.h +++ b/include/rtfhtml.h @@ -15,8 +15,8 @@ * * ***************************************************************************/ -/* $Header: /usr/local/cvsroot/sword/include/rtfhtml.h,v 1.5 2001/12/11 22:35:10 scribe Exp $ */ -/* $Revision: 1.5 $ */ +/* $Header: /usr/local/cvsroot/sword/include/rtfhtml.h,v 1.6 2002/10/01 19:52:40 dglassey Exp $ */ +/* $Revision: 1.6 $ */ #ifndef RTFHTML_H #define RTFHTML_H @@ -25,6 +25,8 @@ #include <defs.h> +SWORD_NAMESPACE_START + /** this filter converts RTF text into HTML text */ class SWDLLEXPORT RTFHTML:public SWFilter @@ -34,4 +36,5 @@ public: virtual char ProcessText (char *text, int maxlen, const SWKey * key, const SWModule * = 0); }; +SWORD_NAMESPACE_END #endif diff --git a/include/rwphtml.h b/include/rwphtml.h index 512fa38..1630e92 100644 --- a/include/rwphtml.h +++ b/include/rwphtml.h @@ -16,8 +16,8 @@ * * ***************************************************************************/ -/* $Header: /usr/local/cvsroot/sword/include/rwphtml.h,v 1.7 2001/12/11 22:35:10 scribe Exp $ */ -/* $Revision: 1.7 $ */ +/* $Header: /usr/local/cvsroot/sword/include/rwphtml.h,v 1.8 2002/10/01 19:52:40 dglassey Exp $ */ +/* $Revision: 1.8 $ */ #ifndef RWPHTML_H #define RWPHTML_H @@ -26,6 +26,8 @@ #include <defs.h> +SWORD_NAMESPACE_START + /** this filter converts RWP text to HTML text */ class SWDLLEXPORT RWPHTML:public SWFilter @@ -35,4 +37,5 @@ public: virtual char ProcessText (char *text, int maxlen, const SWKey * key, const SWModule * = 0); }; +SWORD_NAMESPACE_END #endif diff --git a/include/rwprtf.h b/include/rwprtf.h index 5e2452d..0c5c754 100644 --- a/include/rwprtf.h +++ b/include/rwprtf.h @@ -3,7 +3,7 @@ * special tags in Robertsons Word Pictures commentary into * Rich Text Format tags * - * $Id: rwprtf.h,v 1.7 2001/12/11 22:35:10 scribe Exp $ + * $Id: rwprtf.h,v 1.8 2002/10/01 19:52:40 dglassey Exp $ * * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -28,6 +28,8 @@ #include <defs.h> +SWORD_NAMESPACE_START + /** this filter converts RWP text to RTF text */ class SWDLLEXPORT RWPRTF:public SWFilter @@ -37,4 +39,5 @@ public: virtual char ProcessText (char *text, int maxlen, const SWKey * key, const SWModule * = 0); }; +SWORD_NAMESPACE_END #endif diff --git a/include/sapphire.h b/include/sapphire.h index 9e9f724..a5e21ad 100644 --- a/include/sapphire.h +++ b/include/sapphire.h @@ -18,6 +18,11 @@ #ifndef NULL #define NULL 0 #endif /* */ + +#include <defs.h> + +SWORD_NAMESPACE_START + class sapphire { @@ -51,3 +56,4 @@ unsigned *keypos); public:sapphire (unsigned char }; +SWORD_NAMESPACE_END diff --git a/include/scsuutf8.h b/include/scsuutf8.h index 4ff28da..6b085da 100644 --- a/include/scsuutf8.h +++ b/include/scsuutf8.h @@ -24,6 +24,8 @@ #include <defs.h> +SWORD_NAMESPACE_START + /** This filter converts SCSU compressed (encoded) text to UTF-8 */ class SWDLLEXPORT SCSUUTF8:public SWFilter { @@ -38,4 +40,5 @@ class SWDLLEXPORT SCSUUTF8:public SWFilter { virtual char ProcessText (char *text, int maxlen, const SWKey *key, const SWModule * = 0); }; +SWORD_NAMESPACE_END #endif diff --git a/include/strkey.h b/include/strkey.h index fc8fd58..aa0b4b1 100644 --- a/include/strkey.h +++ b/include/strkey.h @@ -1,7 +1,7 @@ /****************************************************************************** * strkey.h - code for class 'strkey'- a standard Biblical verse key * - * $Id: strkey.h,v 1.6 2001/08/08 09:17:00 scribe Exp $ + * $Id: strkey.h,v 1.7 2002/10/01 19:52:40 dglassey Exp $ * * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -28,6 +28,8 @@ #include <defs.h> +SWORD_NAMESPACE_START + /** a standard string key class (used * for modules that index on single strings (eg. cities, * names, words, etc.) @@ -49,6 +51,6 @@ public: SWKEY_OPERATORS }; - +SWORD_NAMESPACE_END #endif diff --git a/include/swbasicfilter.h b/include/swbasicfilter.h index 0e6a2a4..c1e7c63 100644 --- a/include/swbasicfilter.h +++ b/include/swbasicfilter.h @@ -4,7 +4,7 @@ * many filter will need and can use as a starting * point. * - * $Id: swbasicfilter.h,v 1.10 2002/09/30 10:34:43 dglassey Exp $ + * $Id: swbasicfilter.h,v 1.12 2002/10/01 22:04:58 dglassey Exp $ * * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -30,6 +30,8 @@ #include <defs.h> #include <map> +SWORD_NAMESPACE_START + /** A filter providing commonly used functionality. * This filter has facilities for handling SGML/HTML/XML like tokens and * escape strings (like SGML entities). It has the facility for just @@ -61,7 +63,7 @@ protected: const SWModule *module; const SWKey *key; char *resultBuffer; - typedef map<string, string> DualStringMap; + typedef std::map<std::string, std::string> DualStringMap; DualStringMap tokenSubMap; DualStringMap escSubMap; @@ -113,4 +115,5 @@ protected: virtual bool handleEscapeString(char **buf, const char *escString, DualStringMap &userData); }; +SWORD_NAMESPACE_END #endif diff --git a/include/swcacher.h b/include/swcacher.h index f62adba..9c8f26e 100644 --- a/include/swcacher.h +++ b/include/swcacher.h @@ -2,7 +2,7 @@ * swcacher.h - definition of class SWCacher used to provide an interface for * objects that cache and want a standard interface for cleaning up. * - * $Id: swcacher.h,v 1.2 2002/03/16 04:10:33 scribe Exp $ + * $Id: swcacher.h,v 1.3 2002/10/01 19:52:40 dglassey Exp $ * * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -25,6 +25,8 @@ #include <defs.h> +SWORD_NAMESPACE_START + class SWDLLEXPORT SWCacher { public: SWCacher(); @@ -34,4 +36,5 @@ public: virtual long lastAccess(); }; +SWORD_NAMESPACE_END #endif diff --git a/include/swcipher.h b/include/swcipher.h index 4f1fe21..23ed5bb 100644 --- a/include/swcipher.h +++ b/include/swcipher.h @@ -1,7 +1,7 @@ /****************************************************************************** * swcipher.h - definition of Class SWCipher used for data cipher/decipher * - * $Id: swcipher.h,v 1.6 2001/11/05 07:59:10 chrislit Exp $ + * $Id: swcipher.h,v 1.7 2002/10/01 19:52:40 dglassey Exp $ * * Copyright 1999 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -26,6 +26,8 @@ #include <defs.h> +SWORD_NAMESPACE_START + class SWDLLEXPORT SWCipher { @@ -46,4 +48,5 @@ public: virtual void Decode (void); }; +SWORD_NAMESPACE_END #endif diff --git a/include/swcom.h b/include/swcom.h index c0b7420..ba104b6 100644 --- a/include/swcom.h +++ b/include/swcom.h @@ -2,7 +2,7 @@ * swcom.h - code for base class 'SWCom'. SWCom is the basis for all * types of commentary modules * - * $Id: swcom.h,v 1.11 2002/09/29 03:21:08 scribe Exp $ + * $Id: swcom.h,v 1.12 2002/10/01 19:52:40 dglassey Exp $ * * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -28,6 +28,8 @@ #include <defs.h> +SWORD_NAMESPACE_START + /** The basis for all commentary modules */ class SWDLLEXPORT SWCom : public SWModule { @@ -58,5 +60,5 @@ public: }; - +SWORD_NAMESPACE_END #endif diff --git a/include/swcomprs.h b/include/swcomprs.h index 034060e..094c398 100644 --- a/include/swcomprs.h +++ b/include/swcomprs.h @@ -1,7 +1,7 @@ /****************************************************************************** * swcomprs.h - definition of Class SWCompress used for data compression * - * $Id: swcomprs.h,v 1.7 2001/12/20 10:01:00 scribe Exp $ + * $Id: swcomprs.h,v 1.8 2002/10/01 19:52:40 dglassey Exp $ * * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -24,6 +24,8 @@ #include <defs.h> +SWORD_NAMESPACE_START + class SWDLLEXPORT SWCompress { void Init (); @@ -42,4 +44,5 @@ public: virtual void Decode (void); // override to provide compression algorythm }; +SWORD_NAMESPACE_END #endif diff --git a/include/swconfig.h b/include/swconfig.h index 80c42b6..b9afcf6 100644 --- a/include/swconfig.h +++ b/include/swconfig.h @@ -2,7 +2,7 @@ * swconfig.h - definition of Class SWConfig used for saving and retrieval * of configuration information * - * $Id: swconfig.h,v 1.18 2002/09/30 10:34:43 dglassey Exp $ + * $Id: swconfig.h,v 1.20 2002/10/01 22:04:58 dglassey Exp $ * * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -32,22 +32,22 @@ #include <multimapwdef.h> +SWORD_NAMESPACE_START - -typedef multimapwithdefault < string, string, less < string > >ConfigEntMap; -typedef map < string, ConfigEntMap, less < string > >SectionMap; +typedef multimapwithdefault < std::string, std::string, std::less < std::string > >ConfigEntMap; +typedef std::map < std::string, ConfigEntMap, std::less < std::string > >SectionMap; /** The class to read and save settings using a file on disk. * */ class SWDLLEXPORT SWConfig { private: - char getline(FILE * fp, string & line); + char getline(FILE * fp, std::string & line); public: /** The filename used by this SWConfig object * */ - string filename; + std::string filename; /** Map of available sections * The map of available sections. */ @@ -86,5 +86,5 @@ public: */ virtual ConfigEntMap & operator [](const char *section); }; - +SWORD_NAMESPACE_END #endif diff --git a/include/swdisp.h b/include/swdisp.h index 9668470..0a1b468 100644 --- a/include/swdisp.h +++ b/include/swdisp.h @@ -2,7 +2,7 @@ * swdisp.h - code for base class 'swdisp'. swdisp is the basis for all * types of displays (e.g. raw textout, curses, xwindow, etc.) * - * $Id: swdisp.h,v 1.7 2002/05/25 22:56:51 scribe Exp $ + * $Id: swdisp.h,v 1.8 2002/10/01 19:52:40 dglassey Exp $ * * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -26,6 +26,8 @@ #include <swobject.h> #include <defs.h> +SWORD_NAMESPACE_START + class SWModule; /** swdisp is the basis for all types of displays @@ -44,4 +46,6 @@ public: */ virtual char Display (SWModule & imodule); }; + +SWORD_NAMESPACE_END #endif diff --git a/include/swfilter.h b/include/swfilter.h index 68a67a4..e36a82e 100644 --- a/include/swfilter.h +++ b/include/swfilter.h @@ -2,7 +2,7 @@ * swfilter.h - definition of class SWFilter used to filter text between * different formats * - * $Id: swfilter.h,v 1.13 2001/12/11 22:35:10 scribe Exp $ + * $Id: swfilter.h,v 1.14 2002/10/01 19:52:40 dglassey Exp $ * * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -28,6 +28,8 @@ #include <defs.h> +SWORD_NAMESPACE_START + /** * The type definitoin for option types */ @@ -105,4 +107,5 @@ public: } }; +SWORD_NAMESPACE_END #endif diff --git a/include/swfiltermgr.h b/include/swfiltermgr.h index 6de765b..f8d41ff 100644 --- a/include/swfiltermgr.h +++ b/include/swfiltermgr.h @@ -2,7 +2,7 @@ * swfiltermgr.h - definition of class SWFilterMgr used as an interface to * manage filters on a module * - * $Id: swfiltermgr.h,v 1.1 2001/11/30 21:05:41 scribe Exp $ + * $Id: swfiltermgr.h,v 1.2 2002/10/01 19:52:40 dglassey Exp $ * * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -30,6 +30,8 @@ #include <defs.h> +SWORD_NAMESPACE_START + class SWMgr; @@ -78,5 +80,5 @@ public: virtual void AddRawFilters (SWModule * module, ConfigEntMap & section); }; - +SWORD_NAMESPACE_END #endif diff --git a/include/swgenbook.h b/include/swgenbook.h index bb8c56b..d32ed8b 100644 --- a/include/swgenbook.h +++ b/include/swgenbook.h @@ -2,7 +2,7 @@ * swld.h - code for base class 'SWLD'. SWLD is the basis for all * types of Lexicon and Dictionary modules (hence the 'LD'). * -* $Id: swgenbook.h,v 1.2 2002/07/28 01:48:38 scribe Exp $ +* $Id: swgenbook.h,v 1.3 2002/10/01 19:52:40 dglassey Exp $ * * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -28,6 +28,8 @@ #include <defs.h> +SWORD_NAMESPACE_START + /** the basis for all types of Lexicon and * Dictionary modules (hence the 'LD'). */ @@ -58,4 +60,5 @@ public: }; +SWORD_NAMESPACE_END #endif diff --git a/include/swinputmeth.h b/include/swinputmeth.h index 05eed88..97a67f6 100644 --- a/include/swinputmeth.h +++ b/include/swinputmeth.h @@ -10,6 +10,9 @@ #ifndef SWINPUTMETHOD_H #define SWINPUTMETHOD_H +#include <defs.h> +SWORD_NAMESPACE_START + class SWInputMethod { private: @@ -27,4 +30,5 @@ public: virtual void clearState(); }; +SWORD_NAMESPACE_END #endif diff --git a/include/swkey.h b/include/swkey.h index 1b58145..56a1e0c 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.22 2002/09/29 03:21:08 scribe Exp $ + * $Id: swkey.h,v 1.23 2002/10/01 19:52:40 dglassey Exp $ * * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -28,6 +28,8 @@ #include <defs.h> +SWORD_NAMESPACE_START + #define KEYERR_OUTOFBOUNDS 1 #define SWKEY_OPERATORS \ @@ -210,5 +212,5 @@ public: }; - +SWORD_NAMESPACE_END #endif diff --git a/include/swld.h b/include/swld.h index 07718f7..53319f9 100644 --- a/include/swld.h +++ b/include/swld.h @@ -2,7 +2,7 @@ * swld.h - code for base class 'SWLD'. SWLD is the basis for all * types of Lexicon and Dictionary modules (hence the 'LD'). * - * $Id: swld.h,v 1.12 2002/07/28 01:48:38 scribe Exp $ + * $Id: swld.h,v 1.13 2002/10/01 19:52:40 dglassey Exp $ * * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -28,6 +28,8 @@ #include <defs.h> +SWORD_NAMESPACE_START + /** the basis for all types of Lexicon and * Dictionary modules (hence the 'LD'). */ @@ -65,5 +67,5 @@ public: }; - +SWORD_NAMESPACE_END #endif diff --git a/include/swlocale.h b/include/swlocale.h index eed6adf..220848a 100644 --- a/include/swlocale.h +++ b/include/swlocale.h @@ -2,7 +2,7 @@ * swlocale.h - definition of Class SWLocale used for retrieval * of locale lookups * - * $Id: swlocale.h,v 1.8 2002/09/30 10:34:43 dglassey Exp $ + * $Id: swlocale.h,v 1.10 2002/10/01 22:04:58 dglassey Exp $ * * Copyright 2000 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -31,8 +31,9 @@ #include <defs.h> +SWORD_NAMESPACE_START -typedef map < string, string, less < string > >LookupMap; +typedef std::map < std::string, std::string, std::less < std::string > >LookupMap; /** SWLocale is used for the localisation of the booknames * The SWLocale is a class which holds the information of one language. @@ -69,4 +70,5 @@ public: virtual void getBooks(char **iBMAX, struct sbook ***ibooks); }; +SWORD_NAMESPACE_END #endif diff --git a/include/swlog.h b/include/swlog.h index 6e9ee57..a836c8f 100644 --- a/include/swlog.h +++ b/include/swlog.h @@ -1,7 +1,7 @@ /****************************************************************************** * swlog.h - definition of class SWLog used for logging messages * - * $Id: swlog.h,v 1.4 2002/07/19 23:00:43 scribe Exp $ + * $Id: swlog.h,v 1.5 2002/10/01 19:52:40 dglassey Exp $ * * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -26,6 +26,8 @@ #include <defs.h> +SWORD_NAMESPACE_START + class SWDLLEXPORT SWLog { protected: char logLevel; @@ -42,5 +44,5 @@ public: virtual void LogInformation (char *fmt, ...); }; - +SWORD_NAMESPACE_END #endif diff --git a/include/swmacs.h b/include/swmacs.h index ea9f8d3..de5fa38 100644 --- a/include/swmacs.h +++ b/include/swmacs.h @@ -1,7 +1,7 @@ /****************************************************************************** * swmacs.h - generic macros * - * $Id: swmacs.h,v 1.1.1.1 1999/05/04 22:03:36 scribe Exp $ + * $Id: swmacs.h,v 1.2 2002/10/01 19:52:40 dglassey Exp $ * * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -22,9 +22,11 @@ #ifndef SWMACS_H #define SWMACS_H +#include <defs.h> +SWORD_NAMESPACE_START // Maximum positive value of a signed numeric type #define MAXPOS(x) ((x)((unsigned x)(1L << (sizeof(x)*8-1)) - 1)) - +SWORD_NAMESPACE_END #endif diff --git a/include/swmgr.h b/include/swmgr.h index 214a9b0..c924494 100644 --- a/include/swmgr.h +++ b/include/swmgr.h @@ -2,7 +2,7 @@ * swmgr.h - definition of class SWMgr used to interact with an install * base of sword modules. * -* $Id: swmgr.h,v 1.46 2002/09/30 10:34:43 dglassey Exp $ +* $Id: swmgr.h,v 1.48 2002/10/01 22:04:58 dglassey Exp $ * * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -50,9 +50,11 @@ #include <defs.h> -typedef map < string, SWModule *, less < string > >ModMap; -typedef list < string > OptionsList; -typedef map < string, SWFilter * >FilterMap; +SWORD_NAMESPACE_START + +typedef std::map < std::string, SWModule *, std::less < std::string > >ModMap; +typedef std::list < std::string > OptionsList; +typedef std::map < std::string, SWFilter * >FilterMap; /** SWMgr is the main class of the Sword library. * @@ -62,7 +64,7 @@ typedef map < string, SWFilter * >FilterMap; * * To get the SWModule objects of the instalelled modules use @ref Modules for this. * @see AddRawFilters(), AddRenderFilters(), AddStripFilters() -* @version $Id: swmgr.h,v 1.46 2002/09/30 10:34:43 dglassey Exp $ +* @version $Id: swmgr.h,v 1.48 2002/10/01 22:04:58 dglassey Exp $ */ class SWDLLEXPORT SWMgr { @@ -75,7 +77,7 @@ protected: SWConfig *mysysconfig; SWConfig *homeConfig; void CreateMods(); - SWModule *CreateMod(string name, string driver, ConfigEntMap & section); + SWModule *CreateMod(std::string name, std::string driver, ConfigEntMap & section); void DeleteMods(); char configType; // 0 = file; 1 = directory FilterMap optionFilters; @@ -94,7 +96,7 @@ protected: virtual void AddLocalOptions(SWModule * module, ConfigEntMap & section, ConfigEntMap::iterator start, ConfigEntMap::iterator end); - list<string> augPaths; + std::list<std::string> augPaths; /** * Adds the encoding filters which are defined in "section" to the SWModule object "module". @@ -135,7 +137,7 @@ public: /** * */ - static void findConfig(char *configType, char **prefixPath, char **configPath, list<string> *augPaths = 0); + static void findConfig(char *configType, char **prefixPath, char **configPath, std::list<std::string> *augPaths = 0); /** The global config object. * This is the global config object. It contains all items of all modules, * so lookups of entries should use this config object. @@ -289,4 +291,6 @@ public: */ virtual signed char setCipherKey(const char *modName, const char *key); }; + +SWORD_NAMESPACE_END #endif diff --git a/include/swmodule.h b/include/swmodule.h index b8c2075..a7f51a1 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.54 2002/09/30 10:34:43 dglassey Exp $ +* $Id: swmodule.h,v 1.56 2002/10/01 22:04:58 dglassey Exp $ * * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -35,7 +35,7 @@ #include <defs.h> #include <multimapwdef.h> - +SWORD_NAMESPACE_START #define SWMODULE_OPERATORS \ operator const char *() { return RenderText(); } \ @@ -50,11 +50,11 @@ SWModule &operator =(SW_POSITION p) { setPosition(p); return *this; } -typedef list < SWFilter * >FilterList; +typedef std::list < SWFilter * >FilterList; -typedef map < string, string, less < string > > AttributeValue; -typedef map < string, AttributeValue, less < string > > AttributeList; -typedef map < string, AttributeList, less < string > > AttributeTypeList; +typedef std::map < std::string, std::string, std::less < std::string > > AttributeValue; +typedef std::map < std::string, AttributeValue, std::less < std::string > > AttributeList; +typedef std::map < std::string, AttributeList, std::less < std::string > > AttributeTypeList; #define SWTextDirection char #define SWTextEncoding char @@ -574,4 +574,6 @@ protected: SWMODULE_OPERATORS }; + +SWORD_NAMESPACE_END #endif diff --git a/include/swobject.h b/include/swobject.h index 567405b..9ddc2c3 100644 --- a/include/swobject.h +++ b/include/swobject.h @@ -10,6 +10,7 @@ #include <defs.h> #include <string.h> +SWORD_NAMESPACE_START #define SWDYNAMIC_CAST(className, object) (className *)((object)?((object->getClass()->isAssignableFrom(#className))?object:0):0) /** @@ -51,4 +52,5 @@ public: } }; +SWORD_NAMESPACE_END #endif diff --git a/include/swtext.h b/include/swtext.h index 14308db..4b61a8f 100644 --- a/include/swtext.h +++ b/include/swtext.h @@ -2,7 +2,7 @@ * swtext.h - code for base class 'SWText'. SWText is the basis for all * types of text modules * - * $Id: swtext.h,v 1.12 2002/09/29 03:21:08 scribe Exp $ + * $Id: swtext.h,v 1.13 2002/10/01 19:52:40 dglassey Exp $ * * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -29,6 +29,8 @@ #include <defs.h> +SWORD_NAMESPACE_START + /** The basis for all text modules */ class SWDLLEXPORT SWText : public SWModule { @@ -59,5 +61,6 @@ public: }; +SWORD_NAMESPACE_END #endif diff --git a/include/swunicod.h b/include/swunicod.h index af25630..3bf4e95 100644 --- a/include/swunicod.h +++ b/include/swunicod.h @@ -20,6 +20,9 @@ #ifndef SWUNICOD_H #define SWUNICOD_H +#include <defs.h> +SWORD_NAMESPACE_START + /** Converts a 32-bit unsigned integer UTF-32 value into a UTF-8 encoded 1-6 byte array * @param utf32 the UTF-32 Unicode code point value * @param utf8 pointer to an array of 6 unsigned chars to contain the UTF-8 value @@ -35,4 +38,6 @@ unsigned char* UTF32to8 (unsigned long utf32, unsigned char * utf8); */ unsigned long UTF8to32 (unsigned char * utf8, unsigned long utf32); +SWORD_NAMESPACE_END + #endif diff --git a/include/swversion.h b/include/swversion.h index ae84e50..1eceb08 100644 --- a/include/swversion.h +++ b/include/swversion.h @@ -1,7 +1,7 @@ /****************************************************************************** * swversion.h - definition of class SWVersion used to compare version info * - * $Id: swversion.h,v 1.5 2002/09/28 12:14:50 joachim Exp $ + * $Id: swversion.h,v 1.6 2002/10/01 19:52:40 dglassey Exp $ * * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -26,6 +26,9 @@ #ifndef SWVERSION_H #define SWVERSION_H +#include <defs.h> +SWORD_NAMESPACE_START + class SWVersion { public: int major, minor, minor2, minor3; @@ -42,5 +45,6 @@ class SWVersion { static SWVersion currentVersion; }; +SWORD_NAMESPACE_END #endif diff --git a/include/sysdata.h b/include/sysdata.h index deb2e5c..58b8083 100644 --- a/include/sysdata.h +++ b/include/sysdata.h @@ -8,6 +8,7 @@ #include "config.h" #endif + typedef signed char __s8; typedef unsigned char __u8; diff --git a/include/thmlfootnotes.h b/include/thmlfootnotes.h index 871700f..94bb8c4 100644 --- a/include/thmlfootnotes.h +++ b/include/thmlfootnotes.h @@ -25,6 +25,8 @@ #include <defs.h> +SWORD_NAMESPACE_START + /** This Filter shows/hides footnotes in a ThML text */ class SWDLLEXPORT ThMLFootnotes:public SWFilter @@ -54,5 +56,5 @@ public: return options; } }; - +SWORD_NAMESPACE_END #endif diff --git a/include/thmlgbf.h b/include/thmlgbf.h index 02ae82e..65529af 100644 --- a/include/thmlgbf.h +++ b/include/thmlgbf.h @@ -25,6 +25,8 @@ #include <defs.h> +SWORD_NAMESPACE_START + /** this filter converts ThML text to GBF text */ class SWDLLEXPORT ThMLGBF:public SWFilter @@ -33,5 +35,5 @@ public: ThMLGBF (); virtual char ProcessText (char *text, int maxlen = -1); }; - +SWORD_NAMESPACE_END #endif diff --git a/include/thmlheadings.h b/include/thmlheadings.h index f159503..d85d955 100644 --- a/include/thmlheadings.h +++ b/include/thmlheadings.h @@ -25,6 +25,8 @@ #include <defs.h> +SWORD_NAMESPACE_START + /** This Filter shows/hides headings in a ThML text */ class SWDLLEXPORT ThMLHeadings:public SWFilter @@ -54,5 +56,5 @@ public: return options; } }; - +SWORD_NAMESPACE_END #endif diff --git a/include/thmlhtml.h b/include/thmlhtml.h index f6c29ad..4077ac2 100644 --- a/include/thmlhtml.h +++ b/include/thmlhtml.h @@ -23,6 +23,8 @@ #include <defs.h> +SWORD_NAMESPACE_START + /** this filter converts ThML text to HTML text */ class SWDLLEXPORT ThMLHTML : public SWBasicFilter { @@ -31,5 +33,5 @@ protected: public: ThMLHTML(); }; - +SWORD_NAMESPACE_END #endif diff --git a/include/thmlhtmlhref.h b/include/thmlhtmlhref.h index dc1d192..4c3a3ca 100644 --- a/include/thmlhtmlhref.h +++ b/include/thmlhtmlhref.h @@ -21,6 +21,8 @@ #include <defs.h> +SWORD_NAMESPACE_START + /** this filter converts ThML text to HTML text with hrefs */ class SWDLLEXPORT ThMLHTMLHREF : public SWBasicFilter { @@ -29,5 +31,5 @@ protected: public: ThMLHTMLHREF(); }; - +SWORD_NAMESPACE_END #endif /* _THMLHTMLHREF_H */ diff --git a/include/thmllemma.h b/include/thmllemma.h index b2ab320..834d2e1 100644 --- a/include/thmllemma.h +++ b/include/thmllemma.h @@ -25,6 +25,8 @@ #include <defs.h> +SWORD_NAMESPACE_START + /** This Filter shows/hides lemmas in a ThML text */ class SWDLLEXPORT ThMLLemma:public SWFilter @@ -54,5 +56,5 @@ public: return options; } }; - +SWORD_NAMESPACE_END #endif diff --git a/include/thmlmorph.h b/include/thmlmorph.h index c71a380..449a12c 100644 --- a/include/thmlmorph.h +++ b/include/thmlmorph.h @@ -24,6 +24,8 @@ #include <defs.h> +SWORD_NAMESPACE_START + /** This Filter shows/hides morph tags in a ThML text */ class SWDLLEXPORT ThMLMorph:public SWFilter @@ -53,5 +55,5 @@ public: return options; } }; - +SWORD_NAMESPACE_END #endif diff --git a/include/thmlolb.h b/include/thmlolb.h index 6f6c0f7..d4c08f5 100644 --- a/include/thmlolb.h +++ b/include/thmlolb.h @@ -25,6 +25,8 @@ #include <defs.h> +SWORD_NAMESPACE_START + /** this filter converts ThML text to OLB text */ class SWDLLEXPORT ThMLOLB:public SWFilter @@ -33,5 +35,5 @@ public: ThMLOLB (); virtual char ProcessText (char *text, int maxlen = -1); }; - +SWORD_NAMESPACE_END #endif diff --git a/include/thmlosis.h b/include/thmlosis.h index 038d4b6..eebcd40 100644 --- a/include/thmlosis.h +++ b/include/thmlosis.h @@ -20,6 +20,8 @@ #include <defs.h> #include <swfilter.h> +SWORD_NAMESPACE_START + /** this filter converts ThML text to HTML text with hrefs */ class SWDLLEXPORT ThMLOSIS : public SWFilter { @@ -31,5 +33,5 @@ public: virtual ~ThMLOSIS(); char ProcessText(char *text, int maxlen, const SWKey *, const SWModule * = 0); }; - +SWORD_NAMESPACE_END #endif /* THMLOSIS_H */ diff --git a/include/thmlplain.h b/include/thmlplain.h index 0a753fe..0db4d59 100644 --- a/include/thmlplain.h +++ b/include/thmlplain.h @@ -25,6 +25,8 @@ #include <defs.h> +SWORD_NAMESPACE_START + /** this filter converts ThML text to plain text */ class SWDLLEXPORT ThMLPlain:public SWFilter @@ -34,4 +36,5 @@ public: virtual char ProcessText (char *text, int maxlen = -1); }; +SWORD_NAMESPACE_END #endif diff --git a/include/thmlrtf.h b/include/thmlrtf.h index 319cf4e..1d8ddd4 100644 --- a/include/thmlrtf.h +++ b/include/thmlrtf.h @@ -25,6 +25,8 @@ #include <defs.h> +SWORD_NAMESPACE_START + /** this filter converts ThML text to RTF text */ class SWDLLEXPORT ThMLRTF:public SWBasicFilter @@ -35,4 +37,5 @@ public: ThMLRTF (); }; +SWORD_NAMESPACE_END #endif diff --git a/include/thmlscripref.h b/include/thmlscripref.h index da96c42..eb03aa0 100644 --- a/include/thmlscripref.h +++ b/include/thmlscripref.h @@ -25,6 +25,8 @@ #include <defs.h> +SWORD_NAMESPACE_START + /** This Filter shows/hides scripture references in a ThML text */ class SWDLLEXPORT ThMLScripref:public SWFilter @@ -55,4 +57,6 @@ public: } }; +SWORD_NAMESPACE_END + #endif diff --git a/include/thmlstrongs.h b/include/thmlstrongs.h index 2b37d87..4b8ca7b 100644 --- a/include/thmlstrongs.h +++ b/include/thmlstrongs.h @@ -25,6 +25,8 @@ #include <defs.h> +SWORD_NAMESPACE_START + /** This Filter shows/hides strong's numbers in a ThML text */ class SWDLLEXPORT ThMLStrongs:public SWFilter @@ -55,4 +57,5 @@ public: } }; +SWORD_NAMESPACE_END #endif diff --git a/include/thmlvariants.h b/include/thmlvariants.h index 973b1e3..f6a7165 100644 --- a/include/thmlvariants.h +++ b/include/thmlvariants.h @@ -24,6 +24,8 @@ #include <defs.h> +SWORD_NAMESPACE_START + /** This Filter shows/hides textual variants */ class SWDLLEXPORT ThMLVariants : public SWFilter @@ -58,4 +60,5 @@ class SWDLLEXPORT ThMLVariants : public SWFilter } }; +SWORD_NAMESPACE_END #endif diff --git a/include/treekey.h b/include/treekey.h index 8768ac5..83393c5 100644 --- a/include/treekey.h +++ b/include/treekey.h @@ -1,7 +1,7 @@ /****************************************************************************** * versekey.h - code for class 'versekey'- a standard Biblical verse key * - * $Id: treekey.h,v 1.3 2002/04/15 21:26:44 scribe Exp $ + * $Id: treekey.h,v 1.4 2002/10/01 19:52:40 dglassey Exp $ * * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -28,6 +28,7 @@ #include <defs.h> +SWORD_NAMESPACE_START /** * Class VerseKey @@ -85,5 +86,5 @@ public: }; - +SWORD_NAMESPACE_END #endif diff --git a/include/treekeyidx.h b/include/treekeyidx.h index 170d87c..4e5e88a 100644 --- a/include/treekeyidx.h +++ b/include/treekeyidx.h @@ -1,7 +1,7 @@ /****************************************************************************** * versekey.h - code for class 'versekey'- a standard Biblical verse key * - * $Id: treekeyidx.h,v 1.4 2002/09/11 07:04:20 scribe Exp $ + * $Id: treekeyidx.h,v 1.5 2002/10/01 19:52:40 dglassey Exp $ * * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -27,6 +27,7 @@ #include <sysdata.h> #include <filemgr.h> +SWORD_NAMESPACE_START /** * Class VerseKey @@ -118,5 +119,6 @@ public: static signed char create(const char *path); }; +SWORD_NAMESPACE_END #endif diff --git a/include/unicodertf.h b/include/unicodertf.h index be72707..88548ab 100644 --- a/include/unicodertf.h +++ b/include/unicodertf.h @@ -1,6 +1,6 @@ /* * - * $Id: unicodertf.h,v 1.3 2001/12/11 22:35:10 scribe Exp $ + * $Id: unicodertf.h,v 1.4 2002/10/01 19:52:40 dglassey Exp $ * * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -25,6 +25,8 @@ #include <defs.h> +SWORD_NAMESPACE_START + /** This filter converts UTF-8 text into RTF Unicode tags */ class SWDLLEXPORT UnicodeRTF:public SWFilter { @@ -33,4 +35,5 @@ public: virtual char ProcessText (char *text, int maxlen, const SWKey *key, const SWModule * = 0); }; +SWORD_NAMESPACE_END #endif diff --git a/include/unixstr.h b/include/unixstr.h index 87069b7..1f275c2 100644 --- a/include/unixstr.h +++ b/include/unixstr.h @@ -1,7 +1,7 @@ // Include only if your UNIX compiler does not include stricmp but does include strcasecmp /* * - * $Id: unixstr.h,v 1.2 2001/02/09 15:38:51 jansorg Exp $ + * $Id: unixstr.h,v 1.3 2002/10/01 19:52:40 dglassey Exp $ * * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -22,7 +22,10 @@ #ifndef UNIXSTR_H #define UNIXSTR_H #include <string.h> +#include <defs.h> +SWORD_NAMESPACE_START int stricmp (const char *s1, const char *s2); +SWORD_NAMESPACE_END #endif diff --git a/include/utf16utf8.h b/include/utf16utf8.h index 5481980..75be4e8 100644 --- a/include/utf16utf8.h +++ b/include/utf16utf8.h @@ -24,6 +24,8 @@ #include <defs.h> +SWORD_NAMESPACE_START + /** This filter converts UTF-16 encoded text to UTF-8 */ class SWDLLEXPORT UTF16UTF8:public SWFilter { @@ -32,4 +34,5 @@ public: virtual char ProcessText (char *text, int maxlen, const SWKey *key, const SWModule * = 0); }; +SWORD_NAMESPACE_END #endif diff --git a/include/utf8arshaping.h b/include/utf8arshaping.h index 411e1f5..553f00d 100644 --- a/include/utf8arshaping.h +++ b/include/utf8arshaping.h @@ -27,6 +27,7 @@ #include <unicode/ushape.h> #include <defs.h> +SWORD_NAMESPACE_START /** This Filter shows/hides reorders UTF-8 text according to Unicode BiDi */ @@ -41,6 +42,8 @@ class SWDLLEXPORT UTF8arShaping : public SWFilter virtual char ProcessText (char *text, int maxlen, const SWKey * key, const SWModule * = 0); }; + +SWORD_NAMESPACE_END #endif diff --git a/include/utf8bidireorder.h b/include/utf8bidireorder.h index 61263e3..088667b 100644 --- a/include/utf8bidireorder.h +++ b/include/utf8bidireorder.h @@ -27,6 +27,7 @@ #include <unicode/bidi.h> #include <defs.h> +SWORD_NAMESPACE_START /** This Filter shows/hides reorders UTF-8 text according to Unicode BiDi */ @@ -41,5 +42,6 @@ class SWDLLEXPORT UTF8BiDiReorder : public SWFilter virtual char ProcessText (char *text, int maxlen, const SWKey * key, const SWModule * = 0); }; +SWORD_NAMESPACE_END #endif diff --git a/include/utf8cantillation.h b/include/utf8cantillation.h index c95e0ff..783c154 100644 --- a/include/utf8cantillation.h +++ b/include/utf8cantillation.h @@ -24,6 +24,8 @@ #include <defs.h> +SWORD_NAMESPACE_START + /** This Filter shows/hides Hebrew cantillation marks in UTF8 text */ class SWDLLEXPORT UTF8Cantillation:public SWFilter @@ -54,4 +56,5 @@ public: } }; +SWORD_NAMESPACE_END #endif diff --git a/include/utf8greekaccents.h b/include/utf8greekaccents.h index c579a18..c94aaeb 100644 --- a/include/utf8greekaccents.h +++ b/include/utf8greekaccents.h @@ -24,6 +24,8 @@ #include <defs.h> +SWORD_NAMESPACE_START + /** This Filter shows/hides Greek Accents marks in UTF8 text */ class SWDLLEXPORT UTF8GreekAccents:public SWFilter @@ -54,4 +56,5 @@ public: } }; +SWORD_NAMESPACE_END #endif diff --git a/include/utf8hebrewpoints.h b/include/utf8hebrewpoints.h index 288500c..8e2b566 100644 --- a/include/utf8hebrewpoints.h +++ b/include/utf8hebrewpoints.h @@ -24,6 +24,8 @@ #include <defs.h> +SWORD_NAMESPACE_START + /** This Filter shows/hides Hebrew vowel points in UTF8 text */ class SWDLLEXPORT UTF8HebrewPoints:public SWFilter @@ -54,4 +56,5 @@ public: } }; +SWORD_NAMESPACE_END #endif diff --git a/include/utf8html.h b/include/utf8html.h index f292efe..73da2e0 100644 --- a/include/utf8html.h +++ b/include/utf8html.h @@ -24,6 +24,8 @@ #include <defs.h> +SWORD_NAMESPACE_START + /** This filter converts UTF-8 text into HTML escape sequences */ class SWDLLEXPORT UTF8HTML:public SWFilter { @@ -32,4 +34,5 @@ public: virtual char ProcessText (char *text, int maxlen, const SWKey *key, const SWModule * = 0); }; +SWORD_NAMESPACE_END #endif diff --git a/include/utf8latin1.h b/include/utf8latin1.h index 0b9247b..a09ed0d 100644 --- a/include/utf8latin1.h +++ b/include/utf8latin1.h @@ -24,6 +24,8 @@ #include <defs.h> +SWORD_NAMESPACE_START + /** This filter converts UTF-8 encoded text to Latin-1 */ class SWDLLEXPORT UTF8Latin1:public SWFilter { @@ -33,4 +35,5 @@ public: virtual char ProcessText (char *text, int maxlen, const SWKey *key, const SWModule * = 0); }; +SWORD_NAMESPACE_END #endif diff --git a/include/utf8nfc.h b/include/utf8nfc.h index 15a0c3d..9783799 100644 --- a/include/utf8nfc.h +++ b/include/utf8nfc.h @@ -27,6 +27,7 @@ #include <unicode/unorm.h> #include <defs.h> +SWORD_NAMESPACE_START class SWDLLEXPORT UTF8NFC : public SWFilter { @@ -40,4 +41,5 @@ class SWDLLEXPORT UTF8NFC : public SWFilter virtual char ProcessText (char *text, int maxlen, const SWKey * key, const SWModule * = 0); }; +SWORD_NAMESPACE_END #endif diff --git a/include/utf8nfkd.h b/include/utf8nfkd.h index 9f4364e..33e9d94 100644 --- a/include/utf8nfkd.h +++ b/include/utf8nfkd.h @@ -27,6 +27,7 @@ #include <unicode/unorm.h> #include <defs.h> +SWORD_NAMESPACE_START class SWDLLEXPORT UTF8NFKD : public SWFilter { @@ -40,4 +41,5 @@ class SWDLLEXPORT UTF8NFKD : public SWFilter virtual char ProcessText (char *text, int maxlen, const SWKey * key, const SWModule * = 0); }; +SWORD_NAMESPACE_END #endif diff --git a/include/utf8transliterator.h b/include/utf8transliterator.h index 76d43b1..10b2bcf 100644 --- a/include/utf8transliterator.h +++ b/include/utf8transliterator.h @@ -31,20 +31,23 @@ enum scriptEnum {SE_OFF, SE_LATIN, /*one-way (to) transliterators*/ SE_BASICLATI //#include <unicode/ustring.h> //#include <unicode/uchar.h> -//#include <unicode/unistr.h> -//#include <unicode/translit.h> +#include <unicode/unistr.h> +#include <unicode/translit.h> #include <defs.h> #include <map> -class UnicodeString; + +//class UnicodeString; + +SWORD_NAMESPACE_START struct SWTransData { UnicodeString resource; UTransDirection dir; }; -typedef map <const UnicodeString, SWTransData> SWTransMap; -typedef pair<UnicodeString, SWTransData> SWTransPair; +typedef std::map <const UnicodeString, SWTransData> SWTransMap; +typedef std::pair<UnicodeString, SWTransData> SWTransPair; /** This Filter uses ICU for transliteration */ @@ -91,4 +94,5 @@ private: } }; +SWORD_NAMESPACE_END #endif diff --git a/include/utf8utf16.h b/include/utf8utf16.h index c4010a9..8cd2842 100644 --- a/include/utf8utf16.h +++ b/include/utf8utf16.h @@ -24,6 +24,8 @@ #include <defs.h> +SWORD_NAMESPACE_START + /** This filter converts UTF-8 encoded text to UTF-16 */ class SWDLLEXPORT UTF8UTF16:public SWFilter { @@ -32,4 +34,5 @@ public: virtual char ProcessText (char *text, int maxlen, const SWKey *key, const SWModule * = 0); }; +SWORD_NAMESPACE_END #endif diff --git a/include/utilconf.h b/include/utilconf.h index 8be0173..d8407c7 100644 --- a/include/utilconf.h +++ b/include/utilconf.h @@ -1,8 +1,9 @@ #ifndef UTILCONF_H #define UTILCONF_H - +#include <defs.h> +SWORD_NAMESPACE_START char getconfent (char *filename, char *entryname, char *buf, int len); - +SWORD_NAMESPACE_END #endif diff --git a/include/utilstr.h b/include/utilstr.h index b3bcfb2..8739070 100644 --- a/include/utilstr.h +++ b/include/utilstr.h @@ -1,7 +1,7 @@ /****************************************************************************** * utilstr.h - prototypes for string utility functions * - * $Id: utilstr.h,v 1.9 2002/07/28 06:44:01 scribe Exp $ + * $Id: utilstr.h,v 1.10 2002/10/01 19:52:40 dglassey Exp $ * * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -22,6 +22,10 @@ #ifndef UTILSTR_H #define UTILSTR_H +#include <defs.h> + +SWORD_NAMESPACE_START + /** Use stdstr to copy a const char* to a char* */ char *stdstr (char **iistr, const char *istr); @@ -81,4 +85,5 @@ static const unsigned char SW_toupper_array[256] = #define SW_toupper(c) SW_toupper_array[(unsigned char)c] +SWORD_NAMESPACE_END #endif diff --git a/include/versekey.h b/include/versekey.h index 4168f87..26a22b1 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.27 2002/08/27 22:52:36 scribe Exp $ + * $Id: versekey.h,v 1.28 2002/10/01 19:52:40 dglassey Exp $ * * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -30,6 +30,8 @@ #include <defs.h> +SWORD_NAMESPACE_START + #define POS_MAXVERSE ((char)3) #define POS_MAXCHAPTER ((char)4) #define POS_MAXBOOK ((char)5) @@ -404,5 +406,5 @@ public: virtual SWKey & operator = (const VerseKey & ikey) { copyFrom(ikey); return *this; } }; - +SWORD_NAMESPACE_END #endif diff --git a/include/zcom.h b/include/zcom.h index 5c3038d..618deed 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.16 2002/09/25 21:22:03 scribe Exp $ + * $Id: zcom.h,v 1.17 2002/10/01 19:52:40 dglassey Exp $ * * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -29,6 +29,8 @@ #include <defs.h> +SWORD_NAMESPACE_START + class SWDLLEXPORT zCom:public zVerse, public SWCom { VerseKey *lastWriteKey; bool sameBlock(VerseKey * lastWriteKey, VerseKey * key); @@ -71,5 +73,5 @@ public: }; - +SWORD_NAMESPACE_END #endif diff --git a/include/zipcomprs.h b/include/zipcomprs.h index 0e36396..4a8b04f 100644 --- a/include/zipcomprs.h +++ b/include/zipcomprs.h @@ -1,7 +1,7 @@ /****************************************************************************** * swcomprs.h - definition of Class SWCompress used for data compression * - * $Id: zipcomprs.h,v 1.3 2001/02/09 15:38:51 jansorg Exp $ + * $Id: zipcomprs.h,v 1.4 2002/10/01 19:52:40 dglassey Exp $ * * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -26,6 +26,8 @@ #include <defs.h> +SWORD_NAMESPACE_START + class SWDLLEXPORT ZipCompress:public SWCompress { protected: @@ -36,4 +38,5 @@ public: virtual void Decode (void); }; +SWORD_NAMESPACE_END #endif diff --git a/include/zld.h b/include/zld.h index 8c142d9..47a58d8 100644 --- a/include/zld.h +++ b/include/zld.h @@ -2,7 +2,7 @@ * zld.cpp - code for class 'zLD'- a module that reads compressed lexicon and * dictionary files. * - * $Id: zld.h,v 1.6 2002/09/25 21:22:03 scribe Exp $ + * $Id: zld.h,v 1.7 2002/10/01 19:52:40 dglassey Exp $ * * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -28,6 +28,8 @@ #include <defs.h> +SWORD_NAMESPACE_START + class SWDLLEXPORT zLD : public zStr, public SWLD { void strongsPad(char *buf); @@ -70,5 +72,5 @@ public: }; - +SWORD_NAMESPACE_END #endif diff --git a/include/zstr.h b/include/zstr.h index fc314e4..80e211f 100644 --- a/include/zstr.h +++ b/include/zstr.h @@ -4,7 +4,7 @@ * and provides lookup and parsing functions based on * class StrKey * - * $Id: zstr.h,v 1.5 2002/09/25 21:22:03 scribe Exp $ + * $Id: zstr.h,v 1.6 2002/10/01 19:52:40 dglassey Exp $ * * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -29,6 +29,8 @@ #include <defs.h> +SWORD_NAMESPACE_START + class SWCompress; class EntriesBlock; @@ -70,4 +72,5 @@ public: static signed char createModule (const char *path); }; +SWORD_NAMESPACE_END #endif diff --git a/include/ztext.h b/include/ztext.h index 9e02622..3c9ac4e 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.25 2002/09/25 21:22:03 scribe Exp $ + * $Id: ztext.h,v 1.26 2002/10/01 19:52:40 dglassey Exp $ * * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -29,6 +29,8 @@ #include <defs.h> +SWORD_NAMESPACE_START + /*** SWModule implementation for compressed modules * This class handles compressed modules. * It should not be used in frontends, unless you are doing very special things. @@ -76,4 +78,5 @@ public: }; +SWORD_NAMESPACE_END #endif diff --git a/include/zverse.h b/include/zverse.h index 55aeea3..091e721 100644 --- a/include/zverse.h +++ b/include/zverse.h @@ -15,6 +15,8 @@ #include <defs.h> +SWORD_NAMESPACE_START + class SWDLLEXPORT zVerse { SWCompress *compressor; @@ -52,5 +54,5 @@ public: static char createModule(const char *path, int blockBound); }; - +SWORD_NAMESPACE_END #endif |