diff options
Diffstat (limited to 'src/modules')
75 files changed, 252 insertions, 13 deletions
diff --git a/src/modules/comments/hrefcom/hrefcom.cpp b/src/modules/comments/hrefcom/hrefcom.cpp index 200e21f..7e0e029 100644 --- a/src/modules/comments/hrefcom/hrefcom.cpp +++ b/src/modules/comments/hrefcom/hrefcom.cpp @@ -20,6 +20,7 @@ #include <rawverse.h> #include <hrefcom.h> +SWORD_NAMESPACE_START /****************************************************************************** * HREFCom Constructor - Initializes data for instance of HREFCom @@ -95,3 +96,5 @@ char *HREFCom::getRawEntry() { return entrybuf; } + +SWORD_NAMESPACE_END diff --git a/src/modules/comments/rawcom/rawcom.cpp b/src/modules/comments/rawcom/rawcom.cpp index 8d789af..00e177d 100644 --- a/src/modules/comments/rawcom/rawcom.cpp +++ b/src/modules/comments/rawcom/rawcom.cpp @@ -19,6 +19,7 @@ #include <rawverse.h> #include <rawcom.h> +SWORD_NAMESPACE_START /****************************************************************************** * RawCom Constructor - Initializes data for instance of RawCom @@ -223,3 +224,4 @@ void RawCom::deleteEntry() { } +SWORD_NAMESPACE_END diff --git a/src/modules/comments/rawfiles/rawfiles.cpp b/src/modules/comments/rawfiles/rawfiles.cpp index c073a73..8e292f1 100644 --- a/src/modules/comments/rawfiles/rawfiles.cpp +++ b/src/modules/comments/rawfiles/rawfiles.cpp @@ -25,6 +25,7 @@ #define O_BINARY 0 // If it hasn't been defined than we probably #endif // don't need it. +SWORD_NAMESPACE_START /****************************************************************************** * RawFiles Constructor - Initializes data for instance of RawFiles @@ -272,3 +273,4 @@ char RawFiles::createModule (const char *path) { +SWORD_NAMESPACE_END diff --git a/src/modules/comments/swcom.cpp b/src/modules/comments/swcom.cpp index 21afd8e..3f2b940 100644 --- a/src/modules/comments/swcom.cpp +++ b/src/modules/comments/swcom.cpp @@ -5,6 +5,7 @@ #include <swcom.h> +SWORD_NAMESPACE_START /****************************************************************************** * SWCom Constructor - Initializes data for instance of SWCom @@ -66,3 +67,5 @@ long SWCom::Index(long iindex) { return Index(); } + +SWORD_NAMESPACE_END diff --git a/src/modules/comments/zcom/zcom.cpp b/src/modules/comments/zcom/zcom.cpp index a0b35c3..a820e2e 100644 --- a/src/modules/comments/zcom/zcom.cpp +++ b/src/modules/comments/zcom/zcom.cpp @@ -19,6 +19,7 @@ #include <zverse.h> #include <zcom.h> +SWORD_NAMESPACE_START /****************************************************************************** * zCom Constructor - Initializes data for instance of zCom @@ -253,3 +254,4 @@ void zCom::increment(int steps) { delete tmpkey; } +SWORD_NAMESPACE_END diff --git a/src/modules/common/entriesblk.cpp b/src/modules/common/entriesblk.cpp index d38cf53..f4fbdeb 100644 --- a/src/modules/common/entriesblk.cpp +++ b/src/modules/common/entriesblk.cpp @@ -2,6 +2,8 @@ #include <stdlib.h> #include <string.h> +SWORD_NAMESPACE_START + const int EntriesBlock::METAHEADERSIZE = 4; // count(4); const int EntriesBlock::METAENTRYSIZE = 8; @@ -164,3 +166,4 @@ void EntriesBlock::removeEntry(int entryIndex) { } +SWORD_NAMESPACE_END diff --git a/src/modules/common/lzsscomprs.cpp b/src/modules/common/lzsscomprs.cpp index 3606fbc..e3535eb 100644 --- a/src/modules/common/lzsscomprs.cpp +++ b/src/modules/common/lzsscomprs.cpp @@ -7,6 +7,7 @@ #include <stdlib.h> #include <lzsscomprs.h> +SWORD_NAMESPACE_START /****************************************************************************** * LZSSCompress Statics @@ -663,3 +664,5 @@ void LZSSCompress::Decode(void) } slen = totalLen; } + +SWORD_NAMESPACE_END diff --git a/src/modules/common/rawstr.cpp b/src/modules/common/rawstr.cpp index 7b23041..a9f9c1d 100644 --- a/src/modules/common/rawstr.cpp +++ b/src/modules/common/rawstr.cpp @@ -21,6 +21,9 @@ #include <utilfuns.h> #include <rawstr.h> #include <sysdata.h> + +SWORD_NAMESPACE_START + /****************************************************************************** * RawStr Statics */ @@ -549,3 +552,5 @@ signed char RawStr::createModule(const char *ipath) return 0; } + +SWORD_NAMESPACE_END diff --git a/src/modules/common/rawstr4.cpp b/src/modules/common/rawstr4.cpp index da0789b..ffca2da 100644 --- a/src/modules/common/rawstr4.cpp +++ b/src/modules/common/rawstr4.cpp @@ -21,6 +21,8 @@ #include <rawstr4.h> #include <sysdata.h> +SWORD_NAMESPACE_START + /****************************************************************************** * RawStr Statics */ @@ -553,3 +555,5 @@ signed char RawStr4::createModule(const char *ipath) return 0; } + +SWORD_NAMESPACE_END diff --git a/src/modules/common/rawverse.cpp b/src/modules/common/rawverse.cpp index 60b050b..77b87a8 100644 --- a/src/modules/common/rawverse.cpp +++ b/src/modules/common/rawverse.cpp @@ -28,6 +28,7 @@ #define O_BINARY 0 // If it hasn't been defined than we probably #endif // don't need it. +SWORD_NAMESPACE_START /****************************************************************************** * RawVerse Statics @@ -346,3 +347,5 @@ char RawVerse::createModule(const char *ipath) return 0; } + +SWORD_NAMESPACE_END diff --git a/src/modules/common/sapphire.cpp b/src/modules/common/sapphire.cpp index 686bccb..1c97934 100644 --- a/src/modules/common/sapphire.cpp +++ b/src/modules/common/sapphire.cpp @@ -30,6 +30,8 @@ #include "sapphire.h" +SWORD_NAMESPACE_START + unsigned char sapphire::keyrand(int limit, unsigned char *user_key, unsigned char keysize, @@ -226,3 +228,4 @@ void sapphire::hash_final(unsigned char *hash, // Destination hash[i] = encrypt(0); } +SWORD_NAMESPACE_END diff --git a/src/modules/common/swcipher.cpp b/src/modules/common/swcipher.cpp index d221b8b..9b2d9cb 100644 --- a/src/modules/common/swcipher.cpp +++ b/src/modules/common/swcipher.cpp @@ -7,6 +7,7 @@ #include <stdlib.h> #include <swcipher.h> +SWORD_NAMESPACE_START /****************************************************************************** * SWCipher Constructor - Initializes data for instance of SWCipher @@ -121,3 +122,5 @@ void SWCipher::setCipherKey(const char *ikey) { unsigned char *key = (unsigned char *)ikey; master.initialize(key, strlen((char *)key)); } + +SWORD_NAMESPACE_END diff --git a/src/modules/common/swcomprs.cpp b/src/modules/common/swcomprs.cpp index 4bd2e5e..a6d61fd 100644 --- a/src/modules/common/swcomprs.cpp +++ b/src/modules/common/swcomprs.cpp @@ -7,6 +7,7 @@ #include <stdlib.h> #include <swcomprs.h> +SWORD_NAMESPACE_START /****************************************************************************** * SWCompress Constructor - Initializes data for instance of SWCompress @@ -188,3 +189,5 @@ void SWCompress::cycleStream() { zlen = slen = totlen; } + +SWORD_NAMESPACE_END diff --git a/src/modules/common/zipcomprs.cpp b/src/modules/common/zipcomprs.cpp index 01ba430..0cd31d2 100644 --- a/src/modules/common/zipcomprs.cpp +++ b/src/modules/common/zipcomprs.cpp @@ -10,6 +10,8 @@ #include <zipcomprs.h> #include <zlib.h> +SWORD_NAMESPACE_START + /****************************************************************************** * ZipCompress Constructor - Initializes data for instance of ZipCompress * @@ -156,3 +158,5 @@ ZEXTERN int ZEXPORT uncompress OF((Bytef *dest, uLongf *destLen, //printf("Finished decoding\n"); free (zbuf); } + +SWORD_NAMESPACE_END diff --git a/src/modules/common/zstr.cpp b/src/modules/common/zstr.cpp index 972bc50..14615ed 100644 --- a/src/modules/common/zstr.cpp +++ b/src/modules/common/zstr.cpp @@ -23,6 +23,8 @@ #include <sysdata.h> #include <entriesblk.h> +SWORD_NAMESPACE_START + /****************************************************************************** * zStr Statics */ @@ -709,3 +711,5 @@ signed char zStr::createModule(const char *ipath) { return 0; } + +SWORD_NAMESPACE_END diff --git a/src/modules/common/zverse.cpp b/src/modules/common/zverse.cpp index e4c04cf..82c4373 100644 --- a/src/modules/common/zverse.cpp +++ b/src/modules/common/zverse.cpp @@ -29,6 +29,7 @@ #define O_BINARY 0 #endif +SWORD_NAMESPACE_START /****************************************************************************** * zVerse Statics @@ -530,3 +531,5 @@ void zVerse::preptext(char *buf) } } } + +SWORD_NAMESPACE_END diff --git a/src/modules/filters/cipherfil.cpp b/src/modules/filters/cipherfil.cpp index ddb97b1..8179fb1 100644 --- a/src/modules/filters/cipherfil.cpp +++ b/src/modules/filters/cipherfil.cpp @@ -8,6 +8,7 @@ #include <string.h> #include <cipherfil.h> +SWORD_NAMESPACE_START CipherFilter::CipherFilter(const char *key) { cipher = new SWCipher((unsigned char *)key); @@ -42,3 +43,5 @@ char CipherFilter::ProcessText(char *text, int maxlen, const SWKey *key, const S // text[maxlen] = 0; return 0; } + +SWORD_NAMESPACE_END diff --git a/src/modules/filters/gbffootnotes.cpp b/src/modules/filters/gbffootnotes.cpp index c5b7b90..cebe27f 100644 --- a/src/modules/filters/gbffootnotes.cpp +++ b/src/modules/filters/gbffootnotes.cpp @@ -13,6 +13,7 @@ #include <unixstr.h> #endif +SWORD_NAMESPACE_START const char GBFFootnotes::on[] = "On"; const char GBFFootnotes::off[] = "Off"; @@ -116,3 +117,5 @@ char GBFFootnotes::ProcessText(char *text, int maxlen, const SWKey *key, const S } return 0; } + +SWORD_NAMESPACE_END diff --git a/src/modules/filters/gbfheadings.cpp b/src/modules/filters/gbfheadings.cpp index 590e2fa..ca97fcb 100644 --- a/src/modules/filters/gbfheadings.cpp +++ b/src/modules/filters/gbfheadings.cpp @@ -13,6 +13,8 @@ #include <unixstr.h> #endif +SWORD_NAMESPACE_START + const char GBFHeadings::on[] = "On"; const char GBFHeadings::off[] = "Off"; @@ -105,3 +107,5 @@ char GBFHeadings::ProcessText(char *text, int maxlen, const SWKey *key, const SW } return 0; } + +SWORD_NAMESPACE_END diff --git a/src/modules/filters/gbfhtml.cpp b/src/modules/filters/gbfhtml.cpp index 73d445a..47ffb1c 100644 --- a/src/modules/filters/gbfhtml.cpp +++ b/src/modules/filters/gbfhtml.cpp @@ -19,6 +19,8 @@ #include <string.h> #include <gbfhtml.h> +SWORD_NAMESPACE_START + GBFHTML::GBFHTML() { @@ -534,3 +536,5 @@ char GBFHTML::ProcessText(char *text, int maxlen, const SWKey *key, const SWModu *to = 0; return 0; } + +SWORD_NAMESPACE_END diff --git a/src/modules/filters/gbfhtmlhref.cpp b/src/modules/filters/gbfhtmlhref.cpp index 30b27ba..a49aad8 100644 --- a/src/modules/filters/gbfhtmlhref.cpp +++ b/src/modules/filters/gbfhtmlhref.cpp @@ -19,6 +19,8 @@ #include <string.h> #include <gbfhtmlhref.h> +SWORD_NAMESPACE_START + GBFHTMLHREF::GBFHTMLHREF() { setTokenStart("<"); setTokenEnd(">"); @@ -146,3 +148,5 @@ bool GBFHTMLHREF::handleToken(char **buf, const char *token, DualStringMap &user } return true; } + +SWORD_NAMESPACE_END diff --git a/src/modules/filters/gbfmorph.cpp b/src/modules/filters/gbfmorph.cpp index f8d336e..20ec379 100644 --- a/src/modules/filters/gbfmorph.cpp +++ b/src/modules/filters/gbfmorph.cpp @@ -13,6 +13,7 @@ #include <unixstr.h> #endif +SWORD_NAMESPACE_START const char GBFMorph::on[] = "On"; const char GBFMorph::off[] = "Off"; @@ -96,3 +97,5 @@ char GBFMorph::ProcessText(char *text, int maxlen, const SWKey *key, const SWMod } return 0; } + +SWORD_NAMESPACE_END diff --git a/src/modules/filters/gbfosis.cpp b/src/modules/filters/gbfosis.cpp index ef5f92a..eb65952 100644 --- a/src/modules/filters/gbfosis.cpp +++ b/src/modules/filters/gbfosis.cpp @@ -7,7 +7,7 @@ #include <stdlib.h> #include <stdio.h> -#include <string.h> +#include <string> #include <stdarg.h> #include <gbfosis.h> #include <swmodule.h> @@ -18,6 +18,7 @@ #include <unixstr.h> #endif +SWORD_NAMESPACE_START GBFOSIS::GBFOSIS() { } @@ -44,7 +45,7 @@ char GBFOSIS::ProcessText(char *text, int maxlen, const SWKey *key, const SWModu char *wordStart, *wordEnd; bool newText = false; bool newWord = false; - string tmp; + std::string tmp; bool suspendTextPassThru = false; bool keepToken = false; @@ -306,7 +307,7 @@ void GBFOSIS::pushString(char **buf, const char *format, ...) { const char *GBFOSIS::convertToOSIS(const char *inRef, const SWKey *key) { - static string outRef; + static std::string outRef; outRef = ""; @@ -333,3 +334,5 @@ const char *GBFOSIS::convertToOSIS(const char *inRef, const SWKey *key) { } return outRef.c_str(); } + +SWORD_NAMESPACE_END diff --git a/src/modules/filters/gbfplain.cpp b/src/modules/filters/gbfplain.cpp index 65766d3..e8a2f76 100644 --- a/src/modules/filters/gbfplain.cpp +++ b/src/modules/filters/gbfplain.cpp @@ -9,6 +9,7 @@ #include <string.h> #include <gbfplain.h> +SWORD_NAMESPACE_START GBFPlain::GBFPlain() { } @@ -104,3 +105,5 @@ char GBFPlain::ProcessText(char *text, int maxlen, const SWKey *key, const SWMod *to = 0; return 0; } + +SWORD_NAMESPACE_END diff --git a/src/modules/filters/gbfrtf.cpp b/src/modules/filters/gbfrtf.cpp index d704702..95b5167 100644 --- a/src/modules/filters/gbfrtf.cpp +++ b/src/modules/filters/gbfrtf.cpp @@ -9,6 +9,8 @@ #include <gbfrtf.h> #include <ctype.h> +SWORD_NAMESPACE_START + GBFRTF::GBFRTF() { } @@ -296,3 +298,5 @@ char GBFRTF::ProcessText(char *text, int maxlen, const SWKey *key, const SWModul *to = 0; return 0; } + +SWORD_NAMESPACE_END diff --git a/src/modules/filters/gbfstrongs.cpp b/src/modules/filters/gbfstrongs.cpp index cb722bd..4cef9c6 100644 --- a/src/modules/filters/gbfstrongs.cpp +++ b/src/modules/filters/gbfstrongs.cpp @@ -15,6 +15,8 @@ #endif #include <ctype.h> +SWORD_NAMESPACE_START + const char GBFStrongs::on[] = "On"; const char GBFStrongs::off[] = "Off"; const char GBFStrongs::optName[] = "Strong's Numbers"; @@ -55,7 +57,7 @@ char GBFStrongs::ProcessText(char *text, int maxlen, const SWKey *key, const SWM char *ch; char *textStart = text, *textEnd = 0; bool newText = false; - string tmp; + std::string tmp; len = strlen(text) + 1; // shift string to right of buffer if (len < maxlen) { @@ -128,3 +130,5 @@ char GBFStrongs::ProcessText(char *text, int maxlen, const SWKey *key, const SWM *to = 0; return 0; } + +SWORD_NAMESPACE_END diff --git a/src/modules/filters/gbfthml.cpp b/src/modules/filters/gbfthml.cpp index ca03e71..4722038 100644 --- a/src/modules/filters/gbfthml.cpp +++ b/src/modules/filters/gbfthml.cpp @@ -18,6 +18,7 @@ #include <string.h> #include <gbfthml.h> +SWORD_NAMESPACE_START GBFThML::GBFThML() { @@ -461,3 +462,4 @@ char GBFThML::ProcessText(char *text, int maxlen) +SWORD_NAMESPACE_END diff --git a/src/modules/filters/greeklexattribs.cpp b/src/modules/filters/greeklexattribs.cpp index 0f85c6c..4cc3b4d 100644 --- a/src/modules/filters/greeklexattribs.cpp +++ b/src/modules/filters/greeklexattribs.cpp @@ -7,10 +7,13 @@ #include <stdlib.h> #include <ctype.h> -#include <string.h> +#include <string> #include <greeklexattribs.h> #include <swmodule.h> +using std::string; + +SWORD_NAMESPACE_START GreekLexAttribs::GreekLexAttribs() { } @@ -94,3 +97,4 @@ char GreekLexAttribs::ProcessText(char *text, int maxlen, const SWKey *key, cons } +SWORD_NAMESPACE_END diff --git a/src/modules/filters/latin1utf16.cpp b/src/modules/filters/latin1utf16.cpp index 7bbcafb..f194db9 100644 --- a/src/modules/filters/latin1utf16.cpp +++ b/src/modules/filters/latin1utf16.cpp @@ -9,6 +9,8 @@ #include <stdio.h> #include <latin1utf16.h> +SWORD_NAMESPACE_START + Latin1UTF16::Latin1UTF16() { } @@ -120,3 +122,5 @@ char Latin1UTF16::ProcessText(char *text, int maxlen, const SWKey *key, const SW *to = 0; return 0; } + +SWORD_NAMESPACE_END diff --git a/src/modules/filters/latin1utf8.cpp b/src/modules/filters/latin1utf8.cpp index 2a76306..5d3daba 100644 --- a/src/modules/filters/latin1utf8.cpp +++ b/src/modules/filters/latin1utf8.cpp @@ -10,6 +10,8 @@ #include <latin1utf8.h> #include <swmodule.h> +SWORD_NAMESPACE_START + Latin1UTF8::Latin1UTF8() { } @@ -178,3 +180,5 @@ char Latin1UTF8::ProcessText(char *text, int maxlen, const SWKey *key, const SWM *to = 0; return 0; } + +SWORD_NAMESPACE_END diff --git a/src/modules/filters/plainfootnotes.cpp b/src/modules/filters/plainfootnotes.cpp index 96fc4d8..bbe7732 100644 --- a/src/modules/filters/plainfootnotes.cpp +++ b/src/modules/filters/plainfootnotes.cpp @@ -25,6 +25,8 @@ #include <unixstr.h> #endif +SWORD_NAMESPACE_START + const char PLAINFootnotes::on[] = "On"; const char PLAINFootnotes::off[] = "Off"; const char PLAINFootnotes::optName[] = "Footnotes"; @@ -100,3 +102,4 @@ char PLAINFootnotes::ProcessText(char *text, int maxlen, const SWKey *key, const return 0; } +SWORD_NAMESPACE_END diff --git a/src/modules/filters/plainhtml.cpp b/src/modules/filters/plainhtml.cpp index fefb029..d566b6b 100644 --- a/src/modules/filters/plainhtml.cpp +++ b/src/modules/filters/plainhtml.cpp @@ -19,6 +19,7 @@ #include <string.h> #include <plainhtml.h> +SWORD_NAMESPACE_START PLAINHTML::PLAINHTML() { @@ -132,3 +133,5 @@ char PLAINHTML::ProcessText(char *text, int maxlen, const SWKey *key, const SWMo *to = 0; return 0; } + +SWORD_NAMESPACE_END diff --git a/src/modules/filters/rtfhtml.cpp b/src/modules/filters/rtfhtml.cpp index f0b842b..aa2abf3 100644 --- a/src/modules/filters/rtfhtml.cpp +++ b/src/modules/filters/rtfhtml.cpp @@ -19,6 +19,7 @@ #include <string.h> #include <rtfhtml.h> +SWORD_NAMESPACE_START RTFHTML::RTFHTML() { @@ -97,3 +98,5 @@ char RTFHTML::ProcessText(char *text, int maxlen, const SWKey *key, const SWModu *to = 0; return 0; } + +SWORD_NAMESPACE_END diff --git a/src/modules/filters/rwphtml.cpp b/src/modules/filters/rwphtml.cpp index 6f8ae4f..1b9101f 100644 --- a/src/modules/filters/rwphtml.cpp +++ b/src/modules/filters/rwphtml.cpp @@ -20,6 +20,8 @@ #include <ctype.h> #include <rwphtml.h> +SWORD_NAMESPACE_START + RWPHTML::RWPHTML() { } @@ -185,3 +187,5 @@ char RWPHTML::ProcessText(char *text, int maxlen, const SWKey *key, const SWModu *to = 0; return 0; } + +SWORD_NAMESPACE_END diff --git a/src/modules/filters/rwprtf.cpp b/src/modules/filters/rwprtf.cpp index 8f7b074..db87e78 100644 --- a/src/modules/filters/rwprtf.cpp +++ b/src/modules/filters/rwprtf.cpp @@ -8,6 +8,7 @@ #include <string.h> #include <rwprtf.h> +SWORD_NAMESPACE_START RWPRTF::RWPRTF() { @@ -105,3 +106,5 @@ char RWPRTF::ProcessText(char *text, int maxlen, const SWKey *key, const SWModul *to = 0; return 0; } + +SWORD_NAMESPACE_END diff --git a/src/modules/filters/scsuutf8.cpp b/src/modules/filters/scsuutf8.cpp index 15fd015..7a371d7 100644 --- a/src/modules/filters/scsuutf8.cpp +++ b/src/modules/filters/scsuutf8.cpp @@ -22,6 +22,8 @@ #include <scsuutf8.h> +SWORD_NAMESPACE_START + SCSUUTF8::SCSUUTF8() { } @@ -220,3 +222,4 @@ char SCSUUTF8::ProcessText(char *text, int len, const SWKey *key, const SWModule return 0; } +SWORD_NAMESPACE_END diff --git a/src/modules/filters/swbasicfilter.cpp b/src/modules/filters/swbasicfilter.cpp index dd5fe81..88d0c63 100644 --- a/src/modules/filters/swbasicfilter.cpp +++ b/src/modules/filters/swbasicfilter.cpp @@ -4,7 +4,7 @@ * many filters will need and can use as a starting * point. * - * $Id: swbasicfilter.cpp,v 1.18 2002/06/06 21:08:47 scribe Exp $ + * $Id: swbasicfilter.cpp,v 1.20 2002/10/01 22:04:59 dglassey Exp $ * * Copyright 2001 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -28,6 +28,8 @@ #include <stdio.h> #include <stdarg.h> +SWORD_NAMESPACE_START + SWBasicFilter::SWBasicFilter() { tokenStart = 0; tokenEnd = 0; @@ -203,7 +205,7 @@ char SWBasicFilter::ProcessText(char *text, int maxlen, const SWKey *key, const char tokenEndLen = strlen(tokenEnd); char tokenStartPos = 0, tokenEndPos = 0; DualStringMap userData; - string lastTextNode; + std::string lastTextNode; bool suspendTextPassThru = false; userData["suspendTextPassThru"] = "false"; @@ -297,4 +299,4 @@ char SWBasicFilter::ProcessText(char *text, int maxlen, const SWKey *key, const } - +SWORD_NAMESPACE_END diff --git a/src/modules/filters/thmlfootnotes.cpp b/src/modules/filters/thmlfootnotes.cpp index d9b1f0e..c15b279 100644 --- a/src/modules/filters/thmlfootnotes.cpp +++ b/src/modules/filters/thmlfootnotes.cpp @@ -13,6 +13,7 @@ #include <unixstr.h> #endif +SWORD_NAMESPACE_START const char ThMLFootnotes::on[] = "On"; const char ThMLFootnotes::off[] = "Off"; @@ -101,3 +102,5 @@ char ThMLFootnotes::ProcessText(char *text, int maxlen, const SWKey *key, const } return 0; } + +SWORD_NAMESPACE_END diff --git a/src/modules/filters/thmlgbf.cpp b/src/modules/filters/thmlgbf.cpp index 66d9a20..4a16463 100644 --- a/src/modules/filters/thmlgbf.cpp +++ b/src/modules/filters/thmlgbf.cpp @@ -18,6 +18,7 @@ #include <string.h> #include <thmlgbf.h> +SWORD_NAMESPACE_START ThMLGBF::ThMLGBF() { @@ -328,3 +329,4 @@ char ThMLGBF::ProcessText(char *text, int maxlen) +SWORD_NAMESPACE_END diff --git a/src/modules/filters/thmlheadings.cpp b/src/modules/filters/thmlheadings.cpp index 00b8a23..8d35f9a 100644 --- a/src/modules/filters/thmlheadings.cpp +++ b/src/modules/filters/thmlheadings.cpp @@ -13,6 +13,7 @@ #include <unixstr.h> #endif +SWORD_NAMESPACE_START const char ThMLHeadings::on[] = "On"; const char ThMLHeadings::off[] = "Off"; @@ -105,3 +106,5 @@ char ThMLHeadings::ProcessText(char *text, int maxlen, const SWKey *key, const S } return 0; } + +SWORD_NAMESPACE_END diff --git a/src/modules/filters/thmlhtml.cpp b/src/modules/filters/thmlhtml.cpp index 9cb8679..c466c3f 100644 --- a/src/modules/filters/thmlhtml.cpp +++ b/src/modules/filters/thmlhtml.cpp @@ -19,6 +19,7 @@ #include <thmlhtml.h> #include <swmodule.h> +SWORD_NAMESPACE_START ThMLHTML::ThMLHTML() { setTokenStart("<"); @@ -209,3 +210,5 @@ bool ThMLHTML::handleToken(char **buf, const char *token, DualStringMap &userDat return true; } + +SWORD_NAMESPACE_END diff --git a/src/modules/filters/thmlhtmlhref.cpp b/src/modules/filters/thmlhtmlhref.cpp index ce7e3fd..8e02944 100644 --- a/src/modules/filters/thmlhtmlhref.cpp +++ b/src/modules/filters/thmlhtmlhref.cpp @@ -19,6 +19,7 @@ #include <thmlhtmlhref.h> #include <swmodule.h> +SWORD_NAMESPACE_START ThMLHTMLHREF::ThMLHTMLHREF() { setTokenStart("<"); @@ -267,3 +268,5 @@ bool ThMLHTMLHREF::handleToken(char **buf, const char *token, DualStringMap &use return true; } + +SWORD_NAMESPACE_END diff --git a/src/modules/filters/thmllemma.cpp b/src/modules/filters/thmllemma.cpp index 33856db..b510ac4 100644 --- a/src/modules/filters/thmllemma.cpp +++ b/src/modules/filters/thmllemma.cpp @@ -13,6 +13,7 @@ #include <unixstr.h> #endif +SWORD_NAMESPACE_START const char ThMLLemma::on[] = "On"; const char ThMLLemma::off[] = "Off"; @@ -95,3 +96,5 @@ char ThMLLemma::ProcessText(char *text, int maxlen, const SWKey *key, const SWMo } return 0; } + +SWORD_NAMESPACE_END diff --git a/src/modules/filters/thmlmorph.cpp b/src/modules/filters/thmlmorph.cpp index f95bede..ec53065 100644 --- a/src/modules/filters/thmlmorph.cpp +++ b/src/modules/filters/thmlmorph.cpp @@ -13,6 +13,7 @@ #include <unixstr.h> #endif +SWORD_NAMESPACE_START const char ThMLMorph::on[] = "On"; const char ThMLMorph::off[] = "Off"; @@ -96,3 +97,5 @@ char ThMLMorph::ProcessText(char *text, int maxlen, const SWKey *key, const SWMo } return 0; } + +SWORD_NAMESPACE_END diff --git a/src/modules/filters/thmlolb.cpp b/src/modules/filters/thmlolb.cpp index 2b31fab..33aae60 100644 --- a/src/modules/filters/thmlolb.cpp +++ b/src/modules/filters/thmlolb.cpp @@ -18,6 +18,7 @@ #include <string.h> #include <thmlolb.h> +SWORD_NAMESPACE_START ThMLOLB::ThMLOLB() { @@ -241,3 +242,4 @@ char ThMLOLB::ProcessText(char *text, int maxlen) +SWORD_NAMESPACE_END diff --git a/src/modules/filters/thmlosis.cpp b/src/modules/filters/thmlosis.cpp index 57d48d2..6af983d 100644 --- a/src/modules/filters/thmlosis.cpp +++ b/src/modules/filters/thmlosis.cpp @@ -7,7 +7,7 @@ #include <stdlib.h> #include <stdio.h> -#include <string.h> +#include <string> #include <stdarg.h> #include <thmlosis.h> #include <swmodule.h> @@ -18,6 +18,7 @@ #include <unixstr.h> #endif +SWORD_NAMESPACE_START ThMLOSIS::ThMLOSIS() { } @@ -44,7 +45,7 @@ char ThMLOSIS::ProcessText(char *text, int maxlen, const SWKey *key, const SWMod char *wordStart, *wordEnd; bool newText = false; bool newWord = false; - string tmp; + std::string tmp; bool suspendTextPassThru = false; bool keepToken = false; @@ -303,7 +304,7 @@ void ThMLOSIS::pushString(char **buf, const char *format, ...) { const char *ThMLOSIS::convertToOSIS(const char *inRef, const SWKey *key) { - static string outRef; + static std::string outRef; outRef = ""; @@ -330,3 +331,5 @@ const char *ThMLOSIS::convertToOSIS(const char *inRef, const SWKey *key) { } return outRef.c_str(); } + +SWORD_NAMESPACE_END diff --git a/src/modules/filters/thmlplain.cpp b/src/modules/filters/thmlplain.cpp index 5609f16..8bcbb3d 100644 --- a/src/modules/filters/thmlplain.cpp +++ b/src/modules/filters/thmlplain.cpp @@ -9,6 +9,7 @@ #include <string.h> #include <thmlplain.h> +SWORD_NAMESPACE_START ThMLPlain::ThMLPlain() { } @@ -199,3 +200,4 @@ char ThMLPlain::ProcessText(char *text, int maxlen) } +SWORD_NAMESPACE_END diff --git a/src/modules/filters/thmlrtf.cpp b/src/modules/filters/thmlrtf.cpp index 8b603b0..59ce1a9 100644 --- a/src/modules/filters/thmlrtf.cpp +++ b/src/modules/filters/thmlrtf.cpp @@ -18,6 +18,7 @@ #include <string.h> #include <thmlrtf.h> +SWORD_NAMESPACE_START ThMLRTF::ThMLRTF() { @@ -220,3 +221,4 @@ bool ThMLRTF::handleToken(char **buf, const char *token, DualStringMap &userData } +SWORD_NAMESPACE_END diff --git a/src/modules/filters/thmlscripref.cpp b/src/modules/filters/thmlscripref.cpp index 23edd6d..9d48c8b 100644 --- a/src/modules/filters/thmlscripref.cpp +++ b/src/modules/filters/thmlscripref.cpp @@ -13,6 +13,7 @@ #include <unixstr.h> #endif +SWORD_NAMESPACE_START const char ThMLScripref::on[] = "On"; const char ThMLScripref::off[] = "Off"; @@ -101,3 +102,5 @@ char ThMLScripref::ProcessText(char *text, int maxlen, const SWKey *key, const S } return 0; } + +SWORD_NAMESPACE_END diff --git a/src/modules/filters/thmlstrongs.cpp b/src/modules/filters/thmlstrongs.cpp index ab5a3eb..f7817cb 100644 --- a/src/modules/filters/thmlstrongs.cpp +++ b/src/modules/filters/thmlstrongs.cpp @@ -16,6 +16,8 @@ #endif #include <ctype.h> +SWORD_NAMESPACE_START + const char ThMLStrongs::on[] = "On"; const char ThMLStrongs::off[] = "Off"; const char ThMLStrongs::optName[] = "Strong's Numbers"; @@ -55,7 +57,7 @@ char ThMLStrongs::ProcessText(char *text, int maxlen, const SWKey *key, const SW char *valto; char *ch; char *textStart = text, *textEnd = 0; - string tmp; + std::string tmp; bool newText = false; len = strlen(text) + 1; // shift string to right of buffer @@ -154,3 +156,5 @@ char ThMLStrongs::ProcessText(char *text, int maxlen, const SWKey *key, const SW *to = 0; return 0; } + +SWORD_NAMESPACE_END diff --git a/src/modules/filters/thmlvariants.cpp b/src/modules/filters/thmlvariants.cpp index a6a52cf..cf039c5 100644 --- a/src/modules/filters/thmlvariants.cpp +++ b/src/modules/filters/thmlvariants.cpp @@ -13,6 +13,7 @@ #include <unixstr.h> #endif +SWORD_NAMESPACE_START const char ThMLVariants::primary[] = "Primary Reading"; const char ThMLVariants::secondary[] = "Secondary Reading"; @@ -183,3 +184,4 @@ char ThMLVariants::ProcessText(char *text, int maxlen, const SWKey *key, const S +SWORD_NAMESPACE_END diff --git a/src/modules/filters/unicodertf.cpp b/src/modules/filters/unicodertf.cpp index 6313792..b68eeba 100644 --- a/src/modules/filters/unicodertf.cpp +++ b/src/modules/filters/unicodertf.cpp @@ -9,6 +9,8 @@ #include <stdio.h> #include <unicodertf.h> +SWORD_NAMESPACE_START + UnicodeRTF::UnicodeRTF() { } @@ -73,3 +75,5 @@ char UnicodeRTF::ProcessText(char *text, int maxlen, const SWKey *key, const SWM *to = 0; return 0; } + +SWORD_NAMESPACE_END diff --git a/src/modules/filters/utf16utf8.cpp b/src/modules/filters/utf16utf8.cpp index aa4215b..ab6e63d 100644 --- a/src/modules/filters/utf16utf8.cpp +++ b/src/modules/filters/utf16utf8.cpp @@ -9,6 +9,8 @@ #include <utf16utf8.h> +SWORD_NAMESPACE_START + UTF16UTF8::UTF16UTF8() { } @@ -95,3 +97,4 @@ char UTF16UTF8::ProcessText(char *text, int maxlen, const SWKey *key, const SWMo +SWORD_NAMESPACE_END diff --git a/src/modules/filters/utf8arshaping.cpp b/src/modules/filters/utf8arshaping.cpp index 4427e62..3b2c54c 100644 --- a/src/modules/filters/utf8arshaping.cpp +++ b/src/modules/filters/utf8arshaping.cpp @@ -15,6 +15,8 @@ #include <utf8arshaping.h> +SWORD_NAMESPACE_START + UTF8arShaping::UTF8arShaping() { conv = ucnv_open("UTF-8", &err); @@ -47,4 +49,5 @@ char UTF8arShaping::ProcessText(char *text, int maxlen, const SWKey *key, const return 0; } +SWORD_NAMESPACE_END #endif diff --git a/src/modules/filters/utf8bidireorder.cpp b/src/modules/filters/utf8bidireorder.cpp index bdaae52..baae0eb 100644 --- a/src/modules/filters/utf8bidireorder.cpp +++ b/src/modules/filters/utf8bidireorder.cpp @@ -15,6 +15,8 @@ #include <utf8bidireorder.h> +SWORD_NAMESPACE_START + UTF8BiDiReorder::UTF8BiDiReorder() { conv = ucnv_open("UTF-8", &err); @@ -54,4 +56,5 @@ char UTF8BiDiReorder::ProcessText(char *text, int maxlen, const SWKey *key, cons return 0; } +SWORD_NAMESPACE_END #endif diff --git a/src/modules/filters/utf8cantillation.cpp b/src/modules/filters/utf8cantillation.cpp index 84cb513..8884c62 100644 --- a/src/modules/filters/utf8cantillation.cpp +++ b/src/modules/filters/utf8cantillation.cpp @@ -9,6 +9,7 @@ #include <stdio.h> #include <utf8cantillation.h> +SWORD_NAMESPACE_START const char UTF8Cantillation::on[] = "On"; const char UTF8Cantillation::off[] = "Off"; @@ -62,3 +63,5 @@ char UTF8Cantillation::ProcessText(char *text, int maxlen, const SWKey *key, con } return 0; } + +SWORD_NAMESPACE_END diff --git a/src/modules/filters/utf8greekaccents.cpp b/src/modules/filters/utf8greekaccents.cpp index b0e5dc8..d56c717 100644 --- a/src/modules/filters/utf8greekaccents.cpp +++ b/src/modules/filters/utf8greekaccents.cpp @@ -9,6 +9,7 @@ #include <stdio.h> #include <utf8greekaccents.h> +SWORD_NAMESPACE_START const char UTF8GreekAccents::on[] = "On"; const char UTF8GreekAccents::off[] = "Off"; @@ -250,3 +251,4 @@ char UTF8GreekAccents::ProcessText(char *text, int maxlen, const SWKey *key, con +SWORD_NAMESPACE_END diff --git a/src/modules/filters/utf8hebrewpoints.cpp b/src/modules/filters/utf8hebrewpoints.cpp index e5b50e1..35fedf7 100644 --- a/src/modules/filters/utf8hebrewpoints.cpp +++ b/src/modules/filters/utf8hebrewpoints.cpp @@ -9,6 +9,7 @@ #include <stdio.h> #include <utf8hebrewpoints.h> +SWORD_NAMESPACE_START const char UTF8HebrewPoints::on[] = "On"; const char UTF8HebrewPoints::off[] = "Off"; @@ -53,3 +54,5 @@ char UTF8HebrewPoints::ProcessText(char *text, int maxlen, const SWKey *key, con } return 0; } + +SWORD_NAMESPACE_END diff --git a/src/modules/filters/utf8html.cpp b/src/modules/filters/utf8html.cpp index f337698..7469b81 100644 --- a/src/modules/filters/utf8html.cpp +++ b/src/modules/filters/utf8html.cpp @@ -9,6 +9,8 @@ #include <stdio.h> #include <utf8html.h> +SWORD_NAMESPACE_START + UTF8HTML::UTF8HTML() { } @@ -66,3 +68,5 @@ char UTF8HTML::ProcessText(char *text, int maxlen, const SWKey *key, const SWMod *to = 0; return 0; } + +SWORD_NAMESPACE_END diff --git a/src/modules/filters/utf8latin1.cpp b/src/modules/filters/utf8latin1.cpp index 07299fe..6128693 100644 --- a/src/modules/filters/utf8latin1.cpp +++ b/src/modules/filters/utf8latin1.cpp @@ -9,6 +9,8 @@ #include <utf8latin1.h> +SWORD_NAMESPACE_START + UTF8Latin1::UTF8Latin1(char rchar) : replacementChar(rchar) { } @@ -74,3 +76,4 @@ char UTF8Latin1::ProcessText(char *text, int maxlen, const SWKey *key, const SWM return 0; } +SWORD_NAMESPACE_END diff --git a/src/modules/filters/utf8nfc.cpp b/src/modules/filters/utf8nfc.cpp index 861a291..f3630f8 100644 --- a/src/modules/filters/utf8nfc.cpp +++ b/src/modules/filters/utf8nfc.cpp @@ -15,6 +15,8 @@ #include <utf8nfc.h> +SWORD_NAMESPACE_START + UTF8NFC::UTF8NFC() { conv = ucnv_open("UTF-8", &err); } @@ -45,4 +47,5 @@ char UTF8NFC::ProcessText(char *text, int maxlen, const SWKey *key, const SWModu return 0; } +SWORD_NAMESPACE_END #endif diff --git a/src/modules/filters/utf8nfkd.cpp b/src/modules/filters/utf8nfkd.cpp index d790266..ca0e099 100644 --- a/src/modules/filters/utf8nfkd.cpp +++ b/src/modules/filters/utf8nfkd.cpp @@ -15,6 +15,8 @@ #include <utf8nfkd.h> +SWORD_NAMESPACE_START + UTF8NFKD::UTF8NFKD() { conv = ucnv_open("UTF-8", &err); } @@ -45,4 +47,5 @@ char UTF8NFKD::ProcessText(char *text, int maxlen, const SWKey *key, const SWMod return 0; } +SWORD_NAMESPACE_END #endif diff --git a/src/modules/filters/utf8transliterator.cpp b/src/modules/filters/utf8transliterator.cpp index ff39865..80d52be 100644 --- a/src/modules/filters/utf8transliterator.cpp +++ b/src/modules/filters/utf8transliterator.cpp @@ -13,6 +13,8 @@ #include <unixstr.h> #endif +#include <unicode/ucnv.h> +#include <unicode/uchar.h> #include <utf8transliterator.h> #ifndef _ICUSWORD_ @@ -20,6 +22,8 @@ #endif #include <swlog.h> +SWORD_NAMESPACE_START + #if 0 #ifdef _ICU_ class UnicodeCaster { @@ -718,6 +722,8 @@ char UTF8Transliterator::ProcessText(char *text, int maxlen, const SWKey *key, c } return 0; } + +SWORD_NAMESPACE_END #endif diff --git a/src/modules/filters/utf8utf16.cpp b/src/modules/filters/utf8utf16.cpp index 33248a9..771be16 100644 --- a/src/modules/filters/utf8utf16.cpp +++ b/src/modules/filters/utf8utf16.cpp @@ -9,6 +9,8 @@ #include <utf8utf16.h> +SWORD_NAMESPACE_START + UTF8UTF16::UTF8UTF16() { } @@ -79,3 +81,4 @@ char UTF8UTF16::ProcessText(char *text, int maxlen, const SWKey *key, const SWMo return 0; } +SWORD_NAMESPACE_END diff --git a/src/modules/genbook/rawgenbook/rawgenbook.cpp b/src/modules/genbook/rawgenbook/rawgenbook.cpp index 89367b5..46be783 100644 --- a/src/modules/genbook/rawgenbook/rawgenbook.cpp +++ b/src/modules/genbook/rawgenbook/rawgenbook.cpp @@ -22,6 +22,8 @@ #define O_BINARY 0 #endif +SWORD_NAMESPACE_START + /****************************************************************************** * RawGenBook Constructor - Initializes data for instance of RawGenBook * @@ -216,3 +218,5 @@ SWKey *RawGenBook::CreateKey() { TreeKeyIdx *newKey = new TreeKeyIdx(path); return newKey; } + +SWORD_NAMESPACE_END diff --git a/src/modules/genbook/swgenbook.cpp b/src/modules/genbook/swgenbook.cpp index 589b0b9..3381ef8 100644 --- a/src/modules/genbook/swgenbook.cpp +++ b/src/modules/genbook/swgenbook.cpp @@ -5,6 +5,7 @@ #include <swgenbook.h> +SWORD_NAMESPACE_START /****************************************************************************** * SWLD Constructor - Initializes data for instance of SWLD @@ -25,3 +26,4 @@ SWGenBook::SWGenBook(const char *imodname, const char *imoddesc, SWDisplay *idis SWGenBook::~SWGenBook() { } +SWORD_NAMESPACE_END diff --git a/src/modules/lexdict/rawld/rawld.cpp b/src/modules/lexdict/rawld/rawld.cpp index 2e5c90a..44e8d3c 100644 --- a/src/modules/lexdict/rawld/rawld.cpp +++ b/src/modules/lexdict/rawld/rawld.cpp @@ -19,6 +19,7 @@ #include <rawstr.h> #include <rawld.h> +SWORD_NAMESPACE_START /****************************************************************************** * RawLD Constructor - Initializes data for instance of RawLD @@ -173,3 +174,5 @@ void RawLD::linkEntry(const SWKey *inkey) { void RawLD::deleteEntry() { settext(*key, ""); } + +SWORD_NAMESPACE_END diff --git a/src/modules/lexdict/rawld4/rawld4.cpp b/src/modules/lexdict/rawld4/rawld4.cpp index 435767d..a055e18 100644 --- a/src/modules/lexdict/rawld4/rawld4.cpp +++ b/src/modules/lexdict/rawld4/rawld4.cpp @@ -19,6 +19,7 @@ #include <rawstr4.h> #include <rawld4.h> +SWORD_NAMESPACE_START /****************************************************************************** * RawLD Constructor - Initializes data for instance of RawLD @@ -172,3 +173,5 @@ void RawLD4::linkEntry(const SWKey *inkey) { void RawLD4::deleteEntry() { setText(*key, ""); } + +SWORD_NAMESPACE_END diff --git a/src/modules/lexdict/swld.cpp b/src/modules/lexdict/swld.cpp index d28a5b8..bba4bd4 100644 --- a/src/modules/lexdict/swld.cpp +++ b/src/modules/lexdict/swld.cpp @@ -5,6 +5,7 @@ #include <swld.h> +SWORD_NAMESPACE_START /****************************************************************************** * SWLD Constructor - Initializes data for instance of SWLD @@ -74,3 +75,4 @@ void SWLD::setPosition(SW_POSITION p) { } +SWORD_NAMESPACE_END diff --git a/src/modules/lexdict/zld/zld.cpp b/src/modules/lexdict/zld/zld.cpp index f444f61..5be55ca 100644 --- a/src/modules/lexdict/zld/zld.cpp +++ b/src/modules/lexdict/zld/zld.cpp @@ -19,6 +19,7 @@ #include <zstr.h> #include <zld.h> +SWORD_NAMESPACE_START /****************************************************************************** * RawLD Constructor - Initializes data for instance of RawLD @@ -172,3 +173,5 @@ void zLD::linkEntry(const SWKey *inkey) { void zLD::deleteEntry() { setText(*key, ""); } + +SWORD_NAMESPACE_END diff --git a/src/modules/swmodule.cpp b/src/modules/swmodule.cpp index b0e1002..5d4126b 100644 --- a/src/modules/swmodule.cpp +++ b/src/modules/swmodule.cpp @@ -14,6 +14,8 @@ #include <iostream> #endif +SWORD_NAMESPACE_START + SWDisplay SWModule::rawdisp; void SWModule::nullPercent(char percent, void *percentUserData) {} @@ -648,3 +650,5 @@ const char *SWModule::getConfigEntry(const char *key) const { void SWModule::setConfig(ConfigEntMap *config) { this->config = config; } + +SWORD_NAMESPACE_END diff --git a/src/modules/texts/rawgbf/rawgbf.cpp b/src/modules/texts/rawgbf/rawgbf.cpp index dd2fd47..6b8516f 100644 --- a/src/modules/texts/rawgbf/rawgbf.cpp +++ b/src/modules/texts/rawgbf/rawgbf.cpp @@ -19,6 +19,7 @@ #include <rawverse.h> #include <rawgbf.h> +SWORD_NAMESPACE_START /****************************************************************************** * RawGBF Constructor - Initializes data for instance of RawGBF @@ -82,3 +83,5 @@ RawGBF::operator char*() return entrybuf; } + +SWORD_NAMESPACE_END diff --git a/src/modules/texts/rawtext/rawtext.cpp b/src/modules/texts/rawtext/rawtext.cpp index 489ea1c..072a341 100644 --- a/src/modules/texts/rawtext/rawtext.cpp +++ b/src/modules/texts/rawtext/rawtext.cpp @@ -13,7 +13,7 @@ #include <unistd.h> #endif -#include <string.h> +#include <string> #include <utilfuns.h> #include <rawverse.h> #include <rawtext.h> @@ -27,6 +27,12 @@ #define O_BINARY 0 #endif +using std::string; +using std::map; +using std::list; + +SWORD_NAMESPACE_START + /****************************************************************************** * RawText Constructor - Initializes data for instance of RawText * @@ -580,3 +586,5 @@ void RawText::increment(int steps) { if (tmpkey != key) delete tmpkey; } + +SWORD_NAMESPACE_END diff --git a/src/modules/texts/swtext.cpp b/src/modules/texts/swtext.cpp index dc8ea43..8610dae 100644 --- a/src/modules/texts/swtext.cpp +++ b/src/modules/texts/swtext.cpp @@ -5,6 +5,7 @@ #include <swtext.h> #include <listkey.h> +SWORD_NAMESPACE_START /****************************************************************************** * SWText Constructor - Initializes data for instance of SWText @@ -76,3 +77,5 @@ long SWText::Index(long iindex) { return Index(); } + +SWORD_NAMESPACE_END diff --git a/src/modules/texts/ztext/ztext.cpp b/src/modules/texts/ztext/ztext.cpp index 77a45b1..a51b338 100644 --- a/src/modules/texts/ztext/ztext.cpp +++ b/src/modules/texts/ztext/ztext.cpp @@ -20,6 +20,7 @@ #include <ztext.h> //#include <zlib.h> +SWORD_NAMESPACE_START /****************************************************************************** * zText Constructor - Initializes data for instance of zText @@ -259,3 +260,5 @@ void zText::increment(int steps) { if (tmpkey != key) delete tmpkey; } + +SWORD_NAMESPACE_END |