From bf167779c3051180f10188b1a988def048a8d232 Mon Sep 17 00:00:00 2001 From: danglassey Date: Wed, 2 Oct 2002 13:02:56 +0000 Subject: sync with crosswire 20021002-1300 --- ChangeLog | 6 + apps/console/diatheke/corediatheke.cpp | 6 + apps/console/diatheke/corediatheke.h | 2 +- apps/console/diatheke/diafiltmgr.h | 3 + apps/console/diatheke/diatheke.cpp | 4 + apps/console/diatheke/diathekemgr.cpp | 2 + apps/console/diatheke/gbfcgi.cpp | 4 + apps/console/diatheke/gbfcgi.h | 3 + apps/console/diatheke/thmlcgi.cpp | 3 + apps/console/diatheke/thmlcgi.h | 3 + .../CBuilder5/BibleCS/stage/uilocales.d/hu.conf | 335 ++++++------ bindings/flatapi.cpp | 3 + bindings/swig/Makefile | 3 +- bindings/swig/Makefile.swig | 2 +- bindings/swig/listkey.i | 2 +- bindings/swig/swmgr.i | 4 +- bindings/swig/swmodule.i | 2 +- bindings/swig/sword.pl | 9 +- examples/cmdline/lookup.cpp | 10 + examples/cmdline/search.cpp | 8 + examples/cmdline/threaded_search.cpp | 9 + include/Greek2Greek.h | 7 +- include/GreekChars.h | 7 +- include/canon.h | 7 +- include/cipherfil.h | 5 +- include/defs.h | 16 + include/echomod.h | 6 +- include/encfiltmgr.h | 2 + include/entriesblk.h | 4 + include/filemgr.h | 7 +- include/gbffootnotes.h | 5 +- include/gbfheadings.h | 5 +- include/gbfhtml.h | 7 +- include/gbfhtmlhref.h | 4 + include/gbfmorph.h | 3 + include/gbfosis.h | 3 + include/gbfplain.h | 5 +- include/gbfrtf.h | 5 +- include/gbfstrongs.h | 5 +- include/gbfthml.h | 3 + include/greeklexattribs.h | 3 + include/hebrewmcim.h | 4 + include/hrefcom.h | 6 +- include/latin1utf16.h | 3 + include/latin1utf8.h | 3 + include/listkey.h | 6 +- include/localemgr.h | 9 +- include/lzsscomprs.h | 5 +- include/markupfiltmgr.h | 3 + include/multimapwdef.h | 10 +- include/nullim.h | 4 +- include/plainfootnotes.h | 9 +- include/plainhtml.h | 7 +- include/rawcom.h | 5 +- include/rawfiles.h | 6 +- include/rawgbf.h | 6 +- include/rawgenbook.h | 6 +- include/rawld.h | 6 +- include/rawld4.h | 6 +- include/rawstr.h | 5 +- include/rawstr4.h | 5 +- include/rawtext.h | 6 +- include/rawverse.h | 4 +- include/roman.h | 5 + include/rtfhtml.h | 7 +- include/rwphtml.h | 7 +- include/rwprtf.h | 5 +- include/sapphire.h | 6 + include/scsuutf8.h | 3 + include/strkey.h | 6 +- include/swbasicfilter.h | 7 +- include/swcacher.h | 5 +- include/swcipher.h | 5 +- include/swcom.h | 6 +- include/swcomprs.h | 5 +- include/swconfig.h | 14 +- include/swdisp.h | 6 +- include/swfilter.h | 5 +- include/swfiltermgr.h | 6 +- include/swgenbook.h | 5 +- include/swinputmeth.h | 4 + include/swkey.h | 6 +- include/swld.h | 6 +- include/swlocale.h | 6 +- include/swlog.h | 6 +- include/swmacs.h | 6 +- include/swmgr.h | 20 +- include/swmodule.h | 14 +- include/swobject.h | 2 + include/swtext.h | 5 +- include/swunicod.h | 5 + include/swversion.h | 6 +- include/sysdata.h | 1 + include/thmlfootnotes.h | 4 +- include/thmlgbf.h | 4 +- include/thmlheadings.h | 4 +- include/thmlhtml.h | 4 +- include/thmlhtmlhref.h | 4 +- include/thmllemma.h | 4 +- include/thmlmorph.h | 4 +- include/thmlolb.h | 4 +- include/thmlosis.h | 4 +- include/thmlplain.h | 3 + include/thmlrtf.h | 3 + include/thmlscripref.h | 4 + include/thmlstrongs.h | 3 + include/thmlvariants.h | 3 + include/treekey.h | 5 +- include/treekeyidx.h | 4 +- include/unicodertf.h | 5 +- include/unixstr.h | 5 +- include/utf16utf8.h | 3 + include/utf8arshaping.h | 3 + include/utf8bidireorder.h | 2 + include/utf8cantillation.h | 3 + include/utf8greekaccents.h | 3 + include/utf8hebrewpoints.h | 3 + include/utf8html.h | 3 + include/utf8latin1.h | 3 + include/utf8nfc.h | 2 + include/utf8nfkd.h | 2 + include/utf8transliterator.h | 14 +- include/utf8utf16.h | 3 + include/utilconf.h | 5 +- include/utilstr.h | 7 +- include/versekey.h | 6 +- include/zcom.h | 6 +- include/zipcomprs.h | 5 +- include/zld.h | 6 +- include/zstr.h | 5 +- include/ztext.h | 5 +- include/zverse.h | 4 +- locales.d/hu.conf | 579 ++++++++++++--------- src/frontend/swdisp.cpp | 4 + src/frontend/swlog.cpp | 5 +- src/keys/listkey.cpp | 4 +- src/keys/strkey.cpp | 3 + src/keys/swkey.cpp | 4 + src/keys/treekey.cpp | 6 +- src/keys/treekeyidx.cpp | 11 +- src/keys/versekey.cpp | 4 +- src/mgr/encfiltmgr.cpp | 6 +- src/mgr/filemgr.cpp | 6 +- src/mgr/localemgr.cpp | 13 +- src/mgr/markupfiltmgr.cpp | 3 + src/mgr/swcacher.cpp | 6 +- src/mgr/swconfig.cpp | 15 +- src/mgr/swfiltermgr.cpp | 5 +- src/mgr/swlocale.cpp | 5 +- src/mgr/swmgr.cpp | 80 +-- src/modules/comments/hrefcom/hrefcom.cpp | 3 + src/modules/comments/rawcom/rawcom.cpp | 2 + src/modules/comments/rawfiles/rawfiles.cpp | 2 + src/modules/comments/swcom.cpp | 3 + src/modules/comments/zcom/zcom.cpp | 2 + src/modules/common/entriesblk.cpp | 3 + src/modules/common/lzsscomprs.cpp | 3 + src/modules/common/rawstr.cpp | 5 + src/modules/common/rawstr4.cpp | 4 + src/modules/common/rawverse.cpp | 3 + src/modules/common/sapphire.cpp | 3 + src/modules/common/swcipher.cpp | 3 + src/modules/common/swcomprs.cpp | 3 + src/modules/common/zipcomprs.cpp | 4 + src/modules/common/zstr.cpp | 4 + src/modules/common/zverse.cpp | 3 + src/modules/filters/cipherfil.cpp | 3 + src/modules/filters/gbffootnotes.cpp | 3 + src/modules/filters/gbfheadings.cpp | 4 + src/modules/filters/gbfhtml.cpp | 4 + src/modules/filters/gbfhtmlhref.cpp | 4 + src/modules/filters/gbfmorph.cpp | 3 + src/modules/filters/gbfosis.cpp | 9 +- src/modules/filters/gbfplain.cpp | 3 + src/modules/filters/gbfrtf.cpp | 4 + src/modules/filters/gbfstrongs.cpp | 6 +- src/modules/filters/gbfthml.cpp | 2 + src/modules/filters/greeklexattribs.cpp | 6 +- src/modules/filters/latin1utf16.cpp | 4 + src/modules/filters/latin1utf8.cpp | 4 + src/modules/filters/plainfootnotes.cpp | 3 + src/modules/filters/plainhtml.cpp | 3 + src/modules/filters/rtfhtml.cpp | 3 + src/modules/filters/rwphtml.cpp | 4 + src/modules/filters/rwprtf.cpp | 3 + src/modules/filters/scsuutf8.cpp | 3 + src/modules/filters/swbasicfilter.cpp | 8 +- src/modules/filters/thmlfootnotes.cpp | 3 + src/modules/filters/thmlgbf.cpp | 2 + src/modules/filters/thmlheadings.cpp | 3 + src/modules/filters/thmlhtml.cpp | 3 + src/modules/filters/thmlhtmlhref.cpp | 3 + src/modules/filters/thmllemma.cpp | 3 + src/modules/filters/thmlmorph.cpp | 3 + src/modules/filters/thmlolb.cpp | 2 + src/modules/filters/thmlosis.cpp | 9 +- src/modules/filters/thmlplain.cpp | 2 + src/modules/filters/thmlrtf.cpp | 2 + src/modules/filters/thmlscripref.cpp | 3 + src/modules/filters/thmlstrongs.cpp | 6 +- src/modules/filters/thmlvariants.cpp | 2 + src/modules/filters/unicodertf.cpp | 4 + src/modules/filters/utf16utf8.cpp | 3 + src/modules/filters/utf8arshaping.cpp | 3 + src/modules/filters/utf8bidireorder.cpp | 3 + src/modules/filters/utf8cantillation.cpp | 3 + src/modules/filters/utf8greekaccents.cpp | 2 + src/modules/filters/utf8hebrewpoints.cpp | 3 + src/modules/filters/utf8html.cpp | 4 + src/modules/filters/utf8latin1.cpp | 3 + src/modules/filters/utf8nfc.cpp | 3 + src/modules/filters/utf8nfkd.cpp | 3 + src/modules/filters/utf8transliterator.cpp | 6 + src/modules/filters/utf8utf16.cpp | 3 + src/modules/genbook/rawgenbook/rawgenbook.cpp | 4 + src/modules/genbook/swgenbook.cpp | 2 + src/modules/lexdict/rawld/rawld.cpp | 3 + src/modules/lexdict/rawld4/rawld4.cpp | 3 + src/modules/lexdict/swld.cpp | 2 + src/modules/lexdict/zld/zld.cpp | 3 + src/modules/swmodule.cpp | 4 + src/modules/texts/rawgbf/rawgbf.cpp | 3 + src/modules/texts/rawtext/rawtext.cpp | 10 +- src/modules/texts/swtext.cpp | 3 + src/modules/texts/ztext/ztext.cpp | 3 + src/utilfuns/Greek2Greek.cpp | 4 + src/utilfuns/swunicod.cpp | 3 + src/utilfuns/swversion.cpp | 3 + src/utilfuns/unixstr.cpp | 2 + src/utilfuns/utilconf.cpp | 4 + src/utilfuns/utilstr.cpp | 4 + testlib.cpp | 8 +- tests/casttest.cpp | 4 + tests/complzss.cpp | 3 + tests/compnone.cpp | 3 + tests/compzip.cpp | 3 + tests/configtest.cpp | 3 + tests/filtertest.cpp | 3 + tests/genbooktest.cpp | 8 +- tests/indextest.cpp | 3 + tests/introtest.cpp | 3 + tests/keycast.cpp | 3 + tests/keytest.cpp | 4 + tests/lextest.cpp | 4 + tests/listtest.cpp | 4 +- tests/localetest.cpp | 3 + tests/mgrtest.cpp | 5 +- tests/modtest.cpp | 3 + tests/parsekey.cpp | 5 +- tests/romantest.cpp | 6 +- tests/testblocks.cpp | 3 + tests/treeidxtest.cpp | 3 + utilities/addgb.cpp | 7 + utilities/addld.cpp | 8 + utilities/addvs.cpp | 18 +- utilities/cipherraw.cpp | 6 +- utilities/ciphertest.cpp | 6 +- utilities/ciphertest2.cpp | 5 + utilities/emptyvss.cpp | 9 + utilities/imp2gbs.cpp | 12 +- utilities/imp2ld.cpp | 8 + utilities/imp2vs.cpp | 7 + utilities/mkfastmod.cpp | 7 + utilities/mod2imp.cpp | 20 +- utilities/mod2osis.cpp | 7 + utilities/mod2vpl.cpp | 8 + utilities/mod2zmod.cpp | 20 + utilities/modwrite.cpp | 10 +- utilities/step2vpl.cpp | 3 + utilities/stepdump.cpp | 3 + utilities/thml2gbs.cpp | 8 +- utilities/txt2sword.cpp | 5 + utilities/vpl2mod.cpp | 9 + 273 files changed, 1655 insertions(+), 669 deletions(-) diff --git a/ChangeLog b/ChangeLog index d6b65d5..9342fbe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,12 @@ API ChangeLog (see the ChangeLog in each 'apps' directory for app specific changes +01-Oct-2002 Daniel Glassey + change sword to use a sword namespace + fix to build with gcc3.2 again after yesterday + +30-Sep-2002 Daniel Glassey + remove using namespace std from all headers 28-Sep-2002 Troy A. Griffitts Added SWModule::Index and SWCom and SWText impls diff --git a/apps/console/diatheke/corediatheke.cpp b/apps/console/diatheke/corediatheke.cpp index e87f4da..6c32bbe 100644 --- a/apps/console/diatheke/corediatheke.cpp +++ b/apps/console/diatheke/corediatheke.cpp @@ -9,6 +9,12 @@ #include #include +using std::string; +using std::list; +using std::cout; +using std::endl; +using std::ostream; + void systemquery(const char * key, ostream* output){ DiathekeMgr manager; ModMap::iterator it; diff --git a/apps/console/diatheke/corediatheke.h b/apps/console/diatheke/corediatheke.h index b265053..45a0569 100644 --- a/apps/console/diatheke/corediatheke.h +++ b/apps/console/diatheke/corediatheke.h @@ -36,4 +36,4 @@ #define ST_MULTIWORD 3 // -2 int hasalpha (char * string); -void doquery(unsigned long maxverses, unsigned char outputformat, unsigned char outputencoding, unsigned long optionfilters, unsigned char searchtype, const char *text, const char *locale, const char *ref, ostream* output, const char* script, signed short variants); +void doquery(unsigned long maxverses, unsigned char outputformat, unsigned char outputencoding, unsigned long optionfilters, unsigned char searchtype, const char *text, const char *locale, const char *ref, std::ostream* output, const char* script, signed short variants); diff --git a/apps/console/diatheke/diafiltmgr.h b/apps/console/diatheke/diafiltmgr.h index cb04fff..2ca34eb 100644 --- a/apps/console/diatheke/diafiltmgr.h +++ b/apps/console/diatheke/diafiltmgr.h @@ -23,6 +23,9 @@ #define FMT_CGI 127 #include +#ifndef NO_SWORD_NAMESPACE +using namespace sword; +#endif class SWDLLEXPORT DiathekeFilterMgr : public EncodingFilterMgr { protected: diff --git a/apps/console/diatheke/diatheke.cpp b/apps/console/diatheke/diatheke.cpp index f423e6b..58eaf01 100644 --- a/apps/console/diatheke/diatheke.cpp +++ b/apps/console/diatheke/diatheke.cpp @@ -4,11 +4,15 @@ // Licensed under GNU General Public License (GPL) // see accompanying LICENSE file for license details + #include "corediatheke.h" #include "diathekemgr.h" #include "diafiltmgr.h" #include +using std::string; +using std::cout; + #define RQ_REF 1 #define RQ_BOOK 2 diff --git a/apps/console/diatheke/diathekemgr.cpp b/apps/console/diatheke/diathekemgr.cpp index 87f9102..3b87967 100644 --- a/apps/console/diatheke/diathekemgr.cpp +++ b/apps/console/diatheke/diathekemgr.cpp @@ -28,6 +28,8 @@ #include "gbfcgi.h" #include "thmlcgi.h" +using std::string; + //--------------------------------------------------------------------------- DiathekeMgr::DiathekeMgr (SWConfig * iconfig, SWConfig * isysconfig, bool autoload, char enc, char mark, bool ibidi, bool ishape) : SWMgr(iconfig, isysconfig, autoload, new DiathekeFilterMgr(mark, enc)) diff --git a/apps/console/diatheke/gbfcgi.cpp b/apps/console/diatheke/gbfcgi.cpp index 1bcd176..28ce7fb 100644 --- a/apps/console/diatheke/gbfcgi.cpp +++ b/apps/console/diatheke/gbfcgi.cpp @@ -18,6 +18,8 @@ #include #include "gbfcgi.h" +SWORD_NAMESPACE_START + GBFCGI::GBFCGI() { setTokenStart("<"); setTokenEnd(">"); @@ -136,3 +138,5 @@ bool GBFCGI::handleToken(char **buf, const char *token, DualStringMap &userData) } return true; } + +SWORD_NAMESPACE_END diff --git a/apps/console/diatheke/gbfcgi.h b/apps/console/diatheke/gbfcgi.h index 51b0d6c..530b5cf 100644 --- a/apps/console/diatheke/gbfcgi.h +++ b/apps/console/diatheke/gbfcgi.h @@ -21,6 +21,8 @@ #include +SWORD_NAMESPACE_START + /** this filter converts GBF text to Diatheke/CGI format */ class SWDLLEXPORT GBFCGI : public SWBasicFilter { @@ -30,4 +32,5 @@ public: GBFCGI (); }; +SWORD_NAMESPACE_END #endif diff --git a/apps/console/diatheke/thmlcgi.cpp b/apps/console/diatheke/thmlcgi.cpp index 2bb7720..d8370c6 100644 --- a/apps/console/diatheke/thmlcgi.cpp +++ b/apps/console/diatheke/thmlcgi.cpp @@ -18,6 +18,8 @@ #include #include "thmlcgi.h" +SWORD_NAMESPACE_START + ThMLCGI::ThMLCGI() { setTokenStart("<"); setTokenEnd(">"); @@ -190,3 +192,4 @@ bool ThMLCGI::handleToken(char **buf, const char *token, DualStringMap &userData +SWORD_NAMESPACE_END diff --git a/apps/console/diatheke/thmlcgi.h b/apps/console/diatheke/thmlcgi.h index c164f0d..a0723d5 100644 --- a/apps/console/diatheke/thmlcgi.h +++ b/apps/console/diatheke/thmlcgi.h @@ -21,6 +21,8 @@ #include +SWORD_NAMESPACE_START + /** this filter converts ThML text to Diatheke/CGI format */ class SWDLLEXPORT ThMLCGI : public SWBasicFilter { @@ -30,4 +32,5 @@ public: ThMLCGI(); }; +SWORD_NAMESPACE_END #endif diff --git a/apps/windoze/CBuilder5/BibleCS/stage/uilocales.d/hu.conf b/apps/windoze/CBuilder5/BibleCS/stage/uilocales.d/hu.conf index 012eed4..0387180 100644 --- a/apps/windoze/CBuilder5/BibleCS/stage/uilocales.d/hu.conf +++ b/apps/windoze/CBuilder5/BibleCS/stage/uilocales.d/hu.conf @@ -1,167 +1,168 @@ -[Meta] -Name=hu -Description=Magyar -Translator=Mentler Gyula -[Text] -#BackBtnImage=uilocales.d/en_back.bmp -#SearchBtnImage=uilocales.d/en_search.bmp -&About=SWORD &névjegye -About The SWORD Project=SWORD Projektről -&Add=&Hozzáadás -&Add Bookmark=&Könyvjelző elhelyezése -Add New Bookmark File=Új könyvjelzőfile létrehozása -Bookmark Section Title:=Könyvjelző csoport címe: -Bookmark=Könyvjelző -Bookmarks=Könyvjelzők -Cancel=Mégsem -Case Sensitive=Kis-/Nagybetű érzékeny -Chapter=Fejezet -Check Modules To Show As Tabs=Fülként megjelenő modulok kijelölése -Combo/Edit Fields=Combo/Edit Fields -Contents=&Tartalom -&Copy=&Másolás -Copy as &B-Greek Transliteration=Másolás &B-Görög átírásban -&Close=Be&zárás -Create a New Verse List Window=Új verslista ablak létrehozása -Create Verse List=Verslista létrehozása -Current Verse Color=Aktuális vers színe -Daily Devotionals=Napi csendesség -Default Devotional=Alapértelmezett napi csendesség -Define Custom Range=Tartomány megadása -Definitions=Definíciók -&Delete Entry=Bejegyzés törlése -Description=Leírás -Devotion for Today=Mai csendesség -Devotional of the Day=&Csendesség -Dictionary Lookup=Keresés a szótárban -Display Colors=Képernyő színei -Display=Képernyő -&Edit=S&zerkesztés -&Edit Bookmarks / Tree View...=Könyvjelzők s&zerkesztése / Fa nézet -Edit Entry=Bejegyzés szerkesztése -&Edit Entry=Bejegyzés s&zerkesztése -"Entire Module","Current Results","Custom Range"="Egész modul","Aktuális eredmények","Beállított tartomány" -E&xit=&Kilépés -eg. mat-jo;rev4=eg. mat-jo;rev4 -&File=&File -File Name (without extension):=File neve (kiterjesztés nélkül): -Font Size:=Betűtípus mérete: -Found New Module...=Új modultok... -General=Álltalános -Greek=Görög -Hebrew=Héber -&Help=&Súgó -Hide / Show Modules=Modulok elrejtése/megjelenítése -Individual Modules (Font Only)=Egyedi modulok (csak betűtípus) -Install Manager=&Install manager program -Language=Nyelv -Link to Comment for Verse...=Mutató a vershez tartozó kommentárra -Maintain Custom Ranges=Tartományok beállítása -Window Type=Modul típus -Module=Modul "Mult Word","Phrase","Regular Expression"="Több szó","Kifejezés","Reguláris kifejezés" -&New Search Window=Új keresőablak -OK=OK -OkBtn=OK -Options=&Beállítások -Original Language Support - Default Modules=Eredeti nyelv támogatás - Alapértelmezett modulok -Parsing=Szintaktikai feldolgozás -Personalize=Personalize -Preferences=Testreszabás -&Preferences...=&Testreszabás... -Preview...=Preview... -Preview=Preview -Range Name=Tartomány neve -Range Text=Tartomány szövege -Reference=Hivatkozás -&Remove=&Eltávolítás -&Save=&Mentés -S&ave Layout=Elrendezés &mentése -Autosave Other Bookmarks=Egyéb könyvjelzők mentése -Autosave Personal Bookmarks=Személyes könyvjelzők mentése -Autosave Screen Layout=Képernyőelrendezés mentése -Scheme=Séma -Scope=Környezet(Scope) -&Search=&Keresés -Search Options=Keresési opciók -Search Type=Kereséstípus -Search...=Keresés... -Search=Keresés -Select Color...=Szín... -Select Font...=Betűtípus... -Show Devotional at Startup=Show Devotional at Startup -Show Devotional Splash Screen on Startup=Show Devotional Splash Screen on Startup -Show Devotionals as Dictionaries=Show Devotionals as Dictionaries -Show Hint Over Strongs Numbers=Magyarázatok megmutatása a Strong számok felett -Show Hint Pop-ups=Tipp ablalok megmutatása -Special Modules=Speciális modulok -Strong's Numbered Text=Strong számokkal ellátott szöveg -Text Styles and Colors=Betűtípus a szöveghez -&Tools=&Eszközök -Type Verse=Type Verse -User Verse List=Felhasználói verslista -Verse List=Verslista -Verse Number Color=Vers sorszámok színe -&New Bookmark File=&Új könyvjelzőfile -P&rint...=&Nyomtatás... -The SWORD Project=A SWORD Projekt -&Footnotes=&Lábjegyzetek -&On=&Be -O&ff=@Ki -&Hebrew Cantillation=Héber recitálás -H&ebrew Vowel Points=Héber magánhangzók pontozása -&Strong's Numbers=Strong számok -&Morphological Tags=Morfológiai jelzések -He&adings=Fejlécek -&Transliteration=Átírás -&Latin=Latin betűk -&Basic Latin=Latin betűk ékezet nélkül -B&eta=B&eta -B&Greek=B&Görög -Print Selection=Kiválasztott rész kinyomtatása -Print Source=Forrás nyomtatása -Bible Text=Bibliai szöveg -Commentary Text=Kommentár szövege -Lexicon/Dictionary Text=Lexikon/Szótár -Module Name=Modulnév -Print Range=Tartomány nyomtatása -&Print=&Nyomtatás -P&review=Bemutatás -Printer&s...=Nyomtatók... -Margins (Inches)=Margók (inch) -Top=Fent -Left=Bal -Right=Jobb -Bottom=Lent -Header/Footer=Fej-/Lábléc -Print Header=Fejléc nyomtatás -Header Text=Fejléc szövege -Print Footer=Lábléc nyomtatása -Footer Text=Lábléc szövege -Formatting Options=Formázási opciók -Font and Size=Metűtípus és méret -Chapter Heading=Fejezet fejléce -Body Text=Kenyérszöveg -Verse Numbers=Versszámozás -Font=Betűtípus -Book Name=Könyv neve -Chapter Headigns=Fejezetek fejlécei -Paragraph Format=Bekezdés formázás -Verse Numbers=Versszámozás -Superscripted=Felső indexbe -Prefixed (John 1:1 KJV)...=Elé írva (János 1,1 KJV)... -Postfixed ...(John 1:1 KJV)=Utána írva ...(János 1,1 KJV) -"English (US)","Czech","Danish","German","French","Norwegian","Polish","Portuguese","Slovak"="Angol (USA)","Cseh","Dán","Német","Francia","Norvég","Lengyel","Portugál","Szlovák" -Glossaries=Szójegyzékek -Show Glossaries as Dictionaries=Szójegyzékek és szótárak megmutatása -Default=Alapértelmezett -"All Modules","Bible Modules","Commentary Modules","Lexicon/Dictionary Modules","Pop-Up Windows","Search Results"="Minden modul","Biblia modulok","Kommentár modulok","Lexikon/szótár modulok","Pop-Up Windows","Search Results" -&Save Scheme=Séma &mentés -&Delete Scheme=Séma -&törlés &Import Scheme=Séma &importálás -&Export Scheme=Séma &exportálás -Words To Live By...=Words To Live By... -Go Back To Previous Location=Vissza az előző helyre -Bring Up Search Window=Keresőablak megjelenítése -Biblical Texts=Bibliai szövegek -Commentaries=Kommentárok -Lexicons / Dictionaries=Lexikonok/Szótárak +[Meta] +Name=hu +Description=Magyar +Translator=Mentler Gyula + +[Text] +BackBtnImage=uilocales.d/hu_back.bmp +SearchBtnImage=uilocales.d/hu_search.bmp +&About=SWORD &névjegye +About The SWORD Project=SWORD Projektről +&Add=&Hozzáadás +&Add Bookmark=&Könyvjelző elhelyezése +Add New Bookmark File=Új könyvjelzőfile létrehozása +Bookmark Section Title:=Könyvjelző csoport címe: +Bookmark=Könyvjelző +Bookmarks=Könyvjelzők +Cancel=Mégsem +Case Sensitive=Kis-/Nagybetű érzékeny +Chapter=Fejezet +Check Modules To Show As Tabs=Fülként megjelenő modulok kijelölése +Combo/Edit Fields=Combo/Edit Fields +Contents=&Tartalom +&Copy=&Másolás +Copy as &B-Greek Transliteration=Másolás &B-Görög átírásban +&Close=Be&zárás +Create a New Verse List Window=Új verslista ablak létrehozása +Create Verse List=Verslista létrehozása +Current Verse Color=Aktuális vers színe +Daily Devotionals=Napi csendesség +Default Devotional=Alapértelmezett napi csendesség +Define Custom Range=Tartomány megadása +Definitions=Definíciók +&Delete Entry=Bejegyzés törlése +Description=Leírás +Devotion for Today=Mai csendesség +Devotional of the Day=&Csendesség +Dictionary Lookup=Keresés a szótárban +Display Colors=Képernyő színei +Display=Képernyő +&Edit=S&zerkesztés +&Edit Bookmarks / Tree View...=Könyvjelzők s&zerkesztése / Fa nézet +Edit Entry=Bejegyzés szerkesztése +&Edit Entry=Bejegyzés s&zerkesztése +"Entire Module","Current Results","Custom Range"="Egész modul","Aktuális eredmények","Beállított tartomány" +E&xit=&Kilépés +&File=&File +File Name (without extension):=File neve (kiterjesztés nélkül): +Font Size:=Betűtípus mérete: +Found New Module...=Új modultok... +General=Álltalános +Greek=Görög +Hebrew=Héber +&Help=&Súgó +Hide / Show Modules=Modulok elrejtése/megjelenítése +Individual Modules (Font Only)=Egyedi modulok (csak betűtípus) +Install Manager=&Install manager program +Language=Nyelv +Link to Comment for Verse...=Mutató a vershez tartozó kommentárra +Maintain Custom Ranges=Tartományok beállítása +Module Type=Modul típus +Module=Modul +"Mult Word","Phrase","Regular Expression"="Több szó","Kifejezés","Reguláris kifejezés" +&New Search Window=Új keresőablak +OK=OK +OkBtn=OK +Options=&Beállítások +Original Language Support - Default Modules=Eredeti nyelv támogatás - Alapértelmezett modulok +Parsing=Szintaktikai feldolgozás +Personalize=Personalize +Preferences=Testreszabás +&Preferences...=&Testreszabás... +Preview...=Preview... +Preview=Preview +Range Name=Tartomány neve +Range Text=Tartomány szövege +Reference=Hivatkozás +&Remove=&Eltávolítás +&Save=&Mentés +S&ave Layout=Elrendezés &mentése +Save Other Bookmarks=Egyéb könyvjelzők mentése +Save Personal Bookmarks=Személyes könyvjelzők mentése +Save Screen Layout=Képernyőelrendezés mentése +Scheme=Séma +Scope=Környezet(Scope) +&Search=&Keresés +Search Options=Keresési opciók +Search Type=Kereséstípus +Search...=Keresés... +Search=Keresés +Select Color...=Szín... +Select Font...=Betűtípus... +Show Devotional at Startup=Csendesség mutatása az induláskor +Show Devotional Splash Screen on Startup=Csendesség ablak az induláskor +Show Devotionals as Dictionaries=Csendességek mint szótárak mutatása +Show Hint Over Strongs Numbers=Magyarázatok megmutatása a Strong számok felett +Show Hint Pop-ups=Tipp ablalok megmutatása +Special Modules=Speciális modulok +Strong's Numbered Text=Strong számokkal ellátott szöveg +Text Font=Betűtípus a szöveghez +&Tools=&Eszközök +Type Verse=Type Verse +User Verse List=Felhasználói verslista +Verse List=Verslista +Verse Number Color=Vers sorszámok színe +&New Bookmark File=&Új könyvjelzőfile +P&rint...=&Nyomtatás... +The SWORD Project=A SWORD Projekt +&Footnotes=&Lábjegyzetek +&On=&Be +O&ff=@Ki +&Hebrew Cantillation=Héber recitálás +H&ebrew Vowel Points=Héber magánhangzók pontozása +&Strong's Numbers=Strong számok +&Morphological Tags=Morfológiai jelzések +He&adings=Fejlécek +&Transliteration=Átírás +&Latin=Latin betűk +&Basic Latin=Latin betűk ékezet nélkül +B&eta=B&eta +B&Greek=B&Görög +Print Selection=Kiválasztott rész kinyomtatása +Print Source=Forrás nyomtatása +Bible Text=Bibliai szöveg +Commentary Text=Kommentár szövege +Lexicon/Dictionary Text=Lexikon/Szótár +Module Name=Modulnév +Print Range=Tartomány nyomtatása +&Print=&Nyomtatás +P&review=Bemutatás +Printer&s...=Nyomtatók... +Margins (Inches)=Margók (inch) +Top=Fent +Left=Bal +Right=Jobb +Bottom=Lent +Header/Footer=Fej-/Lábléc +Print Header=Fejléc nyomtatás +Header Text=Fejléc szövege +Print Footer=Lábléc nyomtatása +Footer Text=Lábléc szövege +Formatting Options=Formázási opciók +Font and Size=Metűtípus és méret +Chapter Heading=Fejezet fejléce +Body Text=Kenyérszöveg +Verse Numbers=Versszámozás +Font=Betűtípus +Book Name=Könyv neve +Chapter Headigns=Fejezetek fejlécei +Paragraph Format=Bekezdés formázás +Verse Numbers=Versszámozás +Superscripted=Felső indexbe +Prefixed (John 1:1 KJV)...=Elé írva (János 1,1 KJV)... +Postfixed ...(John 1:1 KJV)=Utána írva ...(János 1,1 KJV) +"English (US)","Czech","Danish","German","French","Norwegian","Polish","Portuguese","Slovak"="Angol (USA)","Cseh","Dán","Német","Francia","Norvég","Lengyel","Portugál","Szlovák" +Glossaries=Szójegyzékek +Show Glossaries as Dictionaries=Szójegyzékek és szótárak megmutatása +Default=Alapértelmezett +"All Modules","Bible Modules","Commentary Modules","Lexicon/Dictionary Modules"="Minden modul","Biblia modulok","Kommentár modulok","Lexikon/szótár modulok" +&Save Scheme=Séma &mentés +&Delete Scheme=Séma &törlés +&Import Scheme=Séma &importálás +&Export Scheme=Séma &exportálás +Words To Live By...=Words To Live By... +Go Back To Previous Location=Vissza az előző helyre +Bring Up Search Window=Keresőablak megjelenítése +Biblical Texts=Bibliai szövegek +Commentaries=Kommentárok +Lexicons / Dictionaries=Lexikonok/Szótárak diff --git a/bindings/flatapi.cpp b/bindings/flatapi.cpp index 7728b86..a2c2696 100644 --- a/bindings/flatapi.cpp +++ b/bindings/flatapi.cpp @@ -14,6 +14,9 @@ #include #include #include +#ifndef NO_SWORD_NAMESPACE +using namespace sword; +#endif #include "flatapi.h" diff --git a/bindings/swig/Makefile b/bindings/swig/Makefile index a1dca13..44f00ce 100644 --- a/bindings/swig/Makefile +++ b/bindings/swig/Makefile @@ -1,6 +1,7 @@ TOP = $(PWD) SWIG = swig -SWIGOPT = -Wall -proxy +#SWIGOPT = -Wall -proxy +SWIGOPT = -shadow CXXSRCS = TARGET = sword INTERFACE = sword.i diff --git a/bindings/swig/Makefile.swig b/bindings/swig/Makefile.swig index 736488c..9b8271a 100644 --- a/bindings/swig/Makefile.swig +++ b/bindings/swig/Makefile.swig @@ -167,7 +167,7 @@ tcl_multi_cpp: $(SRCS) # files "perl.h", "EXTERN.h" and "XSUB.h". With Perl5.003, it's # usually something like /usr/local/lib/perl5/arch-osname/5.003/CORE. -PERL5_INCLUDE= /usr/lib/perl5/5.6.1/i586-linux/CORE +PERL5_INCLUDE= /usr/lib/perl5/5.6.1/i386-linux/CORE # Extra Perl specific dynamic linking options PERL5_DLNK = diff --git a/bindings/swig/listkey.i b/bindings/swig/listkey.i index 945621f..bb39b3d 100644 --- a/bindings/swig/listkey.i +++ b/bindings/swig/listkey.i @@ -38,7 +38,7 @@ public: //virtual char SetToElement (int ielement, SW_POSITION = TOP); %extend { virtual char SetToElement(int element) { - self->SetToElement(element, TOP); + return self->SetToElement(element, TOP); }; } diff --git a/bindings/swig/swmgr.i b/bindings/swig/swmgr.i index a50c8fe..b66c2c4 100644 --- a/bindings/swig/swmgr.i +++ b/bindings/swig/swmgr.i @@ -9,8 +9,8 @@ typedef map < string, SWFilter * > FilterMap; class SWMgr { public: //member data - static bool debug; - static const char *globalConfPath; +// static bool debug; +// static const char *globalConfPath; static void findConfig (char *configType, char **prefixPath, char **configPath); SWConfig *config; diff --git a/bindings/swig/swmodule.i b/bindings/swig/swmodule.i index f65fd1b..da8c8ff 100644 --- a/bindings/swig/swmodule.i +++ b/bindings/swig/swmodule.i @@ -84,7 +84,7 @@ public: //write interface virtual bool isWritable (); static signed char createModule (const char *); - virtual SWModule& setentry (const char *inbuf, long len); + virtual void setEntry (const char *inbuf, long len); virtual void deleteEntry (); %extend { diff --git a/bindings/swig/sword.pl b/bindings/swig/sword.pl index 969424d..873b948 100644 --- a/bindings/swig/sword.pl +++ b/bindings/swig/sword.pl @@ -21,11 +21,14 @@ print " finished \n"; $config->Save(); #testing SWMgr -$localemgr = sword::LocaleMgr::systemLocaleMgr(); -$localemgr->setDefaultLocaleName("de"); +print "testing SWMgr\n"; +#$localemgr = sword::LocaleMgr::systemLocaleMgr(); +#$localemgr->setDefaultLocaleName("de"); $mgr = new sword::SWMgr(); -$module = $mgr->module("GerLut1545-temp"); +print "init ... "; +#$module = $mgr->module("GerLut1545-temp"); +$module = $mgr->module("WEB"); print "Printing WEB Module information: \n"; print "Name:\t", $module->Name(),"\nDescription:\t", $module->Description(), "\nLang:\t", $module->Lang(), "\n"; diff --git a/examples/cmdline/lookup.cpp b/examples/cmdline/lookup.cpp index 0bccc09..5d8d6a8 100644 --- a/examples/cmdline/lookup.cpp +++ b/examples/cmdline/lookup.cpp @@ -3,6 +3,16 @@ #include #include +#ifndef NO_SWORD_NAMESPACE +using sword::SWMgr; +using sword::SWModule; +using sword::ModMap; +using sword::SWKey; +using sword::AttributeTypeList; +using sword::AttributeValue; +using sword::AttributeList; +#endif + int main(int argc, char **argv) { SWMgr manager; diff --git a/examples/cmdline/search.cpp b/examples/cmdline/search.cpp index 9e1c896..235f5b6 100644 --- a/examples/cmdline/search.cpp +++ b/examples/cmdline/search.cpp @@ -4,6 +4,14 @@ #include // GNU #include +#ifndef NO_SWORD_NAMESPACE +using sword::SWMgr; +using sword::SWModule; +using sword::ModMap; +using sword::VerseKey; +using sword::ListKey; +#endif + void percentUpdate(char percent, void *userData) { static char printed = 0; char maxHashes = *((char *)userData); diff --git a/examples/cmdline/threaded_search.cpp b/examples/cmdline/threaded_search.cpp index 2267ed2..450ca8b 100755 --- a/examples/cmdline/threaded_search.cpp +++ b/examples/cmdline/threaded_search.cpp @@ -7,6 +7,15 @@ #include +#ifndef NO_SWORD_NAMESPACE +using sword::SWMgr; +using sword::ListKey; +using sword::SWModule; +using sword::VerseKey; +using sword::SWKey; +using sword::ModMap; +#endif + int cms_currentProgress; class CSwordModuleSearch { 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 +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 +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 +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 +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 #include +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 +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 +#include + +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 +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 +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 +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 +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 +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 +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 #include +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 +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 +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 +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 +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 +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 #include +#include +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 +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 +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 +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 +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 +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 +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 +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 +SWORD_NAMESPACE_START // multmap that still lets you use [] to reference FIRST // entry of a key if multiples exist template -class multimapwithdefault : public multimap { +class multimapwithdefault : public std::multimap { public: - typedef pair value_type; + typedef std::pair 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::const_iterator start = lower_bound(k); - typename multimap::const_iterator end = upper_bound(k); + typename std::multimap::const_iterator start = lower_bound(k); + typename std::multimap::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 - +#include +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 -class QObject; #include + +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 +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 +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 +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 +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 +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 +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 +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 +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 +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 +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 +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 +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 +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 +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 +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 + +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 +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 +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 #include +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 DualStringMap; + typedef std::map 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 +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 +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 +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 +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 +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 #include +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 +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 +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 +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 +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 +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 +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 +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 +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 +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 -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 augPaths; + std::list 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 *augPaths = 0); + static void findConfig(char *configType, char **prefixPath, char **configPath, std::list *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 #include - +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 #include +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 +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 +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 +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 +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 +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 +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 +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 +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 +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 +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 +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 #include +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 +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 +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 +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 +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 +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 +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 #include +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 +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 +#include +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 +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 #include +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 #include +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 +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 +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 +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 +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 +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 #include +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 #include +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 //#include -//#include -//#include +#include +#include #include #include -class UnicodeString; + +//class UnicodeString; + +SWORD_NAMESPACE_START struct SWTransData { UnicodeString resource; UTransDirection dir; }; -typedef map SWTransMap; -typedef pair SWTransPair; +typedef std::map SWTransMap; +typedef std::pair 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 +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 +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 + +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 +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 +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 +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 +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 +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 +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 +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 diff --git a/locales.d/hu.conf b/locales.d/hu.conf index 87fe85b..3b1a087 100644 --- a/locales.d/hu.conf +++ b/locales.d/hu.conf @@ -1,256 +1,323 @@ -[Meta] -Name=hu -Description=Magyar - -[Text] -Genesis=Gen -Exodus=Ex -Leviticus=Lev -Numbers=Num -Deuteronomy=Deut -Joshua=Josh -Judges=Judg -Ruth=Ruth -I Samuel=1Sam -II Samuel=2Sam -I Kings=1Kgs -II Kings=2Kgs -I Chronicles=1Chr -II Chronicles=2Chr -Ezra=Ezra -Nehemiah=Neh -Esther=Esth -Job=Job -Psalms=Pss -Proverbs=Prov -Ecclesiastes=Eccl -Song of Solomon=Song -Isaiah=Isa -Jeremiah=Jer -Lamentations=Lam -Ezekiel=Eze -Daniel=Dan -Hosea=Hos -Joel=Joel -Amos=Amos -Obadiah=Ob -Jonah=Jonah -Micah=Mic -Nahum=Nah -Habakkuk=Hab -Zephaniah=Zeph -Haggai=Hag -Zechariah=Zech -Malachi=Mal -Matthew=Mt -Mark=Mk -Luke=Lk -John=Jn -Acts=Acts -Romans=Rom -I Corinthians=1Cor -II Corinthians=2Cor -Galatians=Gal -Ephesians=Eph -Philippians=Php -Colossians=Col -I Thessalonians=1Thes -II Thessalonians=2Thes -I Timothy=1Tim -II Timothy=2Tim -Titus=Tit -Philemon=Phm -Hebrews=Heb -James=Jas -I Peter=1Pet -II Peter=2Pet -I John=1Jn -II John=2Jn -III John=3Jn -Jude=Jude -Revelation of John=Rev - -[Book Abbrevs] -1 C=46 -1 CHRONICLES=13 -1 CORINTHIANS=46 -1 JN=62 -1 JOHN=62 -1 KGS=11 -1 KINGS=11 -1 PETER=60 -1 PTR=60 -1 SAMUEL=9 -1 THESSALONIANS=52 -1 TIMOTHY=54 -1C=46 -1CHRONICLES=13 -1CORINTHIANS=46 -1JN=62 -1JOHN=62 -1KGS=11 -1KINGS=11 -1PETER=60 -1PTR=60 -1SAMUEL=9 -1THESSALONIANS=52 -1TIMOTHY=54 -2 C=47 -2 CHRONICLES=14 -2 CORINTHIANS=47 -2 JN=63 -2 JOHN=63 -2 KGS=12 -2 KINGS=12 -2 PETER=61 -2 PTR=61 -2 SAMUEL=10 -2 THESSALONIANS=53 -2 TIMOTHY=55 -2C=47 -2CHRONICLES=14 -2CORINTHIANS=47 -2JN=63 -2JOHN=63 -2KGS=12 -2KINGS=12 -2PETER=61 -2PTR=61 -2SAMUEL=10 -2THESSALONIANS=53 -2TIMOTHY=55 -3 JN=64 -3 JOHN=64 -3JN=64 -3JOHN=64 -ACTS=44 -AMOS=30 -APOCALYPSE OF ST. JOHN=66 -C=51 -CANTICLE OF CANTICLES=22 -COC=22 -COLOSSIANS=51 -D=5 -DANIEL=27 -DEUTERONOMY=5 -E=49 -ECCLESIASTES=21 -EPHESIANS=49 -ESTER=17 -ESTHER=17 -EXODUS=2 -EZEKIEL=26 -EZRA=15 -G=1 -GALATIANS=48 -GENESIS=1 -H=58 -HABAKKUK=35 -HAGGAI=37 -HEBREWS=58 -HOSEA=28 -I C=46 -I CHRONICLES=13 -I CORINTHIANS=46 -I JN=62 -I JOHN=62 -I KGS=11 -I KINGS=11 -I PETER=60 -I PTR=60 -I SAMUEL=9 -I THESSALONIANS=52 -I TIMOTHY=54 -IC=46 -ICHRONICLES=13 -ICORINTHIANS=46 -II C=47 -II CHRONICLES=14 -II CORINTHIANS=47 -II JN=63 -II JOHN=63 -II KGS=12 -II KINGS=12 -II PETER=61 -II PTR=61 -II SAMUEL=10 -II THESSALONIANS=53 -II TIMOTHY=55 -IIC=47 -IICHRONICLES=14 -IICORINTHIANS=47 -III JN=64 -III JOHN=64 -IIIJN=64 -IIIJOHN=64 -IIJN=63 -IIJOHN=63 -IIKGS=12 -IIKINGS=12 -IIPETER=61 -IIPTR=61 -IISAMUEL=10 -IITHESSALONIANS=53 -IITIMOTHY=55 -IJN=62 -IJOHN=62 -IKGS=11 -IKINGS=11 -IPETER=60 -IPTR=60 -ISA=23 -ISAIAH=23 -ISAMUEL=9 -ITHESSALONIANS=52 -ITIMOTHY=54 -J=43 -JAMES=59 -JAS=59 -JEREMIAH=24 -JN=43 -JO=43 -JOB=18 -JOEL=29 -JOHN=43 -JONAH=32 -JOSHUA=6 -JUD=7 -JUDE=65 -JUDGES=7 -L=42 -LAMENTATIONS=25 -LEVITICUS=3 -LK=42 -LUKE=42 -MA=40 -MALACHI=39 -MARK=41 -MATTHEW=40 -MICAH=33 -MK=41 -MR=41 -MT=40 -N=4 -NAHUM=34 -NEHEMIAH=16 -NUMBERS=4 -OBADIAH=31 -P=19 -PH=50 -PHILEMON=57 -PHILIPPIANS=50 -PHM=57 -PHP=50 -PROVERBS=20 -PSALMS=19 -PSM=19 -PSS=19 -REVELATION OF JOHN=66 -ROMANS=45 -RUTH=8 -SONG OF SOLOMON=22 -SONG OF SONGS=22 -SOS=22 -TITUS=56 -ZECHARIAH=38 -ZEPHANIAH=36 +[Meta] +Name=de +Description=Magyar + +[Text] +Genesis=1. Mózes +Exodus=2. Mózes +Leviticus=3. Mózes +Numbers=4. Mózes +Deuteronomy=5. Mózes +Joshua=Józsué +Judges=Bírák +Ruth=Ruth +I Samuel=1. Sámuel +II Samuel=2. Sámuel +I Kings=1. Királyok +II Kings=2. Királyok +I Chronicles=1. Krónika +II Chronicles=2. Krónika +Ezra=Ezsdrás +Nehemiah=Nehémiás +Esther=Eszter +Job=Jób +Psalms=Zsoltárok +Proverbs=Példabeszédek +Ecclesiastes=Prédikátor +Song of Solomon=Énekek éneke +Isaiah=Ézsaiás +Jeremiah=Jeremás +Lamentations=Jeremiás Siralmai +Ezekiel=Ezékiel +Daniel=Dániel +Hosea=Hóseás +Joel=Jóel +Amos=Ámos +Obadiah=Abdiás +Jonah=Jónás +Micah=Mikeás +Nahum=Náhum +Habakkuk=Habakuk +Zephaniah=Sofóniás +Haggai=Aggeus +Zechariah=Zakariás +Malachi=Malakiás +Matthew=Máté +Mark=Márk +Luke=Lukács +John=János +Acts=apostolok Cselekedetei +Romans=Róma +I Corinthians=1. Korintus +II Corinthians=2. Korintus +Galatians=Galata +Ephesians=Efézus +Philippians=Filippi +Colossians=Kolosser +I Thessalonians=1. Thessalonika +II Thessalonians=2. Thessalonika +I Timothy=1. Timóteus +II Timothy=2. Timóteus +Titus=Titusz +Philemon=Filemon +Hebrews=Zsidókhoz írt levél +James=Jakab +I Peter=1. Péter +II Peter=2. Péter +I John=1. János +II John=2. János +III John=3. János +Jude=Júdás +Revelation of John=Jelenések + +[Book Abbrevs] +1 C=46 +1 CHRONICLES=13 +1 CORINTHIANS=46 +1 JN=62 +1 JOHN=62 +1 KGS=11 +1 KINGS=11 +1 PETER=60 +1 PTR=60 +1 SAMUEL=9 +1 THESSALONIANS=52 +1 TIMOTHY=54 +1C=46 +1CHRONICLES=13 +1CORINTHIANS=46 +1JN=62 +1JOHN=62 +1KGS=11 +1KINGS=11 +1PETER=60 +1PTR=60 +1SAMUEL=9 +1THESSALONIANS=52 +1TIMOTHY=54 +2 C=47 +2 CHRONICLES=14 +2 CORINTHIANS=47 +2 JN=63 +2 JOHN=63 +2 KGS=12 +2 KINGS=12 +2 PETER=61 +2 PTR=61 +2 SAMUEL=10 +2 THESSALONIANS=53 +2 TIMOTHY=55 +2C=47 +2CHRONICLES=14 +2CORINTHIANS=47 +2JN=63 +2JOHN=63 +2KGS=12 +2KINGS=12 +2PETER=61 +2PTR=61 +2SAMUEL=10 +2THESSALONIANS=53 +2TIMOTHY=55 +3 JN=64 +3 JOHN=64 +3JN=64 +3JOHN=64 +ACTS=44 +AMOS=30 +APOCALYPSE OF ST. JOHN=66 +C=51 +CANTICLE OF CANTICLES=22 +COC=22 +COLOSSIANS=51 +D=5 +DANIEL=27 +DEUTERONOMY=5 +E=49 +ECCLESIASTES=21 +EPHESIANS=49 +ESTER=17 +ESTHER=17 +EXODUS=2 +EZEKIEL=26 +EZRA=15 +G=1 +GALATIANS=48 +GENESIS=1 +H=58 +HABAKKUK=35 +HAGGAI=37 +HEBREWS=58 +HOSEA=28 +I C=46 +I CHRONICLES=13 +I CORINTHIANS=46 +I JN=62 +I JOHN=62 +I KGS=11 +I KINGS=11 +I PETER=60 +I PTR=60 +I SAMUEL=9 +I THESSALONIANS=52 +I TIMOTHY=54 +IC=46 +ICHRONICLES=13 +ICORINTHIANS=46 +II C=47 +II CHRONICLES=14 +II CORINTHIANS=47 +II JN=63 +II JOHN=63 +II KGS=12 +II KINGS=12 +II PETER=61 +II PTR=61 +II SAMUEL=10 +II THESSALONIANS=53 +II TIMOTHY=55 +IIC=47 +IICHRONICLES=14 +IICORINTHIANS=47 +III JN=64 +III JOHN=64 +IIIJN=64 +IIIJOHN=64 +IIJN=63 +IIJOHN=63 +IIKGS=12 +IIKINGS=12 +IIPETER=61 +IIPTR=61 +IISAMUEL=10 +IITHESSALONIANS=53 +IITIMOTHY=55 +IJN=62 +IJOHN=62 +IKGS=11 +IKINGS=11 +IPETER=60 +IPTR=60 +ISA=23 +ISAIAH=23 +ISAMUEL=9 +ITHESSALONIANS=52 +ITIMOTHY=54 +J=43 +JAMES=59 +JAS=59 +JEREMIAH=24 +JN=43 +JO=43 +JOB=18 +JOEL=29 +JOHN=43 +JONAH=32 +JOSHUA=6 +JUD=7 +JUDE=65 +JUDGES=7 +L=42 +LAMENTATIONS=25 +LEVITICUS=3 +LK=42 +LUKE=42 +MA=40 +MALACHI=39 +MARK=41 +MATTHEW=40 +MICAH=33 +MK=41 +MR=41 +MT=40 +N=4 +NAHUM=34 +NEHEMIAH=16 +NUMBERS=4 +OBADIAH=31 +P=19 +PH=50 +PHILEMON=57 +PHILIPPIANS=50 +PHM=57 +PHP=50 +PROVERBS=20 +PSALMS=19 +PSM=19 +PSS=19 +REVELATION OF JOHN=66 +ROMANS=45 +RUTH=8 +SONG OF SOLOMON=22 +SONG OF SONGS=22 +SOS=22 +TITUS=56 +ZECHARIAH=38 +ZEPHANIAH=36 + +1. MÓZES=1 +2. MÓZES=2 +3. MÓZES=3 +4. MÓZES=4 +5. MÓZES=5 +JÓZSUÉ=6 +BÍRÁK=7 +RUTH=8 +1. SÁMUEL=9 +2. SÁMUEL=10 +1. KIRÁLYOK=11 +2. KIRÁLYOK=12 +1. KRÓNIKA=13 +2. KRÓNIKA=14 +EZSDRÁS=15 +NEHÉMIÁS=16 +ESZER=17 +JÓB=18 +ZSOLTÁROK=19 +PÉLDABESZÉDEK=20 +PRÉDIKÁTOR=21 +ÉNEKEK ÉNEKE=22 +ÉZSAIÁS=23 +JEREMIÁS=24 +JEREMIÁS SIRALMAI=25 +EZÉKIEL=26 +DÁNIEL=27 +HÓSEÁS=28 +JOEL=29 +ÁMOS=30 +ABDIÁS=31 +JÓNÁS=32 +MIKEÁS=33 +NÁHUM=34 +HABAKUK=35 +SOFÓNIÁS=36 +AGGEUS=37 +ZAKARIÁS=38 +MALAKIÁS=39 +MÁTÉ=40 +MÁRK=41 +LUKÁCS=42 +JÁNOS=43 +APOSTOLOK CSELEKEDETEI=44 +RÓMA=45 +1. KORINTUS=46 +2. KORINTUS=47 +GALATA=48 +EFÉZUS=49 +FILIPPI=50 +KOLOSSÉ=51 +1. THESSALONIKA=52 +2. THESSALONIKA=53 +1. TIMÓTEUS=54 +2. TIMÓTEUS=55 +TITUSZ=56 +FILEMON=57 +ZSIDÓKHOZ ÍRT LEVÉL=58 +JAKAB=59 +1. PÉTER=60 +2. PÉTER=61 +1. JÁNOS=62 +2. JÁNOS=63 +3. JÁNOS=64 +JÚDÁS=65 +JELENÉSEK=66 diff --git a/src/frontend/swdisp.cpp b/src/frontend/swdisp.cpp index 412ce2e..bdb0a74 100644 --- a/src/frontend/swdisp.cpp +++ b/src/frontend/swdisp.cpp @@ -7,6 +7,8 @@ #include #include +SWORD_NAMESPACE_START + static const char *classes[] = {"SWDisplay", "SWObject", 0}; SWClass SWDisplay::classdef(classes); @@ -25,3 +27,5 @@ char SWDisplay::Display(SWModule &imodule) std::cout << (const char *)imodule; return 0; } + +SWORD_NAMESPACE_END diff --git a/src/frontend/swlog.cpp b/src/frontend/swlog.cpp index 15f26fb..a924b57 100644 --- a/src/frontend/swlog.cpp +++ b/src/frontend/swlog.cpp @@ -13,6 +13,7 @@ #include "swlog.h" //--------------------------------------------------------------------------- +SWORD_NAMESPACE_START SWLog *SWLog::systemlog = 0; @@ -129,4 +130,6 @@ void SWLog::LogInformation(char *fmt, ...) std::cout << std::endl; #endif } -} +} + +SWORD_NAMESPACE_END diff --git a/src/keys/listkey.cpp b/src/keys/listkey.cpp index 4b06298..557e36e 100644 --- a/src/keys/listkey.cpp +++ b/src/keys/listkey.cpp @@ -10,6 +10,8 @@ #include #include +SWORD_NAMESPACE_START + static const char *classes[] = {"ListKey", "SWKey", "SWObject", 0}; SWClass ListKey::classdef(classes); @@ -288,5 +290,5 @@ const char *ListKey::getText() const { return (key) ? key->getText() : keytext; } - +SWORD_NAMESPACE_END diff --git a/src/keys/strkey.cpp b/src/keys/strkey.cpp index 7e2d539..15cffe4 100644 --- a/src/keys/strkey.cpp +++ b/src/keys/strkey.cpp @@ -10,6 +10,7 @@ #include #include +SWORD_NAMESPACE_START static const char *classes[] = {"StrKey", "SWKey", "SWObject", 0}; SWClass StrKey::classdef(classes); @@ -39,3 +40,5 @@ void StrKey::init() { StrKey::~StrKey() { } + +SWORD_NAMESPACE_END diff --git a/src/keys/swkey.cpp b/src/keys/swkey.cpp index 1551284..94f0908 100644 --- a/src/keys/swkey.cpp +++ b/src/keys/swkey.cpp @@ -8,6 +8,8 @@ #include #include +SWORD_NAMESPACE_START + static const char *classes[] = {"SWKey", "SWObject", 0}; SWClass SWKey::classdef(classes); @@ -209,3 +211,5 @@ void SWKey::increment(int) { void SWKey::decrement(int) { error = KEYERR_OUTOFBOUNDS; } + +SWORD_NAMESPACE_END diff --git a/src/keys/treekey.cpp b/src/keys/treekey.cpp index d92b7a4..ce94775 100644 --- a/src/keys/treekey.cpp +++ b/src/keys/treekey.cpp @@ -1,7 +1,7 @@ /****************************************************************************** * versekey.h - code for class 'versekey'- a standard Biblical verse key * - * $Id: treekey.cpp,v 1.2 2002/04/15 21:26:44 scribe Exp $ + * $Id: treekey.cpp,v 1.3 2002/10/01 19:52:40 dglassey Exp $ * * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -22,9 +22,13 @@ #include +SWORD_NAMESPACE_START + static const char *classes[] = {"TreeKey", "SWKey", "SWObject", 0}; SWClass TreeKey::classdef(classes); void TreeKey::init() { myclass = &classdef; } + +SWORD_NAMESPACE_END diff --git a/src/keys/treekeyidx.cpp b/src/keys/treekeyidx.cpp index 99bd62f..d5d32fe 100644 --- a/src/keys/treekeyidx.cpp +++ b/src/keys/treekeyidx.cpp @@ -1,7 +1,7 @@ /****************************************************************************** * versekey.h - code for class 'versekey'- a standard Biblical verse key * - * $Id: treekeyidx.cpp,v 1.9 2002/09/30 10:35:26 dglassey Exp $ + * $Id: treekeyidx.cpp,v 1.11 2002/10/01 22:04:58 dglassey Exp $ * * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -32,6 +32,8 @@ #include #endif +SWORD_NAMESPACE_START + static const char nl = '\n'; static const char *classes[] = {"TreeKeyIdx", "TreeKey", "SWKey", "SWObject", 0}; SWClass TreeKeyIdx::classdef(classes); @@ -127,12 +129,12 @@ void TreeKeyIdx::save() { const char *TreeKeyIdx::getFullName() const { TreeNode parent; - static string fullPath; + static std::string fullPath; fullPath = currentNode.name; parent.parent = currentNode.parent; while (parent.parent > -1) { getTreeNodeFromIdxOffset(parent.parent, &parent); - fullPath = ((string)parent.name) + (string) "/" + fullPath; + fullPath = ((std::string)parent.name) + (std::string) "/" + fullPath; } return fullPath.c_str(); } @@ -303,7 +305,7 @@ void TreeKeyIdx::getTreeNodeFromDatOffset(long ioffset, TreeNode *node) const { read(datfd->getFd(), &tmp, 4); node->firstChild = swordtoarch32(tmp); - string name; + std::string name; do { read(datfd->getFd(), &ch, 1); name += ch; @@ -594,3 +596,4 @@ SWKey *TreeKeyIdx::clone() const return new TreeKeyIdx(*this); } +SWORD_NAMESPACE_END diff --git a/src/keys/versekey.cpp b/src/keys/versekey.cpp index 7368eeb..c9f50ab 100644 --- a/src/keys/versekey.cpp +++ b/src/keys/versekey.cpp @@ -20,10 +20,9 @@ #include #include #include -extern "C" { #include -} +SWORD_NAMESPACE_START static const char *classes[] = {"VerseKey", "SWKey", "SWObject", 0}; SWClass VerseKey::classdef(classes); @@ -1479,3 +1478,4 @@ const char *VerseKey::getRangeText() const { return rangeText; } +SWORD_NAMESPACE_END diff --git a/src/mgr/encfiltmgr.cpp b/src/mgr/encfiltmgr.cpp index ab55de9..8360248 100644 --- a/src/mgr/encfiltmgr.cpp +++ b/src/mgr/encfiltmgr.cpp @@ -31,6 +31,8 @@ #include +SWORD_NAMESPACE_START + /****************************************************************************** * EncodingFilterMgr Constructor - initializes instance of EncodingFilterMgr * @@ -80,7 +82,7 @@ void EncodingFilterMgr::AddRawFilters(SWModule *module, ConfigEntMap §ion) { ConfigEntMap::iterator entry; - string encoding = ((entry = section.find("Encoding")) != section.end()) ? (*entry).second : (string)""; + std::string encoding = ((entry = section.find("Encoding")) != section.end()) ? (*entry).second : (std::string)""; if (encoding.empty() || !stricmp(encoding.c_str(), "Latin-1")) { module->AddRawFilter(latin1utf8); } @@ -146,3 +148,5 @@ char EncodingFilterMgr::Encoding(char enc) { } return encoding; } + +SWORD_NAMESPACE_END diff --git a/src/mgr/filemgr.cpp b/src/mgr/filemgr.cpp index 0b31576..09082d2 100644 --- a/src/mgr/filemgr.cpp +++ b/src/mgr/filemgr.cpp @@ -2,7 +2,7 @@ * filemgr.cpp - implementation of class FileMgr used for pooling file * handles * - * $Id: filemgr.cpp,v 1.22 2002/07/31 20:26:38 scribe Exp $ + * $Id: filemgr.cpp,v 1.23 2002/10/01 19:52:40 dglassey Exp $ * * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -35,6 +35,8 @@ #include #endif +SWORD_NAMESPACE_START + // ---------------- statics ----------------- FileMgr FileMgr::systemFileMgr; @@ -264,3 +266,5 @@ signed char FileMgr::existsDir(const char *ipath, const char *idirName) delete [] path; return retVal; } + +SWORD_NAMESPACE_END diff --git a/src/mgr/localemgr.cpp b/src/mgr/localemgr.cpp index bc12f4c..bd43574 100644 --- a/src/mgr/localemgr.cpp +++ b/src/mgr/localemgr.cpp @@ -2,7 +2,7 @@ * localemgr.cpp - implementation of class LocaleMgr used to interact with * registered locales for a sword installation * - * $Id: localemgr.cpp,v 1.12 2002/06/19 09:24:44 scribe Exp $ + * $Id: localemgr.cpp,v 1.14 2002/10/01 22:04:59 dglassey Exp $ * * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -39,6 +39,7 @@ #include #include +SWORD_NAMESPACE_START LocaleMgr LocaleMgr::systemLocaleMgr; @@ -47,7 +48,7 @@ LocaleMgr::LocaleMgr(const char *iConfigPath) { char *prefixPath = 0; char *configPath = 0; char configType = 0; - string path; + std::string path; defaultLocaleName = 0; @@ -103,7 +104,7 @@ LocaleMgr::~LocaleMgr() { void LocaleMgr::loadConfigDir(const char *ipath) { DIR *dir; struct dirent *ent; - string newmodfile; + std::string newmodfile; LocaleMap::iterator it; if ((dir = opendir(ipath))) { @@ -153,8 +154,8 @@ SWLocale *LocaleMgr::getLocale(const char *name) { } -list LocaleMgr::getAvailableLocales() { - list retVal; +std::list LocaleMgr::getAvailableLocales() { + std::list retVal; for (LocaleMap::iterator it = locales.begin(); it != locales.end(); it++) retVal.push_back((*it).second->getName()); @@ -182,3 +183,5 @@ const char *LocaleMgr::getDefaultLocaleName() { void LocaleMgr::setDefaultLocaleName(const char *name) { stdstr(&defaultLocaleName, name); } + +SWORD_NAMESPACE_END diff --git a/src/mgr/markupfiltmgr.cpp b/src/mgr/markupfiltmgr.cpp index 8dc68ea..2069089 100644 --- a/src/mgr/markupfiltmgr.cpp +++ b/src/mgr/markupfiltmgr.cpp @@ -37,6 +37,7 @@ #include +SWORD_NAMESPACE_START /****************************************************************************** * MarkupFilterMgr Constructor - initializes instance of MarkupFilterMgr @@ -234,3 +235,5 @@ void MarkupFilterMgr::CreateFilters(char markup) { } } + +SWORD_NAMESPACE_END diff --git a/src/mgr/swcacher.cpp b/src/mgr/swcacher.cpp index 8128a70..ef04d98 100644 --- a/src/mgr/swcacher.cpp +++ b/src/mgr/swcacher.cpp @@ -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.cpp,v 1.1 2002/03/16 01:12:37 scribe Exp $ + * $Id: swcacher.cpp,v 1.2 2002/10/01 19:52:40 dglassey Exp $ * * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -22,6 +22,8 @@ #include +SWORD_NAMESPACE_START + SWCacher::SWCacher() { } @@ -41,3 +43,5 @@ long SWCacher::resourceConsumption() { long SWCacher::lastAccess() { return 0; } + +SWORD_NAMESPACE_END diff --git a/src/mgr/swconfig.cpp b/src/mgr/swconfig.cpp index d73d475..e29113d 100644 --- a/src/mgr/swconfig.cpp +++ b/src/mgr/swconfig.cpp @@ -2,7 +2,7 @@ * swconfig.cpp - implementation of Class SWConfig used for saving and * retrieval of configuration information * - * $Id: swconfig.cpp,v 1.9 2002/07/28 01:48:38 scribe Exp $ + * $Id: swconfig.cpp,v 1.11 2002/10/01 22:04:59 dglassey Exp $ * * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -23,6 +23,7 @@ #include #include +SWORD_NAMESPACE_START SWConfig::SWConfig(const char * ifilename) { filename = ifilename; @@ -34,7 +35,7 @@ SWConfig::~SWConfig() { } -char SWConfig::getline(FILE *fp, string &line) +char SWConfig::getline(FILE *fp, std::string &line) { char retval = 0; char buf[255]; @@ -64,9 +65,9 @@ char SWConfig::getline(FILE *fp, string &line) void SWConfig::Load() { FILE *cfile; char *buf, *data; - string line; + std::string line; ConfigEntMap cursect; - string sectname; + std::string sectname; bool first = true; Sections.erase(Sections.begin(), Sections.end()); @@ -105,10 +106,10 @@ void SWConfig::Load() { void SWConfig::Save() { FILE *cfile; - string buf; + std::string buf; SectionMap::iterator sit; ConfigEntMap::iterator entry; - string sectname; + std::string sectname; if ((cfile = fopen(filename.c_str(), "w"))) { @@ -161,3 +162,5 @@ void SWConfig::augment(SWConfig &addFrom) { ConfigEntMap & SWConfig::operator [] (const char *section) { return Sections[section]; } + +SWORD_NAMESPACE_END diff --git a/src/mgr/swfiltermgr.cpp b/src/mgr/swfiltermgr.cpp index 264b5a6..26ba98a 100644 --- a/src/mgr/swfiltermgr.cpp +++ b/src/mgr/swfiltermgr.cpp @@ -2,7 +2,7 @@ * swfiltermgr.cpp - definition of class SWFilterMgr used as an interface to * manage filters on a module * - * $Id: swfiltermgr.cpp,v 1.2 2001/11/30 12:04:34 scribe Exp $ + * $Id: swfiltermgr.cpp,v 1.3 2002/10/01 19:52:40 dglassey Exp $ * * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -22,6 +22,8 @@ #include +SWORD_NAMESPACE_START + SWFilterMgr::SWFilterMgr() { } @@ -88,3 +90,4 @@ void SWFilterMgr::AddStripFilters(SWModule * module, ConfigEntMap & section) { void SWFilterMgr::AddRawFilters(SWModule * module, ConfigEntMap & section) { } +SWORD_NAMESPACE_END diff --git a/src/mgr/swlocale.cpp b/src/mgr/swlocale.cpp index d85d1eb..8cf1e96 100644 --- a/src/mgr/swlocale.cpp +++ b/src/mgr/swlocale.cpp @@ -2,7 +2,7 @@ * swlocale.cpp - implementation of Class SWLocale used for retrieval * of locale lookups * - * $Id: swlocale.cpp,v 1.4 2002/07/28 01:48:38 scribe Exp $ + * $Id: swlocale.cpp,v 1.5 2002/10/01 19:52:40 dglassey Exp $ * * Copyright 2000 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -23,6 +23,7 @@ #include #include +SWORD_NAMESPACE_START SWLocale::SWLocale(const char * ifilename) { ConfigEntMap::iterator confEntry; @@ -138,3 +139,5 @@ void SWLocale::getBooks(char **iBMAX, struct sbook ***ibooks) { *iBMAX = BMAX; *ibooks = books; } + +SWORD_NAMESPACE_END diff --git a/src/mgr/swmgr.cpp b/src/mgr/swmgr.cpp index ff36acc..8504fb0 100644 --- a/src/mgr/swmgr.cpp +++ b/src/mgr/swmgr.cpp @@ -2,7 +2,7 @@ * swmgr.cpp - implementaion of class SWMgr used to interact with an install * base of sword modules. * - * $Id: swmgr.cpp,v 1.79 2002/08/09 05:53:48 scribe Exp $ + * $Id: swmgr.cpp,v 1.81 2002/10/01 22:04:59 dglassey Exp $ * * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -67,19 +67,23 @@ #include #include #include - +#ifndef EXCLUDEZLIB +#include "zipcomprs.h" +#endif #ifdef _ICU_ #include +#endif + +SWORD_NAMESPACE_START + +#ifdef _ICU_ bool SWMgr::isICU = true; #else bool SWMgr::isICU = false; #endif -#ifndef EXCLUDEZLIB -#include -#endif bool SWMgr::debug = false; @@ -210,7 +214,7 @@ void SWMgr::commonInit(SWConfig * iconfig, SWConfig * isysconfig, bool autoload, SWMgr::SWMgr(const char *iConfigPath, bool autoload, SWFilterMgr *filterMgr) { - string path; + std::string path; this->filterMgr = filterMgr; if (filterMgr) @@ -267,8 +271,8 @@ SWMgr::~SWMgr() { } -void SWMgr::findConfig(char *configType, char **prefixPath, char **configPath, list *augPaths) { - string path; +void SWMgr::findConfig(char *configType, char **prefixPath, char **configPath, std::list *augPaths) { + std::string path; ConfigEntMap::iterator entry; ConfigEntMap::iterator lastEntry; @@ -512,7 +516,7 @@ void SWMgr::loadConfigDir(const char *ipath) { DIR *dir; struct dirent *ent; - string newmodfile; + std::string newmodfile; if ((dir = opendir(ipath))) { rewinddir(dir); @@ -542,7 +546,7 @@ void SWMgr::loadConfigDir(const char *ipath) void SWMgr::augmentModules(const char *ipath) { - string path = ipath; + std::string path = ipath; if ((ipath[strlen(ipath)-1] != '\\') && (ipath[strlen(ipath)-1] != '/')) path += "/"; if (FileMgr::existsDir(path.c_str(), "mods.d")) { @@ -610,13 +614,13 @@ signed char SWMgr::Load() { CreateMods(); - for (list::iterator pathIt = augPaths.begin(); pathIt != augPaths.end(); pathIt++) { + for (std::list::iterator pathIt = augPaths.begin(); pathIt != augPaths.end(); pathIt++) { augmentModules(pathIt->c_str()); } // augment config with ~/.sword/mods.d if it exists --------------------- char *envhomedir = getenv ("HOME"); if (envhomedir != NULL && configType != 2) { // 2 = user only - string path = envhomedir; + std::string path = envhomedir; if ((envhomedir[strlen(envhomedir)-1] != '\\') && (envhomedir[strlen(envhomedir)-1] != '/')) path += "/"; path += ".sword/"; @@ -635,22 +639,22 @@ signed char SWMgr::Load() { return ret; } -SWModule *SWMgr::CreateMod(string name, string driver, ConfigEntMap §ion) +SWModule *SWMgr::CreateMod(std::string name, std::string driver, ConfigEntMap §ion) { - string description, datapath, misc1; + std::string description, datapath, misc1; ConfigEntMap::iterator entry; SWModule *newmod = 0; - string lang, sourceformat, encoding; + std::string lang, sourceformat, encoding; signed char direction, enc, markup; - description = ((entry = section.find("Description")) != section.end()) ? (*entry).second : (string)""; - lang = ((entry = section.find("Lang")) != section.end()) ? (*entry).second : (string)"en"; - sourceformat = ((entry = section.find("SourceType")) != section.end()) ? (*entry).second : (string)""; - encoding = ((entry = section.find("Encoding")) != section.end()) ? (*entry).second : (string)""; + description = ((entry = section.find("Description")) != section.end()) ? (*entry).second : (std::string)""; + lang = ((entry = section.find("Lang")) != section.end()) ? (*entry).second : (std::string)"en"; + sourceformat = ((entry = section.find("SourceType")) != section.end()) ? (*entry).second : (std::string)""; + encoding = ((entry = section.find("Encoding")) != section.end()) ? (*entry).second : (std::string)""; datapath = prefixPath; if ((prefixPath[strlen(prefixPath)-1] != '\\') && (prefixPath[strlen(prefixPath)-1] != '/')) datapath += "/"; - misc1 += ((entry = section.find("DataPath")) != section.end()) ? (*entry).second : (string)""; + misc1 += ((entry = section.find("DataPath")) != section.end()) ? (*entry).second : (std::string)""; char *buf = new char [ strlen(misc1.c_str()) + 1 ]; char *buf2 = buf; strcpy(buf, misc1.c_str()); @@ -694,7 +698,7 @@ SWModule *SWMgr::CreateMod(string name, string driver, ConfigEntMap §ion) if ((!stricmp(driver.c_str(), "zText")) || (!stricmp(driver.c_str(), "zCom"))) { SWCompress *compress = 0; int blockType = CHAPTERBLOCKS; - misc1 = ((entry = section.find("BlockType")) != section.end()) ? (*entry).second : (string)"CHAPTER"; + misc1 = ((entry = section.find("BlockType")) != section.end()) ? (*entry).second : (std::string)"CHAPTER"; if (!stricmp(misc1.c_str(), "VERSE")) blockType = VERSEBLOCKS; else if (!stricmp(misc1.c_str(), "CHAPTER")) @@ -702,7 +706,7 @@ SWModule *SWMgr::CreateMod(string name, string driver, ConfigEntMap §ion) else if (!stricmp(misc1.c_str(), "BOOK")) blockType = BOOKBLOCKS; - misc1 = ((entry = section.find("CompressType")) != section.end()) ? (*entry).second : (string)"LZSS"; + misc1 = ((entry = section.find("CompressType")) != section.end()) ? (*entry).second : (std::string)"LZSS"; #ifndef EXCLUDEZLIB if (!stricmp(misc1.c_str(), "ZIP")) compress = new ZipCompress(); @@ -736,7 +740,7 @@ SWModule *SWMgr::CreateMod(string name, string driver, ConfigEntMap §ion) } if (!stricmp(driver.c_str(), "HREFCom")) { - misc1 = ((entry = section.find("Prefix")) != section.end()) ? (*entry).second : (string)""; + misc1 = ((entry = section.find("Prefix")) != section.end()) ? (*entry).second : (std::string)""; newmod = new HREFCom(datapath.c_str(), misc1.c_str(), name.c_str(), description.c_str()); } @@ -749,11 +753,11 @@ SWModule *SWMgr::CreateMod(string name, string driver, ConfigEntMap §ion) if (!stricmp(driver.c_str(), "zLD")) { SWCompress *compress = 0; int blockCount; - misc1 = ((entry = section.find("BlockCount")) != section.end()) ? (*entry).second : (string)"200"; + misc1 = ((entry = section.find("BlockCount")) != section.end()) ? (*entry).second : (std::string)"200"; blockCount = atoi(misc1.c_str()); blockCount = (blockCount) ? blockCount : 200; - misc1 = ((entry = section.find("CompressType")) != section.end()) ? (*entry).second : (string)"LZSS"; + misc1 = ((entry = section.find("CompressType")) != section.end()) ? (*entry).second : (std::string)"LZSS"; #ifndef EXCLUDEZLIB if (!stricmp(misc1.c_str(), "ZIP")) compress = new ZipCompress(); @@ -818,10 +822,10 @@ void SWMgr::AddLocalOptions(SWModule *module, ConfigEntMap §ion, ConfigEntMa void SWMgr::AddRawFilters(SWModule *module, ConfigEntMap §ion) { - string sourceformat, cipherKey; + std::string sourceformat, cipherKey; ConfigEntMap::iterator entry; - cipherKey = ((entry = section.find("CipherKey")) != section.end()) ? (*entry).second : (string)""; + cipherKey = ((entry = section.find("CipherKey")) != section.end()) ? (*entry).second : (std::string)""; if (!cipherKey.empty()) { SWFilter *cipherFilter = new CipherFilter(cipherKey.c_str()); cipherFilters.insert(FilterMap::value_type(module->Name(), cipherFilter)); @@ -842,15 +846,15 @@ void SWMgr::AddEncodingFilters(SWModule *module, ConfigEntMap §ion) { void SWMgr::AddRenderFilters(SWModule *module, ConfigEntMap §ion) { - string sourceformat; + std::string sourceformat; ConfigEntMap::iterator entry; - sourceformat = ((entry = section.find("SourceType")) != section.end()) ? (*entry).second : (string)""; + sourceformat = ((entry = section.find("SourceType")) != section.end()) ? (*entry).second : (std::string)""; // Temporary: To support old module types // TODO: Remove at 1.6.0 release? if (sourceformat.empty()) { - sourceformat = ((entry = section.find("ModDrv")) != section.end()) ? (*entry).second : (string)""; + sourceformat = ((entry = section.find("ModDrv")) != section.end()) ? (*entry).second : (std::string)""; if (!stricmp(sourceformat.c_str(), "RawGBF")) sourceformat = "GBF"; else sourceformat = ""; @@ -869,13 +873,13 @@ void SWMgr::AddRenderFilters(SWModule *module, ConfigEntMap §ion) { void SWMgr::AddStripFilters(SWModule *module, ConfigEntMap §ion) { - string sourceformat; + std::string sourceformat; ConfigEntMap::iterator entry; - sourceformat = ((entry = section.find("SourceType")) != section.end()) ? (*entry).second : (string)""; + sourceformat = ((entry = section.find("SourceType")) != section.end()) ? (*entry).second : (std::string)""; // Temporary: To support old module types if (sourceformat.empty()) { - sourceformat = ((entry = section.find("ModDrv")) != section.end()) ? (*entry).second : (string)""; + sourceformat = ((entry = section.find("ModDrv")) != section.end()) ? (*entry).second : (std::string)""; if (!stricmp(sourceformat.c_str(), "RawGBF")) sourceformat = "GBF"; else sourceformat = ""; @@ -900,12 +904,12 @@ void SWMgr::CreateMods() { ConfigEntMap::iterator end; ConfigEntMap::iterator entry; SWModule *newmod; - string driver, misc1; + std::string driver, misc1; for (it = config->Sections.begin(); it != config->Sections.end(); it++) { ConfigEntMap §ion = (*it).second; newmod = 0; - driver = ((entry = section.find("ModDrv")) != section.end()) ? (*entry).second : (string)""; + driver = ((entry = section.find("ModDrv")) != section.end()) ? (*entry).second : (std::string)""; if (!driver.empty()) { newmod = CreateMod((*it).first, driver, section); if (newmod) { @@ -945,8 +949,8 @@ void SWMgr::InstallScan(const char *dirname) DIR *dir; struct dirent *ent; int conffd = 0; - string newmodfile; - string targetName; + std::string newmodfile; + std::string targetName; if (!access(dirname, 04)) { if ((dir = opendir(dirname))) { @@ -1082,3 +1086,5 @@ signed char SWMgr::setCipherKey(const char *modName, const char *key) { } return -1; } + +SWORD_NAMESPACE_END 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 #include +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 #include +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 +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 #include +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 #include +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 #include +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 #include #include + +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 #include +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 #include +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 #include +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 #include +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 #include +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 #include +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 #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 #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 #include +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 #include +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 #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 #include -#include +#include #include #include #include @@ -18,6 +18,7 @@ #include #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 #include +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 #include +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 +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 #include +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 #include -#include +#include #include #include +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 #include +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 #include +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 #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 #include +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 #include +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 #include +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 #include +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 +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 #include +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 #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 #include +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 #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 #include +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 #include +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 #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 #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 #include +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 #include -#include +#include #include #include #include @@ -18,6 +18,7 @@ #include #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 #include +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 #include +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 #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 +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 #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 #include +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 +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 +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 +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 #include +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 #include +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 #include +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 #include +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 +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 +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 +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 #endif +#include +#include #include #ifndef _ICUSWORD_ @@ -20,6 +22,8 @@ #endif #include +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 +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 +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 #include +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 #include +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 +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 #include +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 #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 #include +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 #endif -#include +#include #include #include #include @@ -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 #include +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 //#include +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 diff --git a/src/utilfuns/Greek2Greek.cpp b/src/utilfuns/Greek2Greek.cpp index 7e81f0f..b172f98 100644 --- a/src/utilfuns/Greek2Greek.cpp +++ b/src/utilfuns/Greek2Greek.cpp @@ -34,6 +34,8 @@ // method of transliteration. //***************************************************************************** +SWORD_NAMESPACE_START + unsigned char Greek2bGreek( unsigned char *sResult, unsigned char *sGreekText, @@ -899,3 +901,5 @@ int main() } #endif // __TEST + +SWORD_NAMESPACE_END diff --git a/src/utilfuns/swunicod.cpp b/src/utilfuns/swunicod.cpp index f42fd86..5fa5254 100644 --- a/src/utilfuns/swunicod.cpp +++ b/src/utilfuns/swunicod.cpp @@ -17,6 +17,7 @@ */ #include "swunicod.h" +SWORD_NAMESPACE_START unsigned char* UTF32to8 (unsigned long utf32, unsigned char * utf8) { unsigned int i; for (i = 0; i < 6; i++) utf8[i] = 0; @@ -137,3 +138,5 @@ unsigned long UTF8to32 (unsigned char * utf8) { } return utf32; } + +SWORD_NAMESPACE_END diff --git a/src/utilfuns/swversion.cpp b/src/utilfuns/swversion.cpp index 48c85ff..edb5881 100644 --- a/src/utilfuns/swversion.cpp +++ b/src/utilfuns/swversion.cpp @@ -3,6 +3,7 @@ #include #include +SWORD_NAMESPACE_START SWVersion SWVersion::currentVersion(SWORDVER); @@ -76,3 +77,5 @@ const char *SWVersion::getText() const { return buf; } + +SWORD_NAMESPACE_END diff --git a/src/utilfuns/unixstr.cpp b/src/utilfuns/unixstr.cpp index 7a975a2..6d9c330 100644 --- a/src/utilfuns/unixstr.cpp +++ b/src/utilfuns/unixstr.cpp @@ -2,6 +2,8 @@ #include +SWORD_NAMESPACE_START int stricmp(const char *s1, const char *s2) { return strcasecmp(s1, s2); } +SWORD_NAMESPACE_END diff --git a/src/utilfuns/utilconf.cpp b/src/utilfuns/utilconf.cpp index 5a32ca0..7b38937 100644 --- a/src/utilfuns/utilconf.cpp +++ b/src/utilfuns/utilconf.cpp @@ -13,7 +13,11 @@ * RET: error status */ +SWORD_NAMESPACE_START + char getconfent(char *filename, char *entryname, char *buf, int len) { return 0; } + +SWORD_NAMESPACE_END diff --git a/src/utilfuns/utilstr.cpp b/src/utilfuns/utilstr.cpp index 7363240..23d1f4b 100644 --- a/src/utilfuns/utilstr.cpp +++ b/src/utilfuns/utilstr.cpp @@ -13,6 +13,8 @@ #endif +SWORD_NAMESPACE_START + /****************************************************************************** * stdstr - Sets/gets a string * @@ -196,3 +198,5 @@ char *toupperstr_utf8(char *buf) { return ret; } + +SWORD_NAMESPACE_END diff --git a/testlib.cpp b/testlib.cpp index e74fbb6..282484d 100644 --- a/testlib.cpp +++ b/testlib.cpp @@ -5,7 +5,13 @@ #include //#include //#include - +#ifndef NO_SWORD_NAMESPACE +using sword::VerseKey; +using sword::RawText; +using sword::RawCom; +using sword::SWKey; +#endif +using std::cout; int main(int argc, char **argv) { diff --git a/tests/casttest.cpp b/tests/casttest.cpp index af7576b..7fdedca 100644 --- a/tests/casttest.cpp +++ b/tests/casttest.cpp @@ -2,6 +2,10 @@ #include #include #include +#ifndef NO_SWORD_NAMESPACE +using namespace sword; +#endif + int main(int argc, char **argv) { // VerseKey x("jas"); TreeKeyIdx x("jas"); diff --git a/tests/complzss.cpp b/tests/complzss.cpp index ed1cacb..d855897 100644 --- a/tests/complzss.cpp +++ b/tests/complzss.cpp @@ -14,6 +14,9 @@ #endif #include +#ifndef NO_SWORD_NAMESPACE +using namespace sword; +#endif class FileCompress: public LZSSCompress { int ifd; diff --git a/tests/compnone.cpp b/tests/compnone.cpp index a08c10e..770ccec 100644 --- a/tests/compnone.cpp +++ b/tests/compnone.cpp @@ -14,6 +14,9 @@ #endif #include +#ifndef NO_SWORD_NAMESPACE +using namespace sword; +#endif class FileCompress: public SWCompress { int ifd; diff --git a/tests/compzip.cpp b/tests/compzip.cpp index cbc5c5c..d53ff5f 100644 --- a/tests/compzip.cpp +++ b/tests/compzip.cpp @@ -12,6 +12,9 @@ #endif #include +#ifndef NO_SWORD_NAMESPACE +using namespace sword; +#endif class FileCompress: public ZipCompress { int ifd; diff --git a/tests/configtest.cpp b/tests/configtest.cpp index c6645eb..b616cd5 100644 --- a/tests/configtest.cpp +++ b/tests/configtest.cpp @@ -1,5 +1,8 @@ #include #include +#ifndef NO_SWORD_NAMESPACE +using sword::SWConfig; +#endif int main(int argc, char **argv) { SWConfig config("./test1.conf"); diff --git a/tests/filtertest.cpp b/tests/filtertest.cpp index 5206652..0301c49 100644 --- a/tests/filtertest.cpp +++ b/tests/filtertest.cpp @@ -4,6 +4,9 @@ #include #include #include +#ifndef NO_SWORD_NAMESPACE +using namespace sword; +#endif #define MAXBUF 30000 int main(int argc, char **argv) { diff --git a/tests/genbooktest.cpp b/tests/genbooktest.cpp index c97d4c9..4867161 100644 --- a/tests/genbooktest.cpp +++ b/tests/genbooktest.cpp @@ -4,7 +4,9 @@ #include #include #include - +#ifndef NO_SWORD_NAMESPACE +using namespace sword; +#endif void printTree(TreeKeyIdx treeKey, TreeKeyIdx *target = 0, int level = 1) { if (!target) @@ -54,7 +56,7 @@ void viewEntryText(RawGenBook *book) { void setEntryText(RawGenBook *book) { - string body; + std::string body; TreeKeyIdx *treeKey = (TreeKeyIdx *)(SWKey *)(*book); if (treeKey->getOffset()) { char buf[1023]; @@ -123,7 +125,7 @@ int main(int argc, char **argv) { TreeKeyIdx root = *((TreeKeyIdx *)((SWKey *)(*book))); treeKey = (TreeKeyIdx *)(SWKey *)(*book); - string input; + std::string input; char line[1024]; do { diff --git a/tests/indextest.cpp b/tests/indextest.cpp index 457a2e4..4c9f656 100644 --- a/tests/indextest.cpp +++ b/tests/indextest.cpp @@ -1,6 +1,9 @@ #include #include #include +#ifndef NO_SWORD_NAMESPACE +using namespace sword; +#endif int main(int argc, char **argv) { SWMgr mymgr; diff --git a/tests/introtest.cpp b/tests/introtest.cpp index bed10aa..162b960 100644 --- a/tests/introtest.cpp +++ b/tests/introtest.cpp @@ -2,6 +2,9 @@ #include #include #include +#ifndef NO_SWORD_NAMESPACE +using namespace sword; +#endif int main(int argc, char **argv) { SWMgr mymgr; diff --git a/tests/keycast.cpp b/tests/keycast.cpp index 4245592..9a28018 100644 --- a/tests/keycast.cpp +++ b/tests/keycast.cpp @@ -1,5 +1,8 @@ #include #include +#ifndef NO_SWORD_NAMESPACE +using namespace sword; +#endif int main (int argc, char* argv[]) { SWMgr mgr; diff --git a/tests/keytest.cpp b/tests/keytest.cpp index 2cb9e75..3df19a9 100644 --- a/tests/keytest.cpp +++ b/tests/keytest.cpp @@ -8,6 +8,10 @@ #include +#ifndef NO_SWORD_NAMESPACE +using namespace sword; +#endif + int main(int argc, char **argv) { int loop; diff --git a/tests/lextest.cpp b/tests/lextest.cpp index f918ff7..9119a2a 100644 --- a/tests/lextest.cpp +++ b/tests/lextest.cpp @@ -1,5 +1,8 @@ #include #include +#ifndef NO_SWORD_NAMESPACE +using namespace sword; +#endif int main(int argc, char **argv) { @@ -19,4 +22,5 @@ int main(int argc, char **argv) // lex << "y"; lex = BOTTOM; + return 0; } diff --git a/tests/listtest.cpp b/tests/listtest.cpp index 30316cd..7a9d77d 100644 --- a/tests/listtest.cpp +++ b/tests/listtest.cpp @@ -3,7 +3,9 @@ #include #include #include - +#ifndef NO_SWORD_NAMESPACE +using namespace sword; +#endif int main(int argc, char **argv) { diff --git a/tests/localetest.cpp b/tests/localetest.cpp index baf7333..df6d7da 100644 --- a/tests/localetest.cpp +++ b/tests/localetest.cpp @@ -1,6 +1,9 @@ #include #include #include +#ifndef NO_SWORD_NAMESPACE +using namespace sword; +#endif int main(int argc, char **argv) { if (argc != 3) { diff --git a/tests/mgrtest.cpp b/tests/mgrtest.cpp index 6a77328..d02b26e 100644 --- a/tests/mgrtest.cpp +++ b/tests/mgrtest.cpp @@ -1,6 +1,9 @@ #include #include #include +#ifndef NO_SWORD_NAMESPACE +using namespace sword; +#endif int main(int argc, char **argv) { SWMgr::debug = true; @@ -26,6 +29,6 @@ int main(int argc, char **argv) { for (mhc->Key("Gen 1:1"); mhc->Key() < (VerseKey) "Gen 1:10"; (*mhc)++) std::cout << (const char *) *mhc << "\n"; } - cin >> keypress; + std::cin >> keypress; return 0; } diff --git a/tests/modtest.cpp b/tests/modtest.cpp index c65cb12..37daabf 100644 --- a/tests/modtest.cpp +++ b/tests/modtest.cpp @@ -1,6 +1,9 @@ #include #include #include +#ifndef NO_SWORD_NAMESPACE +using namespace sword; +#endif int main(int argc, char **argv) { SWMgr mymgr; diff --git a/tests/parsekey.cpp b/tests/parsekey.cpp index 277abb5..bfda41e 100644 --- a/tests/parsekey.cpp +++ b/tests/parsekey.cpp @@ -4,6 +4,9 @@ #include #include +#ifndef NO_SWORD_NAMESPACE +using namespace sword; +#endif int main(int argc, char **argv) { if ((argc != 2) && (argc != 3)) { @@ -23,7 +26,7 @@ int main(int argc, char **argv) { for (int i = 0; i < verses.Count(); i++) { VerseKey *element = dynamic_cast(verses.GetElement(i)); if (element) { - std::cout << (string(element->LowerBound()) + " - " + string(element->UpperBound())).c_str() << "\n"; + std::cout << (std::string(element->LowerBound()) + " - " + std::string(element->UpperBound())).c_str() << "\n"; } else std::cout << (const char *)*verses.GetElement(i) << "\n"; // else { diff --git a/tests/romantest.cpp b/tests/romantest.cpp index 58c1fc2..3af0ae1 100644 --- a/tests/romantest.cpp +++ b/tests/romantest.cpp @@ -2,9 +2,11 @@ #include #include #include -extern "C" { #include -} + +#ifndef NO_SWORD_NAMESPACE +using sword::from_rom; +#endif int main(int argc, char **argv) { if (argc != 2) { diff --git a/tests/testblocks.cpp b/tests/testblocks.cpp index 3a3ace4..d4f5ed6 100644 --- a/tests/testblocks.cpp +++ b/tests/testblocks.cpp @@ -4,6 +4,9 @@ #include using namespace std; +#ifndef NO_SWORD_NAMESPACE +using namespace sword; +#endif void addEntry(EntriesBlock *eb) { string input; diff --git a/tests/treeidxtest.cpp b/tests/treeidxtest.cpp index 873a6b7..e7bfa2b 100644 --- a/tests/treeidxtest.cpp +++ b/tests/treeidxtest.cpp @@ -4,6 +4,9 @@ #include #include +#ifndef NO_SWORD_NAMESPACE +using namespace sword; +#endif void printTree(TreeKeyIdx treeKey, TreeKeyIdx *target = 0, int level = 1) { if (!target) diff --git a/utilities/addgb.cpp b/utilities/addgb.cpp index 4926725..034dc5e 100644 --- a/utilities/addgb.cpp +++ b/utilities/addgb.cpp @@ -21,6 +21,13 @@ #define O_BINARY 0 #endif +#ifndef NO_SWORD_NAMESPACE +using sword::TreeKeyIdx; +using sword::RawGenBook; +using sword::SWKey; +#endif + + void printTree(TreeKeyIdx treeKey, TreeKeyIdx *target = 0, int level = 1) { if (!target) target = &treeKey; diff --git a/utilities/addld.cpp b/utilities/addld.cpp index 272460a..0171445 100644 --- a/utilities/addld.cpp +++ b/utilities/addld.cpp @@ -16,6 +16,14 @@ #include #include +#ifndef NO_SWORD_NAMESPACE +using sword::SWMgr; +using sword::ZipCompress; +using sword::RawLD4; +using sword::SWKey; +using sword::zLD; +using sword::RawLD; +#endif #ifndef O_BINARY #define O_BINARY 0 diff --git a/utilities/addvs.cpp b/utilities/addvs.cpp index 1efeede..b736c00 100644 --- a/utilities/addvs.cpp +++ b/utilities/addvs.cpp @@ -14,6 +14,14 @@ #include #include +#ifndef NO_SWORD_NAMESPACE +using sword::SWMgr; +using sword::RawText; +using sword::SWKey; +using sword::VerseKey; +using sword::ListKey; +using sword::SWModule; +#endif #ifndef O_BINARY #define O_BINARY 0 @@ -73,7 +81,7 @@ int main(int argc, char **argv) { if (element) { mod->Key(element->LowerBound()); VerseKey finalkey = element->UpperBound(); - std::cout << (const char*)mod->Key() << "-" << (const char*)finalkey << endl; + std::cout << (const char*)mod->Key() << "-" << (const char*)finalkey << std::endl; if (!havefirst) { havefirst = true; firstverse = mod->Key(); @@ -87,11 +95,11 @@ int main(int argc, char **argv) { entrysize = fread(buffer, sizeof(char), sizeof(buffer), infile); mod->setEntry(buffer, entrysize); // save text to module at current position - std::cout << "f" << (const char*)firstverse << endl; + std::cout << "f" << (const char*)firstverse << std::endl; (*mod)++; } while (mod->Key() <= finalkey) { - std::cout << (const char*)mod->Key() << endl; + std::cout << (const char*)mod->Key() << std::endl; *(SWModule*)mod << &firstverse; (*mod)++; } @@ -100,7 +108,7 @@ int main(int argc, char **argv) { if (havefirst) { mod->Key(*listkey.GetElement(i)); *(SWModule*)mod << &firstverse; - std::cout << (const char*)mod->Key() << endl; + std::cout << (const char*)mod->Key() << std::endl; } else { mod->Key(*listkey.GetElement(i)); @@ -116,7 +124,7 @@ int main(int argc, char **argv) { entrysize = fread(buffer, sizeof(char), sizeof(buffer), infile); mod->setEntry(buffer, entrysize); // save text to module at current position - std::cout << "f" << (const char*)firstverse << endl; + std::cout << "f" << (const char*)firstverse << std::endl; } } } diff --git a/utilities/cipherraw.cpp b/utilities/cipherraw.cpp index 8550609..a297f86 100644 --- a/utilities/cipherraw.cpp +++ b/utilities/cipherraw.cpp @@ -14,7 +14,11 @@ #include #include #include - +#ifndef NO_SWORD_NAMESPACE +using sword::SWCipher; +using sword::VerseKey; +using sword::RawVerse; +#endif int main(int argc, char **argv) { SWCipher *zobj; diff --git a/utilities/ciphertest.cpp b/utilities/ciphertest.cpp index b889324..26d3495 100644 --- a/utilities/ciphertest.cpp +++ b/utilities/ciphertest.cpp @@ -13,7 +13,11 @@ #include #include #include - +#ifndef NO_SWORD_NAMESPACE +using sword::SWCipher; +using sword::VerseKey; +using sword::RawVerse; +#endif int main(int argc, char **argv) { SWCipher *zobj; diff --git a/utilities/ciphertest2.cpp b/utilities/ciphertest2.cpp index 5c7014e..bac5c0c 100644 --- a/utilities/ciphertest2.cpp +++ b/utilities/ciphertest2.cpp @@ -14,6 +14,11 @@ #include #include +#ifndef NO_SWORD_NAMESPACE +using sword::VerseKey; +using sword::RawText; +using sword::CipherFilter; +#endif int main(int argc, char **argv) { VerseKey key; diff --git a/utilities/emptyvss.cpp b/utilities/emptyvss.cpp index 4224c16..10a5b28 100644 --- a/utilities/emptyvss.cpp +++ b/utilities/emptyvss.cpp @@ -2,6 +2,15 @@ #include #include +#ifndef NO_SWORD_NAMESPACE +using sword::SWMgr; +using sword::VerseKey; +using sword::ModMap; +using sword::SWKey; +using sword::SWModule; +using sword::SW_POSITION; +#endif + int main(int argc, char **argv) { if (argc < 2) { fprintf(stderr, "usage: %s \n", argv[0]); diff --git a/utilities/imp2gbs.cpp b/utilities/imp2gbs.cpp index 73d72ea..b693e0f 100644 --- a/utilities/imp2gbs.cpp +++ b/utilities/imp2gbs.cpp @@ -19,6 +19,12 @@ #define O_BINARY 0 #endif +#ifndef NO_SWORD_NAMESPACE +using sword::TreeKeyIdx; +using sword::RawGenBook; +using sword::SWKey; +#endif + void printTree(TreeKeyIdx treeKey, TreeKeyIdx *target = 0, int level = 1) { if (!target) target = &treeKey; @@ -64,7 +70,7 @@ void setkey (TreeKeyIdx * treeKey, char* keybuffer) { treeKey->save(); } - //DEBUG std::cout << treeKey->getLocalName() << " : " << tok << endl; + //DEBUG std::cout << treeKey->getLocalName() << " : " << tok << std::endl; tok = strtok(NULL, "/"); @@ -126,7 +132,7 @@ int main(int argc, char **argv) { while (readline(infile, linebuffer)) { if (!strncmp(linebuffer, "$$$", 3)) { if (strlen(keybuffer) && strlen(entbuffer)) { - std::cout << keybuffer << endl; + std::cout << keybuffer << std::endl; treeKey->root(); setkey(treeKey, keybuffer); book->setEntry(entbuffer, strlen(entbuffer)); @@ -142,7 +148,7 @@ int main(int argc, char **argv) { //handle final entry if (strlen(keybuffer) && strlen(entbuffer)) { - std::cout << keybuffer << endl; + std::cout << keybuffer << std::endl; treeKey->root(); setkey(treeKey, keybuffer); book->setEntry(entbuffer, strlen(entbuffer)); diff --git a/utilities/imp2ld.cpp b/utilities/imp2ld.cpp index 86c8394..ff265a7 100644 --- a/utilities/imp2ld.cpp +++ b/utilities/imp2ld.cpp @@ -21,6 +21,14 @@ #define O_BINARY 0 #endif +#ifndef NO_SWORD_NAMESPACE +using sword::zLD; +using sword::ZipCompress; +using sword::RawLD4; +using sword::RawLD; +using sword::SWKey; +#endif + int readline(FILE* infile, char* linebuffer) { signed char c; char* lbPtr = linebuffer; diff --git a/utilities/imp2vs.cpp b/utilities/imp2vs.cpp index c7ee1c6..c4365d2 100644 --- a/utilities/imp2vs.cpp +++ b/utilities/imp2vs.cpp @@ -18,6 +18,13 @@ #define O_BINARY 0 #endif +#ifndef NO_SWORD_NAMESPACE +using sword::RawText; +using sword::VerseKey; +using sword::SWText; +using sword::ListKey; +#endif + int readline(FILE* infile, char* linebuffer) { signed char c; char* lbPtr = linebuffer; diff --git a/utilities/mkfastmod.cpp b/utilities/mkfastmod.cpp index a1664f8..2553af6 100644 --- a/utilities/mkfastmod.cpp +++ b/utilities/mkfastmod.cpp @@ -1,6 +1,13 @@ #include #include #include +#ifndef NO_SWORD_NAMESPACE +using sword::SWMgr; +using sword::SWModule; +using sword::ListKey; +using sword::VerseKey; +using sword::ModMap; +#endif int main(int argc, char **argv) { diff --git a/utilities/mod2imp.cpp b/utilities/mod2imp.cpp index 1bc5ece..a979407 100644 --- a/utilities/mod2imp.cpp +++ b/utilities/mod2imp.cpp @@ -20,10 +20,20 @@ #include #include +#ifndef NO_SWORD_NAMESPACE +using sword::SWModule; +using sword::SWMgr; +using sword::ModMap; +using sword::SWKey; +using sword::VerseKey; +using sword::SW_POSITION; +#endif + + void errorOutHelp(char *appName) { - cerr << appName << " - a tool to output a Sword module in SWORD's 'imp' import format\n"; - cerr << "usage: "<< appName << " \n"; - cerr << "\n\n"; + std::cerr << appName << " - a tool to output a Sword module in SWORD's 'imp' import format\n"; + std::cerr << "usage: "<< appName << " \n"; + std::cerr << "\n\n"; exit(-1); } @@ -57,8 +67,8 @@ int main(int argc, char **argv) vkey->Headings(1); for ((*inModule) = TOP; !inModule->Error(); (*inModule)++) { - cout << "$$$" << inModule->KeyText() << endl; - cout << inModule->getRawEntry() << endl; + std::cout << "$$$" << inModule->KeyText() << std::endl; + std::cout << inModule->getRawEntry() << std::endl; } return 0; } diff --git a/utilities/mod2osis.cpp b/utilities/mod2osis.cpp index e9327e4..250ceee 100644 --- a/utilities/mod2osis.cpp +++ b/utilities/mod2osis.cpp @@ -22,6 +22,13 @@ #include #include +#ifndef NO_SWORD_NAMESPACE +using namespace sword; +#endif +using std::endl; +using std::cerr; +using std::cout; + void errorOutHelp(char *appName) { cerr << appName << " - a tool to output a Sword module in OSIS format\n"; cerr << "usage: "<< appName << " \n"; diff --git a/utilities/mod2vpl.cpp b/utilities/mod2vpl.cpp index d5b11ed..1cbf398 100644 --- a/utilities/mod2vpl.cpp +++ b/utilities/mod2vpl.cpp @@ -1,6 +1,14 @@ #include #include #include +#ifndef NO_SWORD_NAMESPACE +using sword::SWMgr; +using sword::VerseKey; +using sword::SWModule; +using sword::SWKey; +using sword::SW_POSITION; +using sword::ModMap; +#endif void cleanbuf(char *buf) { char *from = buf; diff --git a/utilities/mod2zmod.cpp b/utilities/mod2zmod.cpp index de7a3e3..d635047 100644 --- a/utilities/mod2zmod.cpp +++ b/utilities/mod2zmod.cpp @@ -20,6 +20,26 @@ #include #include #include +#ifndef NO_SWORD_NAMESPACE +using sword::SWCompress; +using sword::CipherFilter; +using sword::SWModule; +using sword::SWMgr; +using sword::ModMap; +using sword::zText; +using sword::zLD; +using sword::zCom; +using sword::SWFilter; +using sword::VerseKey; +using sword::SWKey; +using sword::SW_POSITION; +using sword::ZipCompress; +using sword::LZSSCompress; +#endif + +using std::cerr; +using std::string; +using std::cout; void errorOutHelp(char *appName) { cerr << appName << " - a tool to create compressed Sword modules\n"; diff --git a/utilities/modwrite.cpp b/utilities/modwrite.cpp index 1caee81..32a7759 100644 --- a/utilities/modwrite.cpp +++ b/utilities/modwrite.cpp @@ -3,7 +3,7 @@ #include #include #include -#include +//#include #ifndef __GNUC__ #include @@ -14,6 +14,14 @@ #include #include +#ifndef NO_SWORD_NAMESPACE +using sword::SWMgr; +using sword::SWModule; +using sword::ModMap; +using sword::SWKey; +#endif + +using std::cerr; int main(int argc, char **argv) { diff --git a/utilities/step2vpl.cpp b/utilities/step2vpl.cpp index e43b1bd..06e0aeb 100644 --- a/utilities/step2vpl.cpp +++ b/utilities/step2vpl.cpp @@ -17,6 +17,9 @@ #endif using namespace std; +#ifndef NO_SWORD_NAMESPACE +using namespace sword; +#endif long SECTIONSLEVELSTART = 38; long SECTIONSLEVELSIZE = 29; diff --git a/utilities/stepdump.cpp b/utilities/stepdump.cpp index 313efbc..e13a826 100644 --- a/utilities/stepdump.cpp +++ b/utilities/stepdump.cpp @@ -17,6 +17,9 @@ using namespace std; +#ifndef NO_SWORD_NAMESPACE +using namespace sword; +#endif typedef struct { short versionRecordSize; diff --git a/utilities/thml2gbs.cpp b/utilities/thml2gbs.cpp index df85806..ca5b31c 100644 --- a/utilities/thml2gbs.cpp +++ b/utilities/thml2gbs.cpp @@ -21,6 +21,12 @@ #define O_BINARY 0 #endif +#ifndef NO_SWORD_NAMESPACE +using sword::TreeKeyIdx; +using sword::RawGenBook; +using sword::SWKey; +#endif + void printTree(TreeKeyIdx treeKey, TreeKeyIdx *target = 0, int level = 1) { if (!target) target = &treeKey; @@ -81,7 +87,7 @@ int main(int argc, char **argv) { const char * helptext ="thml2gbs 1.0 General Book module creation tool for the SWORD Project\n usage:\n %s [modname] [0|1 - long names] [0|1 - output in 'import format']\n"; signed long i = 0; - string divs[6]; + std::string divs[6]; int level = 0; char* keybuffer = new char[2048]; char* entbuffer = new char[1048576]; diff --git a/utilities/txt2sword.cpp b/utilities/txt2sword.cpp index c373f30..1e37c72 100644 --- a/utilities/txt2sword.cpp +++ b/utilities/txt2sword.cpp @@ -6,6 +6,11 @@ #include #include #include + +#ifndef NO_SWORD_NAMESPACE +using sword::VerseKey; +#endif + const long MAXVLEN = 8192; int fp, vfp, cfp, bfp, dfp; diff --git a/utilities/vpl2mod.cpp b/utilities/vpl2mod.cpp index 3760d42..0b65a87 100644 --- a/utilities/vpl2mod.cpp +++ b/utilities/vpl2mod.cpp @@ -19,6 +19,15 @@ #define O_BINARY 0 #endif +#ifndef NO_SWORD_NAMESPACE +using sword::SWMgr; +using sword::RawText; +using sword::VerseKey; +using sword::SW_POSITION; +#endif + +using std::string; + char readline(int fd, char **buf) { char ch; if (*buf) -- cgit