[sword-svn] r3765 - in trunk: include src/mgr
scribe at crosswire.org
scribe at crosswire.org
Sun Jul 26 06:31:09 EDT 2020
Author: scribe
Date: 2020-07-26 06:31:09 -0400 (Sun, 26 Jul 2020)
New Revision: 3765
Modified:
trunk/include/SwordAPI.pas
trunk/include/bz2comprs.h
trunk/include/canon.h
trunk/include/canon_abbrevs.h
trunk/include/canon_calvin.h
trunk/include/canon_catholic.h
trunk/include/canon_catholic2.h
trunk/include/canon_darbyfr.h
trunk/include/canon_german.h
trunk/include/canon_kjva.h
trunk/include/canon_leningrad.h
trunk/include/canon_luther.h
trunk/include/canon_lxx.h
trunk/include/canon_mt.h
trunk/include/canon_nrsv.h
trunk/include/canon_nrsva.h
trunk/include/canon_null.h
trunk/include/canon_orthodox.h
trunk/include/canon_segond.h
trunk/include/canon_synodal.h
trunk/include/canon_synodalprot.h
trunk/include/canon_vulg.h
trunk/include/cipherfil.h
trunk/include/curlftpt.h
trunk/include/curlhttpt.h
trunk/include/defs.h
trunk/include/echomod.h
trunk/include/encfiltmgr.h
trunk/include/entriesblk.h
trunk/include/femain.h
trunk/include/filemgr.h
trunk/include/flatapi.h
trunk/include/ftplib.h
trunk/include/ftplibftpt.h
trunk/include/ftpparse.h
trunk/include/gbffootnotes.h
trunk/include/gbfheadings.h
trunk/include/gbfhtml.h
trunk/include/gbfhtmlhref.h
trunk/include/gbflatex.h
trunk/include/gbfmorph.h
trunk/include/gbfosis.h
trunk/include/gbfplain.h
trunk/include/gbfredletterwords.h
trunk/include/gbfrtf.h
trunk/include/gbfstrongs.h
trunk/include/gbfthml.h
trunk/include/gbfwebif.h
trunk/include/gbfwordjs.h
trunk/include/gbfxhtml.h
trunk/include/greeklexattribs.h
trunk/include/hebrewmcim.h
trunk/include/hrefcom.h
trunk/include/installmgr.h
trunk/include/latin1utf16.h
trunk/include/latin1utf8.h
trunk/include/listkey.h
trunk/include/localemgr.h
trunk/include/lzsscomprs.h
trunk/include/markupfiltmgr.h
trunk/include/multimapwdef.h
trunk/include/nullim.h
trunk/include/osisenum.h
trunk/include/osisfootnotes.h
trunk/include/osisglosses.h
trunk/include/osisheadings.h
trunk/include/osishtmlhref.h
trunk/include/osislatex.h
trunk/include/osislemma.h
trunk/include/osismorph.h
trunk/include/osismorphsegmentation.h
trunk/include/osisosis.h
trunk/include/osisplain.h
trunk/include/osisredletterwords.h
trunk/include/osisreferencelinks.h
trunk/include/osisrtf.h
trunk/include/osisscripref.h
trunk/include/osisstrongs.h
trunk/include/osisvariants.h
trunk/include/osiswebif.h
trunk/include/osiswordjs.h
trunk/include/osisxhtml.h
trunk/include/osisxlit.h
trunk/include/papyriplain.h
trunk/include/rawcom.h
trunk/include/rawcom4.h
trunk/include/rawfiles.h
trunk/include/rawgenbook.h
trunk/include/rawld.h
trunk/include/rawld4.h
trunk/include/rawstr.h
trunk/include/rawstr4.h
trunk/include/rawtext.h
trunk/include/rawtext4.h
trunk/include/rawverse.h
trunk/include/rawverse4.h
trunk/include/remotetrans.h
trunk/include/roman.h
trunk/include/rtfhtml.h
trunk/include/rtranspgdrive.h
trunk/include/sapphire.h
trunk/include/scsuutf8.h
trunk/include/stringmgr.h
trunk/include/strkey.h
trunk/include/swbasicfilter.h
trunk/include/swbuf.h
trunk/include/swcacher.h
trunk/include/swcipher.h
trunk/include/swcom.h
trunk/include/swcomprs.h
trunk/include/swconfig.h
trunk/include/swdisp.h
trunk/include/swfilter.h
trunk/include/swfiltermgr.h
trunk/include/swgenbook.h
trunk/include/swinputmeth.h
trunk/include/swkey.h
trunk/include/swld.h
trunk/include/swlocale.h
trunk/include/swlog.h
trunk/include/swmacs.h
trunk/include/swmgr.h
trunk/include/swmodule.h
trunk/include/swobject.h
trunk/include/swoptfilter.h
trunk/include/swsearchable.h
trunk/include/swtext.h
trunk/include/swversion.h
trunk/include/swversion.h.in
trunk/include/sysdata.h
trunk/include/teihtmlhref.h
trunk/include/teilatex.h
trunk/include/teiplain.h
trunk/include/teirtf.h
trunk/include/teixhtml.h
trunk/include/thmlfootnotes.h
trunk/include/thmlgbf.h
trunk/include/thmlheadings.h
trunk/include/thmlhtml.h
trunk/include/thmlhtmlhref.h
trunk/include/thmllatex.h
trunk/include/thmllemma.h
trunk/include/thmlmorph.h
trunk/include/thmlosis.h
trunk/include/thmlplain.h
trunk/include/thmlrtf.h
trunk/include/thmlscripref.h
trunk/include/thmlstrongs.h
trunk/include/thmlvariants.h
trunk/include/thmlwebif.h
trunk/include/thmlwordjs.h
trunk/include/thmlxhtml.h
trunk/include/treekey.h
trunk/include/treekeyidx.h
trunk/include/unicodertf.h
trunk/include/url.h
trunk/include/utf16utf8.h
trunk/include/utf8arabicpoints.h
trunk/include/utf8arshaping.h
trunk/include/utf8bidireorder.h
trunk/include/utf8cantillation.h
trunk/include/utf8greekaccents.h
trunk/include/utf8hebrewpoints.h
trunk/include/utf8html.h
trunk/include/utf8latin1.h
trunk/include/utf8nfc.h
trunk/include/utf8nfkd.h
trunk/include/utf8scsu.h
trunk/include/utf8transliterator.h
trunk/include/utf8utf16.h
trunk/include/utilstr.h
trunk/include/utilxml.h
trunk/include/versekey.h
trunk/include/versetreekey.h
trunk/include/versificationmgr.h
trunk/include/xzcomprs.h
trunk/include/zcom.h
trunk/include/zcom4.h
trunk/include/zipcomprs.h
trunk/include/zld.h
trunk/include/zstr.h
trunk/include/ztext.h
trunk/include/ztext4.h
trunk/include/zverse.h
trunk/include/zverse4.h
trunk/src/mgr/swmgr.cpp
Log:
whitespace and comments only
Modified: trunk/include/SwordAPI.pas
===================================================================
--- trunk/include/SwordAPI.pas 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/SwordAPI.pas 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,7 +1,7 @@
{******************************************************************************
*
- * SwordAPI.pas -
- *
+ * SwordAPI.pas -
+ *
* $Id$
*
* Copyright 1996-2013 CrossWire Bible Society (http://www.crosswire.org)
@@ -26,10 +26,10 @@
DLLNAME = 'sword32.dll';
type
- paramt = record
- path, name, disc: pchar;
- end;
- pparamt = ^paramt;
+ paramt = record
+ path, name, disc: pchar;
+ end;
+ pparamt = ^paramt;
function NewModule(modtype: PChar; params: pparamt): integer; stdcall; external DLLNAME;
procedure DeleteModule(hmod: integer); stdcall; external DLLNAME;
Modified: trunk/include/bz2comprs.h
===================================================================
--- trunk/include/bz2comprs.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/bz2comprs.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * bz2comprs.h - Bzip2Compress, a driver class that provides bzip2
+ * bz2comprs.h - Bzip2Compress, a driver class that provides bzip2
* compression (Burrows–Wheeler with Huffman coding)
*
* $Id$
Modified: trunk/include/canon.h
===================================================================
--- trunk/include/canon.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/canon.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * canon.h - Canonical text information to be included by VerseKey.cpp
+ * canon.h - Canonical text information to be included by VerseKey.cpp
*
* $Id$
*
Modified: trunk/include/canon_abbrevs.h
===================================================================
--- trunk/include/canon_abbrevs.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/canon_abbrevs.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * canon_abbrevs.h - Canonical text information to be included by
+ * canon_abbrevs.h - Canonical text information to be included by
* VerseKey.cpp
*
* $Id$
Modified: trunk/include/canon_calvin.h
===================================================================
--- trunk/include/canon_calvin.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/canon_calvin.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,9 +1,9 @@
/******************************************************************************
*
- * canon_calvin.h - Versification data for French Bibles de Genève
- * (Bibles de Genève, Épée, Martin, Ostervald)
+ * canon_calvin.h - Versification data for French Bibles de Genève
+ * (Bibles de Genève, Épée, Martin, Ostervald)
*
- * $Id$
+ * $Id$
*
* Copyright 1998-2013 CrossWire Bible Society (http://www.crosswire.org)
* CrossWire Bible Society
Modified: trunk/include/canon_catholic.h
===================================================================
--- trunk/include/canon_catholic.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/canon_catholic.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * canon_catholic.h - Versification data for the Catholic system
+ * canon_catholic.h - Versification data for the Catholic system
*
* $Id$
*
Modified: trunk/include/canon_catholic2.h
===================================================================
--- trunk/include/canon_catholic2.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/canon_catholic2.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * canon_catholic2.h - Versification data for the Catholic2 system
+ * canon_catholic2.h - Versification data for the Catholic2 system
*
* $Id$
*
Modified: trunk/include/canon_darbyfr.h
===================================================================
--- trunk/include/canon_darbyfr.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/canon_darbyfr.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,8 +1,8 @@
/******************************************************************************
*
- * canon_darbyfr.h - Versification data for the French Darby Bibles
+ * canon_darbyfr.h - Versification data for the French Darby Bibles
*
- * $Id$
+ * $Id$
*
* Copyright 1998-2015 CrossWire Bible Society (http://www.crosswire.org)
* CrossWire Bible Society
Modified: trunk/include/canon_german.h
===================================================================
--- trunk/include/canon_german.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/canon_german.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * canon_german.h - Versification data for the German system
+ * canon_german.h - Versification data for the German system
*
* $Id$
*
Modified: trunk/include/canon_kjva.h
===================================================================
--- trunk/include/canon_kjva.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/canon_kjva.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * canon_kjva.h - Versification data for the KJVA system
+ * canon_kjva.h - Versification data for the KJVA system
*
* $Id$
*
Modified: trunk/include/canon_leningrad.h
===================================================================
--- trunk/include/canon_leningrad.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/canon_leningrad.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * canon_leningrad.h - Versification data for the Leningrad system
+ * canon_leningrad.h - Versification data for the Leningrad system
*
* $Id$
*
Modified: trunk/include/canon_luther.h
===================================================================
--- trunk/include/canon_luther.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/canon_luther.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * canon_luther.h - Versification data for the Luther system
+ * canon_luther.h - Versification data for the Luther system
*
* $Id$
*
Modified: trunk/include/canon_lxx.h
===================================================================
--- trunk/include/canon_lxx.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/canon_lxx.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * canon_lxx.h - Versification data for the LXX system
+ * canon_lxx.h - Versification data for the LXX system
*
* $Id$
*
Modified: trunk/include/canon_mt.h
===================================================================
--- trunk/include/canon_mt.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/canon_mt.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * canon_mt.h - Versification data for the Masoretic Text (MT) system
+ * canon_mt.h - Versification data for the Masoretic Text (MT) system
*
* $Id$
*
Modified: trunk/include/canon_nrsv.h
===================================================================
--- trunk/include/canon_nrsv.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/canon_nrsv.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * canon_nrsv.h - Versification data for the NRSV system
+ * canon_nrsv.h - Versification data for the NRSV system
*
* $Id$
*
Modified: trunk/include/canon_nrsva.h
===================================================================
--- trunk/include/canon_nrsva.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/canon_nrsva.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * canon_nrsva.h - Versification data for the NRSVA system
+ * canon_nrsva.h - Versification data for the NRSVA system
*
* $Id$
*
Modified: trunk/include/canon_null.h
===================================================================
--- trunk/include/canon_null.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/canon_null.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * canon_null.h - Versification data for the null system
+ * canon_null.h - Versification data for the null system
*
* $Id$
*
Modified: trunk/include/canon_orthodox.h
===================================================================
--- trunk/include/canon_orthodox.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/canon_orthodox.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * canon_orthodox.h - Versification data for the Orthodox system
+ * canon_orthodox.h - Versification data for the Orthodox system
*
* $Id$
*
Modified: trunk/include/canon_segond.h
===================================================================
--- trunk/include/canon_segond.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/canon_segond.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,9 +1,9 @@
/******************************************************************************
*
- * canon_segond.h - Versification data for French Louis Segond original
- * and revised Bibles
+ * canon_segond.h - Versification data for French Louis Segond original
+ * and revised Bibles
*
- * $Id$
+ * $Id$
*
* Copyright 1998-2013 CrossWire Bible Society (http://www.crosswire.org)
* CrossWire Bible Society
Modified: trunk/include/canon_synodal.h
===================================================================
--- trunk/include/canon_synodal.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/canon_synodal.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * canon_synodal.h - Versification data for the Synodal system
+ * canon_synodal.h - Versification data for the Synodal system
*
* $Id$
*
Modified: trunk/include/canon_synodalprot.h
===================================================================
--- trunk/include/canon_synodalprot.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/canon_synodalprot.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * canon_synodalprot.h - Versification data for the SynodalProt system
+ * canon_synodalprot.h - Versification data for the SynodalProt system
*
* $Id$
*
Modified: trunk/include/canon_vulg.h
===================================================================
--- trunk/include/canon_vulg.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/canon_vulg.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * canon_vulg.h - Versification data for the Vulg system
+ * canon_vulg.h - Versification data for the Vulg system
*
* $Id$
*
Modified: trunk/include/cipherfil.h
===================================================================
--- trunk/include/cipherfil.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/cipherfil.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/***************************************************************************
*
- * cipherfil.h -
+ * cipherfil.h -
*
* $Id$
*
Modified: trunk/include/curlftpt.h
===================================================================
--- trunk/include/curlftpt.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/curlftpt.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * curlftpt.h - code for CURL impl of FTP Transport
+ * curlftpt.h - code for CURL impl of FTP Transport
*
* $Id$
*
Modified: trunk/include/curlhttpt.h
===================================================================
--- trunk/include/curlhttpt.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/curlhttpt.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * curlhttpt.h - code for CURL impl of HTTP Transport
+ * curlhttpt.h - code for CURL impl of HTTP Transport
*
* $Id$
*
Modified: trunk/include/defs.h
===================================================================
--- trunk/include/defs.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/defs.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * defs.h - Global defines, mostly platform-specific stuff
+ * defs.h - Global defines, mostly platform-specific stuff
*
* $Id$
*
Modified: trunk/include/echomod.h
===================================================================
--- trunk/include/echomod.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/echomod.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * echomod.h - code for class 'EchoMod' - a test module that just echo back
+ * echomod.h - code for class 'EchoMod' - a test module that just echo back
* text of key.
*
* $Id$
Modified: trunk/include/encfiltmgr.h
===================================================================
--- trunk/include/encfiltmgr.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/encfiltmgr.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * encfiltmgr.h - definition of class SWEncodingMgr, subclass of
+ * encfiltmgr.h - definition of class SWEncodingMgr, subclass of
* used to transcode all module text to a requested
* markup
*
@@ -32,9 +32,9 @@
class SWFilter;
/** This class is like a normal SWMgr,
- * but you can additonally specify which encoding
- * you want to use.
- */
+ * but you can additonally specify which encoding
+ * you want to use.
+ */
class SWDLLEXPORT EncodingFilterMgr : public SWFilterMgr {
@@ -47,7 +47,7 @@
/*
* current encoding value
- */
+ */
char encoding;
public:
Modified: trunk/include/entriesblk.h
===================================================================
--- trunk/include/entriesblk.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/entriesblk.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * entriesblk.h - Implementation of EntriesBlock
+ * entriesblk.h - Definition of EntriesBlock
*
* $Id$
*
Modified: trunk/include/femain.h
===================================================================
--- trunk/include/femain.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/femain.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * femain.h - Implementation of FEMain
+ * femain.h - Definition of FEMain
*
* $Id$
*
@@ -26,9 +26,9 @@
class FEMain
{
public:
- FEMain ();
- virtual ~FEMain ();
- list < SWDisplay * >displays; // so we can delete each display we create
+ FEMain();
+ virtual ~FEMain();
+ list <SWDisplay *> displays; // so we can delete each display we create
};
#endif
Modified: trunk/include/filemgr.h
===================================================================
--- trunk/include/filemgr.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/filemgr.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * filemgr.h - definition of class FileMgr used for pooling file handles
+ * filemgr.h - definition of class FileMgr used for pooling file handles
*
* $Id$
*
@@ -126,21 +126,21 @@
virtual void flush();
virtual long resourceConsumption();
- /** Get an environment variable from the OS
- * @param variableName
- *
- * @return variable value from the OS
- */
- static SWBuf getEnvValue(const char *variableName);
+ /** Get an environment variable from the OS
+ * @param variableName
+ *
+ * @return variable value from the OS
+ */
+ static SWBuf getEnvValue(const char *variableName);
- /** Check if a path can be access with supplied permissions
- * @param path Path to the resource
- * @param mode Desired access mode
- *
- * @return whether or not the resource can be accessed with the requested
- * mode
- */
- static bool hasAccess(const char *path, int mode);
+ /** Check if a path can be access with supplied permissions
+ * @param path Path to the resource
+ * @param mode Desired access mode
+ *
+ * @return whether or not the resource can be accessed with the requested
+ * mode
+ */
+ static bool hasAccess(const char *path, int mode);
/** Checks for the existence and readability of a file.
* @param ipath Path to file.
@@ -154,16 +154,16 @@
*/
static signed char existsDir(const char *ipath, const char *idirName = 0);
- /** Given a directory path, returns contents of directory
- * @param dirPath Path to directory
- * @param includeSize Optimization flag to allow passing false
- * to skip file size lookup (true forces both size and directory lookup)
- * @param includeIsDirectory Optimization flag to allow passing false
- * to skip isDirectory lookup
- *
- * @return a container of DirEntry records describing contents
- */
- static std::vector<struct DirEntry> getDirList(const char *dirPath, bool includeSize = false, bool includeIsDirectory = true);
+ /** Given a directory path, returns contents of directory
+ * @param dirPath Path to directory
+ * @param includeSize Optimization flag to allow passing false
+ * to skip file size lookup (true forces both size and directory lookup)
+ * @param includeIsDirectory Optimization flag to allow passing false
+ * to skip isDirectory lookup
+ *
+ * @return a container of DirEntry records describing contents
+ */
+ static std::vector<struct DirEntry> getDirList(const char *dirPath, bool includeSize = false, bool includeIsDirectory = true);
/** Truncate a file at its current position
@@ -183,7 +183,7 @@
*/
static int openFile(const char *fName, int mode, int perms);
static int openFileReadOnly(const char *fName);
-
+
static int copyFile(const char *srcFile, const char *destFile);
static int copyDir(const char *srcDir, const char *destDir);
static int removeDir(const char *targetDir);
Modified: trunk/include/flatapi.h
===================================================================
--- trunk/include/flatapi.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/flatapi.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * flatapi.h - This file contains an api usable by non-C++ environments
+ * flatapi.h - This file contains an api usable by non-C++ environments
*
* $Id$
*
@@ -62,36 +62,36 @@
#undef org_crosswire_sword_SWModule_SEARCHTYPE_LUCENE
#define org_crosswire_sword_SWModule_SEARCHTYPE_LUCENE -4L
- const int org_crosswire_sword_SWModule_VERSEKEY_TESTAMENT = 0;
- const int org_crosswire_sword_SWModule_VERSEKEY_BOOK = 1;
- const int org_crosswire_sword_SWModule_VERSEKEY_CHAPTER = 2;
- const int org_crosswire_sword_SWModule_VERSEKEY_VERSE = 3;
- const int org_crosswire_sword_SWModule_VERSEKEY_CHAPTERMAX = 4;
- const int org_crosswire_sword_SWModule_VERSEKEY_VERSEMAX = 5;
- const int org_crosswire_sword_SWModule_VERSEKEY_BOOKNAME = 6;
- const int org_crosswire_sword_SWModule_VERSEKEY_OSISREF = 7;
- const int org_crosswire_sword_SWModule_VERSEKEY_SHORTTEXT = 8;
- const int org_crosswire_sword_SWModule_VERSEKEY_BOOKABBREV = 9;
- const int org_crosswire_sword_SWModule_VERSEKEY_OSISBOOKNAME = 10;
- // for backward compat. Remove
- const int org_crosswire_sword_SWModule_VERSEKEY_CHAPMAX = 4;
+const int org_crosswire_sword_SWModule_VERSEKEY_TESTAMENT = 0;
+const int org_crosswire_sword_SWModule_VERSEKEY_BOOK = 1;
+const int org_crosswire_sword_SWModule_VERSEKEY_CHAPTER = 2;
+const int org_crosswire_sword_SWModule_VERSEKEY_VERSE = 3;
+const int org_crosswire_sword_SWModule_VERSEKEY_CHAPTERMAX = 4;
+const int org_crosswire_sword_SWModule_VERSEKEY_VERSEMAX = 5;
+const int org_crosswire_sword_SWModule_VERSEKEY_BOOKNAME = 6;
+const int org_crosswire_sword_SWModule_VERSEKEY_OSISREF = 7;
+const int org_crosswire_sword_SWModule_VERSEKEY_SHORTTEXT = 8;
+const int org_crosswire_sword_SWModule_VERSEKEY_BOOKABBREV = 9;
+const int org_crosswire_sword_SWModule_VERSEKEY_OSISBOOKNAME = 10;
+// for backward compat. Remove
+const int org_crosswire_sword_SWModule_VERSEKEY_CHAPMAX = 4;
- const int org_crosswire_sword_SWLog_LOG_ERROR = 1;
- const int org_crosswire_sword_SWLog_LOG_WARN = 2;
- const int org_crosswire_sword_SWLog_LOG_INFO = 3;
- const int org_crosswire_sword_SWLog_LOG_TIMEDINFO = 4;
- const int org_crosswire_sword_SWLog_LOG_DEBUG = 5;
-
-
-
-
+const int org_crosswire_sword_SWLog_LOG_ERROR = 1;
+const int org_crosswire_sword_SWLog_LOG_WARN = 2;
+const int org_crosswire_sword_SWLog_LOG_INFO = 3;
+const int org_crosswire_sword_SWLog_LOG_TIMEDINFO = 4;
+const int org_crosswire_sword_SWLog_LOG_DEBUG = 5;
+
+
+
+
/*
* Class: org_crosswire_sword_SWModule
* Method: terminateSearch
* Signature: ()V
*/
void SWDLLEXPORT org_crosswire_sword_SWModule_terminateSearch
- (SWHANDLE hSWModule);
+ (SWHANDLE hSWModule);
typedef void (*org_crosswire_sword_SWModule_SearchCallback)(int);
@@ -103,7 +103,7 @@
* Signature: (Ljava/lang/String;IJLjava/lang/String;Lorg/crosswire/android/sword/SWModule/SearchProgressReporter;)[Lorg/crosswire/android/sword/SWModule/SearchHit;
*/
const struct org_crosswire_sword_SearchHit * SWDLLEXPORT org_crosswire_sword_SWModule_search
- (SWHANDLE hSWModule, const char *searchString, int searchType, long flags, const char *scope, org_crosswire_sword_SWModule_SearchCallback progressReporter);
+ (SWHANDLE hSWModule, const char *searchString, int searchType, long flags, const char *scope, org_crosswire_sword_SWModule_SearchCallback progressReporter);
/*
* Class: org_crosswire_sword_SWModule
@@ -111,7 +111,7 @@
* Signature: ()C
*/
char SWDLLEXPORT org_crosswire_sword_SWModule_popError
- (SWHANDLE hSWModule);
+ (SWHANDLE hSWModule);
/*
* Class: org_crosswire_sword_SWModule
@@ -119,7 +119,7 @@
* Signature: ()J
*/
long SWDLLEXPORT org_crosswire_sword_SWModule_getEntrySize
- (SWHANDLE hSWModule);
+ (SWHANDLE hSWModule);
/*
* Class: org_crosswire_sword_SWModule
@@ -127,7 +127,7 @@
* Signature: (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Z)[Ljava/lang/String;
*/
const char ** SWDLLEXPORT org_crosswire_sword_SWModule_getEntryAttribute
- (SWHANDLE hSWModule, const char *level1, const char *level2, const char *level3, char filteredBool);
+ (SWHANDLE hSWModule, const char *level1, const char *level2, const char *level3, char filteredBool);
/*
* Class: org_crosswire_sword_SWModule
@@ -135,7 +135,7 @@
* Signature: (Ljava/lang/String;)[Ljava/lang/String;
*/
const char ** SWDLLEXPORT org_crosswire_sword_SWModule_parseKeyList
- (SWHANDLE hSWModule, const char *keyText);
+ (SWHANDLE hSWModule, const char *keyText);
/*
* Class: org_crosswire_sword_SWModule
@@ -148,7 +148,7 @@
// [=][key] - position absolutely and don't normalize
// (e.g. "jn.1.0" for John Chapter 1 intro; "jn.0.0" For Book of John Intro)
void SWDLLEXPORT org_crosswire_sword_SWModule_setKeyText
- (SWHANDLE hSWModule, const char *key);
+ (SWHANDLE hSWModule, const char *key);
/*
* Class: org_crosswire_sword_SWModule
@@ -156,7 +156,7 @@
* Signature: ()Ljava/lang/String;
*/
const char * SWDLLEXPORT org_crosswire_sword_SWModule_getKeyText
- (SWHANDLE hSWModule);
+ (SWHANDLE hSWModule);
/*
* Class: org_crosswire_sword_SWModule
@@ -164,7 +164,7 @@
* Signature: ()Z
*/
char SWDLLEXPORT org_crosswire_sword_SWModule_hasKeyChildren
- (SWHANDLE hSWModule);
+ (SWHANDLE hSWModule);
/*
* Class: org_crosswire_sword_SWModule
@@ -176,7 +176,7 @@
// but has special handling if called on a VerseKey module:
// [0..7] [testament, book, chapter, verse, chapterMax, verseMax, bookName, osisRef]
const char ** SWDLLEXPORT org_crosswire_sword_SWModule_getKeyChildren
- (SWHANDLE hSWModule);
+ (SWHANDLE hSWModule);
/*
* Class: org_crosswire_sword_SWModule
@@ -184,7 +184,7 @@
* Signature: ()Ljava/lang/String;
*/
const char * SWDLLEXPORT org_crosswire_sword_SWModule_getName
- (SWHANDLE hSWModule);
+ (SWHANDLE hSWModule);
/*
* Class: org_crosswire_sword_SWModule
@@ -192,7 +192,7 @@
* Signature: ()Ljava/lang/String;
*/
const char * SWDLLEXPORT org_crosswire_sword_SWModule_getDescription
- (SWHANDLE hSWModule);
+ (SWHANDLE hSWModule);
/*
* Class: org_crosswire_sword_SWModule
@@ -200,7 +200,7 @@
* Signature: ()Ljava/lang/String;
*/
const char * SWDLLEXPORT org_crosswire_sword_SWModule_getCategory
- (SWHANDLE hSWModule);
+ (SWHANDLE hSWModule);
/*
* Class: org_crosswire_sword_SWModule
@@ -208,7 +208,7 @@
* Signature: ()Ljava/lang/String;
*/
const char * SWDLLEXPORT org_crosswire_sword_SWModule_getKeyParent
- (SWHANDLE hSWModule);
+ (SWHANDLE hSWModule);
/*
* Class: org_crosswire_sword_SWModule
@@ -216,7 +216,7 @@
* Signature: ()V
*/
void SWDLLEXPORT org_crosswire_sword_SWModule_previous
- (SWHANDLE hSWModule);
+ (SWHANDLE hSWModule);
/*
* Class: org_crosswire_sword_SWModule
@@ -224,7 +224,7 @@
* Signature: ()V
*/
void SWDLLEXPORT org_crosswire_sword_SWModule_next
- (SWHANDLE hSWModule);
+ (SWHANDLE hSWModule);
/*
* Class: org_crosswire_sword_SWModule
@@ -232,7 +232,7 @@
* Signature: ()V
*/
void SWDLLEXPORT org_crosswire_sword_SWModule_begin
- (SWHANDLE hSWModule);
+ (SWHANDLE hSWModule);
/*
* Class: org_crosswire_sword_SWModule
@@ -240,7 +240,7 @@
* Signature: ()Ljava/lang/String;
*/
const char * SWDLLEXPORT org_crosswire_sword_SWModule_stripText
- (SWHANDLE hSWModule);
+ (SWHANDLE hSWModule);
/*
* Class: org_crosswire_sword_SWModule
@@ -248,7 +248,7 @@
* Signature: ()Ljava/lang/String;
*/
const char * SWDLLEXPORT org_crosswire_sword_SWModule_renderText
- (SWHANDLE hSWModule);
+ (SWHANDLE hSWModule);
/*
* Class: org_crosswire_sword_SWModule
@@ -257,7 +257,7 @@
*/
// CSS styles associated with this text
const char * SWDLLEXPORT org_crosswire_sword_SWModule_getRenderHeader
- (SWHANDLE hSWModule);
+ (SWHANDLE hSWModule);
/*
* Class: org_crosswire_sword_SWModule
@@ -265,7 +265,7 @@
* Signature: ()Ljava/lang/String;
*/
const char * SWDLLEXPORT org_crosswire_sword_SWModule_getRawEntry
- (SWHANDLE hSWModule);
+ (SWHANDLE hSWModule);
/*
* Class: org_crosswire_sword_SWModule
@@ -273,7 +273,7 @@
* Signature: (Ljava/lang/String;)V
*/
void SWDLLEXPORT org_crosswire_sword_SWModule_setRawEntry
- (SWHANDLE hSWModule, const char *entryBuffer);
+ (SWHANDLE hSWModule, const char *entryBuffer);
/*
* Class: org_crosswire_sword_SWModule
@@ -281,7 +281,7 @@
* Signature: (Ljava/lang/String;)Ljava/lang/String;
*/
const char * SWDLLEXPORT org_crosswire_sword_SWModule_getConfigEntry
- (SWHANDLE hSWModule, const char *key);
+ (SWHANDLE hSWModule, const char *key);
/*
* Class: org_crosswire_sword_SWModule
@@ -289,7 +289,7 @@
* Signature: ()V
*/
void SWDLLEXPORT org_crosswire_sword_SWModule_deleteSearchFramework
- (SWHANDLE hSWModule);
+ (SWHANDLE hSWModule);
/*
* Class: org_crosswire_sword_SWModule
@@ -297,7 +297,7 @@
* Signature: ()Z
*/
char SWDLLEXPORT org_crosswire_sword_SWModule_hasSearchFramework
- (SWHANDLE hSWModule);
+ (SWHANDLE hSWModule);
/*
* Class: org_crosswire_sword_SWMgr
@@ -305,7 +305,7 @@
* Signature: ()V
*/
SWHANDLE SWDLLEXPORT org_crosswire_sword_SWMgr_new
- ();
+ ();
/*
@@ -315,7 +315,7 @@
* Signature: (Ljava/lang/String;)V
*/
SWHANDLE SWDLLEXPORT org_crosswire_sword_SWMgr_newWithPath
- (const char *path);
+ (const char *path);
/*
* Class: org_crosswire_sword_SWMgr
@@ -323,7 +323,7 @@
* Signature: ()V
*/
void SWDLLEXPORT org_crosswire_sword_SWMgr_delete
- (SWHANDLE hSWMgr);
+ (SWHANDLE hSWMgr);
/*
* Class: org_crosswire_sword_SWMgr
@@ -331,7 +331,7 @@
* Signature: ()Ljava/lang/String;
*/
const char * SWDLLEXPORT org_crosswire_sword_SWMgr_version
- (SWHANDLE hSWMgr);
+ (SWHANDLE hSWMgr);
/*
* Class: org_crosswire_sword_SWMgr
@@ -339,7 +339,7 @@
* Signature: ()[Lorg/crosswire/android/sword/SWMgr/ModInfo;
*/
const struct org_crosswire_sword_ModInfo * SWDLLEXPORT org_crosswire_sword_SWMgr_getModInfoList
- (SWHANDLE hSWMgr);
+ (SWHANDLE hSWMgr);
/*
* Class: org_crosswire_sword_SWMgr
@@ -347,7 +347,7 @@
* Signature: (Ljava/lang/String;)Lorg/crosswire/android/sword/SWModule;
*/
SWHANDLE SWDLLEXPORT org_crosswire_sword_SWMgr_getModuleByName
- (SWHANDLE hSWMgr, const char *moduleName);
+ (SWHANDLE hSWMgr, const char *moduleName);
/*
* Class: org_crosswire_sword_SWMgr
@@ -355,7 +355,7 @@
* Signature: ()Ljava/lang/String;
*/
const char * SWDLLEXPORT org_crosswire_sword_SWMgr_getPrefixPath
- (SWHANDLE hSWMgr);
+ (SWHANDLE hSWMgr);
/*
* Class: org_crosswire_sword_SWMgr
@@ -363,7 +363,7 @@
* Signature: ()Ljava/lang/String;
*/
const char * SWDLLEXPORT org_crosswire_sword_SWMgr_getConfigPath
- (SWHANDLE hSWMgr);
+ (SWHANDLE hSWMgr);
/*
* Class: org_crosswire_sword_SWMgr
@@ -371,7 +371,7 @@
* Signature: (Ljava/lang/String;Ljava/lang/String;)V
*/
void SWDLLEXPORT org_crosswire_sword_SWMgr_setGlobalOption
- (SWHANDLE hSWMgr, const char *option, const char *value);
+ (SWHANDLE hSWMgr, const char *option, const char *value);
/*
* Class: org_crosswire_sword_SWMgr
@@ -379,7 +379,7 @@
* Signature: (Ljava/lang/String;)Ljava/lang/String;
*/
const char * SWDLLEXPORT org_crosswire_sword_SWMgr_getGlobalOption
- (SWHANDLE hSWMgr, const char *option);
+ (SWHANDLE hSWMgr, const char *option);
/*
* Class: org_crosswire_sword_SWMgr
@@ -387,7 +387,7 @@
* Signature: (Ljava/lang/String;)Ljava/lang/String;
*/
const char * SWDLLEXPORT org_crosswire_sword_SWMgr_getGlobalOptionTip
- (SWHANDLE hSWMgr, const char *option);
+ (SWHANDLE hSWMgr, const char *option);
/*
* Class: org_crosswire_sword_SWMgr
@@ -395,7 +395,7 @@
* Signature: (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
*/
const char * SWDLLEXPORT org_crosswire_sword_SWMgr_filterText
- (SWHANDLE hSWMgr, const char *filterName, const char *text);
+ (SWHANDLE hSWMgr, const char *filterName, const char *text);
/*
* Class: org_crosswire_sword_SWMgr
@@ -403,7 +403,7 @@
* Signature: ()[Ljava/lang/String;
*/
const char ** SWDLLEXPORT org_crosswire_sword_SWMgr_getGlobalOptions
- (SWHANDLE hSWMgr);
+ (SWHANDLE hSWMgr);
/*
@@ -412,7 +412,7 @@
* Signature: ()[Ljava/lang/String;
*/
const char ** SWDLLEXPORT org_crosswire_sword_SWConfig_getSections
- (const char *confPath);
+ (const char *confPath);
/*
* Class: org_crosswire_sword_SWConfig
@@ -420,7 +420,7 @@
* Signature: (Ljava/lang/String;)[Ljava/lang/String;
*/
const char ** SWDLLEXPORT org_crosswire_sword_SWConfig_getSectionKeys
- (const char *confPath, const char *section);
+ (const char *confPath, const char *section);
/*
* Class: org_crosswire_sword_SWConfig
@@ -428,7 +428,7 @@
* Signature: (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
*/
const char * SWDLLEXPORT org_crosswire_sword_SWConfig_getKeyValue
- (const char *confPath, const char *section, const char *key);
+ (const char *confPath, const char *section, const char *key);
/*
* Class: org_crosswire_sword_SWConfig
@@ -436,7 +436,7 @@
* Signature: (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
*/
void SWDLLEXPORT org_crosswire_sword_SWConfig_setKeyValue
- (const char *confPath, const char *section, const char *key, const char *value);
+ (const char *confPath, const char *section, const char *key, const char *value);
/*
* Class: org_crosswire_sword_SWConfig
@@ -444,7 +444,7 @@
* Signature: (Ljava/lang/String;)[Ljava/lang/String;
*/
const char ** SWDLLEXPORT org_crosswire_sword_SWConfig_augmentConfig
- (const char *confPath, const char *configBlob);
+ (const char *confPath, const char *configBlob);
/*
* Class: org_crosswire_sword_SWMgr
@@ -452,7 +452,7 @@
* Signature: (Ljava/lang/String;)[Ljava/lang/String;
*/
const char ** SWDLLEXPORT org_crosswire_sword_SWMgr_getGlobalOptionValues
- (SWHANDLE hSWMgr, const char *option);
+ (SWHANDLE hSWMgr, const char *option);
/*
* Class: org_crosswire_sword_SWMgr
@@ -460,7 +460,7 @@
* Signature: (Ljava/lang/String;Ljava/lang/String;)V
*/
void SWDLLEXPORT org_crosswire_sword_SWMgr_setCipherKey
- (SWHANDLE hSWMgr, const char *modName, const char *key);
+ (SWHANDLE hSWMgr, const char *modName, const char *key);
/*
* Class: org_crosswire_sword_SWMgr
@@ -468,7 +468,7 @@
* Signature: (Z)V
*/
void SWDLLEXPORT org_crosswire_sword_SWMgr_setJavascript
- (SWHANDLE hSWMgr, char valueBool);
+ (SWHANDLE hSWMgr, char valueBool);
/*
* Class: org_crosswire_sword_SWMgr
@@ -476,7 +476,7 @@
* Signature: ()[Ljava/lang/String;
*/
const char ** SWDLLEXPORT org_crosswire_sword_SWMgr_getAvailableLocales
- (SWHANDLE hSWMgr);
+ (SWHANDLE hSWMgr);
/*
* Class: org_crosswire_sword_SWMgr
@@ -484,7 +484,7 @@
* Signature: (Ljava/lang/String;)V
*/
void SWDLLEXPORT org_crosswire_sword_SWMgr_setDefaultLocale
- (SWHANDLE hSWMgr, const char *name);
+ (SWHANDLE hSWMgr, const char *name);
/*
* Class: org_crosswire_sword_SWMgr
@@ -492,7 +492,7 @@
* Signature: (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
*/
const char * SWDLLEXPORT org_crosswire_sword_SWMgr_translate
- (SWHANDLE hSWMgr, const char *text, const char *localeName);
+ (SWHANDLE hSWMgr, const char *text, const char *localeName);
@@ -507,14 +507,14 @@
typedef char * (*org_crosswire_sword_StringMgr_toUpperUTF8)(const char *, unsigned long);
void SWDLLEXPORT org_crosswire_sword_StringMgr_setToUpper
- (org_crosswire_sword_StringMgr_toUpperUTF8 toUpperUTF8);
+ (org_crosswire_sword_StringMgr_toUpperUTF8 toUpperUTF8);
/*
* Class: org_crosswire_sword_InstallMgr
* Method: new
* Signature: (Ljava/lang/String;Lorg/crosswire/android/sword/SWModule/SearchProgressReporter;)V
*/
SWHANDLE SWDLLEXPORT org_crosswire_sword_InstallMgr_new
- (const char *baseDir, org_crosswire_sword_InstallMgr_StatusCallback statusReporter);
+ (const char *baseDir, org_crosswire_sword_InstallMgr_StatusCallback statusReporter);
/*
* Class: org_crosswire_sword_InstallMgr
@@ -522,7 +522,7 @@
* Signature: ()V
*/
void SWDLLEXPORT org_crosswire_sword_InstallMgr_delete
- (SWHANDLE hInstallMgr);
+ (SWHANDLE hInstallMgr);
/*
* Class: org_crosswire_sword_InstallMgr
@@ -530,7 +530,7 @@
* Signature: ()V
*/
void SWDLLEXPORT org_crosswire_sword_InstallMgr_setUserDisclaimerConfirmed
- (SWHANDLE hInstallMgr);
+ (SWHANDLE hInstallMgr);
/*
* Class: org_crosswire_sword_InstallMgr
@@ -538,7 +538,7 @@
* Signature: ()I
*/
int SWDLLEXPORT org_crosswire_sword_InstallMgr_syncConfig
- (SWHANDLE hInstallMgr);
+ (SWHANDLE hInstallMgr);
/*
* Class: org_crosswire_sword_InstallMgr
@@ -546,7 +546,7 @@
* Signature: (Lorg/crosswire/android/sword/SWMgr;Ljava/lang/String;)I
*/
int SWDLLEXPORT org_crosswire_sword_InstallMgr_uninstallModule
- (SWHANDLE hInstallMgr, SWHANDLE hSWMgr_removeFrom, const char *modName);
+ (SWHANDLE hInstallMgr, SWHANDLE hSWMgr_removeFrom, const char *modName);
/*
* Class: org_crosswire_sword_InstallMgr
@@ -554,7 +554,7 @@
* Signature: ()[Ljava/lang/String;
*/
const char ** SWDLLEXPORT org_crosswire_sword_InstallMgr_getRemoteSources
- (SWHANDLE hInstallMgr);
+ (SWHANDLE hInstallMgr);
/*
* Class: org_crosswire_sword_InstallMgr
@@ -562,7 +562,7 @@
* Signature: (Ljava/lang/String;)I
*/
int SWDLLEXPORT org_crosswire_sword_InstallMgr_refreshRemoteSource
- (SWHANDLE hInstallMgr, const char *sourceName);
+ (SWHANDLE hInstallMgr, const char *sourceName);
/*
* Class: org_crosswire_sword_InstallMgr
@@ -570,7 +570,7 @@
* Signature: (Lorg/crosswire/android/sword/SWMgr;Ljava/lang/String;)[Lorg/crosswire/android/sword/SWMgr/ModInfo;
*/
const struct org_crosswire_sword_ModInfo * SWDLLEXPORT org_crosswire_sword_InstallMgr_getRemoteModInfoList
- (SWHANDLE hInstallMgr, SWHANDLE hSWMgr_deltaCompareTo, const char *sourceName);
+ (SWHANDLE hInstallMgr, SWHANDLE hSWMgr_deltaCompareTo, const char *sourceName);
/*
* Class: org_crosswire_sword_InstallMgr
@@ -578,7 +578,7 @@
* Signature: (Lorg/crosswire/android/sword/SWMgr;Ljava/lang/String;Ljava/lang/String;)I
*/
int SWDLLEXPORT org_crosswire_sword_InstallMgr_remoteInstallModule
- (SWHANDLE hInstallMgr_from, SWHANDLE hSWMgr_to, const char *sourceName, const char *modName);
+ (SWHANDLE hInstallMgr_from, SWHANDLE hSWMgr_to, const char *sourceName, const char *modName);
/*
* Class: org_crosswire_sword_InstallMgr
@@ -586,7 +586,7 @@
* Signature: (Ljava/lang/String;Ljava/lang/String;)Lorg/crosswire/android/sword/SWModule;
*/
SWHANDLE SWDLLEXPORT org_crosswire_sword_InstallMgr_getRemoteModuleByName
- (SWHANDLE hInstallMgr, const char *sourceName, const char *modName);
+ (SWHANDLE hInstallMgr, const char *sourceName, const char *modName);
/*
* NOTE: this method blocks and should be called in a new thread
@@ -595,7 +595,7 @@
* Signature: (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lorg/crosswire/android/sword/SWMgr/BibleSyncListener;)V
*/
void SWDLLEXPORT org_crosswire_sword_SWMgr_startBibleSync
- (SWHANDLE hMgr, const char *appNameJS, const char *userNameJS, const char *passphraseJS, org_biblesync_MessageReceivedCallback callback);
+ (SWHANDLE hMgr, const char *appNameJS, const char *userNameJS, const char *passphraseJS, org_biblesync_MessageReceivedCallback callback);
/*
* Class: org_crosswire_android_sword_SWMgr
@@ -603,7 +603,7 @@
* Signature: (V;)V
*/
void SWDLLEXPORT org_crosswire_sword_SWMgr_stopBibleSync
- (SWHANDLE hMgr);
+ (SWHANDLE hMgr);
/*
* Class: org_crosswire_android_sword_SWMgr
@@ -611,7 +611,7 @@
* Signature: (Ljava/lang/String;)V
*/
void SWDLLEXPORT org_crosswire_sword_SWMgr_sendBibleSyncMessage
- (SWHANDLE hMgr, const char *osisRefRaw);
+ (SWHANDLE hMgr, const char *osisRefRaw);
void SWDLLEXPORT org_crosswire_sword_SWLog_logError(const char *msg);
void SWDLLEXPORT org_crosswire_sword_SWLog_logDebug(const char *msg);
Modified: trunk/include/ftplib.h
===================================================================
--- trunk/include/ftplib.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/ftplib.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -100,8 +100,7 @@
GLOBALREF int FtpConnect(const char *host, netbuf **nControl);
GLOBALREF int FtpOptions(int opt, long val, netbuf *nControl);
GLOBALREF int FtpLogin(const char *user, const char *pass, netbuf *nControl);
-GLOBALREF int FtpAccess(const char *path, int typ, int mode, netbuf *nControl,
- netbuf **nData);
+GLOBALREF int FtpAccess(const char *path, int typ, int mode, netbuf *nControl, netbuf **nData);
GLOBALREF int FtpRead(void *buf, int max, netbuf *nData);
GLOBALREF int FtpWrite(void *buf, int len, netbuf *nData);
GLOBALREF int FtpClose(netbuf *nData);
@@ -116,10 +115,8 @@
GLOBALREF int FtpDir(const char *output, const char *path, netbuf *nControl);
GLOBALREF int FtpSize(const char *path, int *size, char mode, netbuf *nControl);
GLOBALREF int FtpModDate(const char *path, char *dt, int max, netbuf *nControl);
-GLOBALREF int FtpGet(const char *output, const char *path, char mode,
- netbuf *nControl);
-GLOBALREF int FtpPut(const char *input, const char *path, char mode,
- netbuf *nControl);
+GLOBALREF int FtpGet(const char *output, const char *path, char mode, netbuf *nControl);
+GLOBALREF int FtpPut(const char *input, const char *path, char mode, netbuf *nControl);
GLOBALREF int FtpRename(const char *src, const char *dst, netbuf *nControl);
GLOBALREF int FtpDelete(const char *fnm, netbuf *nControl);
GLOBALREF void FtpQuit(netbuf *nControl);
Modified: trunk/include/ftplibftpt.h
===================================================================
--- trunk/include/ftplibftpt.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/ftplibftpt.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * ftplibftpt.h - code for ftplib impl of FTP Transport
+ * ftplibftpt.h - code for ftplib impl of FTP Transport
* (FTPLibFTPTransport)
*
* $Id$
Modified: trunk/include/ftpparse.h
===================================================================
--- trunk/include/ftpparse.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/ftpparse.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -18,17 +18,17 @@
*/
struct ftpparse {
- char *name; /* not necessarily 0-terminated */
- int namelen;
- int flagtrycwd; /* 0 if cwd is definitely pointless, 1 otherwise */
- int flagtryretr; /* 0 if retr is definitely pointless, 1 otherwise */
- int sizetype;
- long size; /* number of octets */
- int mtimetype;
- time_t mtime; /* modification time */
- int idtype;
- char *id; /* not necessarily 0-terminated */
- int idlen;
+ char *name; /* not necessarily 0-terminated */
+ int namelen;
+ int flagtrycwd; /* 0 if cwd is definitely pointless, 1 otherwise */
+ int flagtryretr; /* 0 if retr is definitely pointless, 1 otherwise */
+ int sizetype;
+ long size; /* number of octets */
+ int mtimetype;
+ time_t mtime; /* modification time */
+ int idtype;
+ char *id; /* not necessarily 0-terminated */
+ int idlen;
} ;
#define FTPPARSE_SIZE_UNKNOWN 0
Modified: trunk/include/gbffootnotes.h
===================================================================
--- trunk/include/gbffootnotes.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/gbffootnotes.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/***************************************************************************
*
- * gbffootnotes.h - Implementation of GBFFootnotes
+ * gbffootnotes.h - Definition of GBFFootnotes
*
* $Id$
*
@@ -28,7 +28,7 @@
SWORD_NAMESPACE_START
/** This Filter shows/hides footnotes in a GBF text
- */
+ */
class SWDLLEXPORT GBFFootnotes : public SWOptionFilter {
public:
GBFFootnotes();
Modified: trunk/include/gbfheadings.h
===================================================================
--- trunk/include/gbfheadings.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/gbfheadings.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/***************************************************************************
*
- * gbfheadings.h - Implementation of GBFHeadings
+ * gbfheadings.h - Definition of GBFHeadings
*
* $Id$
*
@@ -27,8 +27,8 @@
SWORD_NAMESPACE_START
- /** This Filter shows/hides headings in a GBF text
- */
+/** This Filter shows/hides headings in a GBF text
+ */
class SWDLLEXPORT GBFHeadings : public SWOptionFilter {
public:
GBFHeadings();
Modified: trunk/include/gbfhtml.h
===================================================================
--- trunk/include/gbfhtml.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/gbfhtml.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * gbfhtml.h - Implementation of GBFHTML
+ * gbfhtml.h - Definition of GBFHTML
*
* $Id$
*
@@ -27,7 +27,7 @@
SWORD_NAMESPACE_START
-/** this filter converts GBF text to HTML text
+/** this filter converts GBF text to HTML text
*/
class SWDLLEXPORT GBFHTML : public SWBasicFilter {
protected:
Modified: trunk/include/gbfhtmlhref.h
===================================================================
--- trunk/include/gbfhtmlhref.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/gbfhtmlhref.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * gbfhtmlhref.h - Implementation of GBFHTMLHREF
+ * gbfhtmlhref.h - Definition of GBFHTMLHREF
*
* $Id$
*
@@ -27,7 +27,7 @@
SWORD_NAMESPACE_START
-/** this filter converts GBF text to HTML text with hrefs
+/** this filter converts GBF text to HTML text with hrefs
*/
class SWDLLEXPORT GBFHTMLHREF : public SWBasicFilter {
bool renderNoteNumbers;
Modified: trunk/include/gbflatex.h
===================================================================
--- trunk/include/gbflatex.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/gbflatex.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * gbflatex.h - Implementation of GBFLaTeX
+ * gbflatex.h - Definition of GBFLaTeX
*
* $Id$
*
Modified: trunk/include/gbfmorph.h
===================================================================
--- trunk/include/gbfmorph.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/gbfmorph.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/***************************************************************************
*
- * gbfmorph.h - Implementation of GBFMorph
+ * gbfmorph.h - Definition of GBFMorph
*
* $Id$
*
@@ -27,8 +27,8 @@
SWORD_NAMESPACE_START
- /** This Filter shows/hides morph tags in a GBF text
- */
+/** This Filter shows/hides morph tags in a GBF text
+ */
class SWDLLEXPORT GBFMorph : public SWOptionFilter {
public:
GBFMorph();
Modified: trunk/include/gbfosis.h
===================================================================
--- trunk/include/gbfosis.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/gbfosis.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/***************************************************************************
*
- * gbfosis.h - Implementation of GBFOSIS
+ * gbfosis.h - Definition of GBFOSIS
*
* $Id$
*
Modified: trunk/include/gbfplain.h
===================================================================
--- trunk/include/gbfplain.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/gbfplain.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/***************************************************************************
*
- * gbfplain.h - Implementation of GBFPlain
+ * gbfplain.h - Definition of GBFPlain
*
* $Id$
*
@@ -27,8 +27,8 @@
SWORD_NAMESPACE_START
- /** This filter converts GBF text to plain text
- */
+/** This filter converts GBF text to plain text
+ */
class SWDLLEXPORT GBFPlain : public SWFilter {
public:
GBFPlain();
Modified: trunk/include/gbfredletterwords.h
===================================================================
--- trunk/include/gbfredletterwords.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/gbfredletterwords.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/***************************************************************************
*
- * gbfredletterwords.h - Implementation of GBFRedLetterWords
+ * gbfredletterwords.h - Definition of GBFRedLetterWords
*
* $Id$
*
Modified: trunk/include/gbfrtf.h
===================================================================
--- trunk/include/gbfrtf.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/gbfrtf.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/***************************************************************************
*
- * gbfrtf.h - Implementation of GBFRTF
+ * gbfrtf.h - Definition of GBFRTF
*
* $Id$
*
Modified: trunk/include/gbfstrongs.h
===================================================================
--- trunk/include/gbfstrongs.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/gbfstrongs.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/***************************************************************************
*
- * gbfstrongs.h - Implementation of GBFStrongs
+ * gbfstrongs.h - Definition of GBFStrongs
*
* $Id$
*
Modified: trunk/include/gbfthml.h
===================================================================
--- trunk/include/gbfthml.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/gbfthml.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/***************************************************************************
*
- * gbfhtml.h - Implementation of GBFHTML
+ * gbfhtml.h - Definition of GBFHTML
*
* $Id$
*
Modified: trunk/include/gbfwebif.h
===================================================================
--- trunk/include/gbfwebif.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/gbfwebif.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * gbfwebif.h - Implementation of GBFWEBIF
+ * gbfwebif.h - Definition of GBFWEBIF
*
* $Id$
*
Modified: trunk/include/gbfwordjs.h
===================================================================
--- trunk/include/gbfwordjs.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/gbfwordjs.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/***************************************************************************
*
- * gbfwordjs.h - Implementation of GBFWordJS
+ * gbfwordjs.h - Definition of GBFWordJS
*
* $Id$
*
@@ -28,14 +28,14 @@
SWORD_NAMESPACE_START
class SWMgr;
- /** This Filter shows/hides strong's numbers in a GBF text
- */
+/** This Filter shows/hides strong's numbers in a GBF text
+ */
class SWDLLEXPORT GBFWordJS : public SWOptionFilter {
- SWModule *defaultGreekLex;
- SWModule *defaultHebLex;
- SWModule *defaultGreekParse;
- SWModule *defaultHebParse;
- SWMgr *mgr;
+ SWModule *defaultGreekLex;
+ SWModule *defaultHebLex;
+ SWModule *defaultGreekParse;
+ SWModule *defaultHebParse;
+ SWMgr *mgr;
public:
GBFWordJS();
Modified: trunk/include/gbfxhtml.h
===================================================================
--- trunk/include/gbfxhtml.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/gbfxhtml.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * gbfxhtml.h - Implementation of GBFXHTML
+ * gbfxhtml.h - Definition of GBFXHTML
*
* $Id$
*
Modified: trunk/include/greeklexattribs.h
===================================================================
--- trunk/include/greeklexattribs.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/greeklexattribs.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/***************************************************************************
*
- * greeklexattribs.h - Implementation of GreekLexAttribs
+ * greeklexattribs.h - Definition of GreekLexAttribs
*
* $Id$
*
Modified: trunk/include/hebrewmcim.h
===================================================================
--- trunk/include/hebrewmcim.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/hebrewmcim.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * hebrewmcim.h - Implementation of HebrewMCIM
+ * hebrewmcim.h - Definition of HebrewMCIM
*
* $Id$
*
@@ -40,14 +40,14 @@
class SWDLLEXPORT HebrewMCIM : public SWInputMethod {
- void init();
- int subst[255];
- map<int, int> subst2[12];
- map<int, int*> multiChars;
+ void init();
+ int subst[255];
+ map<int, int> subst2[12];
+ map<int, int*> multiChars;
public:
- HebrewMCIM();
- int *translate(char in);
+ HebrewMCIM();
+ int *translate(char in);
};
SWORD_NAMESPACE_END
Modified: trunk/include/hrefcom.h
===================================================================
--- trunk/include/hrefcom.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/hrefcom.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,7 +1,7 @@
/******************************************************************************
*
- * hrefcom.h - code for class 'HREFCom'- a module that produces HTML HREFs
- * pointing to actual text desired. Uses standard
+ * hrefcom.h - code for class 'HREFCom'- a module that produces HTML HREFs
+ * pointing to actual text desired. Uses standard
* files: ot and nt using indexs ??.bks ??.cps ??.vss
*
* $Id$
Modified: trunk/include/installmgr.h
===================================================================
--- trunk/include/installmgr.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/installmgr.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * installmgr.h - Implementation of InstallMgr
+ * installmgr.h - Definition of InstallMgr
*
* $Id$
*
@@ -78,17 +78,17 @@
bool unverifiedPeerAllowed;
/** override this method and provide your own custom RemoteTransport subclass
- */
+ */
virtual RemoteTransport *createFTPTransport(const char *host, StatusReporter *statusReporter);
/** override this method and provide your own custom HTTP RemoteTransport
- */
+ */
virtual RemoteTransport *createHTTPTransport(const char *host, StatusReporter *statusReporter);
/** we have a transport member to set as current running transport so we
* can ask it to terminate below, if user requests
- */
+ */
RemoteTransport *transport;
public:
@@ -103,52 +103,53 @@
SWConfig *installConf;
- /** all remote sources configured for this installmgr. Use this to gain access
- * to individual remote sources.
- */
+ /** all remote sources configured for this installmgr. Use this to gain access
+ * to individual remote sources.
+ */
InstallSourceMap sources;
/** Username and Password supplied here can be used to identify your frontend
* by supplying a valid anon password like installmgr at macsword.com
* This will get overridden if a password is required and provided in an indivual
* source configuration.
- */
+ */
InstallMgr(const char *privatePath = "./", StatusReporter *statusReporter = 0, SWBuf u="ftp", SWBuf p="installmgr at user.com");
virtual ~InstallMgr();
/** Call to re-read InstallMgr.conf
- */
+ */
void readInstallConf();
/** Call to dump sources and other settings to InstallMgr.conf
- */
+ */
void saveInstallConf();
/** Removes all configured sources from memory. Call saveInstallConf() to persist
- */
+ */
void clearSources();
- /** call to delete all files of a locally installed module.
- */
+ /** call to delete all files of a locally installed module.
+ */
virtual int removeModule(SWMgr *manager, const char *modName);
- /** mostly an internally used method to remote download from a remote source to a local destination
- */
+ /** mostly an internally used method to remote download from a remote source
+ * to a local destination
+ */
virtual int remoteCopy(InstallSource *is, const char *src, const char *dest, bool dirTransfer = false, const char *suffix = "");
- /** call to install a module from a local path (fromLocation) or remote InstallSource (is) (leave the other 0)
- */
+ /** call to install a module from a local path (fromLocation) or remote InstallSource (is) (leave the other 0)
+ */
virtual int installModule(SWMgr *destMgr, const char *fromLocation, const char *modName, InstallSource *is = 0);
- /** call to obtain and locally cache the available content list of the remote source
- */
+ /** call to obtain and locally cache the available content list of the remote source
+ */
virtual int refreshRemoteSource(InstallSource *is);
- /** call to populate installmgr configuration with all known
- * remote sources from the master list at CrossWire
- */
+ /** call to populate installmgr configuration with all known
+ * remote sources from the master list at CrossWire
+ */
virtual int refreshRemoteSourceConfiguration();
@@ -161,7 +162,7 @@
* method yourself at the desired time.
*
* Return true if your user confirms.
- *
+ *
* User disclaimer should ask user for confirmation of 2 critical items:
* and the default answer should be NO
* (due to possibly the wrong language for the disclaimer)
@@ -171,7 +172,7 @@
*
* A sample default impl is provided below:
*
- */
+ */
virtual bool isUserDisclaimerConfirmed() const; /* {
bool confirmed = userDisclaimerConfirmed;
@@ -259,15 +260,15 @@
/** whether or not to use passive mode when doing ftp transfers
- */
+ */
void setFTPPassive(bool passive) { this->passive = passive; }
bool isFTPPassive() { return passive; }
void setUnverifiedPeerAllowed(bool allowed) { this->unverifiedPeerAllowed = allowed; }
bool isUnverifiedPeerAllowed() { return unverifiedPeerAllowed; }
- /** call from another thread to terminate the installation process
- */
+ /** call from another thread to terminate the installation process
+ */
void terminate();
/************************************************************************
Modified: trunk/include/latin1utf16.h
===================================================================
--- trunk/include/latin1utf16.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/latin1utf16.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/***************************************************************************
*
- * latin1utf16.h - Implementation of Latin1UTF16
+ * latin1utf16.h - Definition of Latin1UTF16
*
* $Id$
*
Modified: trunk/include/latin1utf8.h
===================================================================
--- trunk/include/latin1utf8.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/latin1utf8.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/***************************************************************************
*
- * latin1utf8.h - Implementation of Latin1UTF8
+ * latin1utf8.h - Definition of Latin1UTF8
*
* $Id$
*
Modified: trunk/include/listkey.h
===================================================================
--- trunk/include/listkey.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/listkey.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * listkey.h - code for base class 'listkey'. listkey is the basis for all
+ * listkey.h - code for base class 'listkey'. listkey is the basis for all
* types of keys for indexing into modules
* (e.g. verse, word, place, etc.)
*
@@ -31,10 +31,10 @@
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.)
- */
+/** ListKey is the basis for all
+ * types of keys that have lists of specified indexes
+ * (e.g. a list of verses, place, etc.)
+ */
class SWDLLEXPORT ListKey : public SWKey {
static SWClass classdef;
Modified: trunk/include/localemgr.h
===================================================================
--- trunk/include/localemgr.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/localemgr.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * localemgr.h - definition of class LocaleMgr used to interact with
+ * localemgr.h - definition of class LocaleMgr used to interact with
* registered locales for a sword installation
*
* $Id$
@@ -59,7 +59,7 @@
public:
- /** Default constructor of LocaleMgr
+ /** Default constructor of LocaleMgr
* You do normally not need this constructor, use LocaleMgr::getSystemLocaleMgr() instead.
*/
LocaleMgr(const char *iConfigPath = 0);
@@ -99,7 +99,7 @@
/** Set the new standard locale of Sword.
*
- * @param name The name of the new default locale
+ * @param name The name of the new default locale
*/
virtual void setDefaultLocaleName(const char *name);
Modified: trunk/include/lzsscomprs.h
===================================================================
--- trunk/include/lzsscomprs.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/lzsscomprs.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * lzsscomprs.h - definition of Class SWCompress used for data
+ * lzsscomprs.h - definition of Class SWCompress used for data
* compression
*
* $Id$
Modified: trunk/include/markupfiltmgr.h
===================================================================
--- trunk/include/markupfiltmgr.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/markupfiltmgr.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * markupfiltmgr.h - definition of class SWMarkupMgr, subclass of
+ * markupfiltmgr.h - definition of class SWMarkupMgr, subclass of
* used to transcode all module text to a requested
* markup
*
@@ -33,45 +33,45 @@
*/
class SWDLLEXPORT MarkupFilterMgr : public EncodingFilterMgr {
protected:
- SWFilter* fromthml;
- SWFilter* fromgbf;
- SWFilter* fromplain;
- SWFilter* fromosis;
- SWFilter* fromtei;
+ SWFilter* fromthml;
+ SWFilter* fromgbf;
+ SWFilter* fromplain;
+ SWFilter* fromosis;
+ SWFilter* fromtei;
/**
* current markup value
*/
- char markup;
+ char markup;
- void createFilters(char markup);
+ void createFilters(char markup);
public:
/** Constructor of SWMarkupMgr.
*
* @param encoding The desired encoding.
* @param markup The desired markup format.
*/
- MarkupFilterMgr(char markup = FMT_THML, char encoding = ENC_UTF8);
+ MarkupFilterMgr(char markup = FMT_THML, char encoding = ENC_UTF8);
/**
* The destructor of SWMarkupMgr.
*/
- ~MarkupFilterMgr();
+ ~MarkupFilterMgr();
/** Markup sets/gets the markup after initialization
*
* @param m The new markup or FMT_UNKNOWN if you just want to get the current markup.
* @return The current (possibly changed) markup format.
*/
- void setMarkup(char m = FMT_UNKNOWN);
- char getMarkup() const { return markup; }
+ void setMarkup(char m = FMT_UNKNOWN);
+ char getMarkup() const { return markup; }
/**
* Adds the render filters which are defined in "section" to the SWModule object "module".
* @param module To this module the render filter(s) are added
* @param section We use this section to get a list of filters we should apply to the module
*/
- virtual void addRenderFilters(SWModule *module, ConfigEntMap §ion);
+ virtual void addRenderFilters(SWModule *module, ConfigEntMap §ion);
};
SWORD_NAMESPACE_END
Modified: trunk/include/multimapwdef.h
===================================================================
--- trunk/include/multimapwdef.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/multimapwdef.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * multimapwdef.h - Implementation of multimapwithdefault
+ * multimapwdef.h - Definition of multimapwithdefault
*
* $Id$
*
Modified: trunk/include/nullim.h
===================================================================
--- trunk/include/nullim.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/nullim.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * nullim.h - Implementation of NullIM
+ * nullim.h - Definition of NullIM
*
* $Id$
*
Modified: trunk/include/osisenum.h
===================================================================
--- trunk/include/osisenum.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/osisenum.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * osisenum.h - Implementation of OSISEnum
+ * osisenum.h - Definition of OSISEnum
*
* $Id$
*
Modified: trunk/include/osisfootnotes.h
===================================================================
--- trunk/include/osisfootnotes.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/osisfootnotes.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * osisfootnotes.h - Implementation of OSISFootnotes
+ * osisfootnotes.h - Definition of OSISFootnotes
*
* $Id$
*
Modified: trunk/include/osisglosses.h
===================================================================
--- trunk/include/osisglosses.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/osisglosses.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * osisglosses.h - Implementation of OSISGlosses
+ * osisglosses.h - Definition of OSISGlosses
*
* $Id$
*
Modified: trunk/include/osisheadings.h
===================================================================
--- trunk/include/osisheadings.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/osisheadings.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * osisheadings.h - Implementation of OSISHeadings
+ * osisheadings.h - Definition of OSISHeadings
*
* $Id$
*
Modified: trunk/include/osishtmlhref.h
===================================================================
--- trunk/include/osishtmlhref.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/osishtmlhref.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * osishtmlhref.h - Implementation of OSISHTMLHREF
+ * osishtmlhref.h - Definition of OSISHTMLHREF
*
* $Id$
*
@@ -45,8 +45,8 @@
int suspendLevel;
SWBuf wordsOfChristStart;
SWBuf wordsOfChristEnd;
- TagStacks *tagStacks; // TODO: modified to wrap all TagStacks necessary for this filter until 1.7.x
-// TagStack *hiStack; // TODO: commented out for binary compat for 1.6.x wrapped in tagStacks until 1.7.x
+ TagStacks *tagStacks; // TODO: modified to wrap all TagStacks necessary for this filter until 1.7.x
+// TagStack *hiStack; // TODO: commented out for binary compat for 1.6.x wrapped in tagStacks until 1.7.x
SWBuf lastTransChange;
SWBuf w;
SWBuf fn;
Modified: trunk/include/osislatex.h
===================================================================
--- trunk/include/osislatex.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/osislatex.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * osislatex.h - Render filter for LaTeX of an OSIS module
+ * osislatex.h - Render filter for LaTeX of an OSIS module
*
* $Id$
*
@@ -47,10 +47,10 @@
bool inXRefNote;
bool isBiblicalText;
int suspendLevel;
- bool firstCell; // for tables, indicates whether a cell is the first one in a row
+ bool firstCell; // for tables, indicates whether a cell is the first one in a row
SWBuf wordsOfChristStart;
SWBuf wordsOfChristEnd;
- SWBuf divLevel; // divLevel "module", "testament, "bookgroup", "book", "majorsection", "section", "paragraph" , ignore others.
+ SWBuf divLevel; // divLevel "module", "testament, "bookgroup", "book", "majorsection", "section", "paragraph" , ignore others.
TagStack *quoteStack;
TagStack *hiStack;
Modified: trunk/include/osislemma.h
===================================================================
--- trunk/include/osislemma.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/osislemma.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * osislemma.h - Implementation of OSISLemma
+ * osislemma.h - Definition of OSISLemma
*
* $Id$
*
Modified: trunk/include/osismorph.h
===================================================================
--- trunk/include/osismorph.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/osismorph.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/***************************************************************************
*
- * osismorph.h - Implementation of OSISMorph
+ * osismorph.h - Definition of OSISMorph
*
* $Id$
*
Modified: trunk/include/osismorphsegmentation.h
===================================================================
--- trunk/include/osismorphsegmentation.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/osismorphsegmentation.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * osismorphsegmentation.h - Implementation of OSISMorphSegmentation
+ * osismorphsegmentation.h - Definition of OSISMorphSegmentation
*
* $Id$
*
@@ -27,10 +27,9 @@
SWORD_NAMESPACE_START
-/* This filters toggles splitting of morphemes
- * (for morpheme segmented Hebrew in the WLC)
+/* This filters toggles splitting of morphemes
+ * (for morpheme segmented Hebrew in the WLC)
*/
-
class SWDLLEXPORT OSISMorphSegmentation : public SWOptionFilter {
public:
Modified: trunk/include/osisosis.h
===================================================================
--- trunk/include/osisosis.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/osisosis.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * osisosis.h - Implementation of OSISOSIS
+ * osisosis.h - Definition of OSISOSIS
*
* $Id$
*
Modified: trunk/include/osisplain.h
===================================================================
--- trunk/include/osisplain.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/osisplain.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * osisplain.h - Implementation of OSISPlain
+ * osisplain.h - Definition of OSISPlain
*
* $Id$
*
Modified: trunk/include/osisredletterwords.h
===================================================================
--- trunk/include/osisredletterwords.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/osisredletterwords.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * osisredletterwords.h - Implementation of OSISRedLetterWords
+ * osisredletterwords.h - Definition of OSISRedLetterWords
*
* $Id$
*
Modified: trunk/include/osisreferencelinks.h
===================================================================
--- trunk/include/osisreferencelinks.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/osisreferencelinks.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,14 +1,14 @@
/******************************************************************************
*
- * osisreferencelinks.h - SWFilter descendant to toggle OSIS reference
+ * osisreferencelinks.h - SWFilter descendant to toggle OSIS reference
* links with specified type/subType
*
* $Id$
*
* Copyright 2013 CrossWire Bible Society (http://www.crosswire.org)
- * CrossWire Bible Society
- * P. O. Box 2528
- * Tempe, AZ 85280-2528
+ * CrossWire Bible Society
+ * P. O. Box 2528
+ * Tempe, AZ 85280-2528
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
Modified: trunk/include/osisrtf.h
===================================================================
--- trunk/include/osisrtf.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/osisrtf.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * osisrtf.h - Implementation of OSISRTF
+ * osisrtf.h - Definition of OSISRTF
*
* $Id$
*
Modified: trunk/include/osisscripref.h
===================================================================
--- trunk/include/osisscripref.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/osisscripref.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * osisscripref.h - Implementation of OSISScripRef
+ * osisscripref.h - Definition of OSISScripRef
*
* $Id$
*
Modified: trunk/include/osisstrongs.h
===================================================================
--- trunk/include/osisstrongs.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/osisstrongs.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/***************************************************************************
*
- * osisstrongs.h - Implementation of OSISStrongs
+ * osisstrongs.h - Definition of OSISStrongs
*
* $Id$
*
@@ -27,8 +27,8 @@
SWORD_NAMESPACE_START
- /** This Filter shows/hides strong's numbers in a OSIS text
- */
+/** This Filter shows/hides strong's numbers in a OSIS text
+ */
class SWDLLEXPORT OSISStrongs : public SWOptionFilter {
public:
OSISStrongs();
Modified: trunk/include/osisvariants.h
===================================================================
--- trunk/include/osisvariants.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/osisvariants.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * osisvariants.h - Implementation of OSISVariants
+ * osisvariants.h - Definition of OSISVariants
*
* $Id$
*
Modified: trunk/include/osiswebif.h
===================================================================
--- trunk/include/osiswebif.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/osiswebif.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * osiswebif.h - Implementation of OSISWEBIF
+ * osiswebif.h - Definition of OSISWEBIF
*
* $Id$
*
@@ -27,7 +27,7 @@
SWORD_NAMESPACE_START
-/** this filter converts OSIS text to HTML text with hrefs
+/** this filter converts OSIS text to HTML text with hrefs
*/
class SWDLLEXPORT OSISWEBIF : public OSISXHTML {
const SWBuf baseURL;
Modified: trunk/include/osiswordjs.h
===================================================================
--- trunk/include/osiswordjs.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/osiswordjs.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/***************************************************************************
*
- * osiswordjs.h - Implementation of OSISWordJS
+ * osiswordjs.h - Definition of OSISWordJS
*
* $Id$
*
@@ -28,14 +28,15 @@
SWORD_NAMESPACE_START
class SWMgr;
- /** This Filter shows/hides strong's numbers in a OSIS text
- */
+
+/** This Filter shows/hides strong's numbers in a OSIS text
+ */
class SWDLLEXPORT OSISWordJS : public SWOptionFilter {
- SWModule *defaultGreekLex;
- SWModule *defaultHebLex;
- SWModule *defaultGreekParse;
- SWModule *defaultHebParse;
- SWMgr *mgr;
+ SWModule *defaultGreekLex;
+ SWModule *defaultHebLex;
+ SWModule *defaultGreekParse;
+ SWModule *defaultHebParse;
+ SWMgr *mgr;
public:
OSISWordJS();
Modified: trunk/include/osisxhtml.h
===================================================================
--- trunk/include/osisxhtml.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/osisxhtml.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * osisxhtml.h - Render filter for classed XHTML of an OSIS module
+ * osisxhtml.h - Render filter for classed XHTML of an OSIS module
*
* $Id$
*
Modified: trunk/include/osisxlit.h
===================================================================
--- trunk/include/osisxlit.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/osisxlit.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * osisxlit.h - Implementation of OSISXlit
+ * osisxlit.h - Definition of OSISXlit
*
* $Id$
*
Modified: trunk/include/papyriplain.h
===================================================================
--- trunk/include/papyriplain.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/papyriplain.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/***************************************************************************
*
- * papyriplain.h - Implementation of PapyriPlain
+ * papyriplain.h - Definition of PapyriPlain
*
* $Id$
*
@@ -27,8 +27,8 @@
SWORD_NAMESPACE_START
- /** This filter converts Papyri text to plain text
- */
+/** This filter converts Papyri text to plain text
+ */
class SWDLLEXPORT PapyriPlain : public SWOptionFilter {
public:
PapyriPlain();
Modified: trunk/include/rawcom.h
===================================================================
--- trunk/include/rawcom.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/rawcom.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * rawcom.h - code for class 'RawCom'- a module that reads raw commentary
+ * rawcom.h - code for class 'RawCom'- a module that reads raw commentary
* files: ot and nt using indexs ??.bks ??.cps ??.vss
*
* $Id$
@@ -33,9 +33,7 @@
class SWDLLEXPORT RawCom : public RawVerse, public SWCom {
-
public:
-
RawCom(const char *ipath, const char *iname = 0, const char *idesc = 0,
SWDisplay *idisp = 0, SWTextEncoding encoding = ENC_UNKNOWN,
SWTextDirection dir = DIRECTION_LTR, SWTextMarkup markup = FMT_UNKNOWN,
Modified: trunk/include/rawcom4.h
===================================================================
--- trunk/include/rawcom4.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/rawcom4.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * rawcom4.h - code for class 'RawCom4'- a module that reads raw commentary
+ * rawcom4.h - code for class 'RawCom4'- a module that reads raw commentary
* files: ot and nt using indexs ??.bks ??.cps ??.vss
*
* $Id$
@@ -33,9 +33,7 @@
class SWDLLEXPORT RawCom4 : public RawVerse4, public SWCom {
-
public:
-
RawCom4(const char *ipath, const char *iname = 0, const char *idesc = 0,
SWDisplay *idisp = 0, SWTextEncoding encoding = ENC_UNKNOWN,
SWTextDirection dir = DIRECTION_LTR, SWTextMarkup markup = FMT_UNKNOWN,
Modified: trunk/include/rawfiles.h
===================================================================
--- trunk/include/rawfiles.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/rawfiles.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * rawfiles.h - code for class 'RawFiles'- a module that produces HTML
+ * rawfiles.h - code for class 'RawFiles'- a module that produces HTML
* HREFs pointing to actual text desired. Uses standard
* files: ot and nt using indexs ??.bks ??.cps ??.vss
*
Modified: trunk/include/rawgenbook.h
===================================================================
--- trunk/include/rawgenbook.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/rawgenbook.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * rawgenbook.h - code for class 'RawGenBook'- a module that reads raw
+ * rawgenbook.h - code for class 'RawGenBook'- a module that reads raw
* text files:
* ot and nt using indexs ??.bks ??.cps ??.vss
*
@@ -39,8 +39,6 @@
bool verseKey;
public:
-
-
RawGenBook(const char *ipath, const char *iname = 0, const char *idesc = 0,
SWDisplay * idisp = 0, SWTextEncoding encoding = ENC_UNKNOWN,
SWTextDirection dir = DIRECTION_LTR,
Modified: trunk/include/rawld.h
===================================================================
--- trunk/include/rawld.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/rawld.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * rawld.cpp - code for class 'RawLD'- a module that reads raw lexicon and
+ * rawld.cpp - code for class 'RawLD'- a module that reads raw lexicon and
* dictionary files: *.dat *.idx
*
* $Id$
Modified: trunk/include/rawld4.h
===================================================================
--- trunk/include/rawld4.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/rawld4.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * rawld4.cpp - code for class 'RawLD4'- a module that reads raw
+ * rawld4.cpp - code for class 'RawLD4'- a module that reads raw
* lexicon and dictionary files: *.dat *.idx
*
* $Id$
Modified: trunk/include/rawstr.h
===================================================================
--- trunk/include/rawstr.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/rawstr.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,7 +1,7 @@
/*****************************************************************************
*
- * rawstr.h - code for class 'RawStr'- a module that reads raw text
- * files: ot and nt using indexs ??.bks ??.cps ??.vss
+ * rawstr.h - code for class 'RawStr'- a module that reads raw text
+ * files: ot and nt using indexs ??.bks ??.cps ??.vss
* and provides lookup and parsing functions based on
* class StrKey
*
Modified: trunk/include/rawstr4.h
===================================================================
--- trunk/include/rawstr4.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/rawstr4.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,7 +1,7 @@
/*****************************************************************************
*
- * rawstr4.h - code for class 'RawStr4'- a module that reads raw text
- * files: ot and nt using indexs ??.bks ??.cps ??.vss
+ * rawstr4.h - code for class 'RawStr4'- a module that reads raw text
+ * files: ot and nt using indexs ??.bks ??.cps ??.vss
* and provides lookup and parsing functions based on
* class StrKey
*
Modified: trunk/include/rawtext.h
===================================================================
--- trunk/include/rawtext.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/rawtext.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * rawtext.h - code for class 'RawText'- a module that reads raw text files:
+ * rawtext.h - code for class 'RawText'- a module that reads raw text files:
* ot and nt using indexs ??.bks ??.cps ??.vss
*
* $Id$
@@ -36,7 +36,6 @@
class SWDLLEXPORT RawText : public SWText, public RawVerse {
public:
-
RawText(const char *ipath, const char *iname = 0, const char *idesc = 0, SWDisplay * idisp = 0, SWTextEncoding encoding = ENC_UNKNOWN, SWTextDirection dir = DIRECTION_LTR, SWTextMarkup markup = FMT_UNKNOWN, const char* ilang = 0, const char *versification = "KJV");
virtual ~RawText();
virtual SWBuf &getRawEntryBuf() const;
Modified: trunk/include/rawtext4.h
===================================================================
--- trunk/include/rawtext4.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/rawtext4.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * rawtext4.h - code for class 'RawText4'- a module that reads raw
+ * rawtext4.h - code for class 'RawText4'- a module that reads raw
* text files:
* ot and nt using indexs ??.bks ??.cps ??.vss
*
@@ -38,7 +38,6 @@
class SWDLLEXPORT RawText4 : public SWText, public RawVerse4 {
public:
-
RawText4(const char *ipath, const char *iname = 0, const char *idesc = 0, SWDisplay * idisp = 0, SWTextEncoding encoding = ENC_UNKNOWN, SWTextDirection dir = DIRECTION_LTR, SWTextMarkup markup = FMT_UNKNOWN, const char* ilang = 0, const char *versification = "KJV");
virtual ~RawText4();
virtual SWBuf &getRawEntryBuf() const;
Modified: trunk/include/rawverse.h
===================================================================
--- trunk/include/rawverse.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/rawverse.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,7 +1,7 @@
/******************************************************************************
*
- * rawverse.h - code for class 'RawVerse'- a module that reads raw text
- * files: ot and nt using indexs ??.bks ??.cps ??.vss
+ * rawverse.h - code for class 'RawVerse'- a module that reads raw text
+ * files: ot and nt using indexs ??.bks ??.cps ??.vss
* and provides lookup and parsing functions based on
* class VerseKey
*
@@ -36,8 +36,8 @@
class SWDLLEXPORT RawVerse {
+ static int instance; // number of instantiated RawVerse objects or derivitives
- static int instance; // number of instantiated RawVerse objects or derivitives
protected:
FileDesc *idxfp[2];
FileDesc *textfp[2];
Modified: trunk/include/rawverse4.h
===================================================================
--- trunk/include/rawverse4.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/rawverse4.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,7 +1,7 @@
/******************************************************************************
*
- * rawverse4.h - code for class 'RawVerse4'- a module that reads raw
- * text files: ot and nt using indexs ??.bks ??.cps
+ * rawverse4.h - code for class 'RawVerse4'- a module that reads raw
+ * text files: ot and nt using indexs ??.bks ??.cps
* ??.vss and provides lookup and parsing functions based
* on class VerseKey
*
@@ -37,8 +37,8 @@
class SWDLLEXPORT RawVerse4 {
+ static int instance; // number of instantiated RawVerse objects or derivitives
- static int instance; // number of instantiated RawVerse objects or derivitives
protected:
FileDesc *idxfp[2];
FileDesc *textfp[2];
Modified: trunk/include/remotetrans.h
===================================================================
--- trunk/include/remotetrans.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/remotetrans.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * remotetrans.h - code for Remote Transport
+ * remotetrans.h - code for Remote Transport
*
* $Id$
*
Modified: trunk/include/roman.h
===================================================================
--- trunk/include/roman.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/roman.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * roman.h - roman numeral functions
+ * roman.h - roman numeral functions
*
* $Id$
*
Modified: trunk/include/rtfhtml.h
===================================================================
--- trunk/include/rtfhtml.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/rtfhtml.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/***************************************************************************
*
- * rtfhtml.h - Implementation of RTFHTML
+ * rtfhtml.h - Definition of RTFHTML
*
* $Id$
*
Modified: trunk/include/rtranspgdrive.h
===================================================================
--- trunk/include/rtranspgdrive.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/rtranspgdrive.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * rtranspgdrive.h - code for Google Drive impl of Remote Transport
+ * rtranspgdrive.h - code for Google Drive impl of Remote Transport
*
* $Id$
*
Modified: trunk/include/sapphire.h
===================================================================
--- trunk/include/sapphire.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/sapphire.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * sapphire.h - the Saphire II stream cipher class
+ * sapphire.h - the Saphire II stream cipher class
*
* $Id$
*
@@ -36,46 +36,45 @@
* unsigned char is assumed to be 8 bits. If it is not, the
* results of assignments need to be reduced to 8 bits with
* & 0xFF or % 0x100, whichever is faster.
- */
-
+ */
+
#ifndef NULL
#define NULL 0
-#endif /* */
+#endif
#include <defs.h>
SWORD_NAMESPACE_START
- class sapphire
-{
-
- // These variables comprise the state of the state machine.
- unsigned char cards[256]; // A permutation of 0-255.
- unsigned char rotor, // Index that rotates smoothly
- ratchet, // Index that moves erratically
- avalanche, // Index heavily data dependent
- last_plain, // Last plain text byte
- last_cipher; // Last cipher text byte
-
- // This function is used by initialize(), which is called by the
- // constructor.
- unsigned char keyrand (int limit, unsigned char *user_key,
- unsigned char keysize, unsigned char *rsum,
-unsigned *keypos); public:sapphire (unsigned char
- *key = NULL, // Calls initialize if a real
- unsigned char keysize = 0); // key is provided. If none
- // is provided, call initialize
- // before encrypt or decrypt.
- ~sapphire (); // Destroy cipher state information.
- void initialize (unsigned char *key, // User key is used to set
- unsigned char keysize); // up state information.
- void hash_init (void); // Set up default hash.
- unsigned char encrypt (unsigned char b = 0); // Encrypt byte
- // or get a random byte.
- unsigned char decrypt (unsigned char b); // Decrypt byte.
- void hash_final (unsigned char *hash, // Copy hash value to hash
- unsigned char hashlength = 20); // Hash length (16-32)
- void burn (void); // Destroy cipher state information.
+class sapphire {
+
+ // These variables comprise the state of the state machine.
+ unsigned char cards[256]; // A permutation of 0-255.
+ unsigned char rotor, // Index that rotates smoothly
+ ratchet, // Index that moves erratically
+ avalanche, // Index heavily data dependent
+ last_plain, // Last plain text byte
+ last_cipher; // Last cipher text byte
+
+ // This function is used by initialize(), which is called by the
+ // constructor.
+ unsigned char keyrand (int limit, unsigned char *user_key,
+ unsigned char keysize, unsigned char *rsum,
+ unsigned *keypos); public:sapphire (unsigned char
+ *key = NULL, // Calls initialize if a real
+ unsigned char keysize = 0); // key is provided. If none
+ // is provided, call initialize
+ // before encrypt or decrypt.
+ ~sapphire (); // Destroy cipher state information.
+ void initialize (unsigned char *key, // User key is used to set
+ unsigned char keysize); // up state information.
+ void hash_init (void); // Set up default hash.
+ unsigned char encrypt (unsigned char b = 0); // Encrypt byte
+ // or get a random byte.
+ unsigned char decrypt (unsigned char b); // Decrypt byte.
+ void hash_final (unsigned char *hash, // Copy hash value to hash
+ unsigned char hashlength = 20); // Hash length (16-32)
+ void burn (void); // Destroy cipher state information.
};
Modified: trunk/include/scsuutf8.h
===================================================================
--- trunk/include/scsuutf8.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/scsuutf8.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * scsuutf8.h - SWFilter descendant to convert a SCSU character to UTF-8
+ * scsuutf8.h - SWFilter descendant to convert a SCSU character to UTF-8
*
* $Id$
*
@@ -53,7 +53,7 @@
int UTF8Output(unsigned long, SWBuf* utf8Buf);
#endif
-
+
public:
SCSUUTF8();
~SCSUUTF8();
Modified: trunk/include/stringmgr.h
===================================================================
--- trunk/include/stringmgr.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/stringmgr.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * stringmgr.h - A class which provides string handling functions which
+ * stringmgr.h - A class which provides string handling functions which
* can be reimplemented by frontends
*
* $Id$
@@ -43,7 +43,7 @@
* @param newStringMgr The new global StringMgr. This pointer will be deleted by this StringMgr
*/
static void setSystemStringMgr(StringMgr *newStringMgr);
-
+
/** Returns the global StringMgr handle
* @return The global string handle
*/
@@ -74,7 +74,7 @@
virtual bool isLower(SW_u32 character) const;
virtual bool isDigit(SW_u32 character) const;
virtual bool isAlpha(SW_u32 character) const;
-
+
/** Converts the param to an uppercase latin1 string
* @param text The text encoded in latin1 which should be turned into an upper case string
* @param max Max buffer size
@@ -89,11 +89,11 @@
/** Default constructor. Protected to make instances on user side impossible, because this is a Singleton
*/
StringMgr();
-
+
/** Copy constructor
*/
StringMgr(const StringMgr &);
-
+
/** Destructor
*/
virtual ~StringMgr();
Modified: trunk/include/strkey.h
===================================================================
--- trunk/include/strkey.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/strkey.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * strkey.h - code for class 'strkey'- a standard Biblical verse key
+ * strkey.h - code for class 'strkey'- a standard Biblical verse key
*
* $Id$
*
@@ -30,27 +30,31 @@
SWORD_NAMESPACE_START
- /** a standard string key class (used
- * for modules that index on single strings (eg. cities,
- * names, words, etc.)
- */
-class SWDLLEXPORT StrKey:public SWKey
-{
- static SWClass classdef;
- void init ();
+/** a standard string key class (used
+ * for modules that index on single strings (eg. cities,
+ * names, words, etc.)
+ */
+class SWDLLEXPORT StrKey:public SWKey {
+
+ static SWClass classdef;
+ void init ();
+
public:
- /** initializes instance of StrKey
- *
- * @param ikey text key (word, city, name, etc.)
- */
- StrKey (const char *ikey = 0);
- /** cleans up instance of StrKey
- */
- virtual ~ StrKey ();
- SWKEY_OPERATORS
+ /** initializes instance of StrKey
+ *
+ * @param ikey text key (word, city, name, etc.)
+ */
+ StrKey (const char *ikey = 0);
+ /** cleans up instance of StrKey
+ */
+ virtual ~ StrKey ();
+
+ SWKEY_OPERATORS
+
};
+
SWORD_NAMESPACE_END
#endif
Modified: trunk/include/swbasicfilter.h
===================================================================
--- trunk/include/swbasicfilter.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/swbasicfilter.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,9 +1,9 @@
/******************************************************************************
*
- * swbasicfilter.h - definition of class SWBasicFilter. An SWFilter
- * impl that provides some basic methods that
- * many filter will need and can use as a starting
- * point
+ * swbasicfilter.h - definition of class SWBasicFilter. An SWFilter
+ * impl that provides some basic methods that
+ * many filter will need and can use as a starting
+ * point
*
* $Id$
*
@@ -197,7 +197,7 @@
* @param buf the output buffer
* @param escString the escape sequence (e.g. <code>"#235"</code> for &235;)
* @return subclasses should return true if they handled the esc seq, or false if they did not.
- */
+ */
virtual bool handleNumericEscapeString(SWBuf &buf, const char *escString);
Modified: trunk/include/swbuf.h
===================================================================
--- trunk/include/swbuf.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/swbuf.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * swbuf.h - code for SWBuf used as a transport and utility for data buffers
+ * swbuf.h - code for SWBuf used as a transport and utility for data buffers
*
* $Id$
*
@@ -138,7 +138,7 @@
* SWBuf::setFillByte - Set the fillByte character
*
* @param ch This character is used when the SWBuf is (re)sized.
- * The memory will be filled with this character. \see setSize() \see resize()
+ * The memory will be filled with this character. \see setSize() \see resize()
*/
inline void setFillByte(char ch) { fillByte = ch; }
@@ -158,14 +158,14 @@
* @param pos The position of the requested character.
* @return The character at the specified position
*/
-// fastest guarded impl. If we reference out of bounds, we return our
+ // fastest guarded impl. If we reference out of bounds, we return our
inline char &charAtGuarded(unsigned long pos) { return ((pos <= (unsigned long)(endAlloc - buf)) ? buf[pos] : (*endAlloc)); }
-// unguarded impl. This is obviously much faster and is likely why std::string specifies references out of bounds have undefined
-// behavior. This is the default impl for operator []
+ // unguarded impl. This is obviously much faster and is likely why std::string specifies references out of bounds have undefined
+ // behavior. This is the default impl for operator []
inline char &charAt(unsigned long pos) { return *(buf + pos); }
inline const char &charAt(unsigned long pos) const { return *(buf + pos); }
-/* these have all proven to be slower implementations */
+// these have all proven to be slower implementations
// inline char &charAt(unsigned long pos) { return buf[pos]; }
// inline char &charAtGuarded(unsigned long pos) { return pos <= (unsigned long)end - (unsigned long)buf ? buf[pos] : *nullStr; }
// inline char &charAtGuarded(unsigned long pos) { return pos <= length() ? buf[pos] : *nullStr; }
@@ -232,12 +232,12 @@
* @warning This function can only write at most JUNKBUFSIZE to the string per call.
*
* @warning This function is not very fast. For loops with many iterations you might
- * consider replacing it by other calls.
- * Example:
- * \code SWBuf buf.setFormatted("<%s>", stringVal); \endcode
- * should be replaced by:
- * \code buf.set("<"); buf.append(stringVal); buf.append(">"); \endcode
- * This will produce much faster results.
+ * consider replacing it by other calls.
+ * Example:
+ * \code SWBuf buf.setFormatted("<%s>", stringVal); \endcode
+ * should be replaced by:
+ * \code buf.set("<"); buf.append(stringVal); buf.append(">"); \endcode
+ * This will produce much faster results.
*
* @param format The format string. Same syntax as printf, for example.
* @param ... Add all arguments here.
@@ -326,12 +326,12 @@
* @warning This function can only write at most JUNKBUFSIZE to the string per call.
*
* @warning This function is not very fast. For loops with many iterations you might
- * consider replacing it by other calls.
- * Example:
- * \code SWBuf buf.appendFormatted("<%s>", stringVal); \endcode
- * should be replaced by:
- * \code buf.append("<"); buf.append(stringVal); buf.append(">"); \endcode
- * This will produce much faster results.
+ * consider replacing it by other calls.
+ * Example:
+ * \code SWBuf buf.appendFormatted("<%s>", stringVal); \endcode
+ * should be replaced by:
+ * \code buf.append("<"); buf.append(stringVal); buf.append(">"); \endcode
+ * This will produce much faster results.
*
* @param format The format string. Same syntax as printf, for example.
* @param ... Add all arguments here.
@@ -445,13 +445,13 @@
* Returns the prefix and modifies this buffer, shifting left to remove prefix
* @param separator to use (e.g. ':')
* @param endOfStringAsSeparator - also count end of string as separator.
- * this is useful for tokenizing entire string like:
- * x|y|z
- * if true it will also include 'z'.
+ * this is useful for tokenizing entire string like:
+ * x|y|z
+ * if true it will also include 'z'.
*
* @return prefix if separator character found; otherwise, null and leaves buffer unmodified
*/
- inline const char *stripPrefix(char separator, bool endOfStringAsSeparator = false) { const char *m = strchr(buf, separator); if (!m && endOfStringAsSeparator) { if (*buf) { operator >>(1); *buf=0; end = buf; return buf + 1;} else return buf; } if (m) { int len = (int)(m-buf); char *hold = new char[len]; memcpy(hold, buf, len); *this << (len+1); memcpy(end+1, hold, len); delete [] hold; end[len+1] = 0; } return (m) ? end+1 : 0; } // safe. we know we don't actually realloc and shrink buffer when shifting, so we can place our return val at end.
+ inline const char *stripPrefix(char separator, bool endOfStringAsSeparator = false) { const char *m = strchr(buf, separator); if (!m && endOfStringAsSeparator) { if (*buf) { operator >>(1); *buf=0; end = buf; return buf + 1;} else return buf; } if (m) { int len = (int)(m-buf); char *hold = new char[len]; memcpy(hold, buf, len); *this << (len+1); memcpy(end+1, hold, len); delete [] hold; end[len+1] = 0; } return (m) ? end+1 : 0; } // safe. we know we don't actually realloc and shrink buffer when shifting, so we can place our return val at end.
// this could be nicer, like replacing a contiguous series of target bytes with single replacement; offering replacement const char *
/**
@@ -459,7 +459,7 @@
* @param targets a set of bytes, any of which will be replaced
* @param newByte value to use as replacement or 0 to remove matching byte.
*
- * Example: replaceBytes("abc", 'z'); // replaces all occurances of 'a', 'b', and 'c' with 'z'
+ * Example: replaceBytes("abc", 'z'); // replaces all occurances of 'a', 'b', and 'c' with 'z'
*/
inline SWBuf &replaceBytes(const char *targets, char newByte) {
for (unsigned int i = 0; (i < size()); i++) {
Modified: trunk/include/swcacher.h
===================================================================
--- trunk/include/swcacher.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/swcacher.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * swcacher.h - definition of class SWCacher used to provide an
+ * swcacher.h - definition of class SWCacher used to provide an
* interface for objects that cache and want a standard
* interface for cleaning up.
*
@@ -32,7 +32,7 @@
/** used to provide an interface for objects that cache and want
* a standard interface for cleaning up.
*/
-class SWDLLEXPORT SWCacher {
+class SWDLLEXPORT SWCacher {
public:
SWCacher();
virtual ~SWCacher();
Modified: trunk/include/swcipher.h
===================================================================
--- trunk/include/swcipher.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/swcipher.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * swcipher.h - definition of Class SWCipher used for data
+ * swcipher.h - definition of Class SWCipher used for data
* cipher/decipher
*
* $Id$
@@ -31,27 +31,28 @@
SWORD_NAMESPACE_START
-class SWDLLEXPORT SWCipher
-{
+class SWDLLEXPORT SWCipher {
- sapphire master;
- sapphire work;
+ sapphire master;
+ sapphire work;
- char *buf;
- bool cipher;
- unsigned long len;
+ char *buf;
+ bool cipher;
+ unsigned long len;
+
protected:
+
public:
- SWCipher (unsigned char *key);
- virtual void setCipherKey (const char *key);
- virtual ~ SWCipher ();
- virtual void setUncipheredBuf(const char *buf = 0, unsigned long len = 0);
- virtual char *getUncipheredBuf();
- virtual void setCipheredBuf(unsigned long *len, const char *buf = 0);
- virtual char *getCipheredBuf(unsigned long *len = 0);
- virtual void encode (void);
- virtual void decode (void);
- static SWBuf personalize(const SWBuf &buf, bool encode);
+ SWCipher (unsigned char *key);
+ virtual void setCipherKey (const char *key);
+ virtual ~ SWCipher ();
+ virtual void setUncipheredBuf(const char *buf = 0, unsigned long len = 0);
+ virtual char *getUncipheredBuf();
+ virtual void setCipheredBuf(unsigned long *len, const char *buf = 0);
+ virtual char *getCipheredBuf(unsigned long *len = 0);
+ virtual void encode (void);
+ virtual void decode (void);
+ static SWBuf personalize(const SWBuf &buf, bool encode);
};
SWORD_NAMESPACE_END
Modified: trunk/include/swcom.h
===================================================================
--- trunk/include/swcom.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/swcom.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * swcom.h - code for base class 'SWCom'. SWCom is the basis for all
+ * swcom.h - code for base class 'SWCom'. SWCom is the basis for all
* types of commentary modules.
* It is traditionally close to the same as the SWText
* module type, but has defaults set which more
@@ -45,13 +45,13 @@
class VerseKey;
class SWKey;
- /** The basis for all commentary modules
- */
+/** The basis for all commentary modules
+ */
class SWDLLEXPORT SWCom : public SWModule {
mutable VerseKey *tmpVK1;
mutable VerseKey *tmpVK2;
- mutable bool tmpSecond;
+ mutable bool tmpSecond;
char *versification;
protected:
Modified: trunk/include/swcomprs.h
===================================================================
--- trunk/include/swcomprs.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/swcomprs.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * swcomprs.h - definition of Class SWCompress used for data
+ * swcomprs.h - definition of Class SWCompress used for data
* compression
*
* $Id$
@@ -28,28 +28,30 @@
SWORD_NAMESPACE_START
-class SWDLLEXPORT SWCompress
-{
+class SWDLLEXPORT SWCompress {
+
private:
- void init();
- void cycleStream();
+ void init();
+ void cycleStream();
+
protected:
- mutable char *buf, *zbuf, direct; // 0 - encode; 1 - decode
- unsigned long zlen, zpos, pos, slen;
- int level;
+ mutable char *buf, *zbuf, direct; // 0 - encode; 1 - decode
+ unsigned long zlen, zpos, pos, slen;
+ int level;
+
public:
- SWCompress ();
- virtual ~ SWCompress ();
- virtual void setUncompressedBuf(const char *buf = 0, unsigned long *len = 0);
- virtual char *getUncompressedBuf(unsigned long *len = 0);
- virtual void setCompressedBuf(unsigned long *len, char *buf = 0);
- virtual char *getCompressedBuf(unsigned long *len = 0);
- virtual unsigned long getChars (char *buf, unsigned long len); // override for other than buffer compression
- virtual unsigned long sendChars (char *buf, unsigned long len); // override for other than buffer compression
- virtual void encode (void); // override to provide compression algorythm
- virtual void decode (void); // override to provide compression algorythm
- virtual void setLevel(int l) {level = l;};
- virtual int getLevel() {return level;};
+ SWCompress();
+ virtual ~SWCompress();
+ virtual void setUncompressedBuf(const char *buf = 0, unsigned long *len = 0);
+ virtual char *getUncompressedBuf(unsigned long *len = 0);
+ virtual void setCompressedBuf(unsigned long *len, char *buf = 0);
+ virtual char *getCompressedBuf(unsigned long *len = 0);
+ virtual unsigned long getChars(char *buf, unsigned long len); // override for other than buffer compression
+ virtual unsigned long sendChars(char *buf, unsigned long len); // override for other than buffer compression
+ virtual void encode(void); // override to provide compression algorythm
+ virtual void decode(void); // override to provide compression algorythm
+ virtual void setLevel(int l) {level = l;};
+ virtual int getLevel() {return level;};
};
SWORD_NAMESPACE_END
Modified: trunk/include/swconfig.h
===================================================================
--- trunk/include/swconfig.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/swconfig.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * swconfig.h - definition of Class SWConfig used for saving and
+ * swconfig.h - definition of Class SWConfig used for saving and
* retrieval of configuration information
*
* $Id$
Modified: trunk/include/swdisp.h
===================================================================
--- trunk/include/swdisp.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/swdisp.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * swdisp.h - code for base class 'swdisp'. swdisp is the basis for all
+ * swdisp.h - code for base class 'swdisp'. swdisp is the basis for all
* types of displays (e.g. raw textout, curses, xwindow, etc.)
*
* $Id$
@@ -32,23 +32,25 @@
class SWModule;
/** swdisp is the basis for all types of displays
-* (e.g. raw textout, curses, xwindow, etc.)
-*/
+ * (e.g. raw textout, curses, xwindow, etc.)
+ */
class SWDLLEXPORT SWDisplay : public SWObject {
- static SWClass classdef;
+
+ static SWClass classdef;
+
public:
- SWDisplay() { myclass = &classdef; };
- virtual ~SWDisplay() {};
-
- /** casts a module to a character pointer and displays it to
- * raw output (overriden for different display types and
- * module types if necessary)
- *
- * @param imodule module to display
- * @return error status
- */
- virtual char display(SWModule &imodule) = 0;
- SWDEPRECATED char Display(SWModule &imodule) { return display(imodule); }
+ SWDisplay() { myclass = &classdef; };
+ virtual ~SWDisplay() {};
+
+ /** casts a module to a character pointer and displays it to
+ * raw output (overriden for different display types and
+ * module types if necessary)
+ *
+ * @param imodule module to display
+ * @return error status
+ */
+ virtual char display(SWModule &imodule) = 0;
+ SWDEPRECATED char Display(SWModule &imodule) { return display(imodule); }
};
SWORD_NAMESPACE_END
Modified: trunk/include/swfilter.h
===================================================================
--- trunk/include/swfilter.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/swfilter.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,7 +1,7 @@
/******************************************************************************
*
- * swfilter.h - definition of class SWFilter used to filter text between
- * different formats
+ * swfilter.h - definition of class SWFilter used to filter text between
+ * different formats
*
* $Id$
*
@@ -39,7 +39,7 @@
* Filters are used to filter/convert text between different formats
* like GBF, HTML, RTF ...
*/
-class SWDLLEXPORT SWFilter {
+class SWDLLEXPORT SWFilter {
public:
virtual ~SWFilter() {}
Modified: trunk/include/swfiltermgr.h
===================================================================
--- trunk/include/swfiltermgr.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/swfiltermgr.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * swfiltermgr.h - definition of class SWFilterMgr used as an interface to
+ * swfiltermgr.h - definition of class SWFilterMgr used as an interface to
* manage filters on a module
*
* $Id$
@@ -40,48 +40,48 @@
SWMgr *parentMgr;
public:
- SWFilterMgr();
- virtual ~SWFilterMgr();
+ SWFilterMgr();
+ virtual ~SWFilterMgr();
- virtual void setParentMgr(SWMgr *parentMgr);
- virtual SWMgr *getParentMgr();
+ virtual void setParentMgr(SWMgr *parentMgr);
+ virtual SWMgr *getParentMgr();
- virtual void addGlobalOptions(SWModule *module, ConfigEntMap §ion, ConfigEntMap::iterator start,
+ virtual void addGlobalOptions(SWModule *module, ConfigEntMap §ion, ConfigEntMap::iterator start,
ConfigEntMap::iterator end);
- virtual void addLocalOptions(SWModule *module, ConfigEntMap §ion, ConfigEntMap::iterator start,
+ virtual void addLocalOptions(SWModule *module, ConfigEntMap §ion, ConfigEntMap::iterator start,
ConfigEntMap::iterator end);
- /**
- * Adds the encoding filters which are defined in "section" to the SWModule object "module".
- * @param module To this module the encoding filter(s) are added
- * @param section We use this section to get a list of filters we should apply to the module
- */
- virtual void addEncodingFilters(SWModule *module, ConfigEntMap §ion);
+ /**
+ * Adds the encoding filters which are defined in "section" to the SWModule object "module".
+ * @param module To this module the encoding filter(s) are added
+ * @param section We use this section to get a list of filters we should apply to the module
+ */
+ virtual void addEncodingFilters(SWModule *module, ConfigEntMap §ion);
- /**
- * Adds the render filters which are defined in "section" to the SWModule object "module".
- * @param module To this module the render filter(s) are added
- * @param section We use this section to get a list of filters we should apply to the module
- */
- virtual void addRenderFilters(SWModule *module, ConfigEntMap §ion);
+ /**
+ * Adds the render filters which are defined in "section" to the SWModule object "module".
+ * @param module To this module the render filter(s) are added
+ * @param section We use this section to get a list of filters we should apply to the module
+ */
+ virtual void addRenderFilters(SWModule *module, ConfigEntMap §ion);
- /**
- * Adds the strip filters which are defined in "section" to the SWModule object "module".
- * @param module To this module the strip filter(s) are added
- * @param section We use this section to get a list of filters we should apply to the module
- */
- virtual void addStripFilters(SWModule *module, ConfigEntMap §ion);
+ /**
+ * Adds the strip filters which are defined in "section" to the SWModule object "module".
+ * @param module To this module the strip filter(s) are added
+ * @param section We use this section to get a list of filters we should apply to the module
+ */
+ virtual void addStripFilters(SWModule *module, ConfigEntMap §ion);
- /**
- * Adds the raw filters which are defined in "section" to the SWModule object "module".
- * @param module To this module the raw filter(s) are added
- * @param section We use this section to get a list of filters we should apply to the module
- */
- virtual void addRawFilters(SWModule *module, ConfigEntMap §ion);
+ /**
+ * Adds the raw filters which are defined in "section" to the SWModule object "module".
+ * @param module To this module the raw filter(s) are added
+ * @param section We use this section to get a list of filters we should apply to the module
+ */
+ virtual void addRawFilters(SWModule *module, ConfigEntMap §ion);
};
SWORD_NAMESPACE_END
Modified: trunk/include/swgenbook.h
===================================================================
--- trunk/include/swgenbook.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/swgenbook.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * swgenbook.h - Implementation of SWGenBook
+ * swgenbook.h - Definition of SWGenBook
*
* $Id$
*
Modified: trunk/include/swinputmeth.h
===================================================================
--- trunk/include/swinputmeth.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/swinputmeth.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * swinputmeth.h - Implementation of SWInputMethod
+ * swinputmeth.h - Definition of SWInputMethod
*
* $Id$
*
@@ -29,18 +29,18 @@
class SWDLLEXPORT SWInputMethod {
private:
- int state;
+ int state;
protected:
- virtual void setState(int state);
+ virtual void setState(int state);
public:
- SWInputMethod();
- virtual ~SWInputMethod() {}
+ SWInputMethod();
+ virtual ~SWInputMethod() {}
- virtual int *translate(char in) = 0;
- virtual int getState();
- virtual void clearState();
+ virtual int *translate(char in) = 0;
+ virtual int getState();
+ virtual void clearState();
};
SWORD_NAMESPACE_END
Modified: trunk/include/swkey.h
===================================================================
--- trunk/include/swkey.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/swkey.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * swkey.h - code for base class 'swkey'. swkey is the basis for all
+ * swkey.h - code for base class 'swkey'. swkey is the basis for all
* types of keys for indexing into modules (e.g. verse, word,
* place, etc.)
*
@@ -36,22 +36,22 @@
#define KEYERR_OUTOFBOUNDS 1
#define SWKEY_OPERATORS \
- SWKey &operator =(const char *ikey) { setText(ikey); return *this; } \
- SWKey &operator =(const SWKey &ikey) { positionFrom(ikey); return *this; } \
- SWKey &operator =(SW_POSITION pos) { setPosition(pos); return *this; } \
- operator const char *() const { return getText(); } \
- bool operator ==(const SWKey &ikey) { return equals(ikey); } \
- bool operator !=(const SWKey &ikey) { return !equals(ikey); } \
- virtual bool operator >(const SWKey &ikey) { return (compare(ikey) > 0); } \
- virtual bool operator <(const SWKey &ikey) { return (compare(ikey) < 0); } \
- virtual bool operator >=(const SWKey &ikey) { return (compare(ikey) > -1); } \
- virtual bool operator <=(const SWKey &ikey) { return (compare(ikey) < 1); } \
- SWKey &operator -=(int steps) { decrement(steps); return *this; } \
- SWKey &operator +=(int steps) { increment(steps); return *this; } \
- SWKey &operator ++() { increment(1); return *this; } \
- SWKey operator ++(int) { SWKey temp = *this; increment(1); return temp; } \
- SWKey &operator --() { decrement(1); return *this; } \
- SWKey operator --(int) { SWKey temp = *this; decrement(1); return temp; }
+ SWKey &operator =(const char *ikey) { setText(ikey); return *this; } \
+ SWKey &operator =(const SWKey &ikey) { positionFrom(ikey); return *this; } \
+ SWKey &operator =(SW_POSITION pos) { setPosition(pos); return *this; } \
+ operator const char *() const { return getText(); } \
+ bool operator ==(const SWKey &ikey) { return equals(ikey); } \
+ bool operator !=(const SWKey &ikey) { return !equals(ikey); } \
+ virtual bool operator >(const SWKey &ikey) { return (compare(ikey) > 0); } \
+ virtual bool operator <(const SWKey &ikey) { return (compare(ikey) < 0); } \
+ virtual bool operator >=(const SWKey &ikey) { return (compare(ikey) > -1); } \
+ virtual bool operator <=(const SWKey &ikey) { return (compare(ikey) < 1); } \
+ SWKey &operator -=(int steps) { decrement(steps); return *this; } \
+ SWKey &operator +=(int steps) { increment(steps); return *this; } \
+ SWKey &operator ++() { increment(1); return *this; } \
+ SWKey operator ++(int) { SWKey temp = *this; increment(1); return temp; } \
+ SWKey &operator --() { decrement(1); return *this; } \
+ SWKey operator --(int) { SWKey temp = *this; decrement(1); return temp; }
/** For use with = operator to position key.
Modified: trunk/include/swld.h
===================================================================
--- trunk/include/swld.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/swld.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * swld.h - code for base class 'SWLD'. SWLD is the basis for all
+ * swld.h - code for base class 'SWLD'. SWLD is the basis for all
* types of Lexicon and Dictionary modules (hence the 'LD').
*
* $Id$
@@ -30,9 +30,9 @@
SWORD_NAMESPACE_START
- /** the basis for all types of Lexicon and
- * Dictionary modules (hence the 'LD').
- */
+/** the basis for all types of Lexicon and
+ * Dictionary modules (hence the 'LD').
+ */
class SWDLLEXPORT SWLD : public SWModule {
protected:
mutable char *entkeytxt;
Modified: trunk/include/swlocale.h
===================================================================
--- trunk/include/swlocale.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/swlocale.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,7 +1,7 @@
/******************************************************************************
*
- * swlocale.h - definition of Class SWLocale used for retrieval
- * of locale lookups
+ * swlocale.h - definition of Class SWLocale used for retrieval
+ * of locale lookups
*
* $Id$
*
Modified: trunk/include/swlog.h
===================================================================
--- trunk/include/swlog.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/swlog.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * swlog.h - definition of class SWLog used for logging messages
+ * swlog.h - definition of class SWLog used for logging messages
*
* $Id$
*
Modified: trunk/include/swmacs.h
===================================================================
--- trunk/include/swmacs.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/swmacs.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * swmacs.h - generic macros
+ * swmacs.h - generic macros
*
* $Id$
*
Modified: trunk/include/swmgr.h
===================================================================
--- trunk/include/swmgr.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/swmgr.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * swmgr.h - definition of class SWMgr used to interact with an install
+ * swmgr.h - definition of class SWMgr used to interact with an install
* base of sword modules.
*
* $Id$
Modified: trunk/include/swmodule.h
===================================================================
--- trunk/include/swmodule.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/swmodule.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,8 +1,8 @@
/******************************************************************************
*
- * swmodule.h - code for base class 'module'. Module is the basis for
- * all types of modules (e.g. texts, commentaries, maps,
- * lexicons, etc.)
+ * swmodule.h - code for base class 'module'. Module is the basis for
+ * all types of modules (e.g. texts, commentaries, maps,
+ * lexicons, etc.)
*
* $Id$
*
@@ -97,15 +97,14 @@
class SWDLLEXPORT SWModule : public SWCacher, public SWSearchable {
-class StdOutDisplay : public SWDisplay {
- char display(SWModule &imodule)
- {
- #ifndef _WIN32_WCE
- std::cout << imodule.renderText();
- #endif
- return 0;
- }
-};
+ class StdOutDisplay : public SWDisplay {
+ char display(SWModule &imodule) {
+#ifndef _WIN32_WCE
+ std::cout << imodule.renderText();
+#endif
+ return 0;
+ }
+ };
protected:
@@ -669,7 +668,7 @@
* @return result buffer
*/
SWBuf renderText(const char *buf, int len = -1, bool render = true) const;
- SWBuf renderText();
+ SWBuf renderText();
SWDEPRECATED const char *RenderText(const char *buf = 0, int len = -1, bool render = true) { return renderText(buf, len, render); }
/** Produces any header data which might be useful which is associated with the
Modified: trunk/include/swobject.h
===================================================================
--- trunk/include/swobject.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/swobject.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * swobject.h - definition for SWObject used as lowest base class for
+ * swobject.h - definition for SWObject used as lowest base class for
* many SWORD objects
*
* $Id$
@@ -30,8 +30,8 @@
#define SWDYNAMIC_CAST(className, object) (className *)((object)?((object->getClass()->isAssignableFrom(#className))?object:0):0)
/**
-* Class used for SWDYNAMIC_CAST to save the inheritance order.
-*/
+ * Class used for SWDYNAMIC_CAST to save the inheritance order.
+ */
class SWDLLEXPORT SWClass {
private:
const char **descends;
@@ -45,19 +45,20 @@
};
/** Base class for major Sword classes.
-* SWObject is the base class for major Sword classes like SWKey.
-* It is used because dynamic_cast is not available on all plattforms supported
-* by Sword. Use SWDYNAMIC_CAST(classname, object) instead of dynamic_cast<classname>(object).
-*/
+ * SWObject is the base class for major Sword classes like SWKey.
+ * It is used because dynamic_cast is not available on all plattforms supported
+ * by Sword. Use SWDYNAMIC_CAST(classname, object) instead of dynamic_cast<classname>(object).
+ */
class SWDLLEXPORT SWObject {
+
protected:
SWClass * myclass;
-
+
public:
/** Use this to get the class definition and inheritance order.
- * @return The class definition of this object
- */
- const SWClass *getClass () const {
+ * @return The class definition of this object
+ */
+ const SWClass *getClass() const {
return myclass;
}
};
Modified: trunk/include/swoptfilter.h
===================================================================
--- trunk/include/swoptfilter.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/swoptfilter.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/***************************************************************************
*
- * swoptfilter.h - Implenetation of SWOptionFilter
+ * swoptfilter.h - Definition of SWOptionFilter
*
* $Id$
*
@@ -35,8 +35,8 @@
typedef std::list < SWBuf > StringList;
- /** Base class for all option filters.
- */
+/** Base class for all option filters.
+ */
class SWDLLEXPORT SWOptionFilter : public virtual SWFilter {
protected:
SWBuf optionValue;
Modified: trunk/include/swsearchable.h
===================================================================
--- trunk/include/swsearchable.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/swsearchable.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * swsearchable.h - definition of class SWSearchable used to provide an
+ * swsearchable.h - definition of class SWSearchable used to provide an
* interface for objects that be searched.
*
* $Id$
Modified: trunk/include/swtext.h
===================================================================
--- trunk/include/swtext.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/swtext.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * swtext.h - code for base class 'SWText'. SWText is the basis for all
+ * swtext.h - code for base class 'SWText'. SWText is the basis for all
* types of text modules
*
* $Id$
@@ -39,7 +39,7 @@
// for conversion if we have been set with a different internal key type
mutable VerseKey *tmpVK1;
mutable VerseKey *tmpVK2;
- mutable bool tmpSecond;
+ mutable bool tmpSecond;
char *versification;
protected:
Modified: trunk/include/swversion.h
===================================================================
--- trunk/include/swversion.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/swversion.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * swversion.h - definition of class SWVersion used to compare version
+ * swversion.h - definition of class SWVersion used to compare version
* info
*
* $Id: swversion.h.in 2959 2013-08-13 03:55:38Z chrislit $
@@ -24,12 +24,12 @@
#ifndef SWVERSION_H
#define SWVERSION_H
-#define SWORD_VERSION_NUM 1089003760
-#define SWORD_VERSION_STR "1.8.900.3760M"
+#define SWORD_VERSION_NUM 1089003763
+#define SWORD_VERSION_STR "1.8.900.3763:3764M"
#define SWORD_VERSION_MAJOR 1
#define SWORD_VERSION_MINOR 8
#define SWORD_VERSION_MICRO 900
-#define SWORD_VERSION_NANO 3760
+#define SWORD_VERSION_NANO 3763
#include <defs.h>
SWORD_NAMESPACE_START
Modified: trunk/include/swversion.h.in
===================================================================
--- trunk/include/swversion.h.in 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/swversion.h.in 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * swversion.h - definition of class SWVersion used to compare version
+ * swversion.h - definition of class SWVersion used to compare version
* info
*
* $Id$
Modified: trunk/include/sysdata.h
===================================================================
--- trunk/include/sysdata.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/sysdata.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * sysdata.h -
+ * sysdata.h -
*
* $Id$
*
@@ -76,7 +76,7 @@
(SW_u64)(((SW_u64)(x) & (SW_u64)0x000000000000ff00ULL) << 40) | \
(SW_u64)(((SW_u64)(x) & (SW_u64)0x0000000000ff0000ULL) << 24) | \
(SW_u64)(((SW_u64)(x) & (SW_u64)0x00000000ff000000ULL) << 8) | \
- (SW_u64)(((SW_u64)(x) & (SW_u64)0x000000ff00000000ULL) >> 8) | \
+ (SW_u64)(((SW_u64)(x) & (SW_u64)0x000000ff00000000ULL) >> 8) | \
(SW_u64)(((SW_u64)(x) & (SW_u64)0x0000ff0000000000ULL) >> 24) | \
(SW_u64)(((SW_u64)(x) & (SW_u64)0x00ff000000000000ULL) >> 40) | \
(SW_u64)(((SW_u64)(x) & (SW_u64)0xff00000000000000ULL) >> 56) ))
Modified: trunk/include/teihtmlhref.h
===================================================================
--- trunk/include/teihtmlhref.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/teihtmlhref.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * teihtmlhref.h - Implementation of TEIHTMLHREF
+ * teihtmlhref.h - Definition of TEIHTMLHREF
*
* $Id$
*
Modified: trunk/include/teilatex.h
===================================================================
--- trunk/include/teilatex.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/teilatex.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * teilatex.h - Implementation of TEILaTeX
+ * teilatex.h - Definition of TEILaTeX
*
* $Id$
*
Modified: trunk/include/teiplain.h
===================================================================
--- trunk/include/teiplain.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/teiplain.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * teiplain.h - Implementation of TEIPlain
+ * teiplain.h - Definition of TEIPlain
*
* $Id$
*
Modified: trunk/include/teirtf.h
===================================================================
--- trunk/include/teirtf.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/teirtf.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * teirtf.h - Implementation of TEIRTF
+ * teirtf.h - Definition of TEIRTF
*
* $Id$
*
Modified: trunk/include/teixhtml.h
===================================================================
--- trunk/include/teixhtml.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/teixhtml.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * teixhtml.h - Implementation of TEIXHTML
+ * teixhtml.h - Definition of TEIXHTML
*
* $Id$
*
Modified: trunk/include/thmlfootnotes.h
===================================================================
--- trunk/include/thmlfootnotes.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/thmlfootnotes.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * thmlfootnotes.h - Implementation of ThMLFootnotes
+ * thmlfootnotes.h - Definition of ThMLFootnotes
*
* $Id$
*
Modified: trunk/include/thmlgbf.h
===================================================================
--- trunk/include/thmlgbf.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/thmlgbf.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * thmlgbf.h - Implementation of ThMLGBF
+ * thmlgbf.h - Definition of ThMLGBF
*
* $Id$
*
Modified: trunk/include/thmlheadings.h
===================================================================
--- trunk/include/thmlheadings.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/thmlheadings.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * thmlheadings.h - Implementation of ThMLHeadings
+ * thmlheadings.h - Definition of ThMLHeadings
*
* $Id$
*
Modified: trunk/include/thmlhtml.h
===================================================================
--- trunk/include/thmlhtml.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/thmlhtml.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * thmlhtml.h - Implementation of ThMLHTML
+ * thmlhtml.h - Definition of ThMLHTML
*
* $Id$
*
Modified: trunk/include/thmlhtmlhref.h
===================================================================
--- trunk/include/thmlhtmlhref.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/thmlhtmlhref.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * thmlhtmlhref.h - Implementation of ThMLHTMLHREF
+ * thmlhtmlhref.h - Definition of ThMLHTMLHREF
*
* $Id$
*
Modified: trunk/include/thmllatex.h
===================================================================
--- trunk/include/thmllatex.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/thmllatex.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * thmllatex.h - Implementation of ThMLLaTeX
+ * thmllatex.h - Definition of ThMLLaTeX
*
* $Id$
*
Modified: trunk/include/thmllemma.h
===================================================================
--- trunk/include/thmllemma.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/thmllemma.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * thmllemma.h - Implementation of ThMLLemma
+ * thmllemma.h - Definition of ThMLLemma
*
* $Id$
*
Modified: trunk/include/thmlmorph.h
===================================================================
--- trunk/include/thmlmorph.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/thmlmorph.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * thmlmorph.h - Implementation of ThMLMorph
+ * thmlmorph.h - Definition of ThMLMorph
*
* $Id$
*
Modified: trunk/include/thmlosis.h
===================================================================
--- trunk/include/thmlosis.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/thmlosis.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * thmlosis.h - Implementation of ThMLOSIS
+ * thmlosis.h - Definition of ThMLOSIS
*
* $Id$
*
Modified: trunk/include/thmlplain.h
===================================================================
--- trunk/include/thmlplain.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/thmlplain.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * thmlplain.h - Implementation of ThMLPlain
+ * thmlplain.h - Definition of ThMLPlain
*
* $Id$
*
Modified: trunk/include/thmlrtf.h
===================================================================
--- trunk/include/thmlrtf.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/thmlrtf.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * thmlrtf.h - Implementation of ThMLRTF
+ * thmlrtf.h - Definition of ThMLRTF
*
* $Id$
*
Modified: trunk/include/thmlscripref.h
===================================================================
--- trunk/include/thmlscripref.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/thmlscripref.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * thmlscripref.h - Implementation of ThMLScripRef
+ * thmlscripref.h - Definition of ThMLScripRef
*
* $Id$
*
Modified: trunk/include/thmlstrongs.h
===================================================================
--- trunk/include/thmlstrongs.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/thmlstrongs.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * thmlstrongs.h - Implementation of ThMLStrongs
+ * thmlstrongs.h - Definition of ThMLStrongs
*
* $Id$
*
Modified: trunk/include/thmlvariants.h
===================================================================
--- trunk/include/thmlvariants.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/thmlvariants.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * thmlvariants.h - Implementation of ThMLVariants
+ * thmlvariants.h - Definition of ThMLVariants
*
* $Id$
*
Modified: trunk/include/thmlwebif.h
===================================================================
--- trunk/include/thmlwebif.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/thmlwebif.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * thmlwebif.h - Implementation of ThMLWEBIF
+ * thmlwebif.h - Definition of ThMLWEBIF
*
* $Id$
*
Modified: trunk/include/thmlwordjs.h
===================================================================
--- trunk/include/thmlwordjs.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/thmlwordjs.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/***************************************************************************
*
- * thmlwordjs.h - Implementation of ThMLWordJS
+ * thmlwordjs.h - Definition of ThMLWordJS
*
* $Id$
*
@@ -28,15 +28,16 @@
SWORD_NAMESPACE_START
class SWMgr;
- /** This Filter shows/hides strong's numbers in a ThML text
- */
+/** This Filter shows/hides strong's numbers in a ThML text
+ */
class SWDLLEXPORT ThMLWordJS : public SWOptionFilter {
- SWModule *defaultGreekLex;
- SWModule *defaultHebLex;
- SWModule *defaultGreekParse;
- SWModule *defaultHebParse;
- SWMgr *mgr;
+ SWModule *defaultGreekLex;
+ SWModule *defaultHebLex;
+ SWModule *defaultGreekParse;
+ SWModule *defaultHebParse;
+ SWMgr *mgr;
+
public:
ThMLWordJS();
virtual ~ThMLWordJS();
Modified: trunk/include/thmlxhtml.h
===================================================================
--- trunk/include/thmlxhtml.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/thmlxhtml.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * thmlxhtml.h - Implementation of ThMLXHTML
+ * thmlxhtml.h - Definition of ThMLXHTML
*
* $Id$
*
Modified: trunk/include/treekey.h
===================================================================
--- trunk/include/treekey.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/treekey.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * treekey.h - code for class 'TreeKey'
+ * treekey.h - code for class 'TreeKey'
*
* $Id$
*
Modified: trunk/include/treekeyidx.h
===================================================================
--- trunk/include/treekeyidx.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/treekeyidx.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * treekeyidx.h - code for class 'TreeKeyIdx'
+ * treekeyidx.h - code for class 'TreeKeyIdx'
*
* $Id$
*
Modified: trunk/include/unicodertf.h
===================================================================
--- trunk/include/unicodertf.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/unicodertf.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * unicodertf.h - Implementation of UnicodeRTF
+ * unicodertf.h - Definition of UnicodeRTF
*
* $Id$
*
Modified: trunk/include/url.h
===================================================================
--- trunk/include/url.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/url.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * url.h - code for an URL parser utility class
+ * url.h - code for an URL parser utility class
*
* $Id$
*
Modified: trunk/include/utf16utf8.h
===================================================================
--- trunk/include/utf16utf8.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/utf16utf8.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * utf16utf8.h - Implementation of UTF16UTF8
+ * utf16utf8.h - Definition of UTF16UTF8
*
* $Id$
*
Modified: trunk/include/utf8arabicpoints.h
===================================================================
--- trunk/include/utf8arabicpoints.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/utf8arabicpoints.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * utf8arabicpoints.h - SWFilter descendant to remove UTF-8 Arabic
+ * utf8arabicpoints.h - SWFilter descendant to remove UTF-8 Arabic
* vowel points
*
* $Id$
Modified: trunk/include/utf8arshaping.h
===================================================================
--- trunk/include/utf8arshaping.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/utf8arshaping.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * utf8arshaping.h - Implementation of UTF8arShaping
+ * utf8arshaping.h - Definition of UTF8arShaping
*
* $Id$
*
@@ -41,7 +41,7 @@
UErrorCode err;
public:
UTF8arShaping();
- ~UTF8arShaping();
+ ~UTF8arShaping();
virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0);
};
Modified: trunk/include/utf8bidireorder.h
===================================================================
--- trunk/include/utf8bidireorder.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/utf8bidireorder.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * utf8bidireorder.h - Implementation of UTF8BiDiReorder
+ * utf8bidireorder.h - Definition of UTF8BiDiReorder
*
* $Id$
*
@@ -40,7 +40,7 @@
UErrorCode err;
public:
UTF8BiDiReorder();
- ~UTF8BiDiReorder();
+ ~UTF8BiDiReorder();
virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0);
};
Modified: trunk/include/utf8cantillation.h
===================================================================
--- trunk/include/utf8cantillation.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/utf8cantillation.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * utf8cantillation.h - Implementation of UTF8Cantillation
+ * utf8cantillation.h - Definition of UTF8Cantillation
*
* $Id$
*
@@ -27,8 +27,8 @@
SWORD_NAMESPACE_START
- /** This Filter shows/hides Hebrew cantillation marks in UTF8 text
- */
+/** This Filter shows/hides Hebrew cantillation marks in UTF8 text
+ */
class SWDLLEXPORT UTF8Cantillation : public SWOptionFilter {
public:
UTF8Cantillation();
Modified: trunk/include/utf8greekaccents.h
===================================================================
--- trunk/include/utf8greekaccents.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/utf8greekaccents.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * utf8greekaccents.h - Implementation of UTF8GreekAccents
+ * utf8greekaccents.h - Definition of UTF8GreekAccents
*
* $Id$
*
@@ -27,8 +27,8 @@
SWORD_NAMESPACE_START
- /** This Filter shows/hides Greek Accents marks in UTF8 text
- */
+/** This Filter shows/hides Greek Accents marks in UTF8 text
+ */
class SWDLLEXPORT UTF8GreekAccents : public SWOptionFilter {
public:
UTF8GreekAccents();
Modified: trunk/include/utf8hebrewpoints.h
===================================================================
--- trunk/include/utf8hebrewpoints.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/utf8hebrewpoints.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * utf8hebrewpoints.h - Implementation of UTF8HebrewPoints
+ * utf8hebrewpoints.h - Definition of UTF8HebrewPoints
*
* $Id$
*
Modified: trunk/include/utf8html.h
===================================================================
--- trunk/include/utf8html.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/utf8html.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * utf8html.h - Implementation of UTF8HTML
+ * utf8html.h - Definition of UTF8HTML
*
* $Id$
*
Modified: trunk/include/utf8latin1.h
===================================================================
--- trunk/include/utf8latin1.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/utf8latin1.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * utf8latin1.h - Implementation of UTF8Latin1
+ * utf8latin1.h - Definition of UTF8Latin1
*
* $Id$
*
Modified: trunk/include/utf8nfc.h
===================================================================
--- trunk/include/utf8nfc.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/utf8nfc.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * utf8nfc.h - Implementation of UTF8NFC
+ * utf8nfc.h - Definition of UTF8NFC
*
* $Id$
*
@@ -40,7 +40,7 @@
UErrorCode err;
public:
UTF8NFC();
- ~UTF8NFC();
+ ~UTF8NFC();
virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0);
};
Modified: trunk/include/utf8nfkd.h
===================================================================
--- trunk/include/utf8nfkd.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/utf8nfkd.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * utf8nfkd.h - Implementation of UTF8NFKD
+ * utf8nfkd.h - Definition of UTF8NFKD
*
* $Id$
*
@@ -33,7 +33,7 @@
struct UTF8NFKDPrivate *p;
public:
UTF8NFKD();
- ~UTF8NFKD();
+ ~UTF8NFKD();
virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0);
};
Modified: trunk/include/utf8scsu.h
===================================================================
--- trunk/include/utf8scsu.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/utf8scsu.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * utf8scsu.h - Implementation of UTF8SCSU
+ * utf8scsu.h - Definition of UTF8SCSU
*
* $Id$
*
Modified: trunk/include/utf8transliterator.h
===================================================================
--- trunk/include/utf8transliterator.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/utf8transliterator.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * utf8transliterator.h - Implementation of UTF8Transliterator
+ * utf8transliterator.h - Definition of UTF8Transliterator
*
* $Id$
*
Modified: trunk/include/utf8utf16.h
===================================================================
--- trunk/include/utf8utf16.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/utf8utf16.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * utf8utf16.h - Implementation of UTF8UTF16
+ * utf8utf16.h - Definition of UTF8UTF16
*
* $Id$
*
Modified: trunk/include/utilstr.h
===================================================================
--- trunk/include/utilstr.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/utilstr.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * utilstr.h - prototypes for string utility functions
+ * utilstr.h - prototypes for string utility functions
*
* $Id$
*
Modified: trunk/include/utilxml.h
===================================================================
--- trunk/include/utilxml.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/utilxml.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * utilxml.h - definition of class that deal with xml constructs
+ * utilxml.h - definition of class that deal with xml constructs
*
* $Id$
*
Modified: trunk/include/versekey.h
===================================================================
--- trunk/include/versekey.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/versekey.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * versekey.h - code for class 'VerseKey'- a standard Biblical verse
+ * versekey.h - code for class 'VerseKey'- a standard Biblical verse
* key
*
* $Id$
Modified: trunk/include/versetreekey.h
===================================================================
--- trunk/include/versetreekey.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/versetreekey.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * versetreekey.h - code for class 'VerseTreeKey'- a standard Biblical
+ * versetreekey.h - code for class 'VerseTreeKey'- a standard Biblical
* verse key
*
* $Id$
Modified: trunk/include/versificationmgr.h
===================================================================
--- trunk/include/versificationmgr.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/versificationmgr.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * versification.h - definition of class VersificationMgr used for managing
+ * versification.h - definition of class VersificationMgr used for managing
* versification systems
*
* $Id$
Modified: trunk/include/xzcomprs.h
===================================================================
--- trunk/include/xzcomprs.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/xzcomprs.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * xzcomprs.h - XzCompress, a driver class that provides xz (LZMA2)
+ * xzcomprs.h - XzCompress, a driver class that provides xz (LZMA2)
* compression
*
* $Id$
Modified: trunk/include/zcom.h
===================================================================
--- trunk/include/zcom.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/zcom.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,7 +1,7 @@
/******************************************************************************
*
- * zcom.h - code for class 'zCom'- a module that reads compressed text
- * files: ot and nt using indexs ??.vss
+ * zcom.h - code for class 'zCom'- a module that reads compressed text
+ * files: ot and nt using indexs ??.vss
*
* $Id$
*
Modified: trunk/include/zcom4.h
===================================================================
--- trunk/include/zcom4.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/zcom4.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,7 +1,7 @@
/******************************************************************************
*
- * zcom4.h - code for class 'zCom4'- a module that reads compressed text
- * files: ot and nt using indexs ??.vss
+ * zcom4.h - code for class 'zCom4'- a module that reads compressed text
+ * files: ot and nt using indexs ??.vss
*
* $Id$
*
Modified: trunk/include/zipcomprs.h
===================================================================
--- trunk/include/zipcomprs.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/zipcomprs.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * zipcomprs.h - definition of Class ZipCompress used for data
+ * zipcomprs.h - definition of Class ZipCompress used for data
* compression
*
* $Id$
Modified: trunk/include/zld.h
===================================================================
--- trunk/include/zld.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/zld.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * zld.cpp - code for class 'zLD'- a module that reads compressed lexicon
+ * zld.cpp - code for class 'zLD'- a module that reads compressed lexicon
* and dictionary files
*
* $Id$
@@ -56,7 +56,7 @@
// end write interface ------------------------
virtual void rawZFilter(SWBuf &buf, char direction = 0) const { rawFilter(buf, (SWKey *)(long)direction); }// hack, use key as direction for enciphering
-
+
// swcacher interface ----------------------
virtual void flush() { flushCache(); }
// end swcacher interface ----------------------
Modified: trunk/include/zstr.h
===================================================================
--- trunk/include/zstr.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/zstr.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,8 +1,7 @@
/*****************************************************************************
*
- * zstr.h - code for class 'zStr'- a module that reads compressed text
- * files.
- * and provides lookup and parsing functions based on
+ * zstr.h - code for class 'zStr'- a module that reads compressed text
+ * files and provides lookup and parsing functions based on
* class StrKey
*
* $Id$
Modified: trunk/include/ztext.h
===================================================================
--- trunk/include/ztext.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/ztext.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * ztext.h - code for class 'zText'- a module that reads compressed text
+ * ztext.h - code for class 'zText'- a module that reads compressed text
* files: ot and nt using indexs ??.vss
*
* $Id$
@@ -66,7 +66,7 @@
virtual void linkEntry(const SWKey *linkKey); // Link current module entry to other module entry
virtual void deleteEntry(); // Delete current module entry
// end write interface ------------------------
-
+
virtual void rawZFilter(SWBuf &buf, char direction = 0) const { rawFilter(buf, (SWKey *)(long)direction); }// hack, use key as direction for enciphering
// swcacher interface ----------------------
Modified: trunk/include/ztext4.h
===================================================================
--- trunk/include/ztext4.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/ztext4.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * ztext4.h - code for class 'zText4'- a module that reads compressed text
+ * ztext4.h - code for class 'zText4'- a module that reads compressed text
* files: ot and nt using indexs ??.vss
*
* $Id$
@@ -66,7 +66,7 @@
virtual void linkEntry(const SWKey *linkKey); // Link current module entry to other module entry
virtual void deleteEntry(); // Delete current module entry
// end write interface ------------------------
-
+
virtual void rawZFilter(SWBuf &buf, char direction = 0) const { rawFilter(buf, (SWKey *)(long)direction); }// hack, use key as direction for enciphering
// swcacher interface ----------------------
Modified: trunk/include/zverse.h
===================================================================
--- trunk/include/zverse.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/zverse.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,7 +1,7 @@
/******************************************************************************
*
- * zverse.h - code for class 'zVerse'- a module that reads raw text
- * files: ot and nt using indexs ??.bks ??.cps ??.vss
+ * zverse.h - code for class 'zVerse'- a module that reads raw text
+ * files: ot and nt using indexs ??.bks ??.cps ??.vss
* and provides lookup and parsing functions based on
* class VerseKey
*
Modified: trunk/include/zverse4.h
===================================================================
--- trunk/include/zverse4.h 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/include/zverse4.h 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1,7 +1,7 @@
/******************************************************************************
*
- * zverse4.h - code for class 'zVerse4'- a module that reads raw text
- * files: ot and nt using indexs ??.bks ??.cps ??.vss
+ * zverse4.h - code for class 'zVerse4'- a module that reads raw text
+ * files: ot and nt using indexs ??.bks ??.cps ??.vss
* and provides lookup and parsing functions based on
* class VerseKey
*
Modified: trunk/src/mgr/swmgr.cpp
===================================================================
--- trunk/src/mgr/swmgr.cpp 2020-07-26 08:44:21 UTC (rev 3764)
+++ trunk/src/mgr/swmgr.cpp 2020-07-26 10:31:09 UTC (rev 3765)
@@ -1176,7 +1176,7 @@
if (filterMgr)
filterMgr->addGlobalOptions(module, section, start, end);
#ifdef _ICU_
- module->addOptionFilter(transliterator);
+ module->addOptionFilter(transliterator);
#endif
}
More information about the sword-cvs
mailing list