[sword-cvs] sword/src/modules/filters gbfhtml.cpp,1.27,1.28 gbfhtmlhref.cpp,1.18,1.19 gbfwebif.cpp,1.4,1.5 osishtmlhref.cpp,1.12,1.13 osisplain.cpp,1.11,1.12 osisrtf.cpp,1.21,1.22 swbasicfilter.cpp,1.30,1.31 thmlhtml.cpp,1.28,1.29 thmlhtmlhref.cpp,1.35,1.36 thmlrtf.cpp,1.35,1.36 thmlwebif.cpp,1.6,1.7
sword@www.crosswire.org
sword@www.crosswire.org
Thu, 7 Aug 2003 16:23:34 -0700
Update of /usr/local/cvsroot/sword/src/modules/filters
In directory www:/tmp/cvs-serv8196/modules/filters
Modified Files:
gbfhtml.cpp gbfhtmlhref.cpp gbfwebif.cpp osishtmlhref.cpp
osisplain.cpp osisrtf.cpp swbasicfilter.cpp thmlhtml.cpp
thmlhtmlhref.cpp thmlrtf.cpp thmlwebif.cpp
Log Message:
making MSVC happy
Index: gbfhtml.cpp
===================================================================
RCS file: /usr/local/cvsroot/sword/src/modules/filters/gbfhtml.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- gbfhtml.cpp 30 Jul 2003 00:51:34 -0000 1.27
+++ gbfhtml.cpp 7 Aug 2003 23:23:32 -0000 1.28
@@ -58,7 +58,7 @@
}
-bool GBFHTML::handleToken(SWBuf &buf, const char *token, UserData *userData) {
+bool GBFHTML::handleToken(SWBuf &buf, const char *token, SWFilterUserData *userData) {
const char *tok;
char val[128];
char *valto;
Index: gbfhtmlhref.cpp
===================================================================
RCS file: /usr/local/cvsroot/sword/src/modules/filters/gbfhtmlhref.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- gbfhtmlhref.cpp 30 Jul 2003 00:51:34 -0000 1.18
+++ gbfhtmlhref.cpp 7 Aug 2003 23:23:32 -0000 1.19
@@ -58,7 +58,7 @@
}
-bool GBFHTMLHREF::handleToken(SWBuf &buf, const char *token, UserData *userData) {
+bool GBFHTMLHREF::handleToken(SWBuf &buf, const char *token, SWFilterUserData *userData) {
const char *tok;
char val[128];
char *valto;
Index: gbfwebif.cpp
===================================================================
RCS file: /usr/local/cvsroot/sword/src/modules/filters/gbfwebif.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- gbfwebif.cpp 30 Jul 2003 00:51:34 -0000 1.4
+++ gbfwebif.cpp 7 Aug 2003 23:23:32 -0000 1.5
@@ -25,7 +25,7 @@
//all is done in GBFHTMLHREF since it inherits form this class
}
-bool GBFWEBIF::handleToken(SWBuf &buf, const char *token, UserData *userData) {
+bool GBFWEBIF::handleToken(SWBuf &buf, const char *token, SWFilterUserData *userData) {
const char *tok;
char val[128];
char *valto;
Index: osishtmlhref.cpp
===================================================================
RCS file: /usr/local/cvsroot/sword/src/modules/filters/osishtmlhref.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- osishtmlhref.cpp 30 Jul 2003 00:51:34 -0000 1.12
+++ osishtmlhref.cpp 7 Aug 2003 23:23:32 -0000 1.13
@@ -23,7 +23,7 @@
SWORD_NAMESPACE_START
-OSISHTMLHref::MyUserData::MyUserData(const SWModule *module, const SWKey *key) : UserData(module, key) {
+OSISHTMLHref::MyUserData::MyUserData(const SWModule *module, const SWKey *key) : SWFilterUserData(module, key) {
osisQToTick = ((!module->getConfigEntry("OSISqToTick")) || (strcmp(module->getConfigEntry("OSISqToTick"), "false")));
}
@@ -47,7 +47,7 @@
setTokenCaseSensitive(true);
}
-bool OSISHTMLHref::handleToken(SWBuf &buf, const char *token, UserData *userData) {
+bool OSISHTMLHref::handleToken(SWBuf &buf, const char *token, SWFilterUserData *userData) {
// manually process if it wasn't a simple substitution
if (!substituteToken(buf, token)) {
MyUserData *u = (MyUserData *)userData;
Index: osisplain.cpp
===================================================================
RCS file: /usr/local/cvsroot/sword/src/modules/filters/osisplain.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- osisplain.cpp 5 Aug 2003 09:06:30 -0000 1.11
+++ osisplain.cpp 7 Aug 2003 23:23:32 -0000 1.12
@@ -47,7 +47,7 @@
}
-bool OSISPlain::handleToken(SWBuf &buf, const char *token, UserData *userData) {
+bool OSISPlain::handleToken(SWBuf &buf, const char *token, SWFilterUserData *userData) {
// manually process if it wasn't a simple substitution
if (!substituteToken(buf, token)) {
MyUserData *u = (MyUserData *)userData;
Index: osisrtf.cpp
===================================================================
RCS file: /usr/local/cvsroot/sword/src/modules/filters/osisrtf.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- osisrtf.cpp 6 Aug 2003 10:34:36 -0000 1.21
+++ osisrtf.cpp 7 Aug 2003 23:23:32 -0000 1.22
@@ -23,7 +23,7 @@
SWORD_NAMESPACE_START
-OSISRTF::MyUserData::MyUserData(const SWModule *module, const SWKey *key) : UserData(module, key) {
+OSISRTF::MyUserData::MyUserData(const SWModule *module, const SWKey *key) : SWFilterUserData(module, key) {
osisQToTick = ((!module->getConfigEntry("OSISqToTick")) || (strcmp(module->getConfigEntry("OSISqToTick"), "false")));
}
@@ -48,7 +48,7 @@
}
-bool OSISRTF::handleToken(SWBuf &buf, const char *token, UserData *userData) {
+bool OSISRTF::handleToken(SWBuf &buf, const char *token, SWFilterUserData *userData) {
// manually process if it wasn't a simple substitution
if (!substituteToken(buf, token)) {
MyUserData *u = (MyUserData *)userData;
Index: swbasicfilter.cpp
===================================================================
RCS file: /usr/local/cvsroot/sword/src/modules/filters/swbasicfilter.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- swbasicfilter.cpp 5 Aug 2003 09:16:10 -0000 1.30
+++ swbasicfilter.cpp 7 Aug 2003 23:23:32 -0000 1.31
@@ -169,12 +169,12 @@
}
-bool SWBasicFilter::handleToken(SWBuf &buf, const char *token, UserData *userData) {
+bool SWBasicFilter::handleToken(SWBuf &buf, const char *token, SWFilterUserData *userData) {
return substituteToken(buf, token);
}
-bool SWBasicFilter::handleEscapeString(SWBuf &buf, const char *escString, UserData *userData) {
+bool SWBasicFilter::handleEscapeString(SWBuf &buf, const char *escString, SWFilterUserData *userData) {
return substituteEscapeString(buf, escString);
}
@@ -212,7 +212,7 @@
char escStartPos = 0, escEndPos = 0;
char tokenStartPos = 0, tokenEndPos = 0;
SWBuf lastTextNode;
- UserData *userData = createUserData(module, key);
+ SWFilterUserData *userData = createUserData(module, key);
SWBuf orig = text;
from = orig.getRawData();
Index: thmlhtml.cpp
===================================================================
RCS file: /usr/local/cvsroot/sword/src/modules/filters/thmlhtml.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- thmlhtml.cpp 30 Jul 2003 00:51:34 -0000 1.28
+++ thmlhtml.cpp 7 Aug 2003 23:23:32 -0000 1.29
@@ -134,7 +134,7 @@
}
-bool ThMLHTML::handleToken(SWBuf &buf, const char *token, UserData *userData) {
+bool ThMLHTML::handleToken(SWBuf &buf, const char *token, SWFilterUserData *userData) {
if (!substituteToken(buf, token)) { // manually process if it wasn't a simple substitution
MyUserData *u = (MyUserData *)userData;
XMLTag tag(token);
Index: thmlhtmlhref.cpp
===================================================================
RCS file: /usr/local/cvsroot/sword/src/modules/filters/thmlhtmlhref.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- thmlhtmlhref.cpp 30 Jul 2003 00:51:34 -0000 1.35
+++ thmlhtmlhref.cpp 7 Aug 2003 23:23:32 -0000 1.36
@@ -135,7 +135,7 @@
}
-bool ThMLHTMLHREF::handleToken(SWBuf &buf, const char *token, UserData *userData) {
+bool ThMLHTMLHREF::handleToken(SWBuf &buf, const char *token, SWFilterUserData *userData) {
const char *tok;
if (!substituteToken(buf, token)) { // manually process if it wasn't a simple substitution
MyUserData *u = (MyUserData *)userData;
Index: thmlrtf.cpp
===================================================================
RCS file: /usr/local/cvsroot/sword/src/modules/filters/thmlrtf.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- thmlrtf.cpp 6 Aug 2003 10:34:36 -0000 1.35
+++ thmlrtf.cpp 7 Aug 2003 23:23:32 -0000 1.36
@@ -170,7 +170,7 @@
return 0;
}
-bool ThMLRTF::handleToken(SWBuf &buf, const char *token, UserData *userData) {
+bool ThMLRTF::handleToken(SWBuf &buf, const char *token, SWFilterUserData *userData) {
MyUserData *u = (MyUserData *)userData;
if (!substituteToken(buf, token)) {
// manually process if it wasn't a simple substitution
Index: thmlwebif.cpp
===================================================================
RCS file: /usr/local/cvsroot/sword/src/modules/filters/thmlwebif.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- thmlwebif.cpp 30 Jul 2003 00:51:34 -0000 1.6
+++ thmlwebif.cpp 7 Aug 2003 23:23:32 -0000 1.7
@@ -26,7 +26,7 @@
//all's done in ThMLHTMLHREF
}
-bool ThMLWEBIF::handleToken(SWBuf &buf, const char *token, UserData *userData) {
+bool ThMLWEBIF::handleToken(SWBuf &buf, const char *token, SWFilterUserData *userData) {
const char *tok;
if (!substituteToken(buf, token)) { // manually process if it wasn't a simple substitution