[sword-cvs] sword/include gbfhtml.h,1.12,1.13 gbfhtmlhref.h,1.5,1.6 gbfwebif.h,1.3,1.4 osishtmlhref.h,1.4,1.5 osisplain.h,1.8,1.9 osisrtf.h,1.8,1.9 swbasicfilter.h,1.20,1.21 thmlhtml.h,1.10,1.11 thmlhtmlhref.h,1.5,1.6 thmlrtf.h,1.9,1.10 thmlwebif.h,1.3,1.4
sword@www.crosswire.org
sword@www.crosswire.org
Thu, 7 Aug 2003 16:23:26 -0700
Update of /usr/local/cvsroot/sword/include
In directory www:/tmp/cvs-serv8163
Modified Files:
gbfhtml.h gbfhtmlhref.h gbfwebif.h osishtmlhref.h osisplain.h
osisrtf.h swbasicfilter.h thmlhtml.h thmlhtmlhref.h thmlrtf.h
thmlwebif.h
Log Message:
making MSVC happy
Index: gbfhtml.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/gbfhtml.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- gbfhtml.h 30 Jul 2003 00:51:33 -0000 1.12
+++ gbfhtml.h 7 Aug 2003 23:23:24 -0000 1.13
@@ -29,15 +29,15 @@
*/
class SWDLLEXPORT GBFHTML : public SWBasicFilter {
protected:
- class MyUserData : public UserData {
+ class MyUserData : public SWFilterUserData {
public:
- MyUserData(const SWModule *module, const SWKey *key) : UserData(module, key) {}
+ MyUserData(const SWModule *module, const SWKey *key) : SWFilterUserData(module, key) {}
bool hasFootnotePreTag;
};
- virtual UserData *createUserData(const SWModule *module, const SWKey *key) {
+ virtual SWFilterUserData *createUserData(const SWModule *module, const SWKey *key) {
return new MyUserData(module, key);
}
- virtual bool handleToken(SWBuf &buf, const char *token, UserData *userData);
+ virtual bool handleToken(SWBuf &buf, const char *token, SWFilterUserData *userData);
public:
GBFHTML();
};
Index: gbfhtmlhref.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/gbfhtmlhref.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- gbfhtmlhref.h 30 Jul 2003 00:51:33 -0000 1.5
+++ gbfhtmlhref.h 7 Aug 2003 23:23:24 -0000 1.6
@@ -29,15 +29,15 @@
*/
class SWDLLEXPORT GBFHTMLHREF : public SWBasicFilter {
protected:
- class MyUserData : public UserData {
+ class MyUserData : public SWFilterUserData {
public:
- MyUserData(const SWModule *module, const SWKey *key) : UserData(module, key) {}
+ MyUserData(const SWModule *module, const SWKey *key) : SWFilterUserData(module, key) {}
bool hasFootnotePreTag;
};
- virtual UserData *createUserData(const SWModule *module, const SWKey *key) {
+ virtual SWFilterUserData *createUserData(const SWModule *module, const SWKey *key) {
return new MyUserData(module, key);
}
- virtual bool handleToken(SWBuf &buf, const char *token, UserData *userData);
+ virtual bool handleToken(SWBuf &buf, const char *token, SWFilterUserData *userData);
public:
GBFHTMLHREF();
};
Index: gbfwebif.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/gbfwebif.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- gbfwebif.h 30 Jul 2003 00:51:33 -0000 1.3
+++ gbfwebif.h 7 Aug 2003 23:23:24 -0000 1.4
@@ -32,7 +32,7 @@
const SWBuf passageStudyURL;
protected:
- virtual bool handleToken(SWBuf &buf, const char *token, UserData *userData);
+ virtual bool handleToken(SWBuf &buf, const char *token, SWFilterUserData *userData);
public:
GBFWEBIF();
};
Index: osishtmlhref.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/osishtmlhref.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- osishtmlhref.h 30 Jul 2003 00:51:33 -0000 1.4
+++ osishtmlhref.h 7 Aug 2003 23:23:24 -0000 1.5
@@ -30,7 +30,7 @@
class SWDLLEXPORT OSISHTMLHref : public SWBasicFilter {
private:
protected:
- class MyUserData : public UserData {
+ class MyUserData : public SWFilterUserData {
public:
bool osisQToTick;
bool inBold;
@@ -38,10 +38,10 @@
SWBuf fn;
MyUserData(const SWModule *module, const SWKey *key);
};
- virtual UserData *createUserData(const SWModule *module, const SWKey *key) {
+ virtual SWFilterUserData *createUserData(const SWModule *module, const SWKey *key) {
return new MyUserData(module, key);
}
- virtual bool handleToken(SWBuf &buf, const char *token, UserData *userData);
+ virtual bool handleToken(SWBuf &buf, const char *token, SWFilterUserData *userData);
public:
OSISHTMLHref();
};
Index: osisplain.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/osisplain.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- osisplain.h 5 Aug 2003 09:06:30 -0000 1.8
+++ osisplain.h 7 Aug 2003 23:23:24 -0000 1.9
@@ -30,15 +30,15 @@
class SWDLLEXPORT OSISPlain : public SWBasicFilter {
public:
protected:
- class MyUserData : public UserData {
+ class MyUserData : public SWFilterUserData {
public:
SWBuf w;
- MyUserData(const SWModule *module, const SWKey *key) : UserData(module, key) {}
+ MyUserData(const SWModule *module, const SWKey *key) : SWFilterUserData(module, key) {}
};
- virtual UserData *createUserData(const SWModule *module, const SWKey *key) {
+ virtual SWFilterUserData *createUserData(const SWModule *module, const SWKey *key) {
return new MyUserData(module, key);
}
- virtual bool handleToken(SWBuf &buf, const char *token, UserData *userData);
+ virtual bool handleToken(SWBuf &buf, const char *token, SWFilterUserData *userData);
public:
OSISPlain();
};
Index: osisrtf.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/osisrtf.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- osisrtf.h 5 Aug 2003 09:06:30 -0000 1.8
+++ osisrtf.h 7 Aug 2003 23:23:24 -0000 1.9
@@ -31,16 +31,16 @@
private:
protected:
- class MyUserData : public UserData {
+ class MyUserData : public SWFilterUserData {
public:
bool osisQToTick;
SWBuf w;
MyUserData(const SWModule *module, const SWKey *key);
};
- virtual UserData *createUserData(const SWModule *module, const SWKey *key) {
+ virtual SWFilterUserData *createUserData(const SWModule *module, const SWKey *key) {
return new MyUserData(module, key);
}
- virtual bool handleToken(SWBuf &buf, const char *token, UserData *userData);
+ virtual bool handleToken(SWBuf &buf, const char *token, SWFilterUserData *userData);
public:
OSISRTF();
};
Index: swbasicfilter.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/swbasicfilter.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- swbasicfilter.h 5 Aug 2003 09:16:10 -0000 1.20
+++ swbasicfilter.h 7 Aug 2003 23:23:24 -0000 1.21
@@ -30,6 +30,18 @@
SWORD_NAMESPACE_START
+
+class SWFilterUserData {
+public:
+ SWFilterUserData(const SWModule *module, const SWKey *key) { this->module = module; this->key = key; suspendTextPassThru = false; supressAdjacentWhitespace = false; }
+ virtual ~SWFilterUserData() {}
+ const SWModule *module;
+ const SWKey *key;
+ SWBuf lastTextNode;
+ bool suspendTextPassThru;
+ bool supressAdjacentWhitespace;
+};
+
/** A filter providing commonly used functionality.
* This filter has facilities for handling SGML/HTML/XML like tokens and
* escape strings (like SGML entities). It has the facility for just
@@ -65,20 +77,8 @@
protected:
- class UserData {
- public:
- UserData(const SWModule *module, const SWKey *key) { this->module = module; this->key = key; suspendTextPassThru = false; supressAdjacentWhitespace = false; }
- virtual ~UserData() {}
- const SWModule *module;
- const SWKey *key;
- SWBuf lastTextNode;
- bool suspendTextPassThru;
- bool supressAdjacentWhitespace;
- };
-
-
- virtual UserData *createUserData(const SWModule *module, const SWKey *key) {
- return new UserData(module, key);
+ virtual SWFilterUserData *createUserData(const SWModule *module, const SWKey *key) {
+ return new SWFilterUserData(module, key);
}
// STAGEs
@@ -130,8 +130,8 @@
* @param userData FIXME: document this
* @return <code>false</code> if was not handled and should be handled in
* the default way (by just substituting).*/
- virtual bool handleToken(SWBuf &buf, const char *token, UserData *userData);
- virtual bool processStage(char stage, SWBuf &text, char *&from, UserData *userData) { return false; }
+ virtual bool handleToken(SWBuf &buf, const char *token, SWFilterUserData *userData);
+ virtual bool processStage(char stage, SWBuf &text, char *&from, SWFilterUserData *userData) { return false; }
virtual void setStageProcessing(char stages) { processStages = stages; } // see STATICs up above
/** This function is called for every escape sequence encountered in the input text.
@@ -140,7 +140,7 @@
* @param userData FIXME: document this
* @return <code>false</code> if was not handled and should be handled in
* the default way (by just substituting).*/
- virtual bool handleEscapeString(SWBuf &buf, const char *escString, UserData *userData);
+ virtual bool handleEscapeString(SWBuf &buf, const char *escString, SWFilterUserData *userData);
};
SWORD_NAMESPACE_END
Index: thmlhtml.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/thmlhtml.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- thmlhtml.h 30 Jul 2003 00:51:33 -0000 1.10
+++ thmlhtml.h 7 Aug 2003 23:23:24 -0000 1.11
@@ -29,15 +29,15 @@
*/
class SWDLLEXPORT ThMLHTML : public SWBasicFilter {
protected:
- class MyUserData : public UserData {
+ class MyUserData : public SWFilterUserData {
public:
- MyUserData(const SWModule *module, const SWKey *key) : UserData(module, key) {}
+ MyUserData(const SWModule *module, const SWKey *key) : SWFilterUserData(module, key) {}
bool SecHead;
};
- virtual UserData *createUserData(const SWModule *module, const SWKey *key) {
+ virtual SWFilterUserData *createUserData(const SWModule *module, const SWKey *key) {
return new MyUserData(module, key);
}
- virtual bool handleToken(SWBuf &buf, const char *token, UserData *userData);
+ virtual bool handleToken(SWBuf &buf, const char *token, SWFilterUserData *userData);
public:
ThMLHTML();
};
Index: thmlhtmlhref.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/thmlhtmlhref.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- thmlhtmlhref.h 30 Jul 2003 00:51:33 -0000 1.5
+++ thmlhtmlhref.h 7 Aug 2003 23:23:24 -0000 1.6
@@ -29,16 +29,16 @@
*/
class SWDLLEXPORT ThMLHTMLHREF : public SWBasicFilter {
protected:
- class MyUserData : public UserData {
+ class MyUserData : public SWFilterUserData {
public:
- MyUserData(const SWModule *module, const SWKey *key) : UserData(module, key) {}
+ MyUserData(const SWModule *module, const SWKey *key) : SWFilterUserData(module, key) {}
bool inscriptRef;
bool SecHead;
};
- virtual UserData *createUserData(const SWModule *module, const SWKey *key) {
+ virtual SWFilterUserData *createUserData(const SWModule *module, const SWKey *key) {
return new MyUserData(module, key);
}
- virtual bool handleToken(SWBuf &buf, const char *token, UserData *userData);
+ virtual bool handleToken(SWBuf &buf, const char *token, SWFilterUserData *userData);
public:
ThMLHTMLHREF();
};
Index: thmlrtf.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/thmlrtf.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- thmlrtf.h 30 Jul 2003 00:51:33 -0000 1.9
+++ thmlrtf.h 7 Aug 2003 23:23:24 -0000 1.10
@@ -29,15 +29,15 @@
*/
class SWDLLEXPORT ThMLRTF : public SWBasicFilter {
protected:
- class MyUserData : public UserData {
+ class MyUserData : public SWFilterUserData {
public:
- MyUserData(const SWModule *module, const SWKey *key) : UserData(module, key) {}
+ MyUserData(const SWModule *module, const SWKey *key) : SWFilterUserData(module, key) {}
bool sechead;
};
- virtual UserData *createUserData(const SWModule *module, const SWKey *key) {
+ virtual SWFilterUserData *createUserData(const SWModule *module, const SWKey *key) {
return new MyUserData(module, key);
}
- virtual bool handleToken(SWBuf &buf, const char *token, UserData *userData);
+ virtual bool handleToken(SWBuf &buf, const char *token, SWFilterUserData *userData);
virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0);
public:
ThMLRTF();
Index: thmlwebif.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/thmlwebif.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- thmlwebif.h 30 Jul 2003 00:51:33 -0000 1.3
+++ thmlwebif.h 7 Aug 2003 23:23:24 -0000 1.4
@@ -32,7 +32,7 @@
const SWBuf passageStudyURL;
protected:
- virtual bool handleToken(SWBuf &buf, const char *token, UserData *userData);
+ virtual bool handleToken(SWBuf &buf, const char *token, SWFilterUserData *userData);
public:
ThMLWEBIF();
};