[sword-cvs] sword/include gbfhtml.h,1.13,1.14 gbfhtmlhref.h,1.6,1.7 gbfwebif.h,1.4,1.5 osishtmlhref.h,1.5,1.6 osisplain.h,1.9,1.10 osisrtf.h,1.9,1.10 swbasicfilter.h,1.21,1.22 swbuf.h,1.23,1.24 thmlhtml.h,1.11,1.12 thmlhtmlhref.h,1.6,1.7 thmlrtf.h,1.10,1.11 thmlwebif.h,1.4,1.5 zstr.h,1.7,1.8 zverse.h,1.13,1.14
sword@www.crosswire.org
sword@www.crosswire.org
Mon, 11 Aug 2003 22:36:34 -0700
- Previous message: [sword-cvs] sword/src/utilfuns swbuf.cpp,1.12,1.13
- Next message: [sword-cvs] sword/src/modules/filters cipherfil.cpp,1.19,1.20 gbfhtml.cpp,1.28,1.29 gbfhtmlhref.cpp,1.19,1.20 gbfwebif.cpp,1.5,1.6 osishtmlhref.cpp,1.13,1.14 osisplain.cpp,1.12,1.13 osisrtf.cpp,1.23,1.24 swbasicfilter.cpp,1.31,1.32 thmlhtml.cpp,1.29,1.30 thmlhtmlhref.cpp,1.36,1.37 thmlrtf.cpp,1.36,1.37 thmlwebif.cpp,1.7,1.8
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /usr/local/cvsroot/sword/include
In directory www:/tmp/cvs-serv1419/include
Modified Files:
gbfhtml.h gbfhtmlhref.h gbfwebif.h osishtmlhref.h osisplain.h
osisrtf.h swbasicfilter.h swbuf.h thmlhtml.h thmlhtmlhref.h
thmlrtf.h thmlwebif.h zstr.h zverse.h
Log Message:
no message
Index: gbfhtml.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/gbfhtml.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- gbfhtml.h 7 Aug 2003 23:23:24 -0000 1.13
+++ gbfhtml.h 12 Aug 2003 05:36:30 -0000 1.14
@@ -29,15 +29,15 @@
*/
class SWDLLEXPORT GBFHTML : public SWBasicFilter {
protected:
- class MyUserData : public SWFilterUserData {
+ class MyUserData : public BasicFilterUserData {
public:
- MyUserData(const SWModule *module, const SWKey *key) : SWFilterUserData(module, key) {}
+ MyUserData(const SWModule *module, const SWKey *key) : BasicFilterUserData(module, key) {}
bool hasFootnotePreTag;
};
- virtual SWFilterUserData *createUserData(const SWModule *module, const SWKey *key) {
+ virtual BasicFilterUserData *createUserData(const SWModule *module, const SWKey *key) {
return new MyUserData(module, key);
}
- virtual bool handleToken(SWBuf &buf, const char *token, SWFilterUserData *userData);
+ virtual bool handleToken(SWBuf &buf, const char *token, BasicFilterUserData *userData);
public:
GBFHTML();
};
Index: gbfhtmlhref.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/gbfhtmlhref.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- gbfhtmlhref.h 7 Aug 2003 23:23:24 -0000 1.6
+++ gbfhtmlhref.h 12 Aug 2003 05:36:30 -0000 1.7
@@ -29,15 +29,15 @@
*/
class SWDLLEXPORT GBFHTMLHREF : public SWBasicFilter {
protected:
- class MyUserData : public SWFilterUserData {
+ class MyUserData : public BasicFilterUserData {
public:
- MyUserData(const SWModule *module, const SWKey *key) : SWFilterUserData(module, key) {}
+ MyUserData(const SWModule *module, const SWKey *key) : BasicFilterUserData(module, key) {}
bool hasFootnotePreTag;
};
- virtual SWFilterUserData *createUserData(const SWModule *module, const SWKey *key) {
+ virtual BasicFilterUserData *createUserData(const SWModule *module, const SWKey *key) {
return new MyUserData(module, key);
}
- virtual bool handleToken(SWBuf &buf, const char *token, SWFilterUserData *userData);
+ virtual bool handleToken(SWBuf &buf, const char *token, BasicFilterUserData *userData);
public:
GBFHTMLHREF();
};
Index: gbfwebif.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/gbfwebif.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- gbfwebif.h 7 Aug 2003 23:23:24 -0000 1.4
+++ gbfwebif.h 12 Aug 2003 05:36:30 -0000 1.5
@@ -32,7 +32,7 @@
const SWBuf passageStudyURL;
protected:
- virtual bool handleToken(SWBuf &buf, const char *token, SWFilterUserData *userData);
+ virtual bool handleToken(SWBuf &buf, const char *token, BasicFilterUserData *userData);
public:
GBFWEBIF();
};
Index: osishtmlhref.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/osishtmlhref.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- osishtmlhref.h 7 Aug 2003 23:23:24 -0000 1.5
+++ osishtmlhref.h 12 Aug 2003 05:36:30 -0000 1.6
@@ -30,7 +30,7 @@
class SWDLLEXPORT OSISHTMLHref : public SWBasicFilter {
private:
protected:
- class MyUserData : public SWFilterUserData {
+ class MyUserData : public BasicFilterUserData {
public:
bool osisQToTick;
bool inBold;
@@ -38,10 +38,10 @@
SWBuf fn;
MyUserData(const SWModule *module, const SWKey *key);
};
- virtual SWFilterUserData *createUserData(const SWModule *module, const SWKey *key) {
+ virtual BasicFilterUserData *createUserData(const SWModule *module, const SWKey *key) {
return new MyUserData(module, key);
}
- virtual bool handleToken(SWBuf &buf, const char *token, SWFilterUserData *userData);
+ virtual bool handleToken(SWBuf &buf, const char *token, BasicFilterUserData *userData);
public:
OSISHTMLHref();
};
Index: osisplain.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/osisplain.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- osisplain.h 7 Aug 2003 23:23:24 -0000 1.9
+++ osisplain.h 12 Aug 2003 05:36:30 -0000 1.10
@@ -30,15 +30,15 @@
class SWDLLEXPORT OSISPlain : public SWBasicFilter {
public:
protected:
- class MyUserData : public SWFilterUserData {
+ class MyUserData : public BasicFilterUserData {
public:
SWBuf w;
- MyUserData(const SWModule *module, const SWKey *key) : SWFilterUserData(module, key) {}
+ MyUserData(const SWModule *module, const SWKey *key) : BasicFilterUserData(module, key) {}
};
- virtual SWFilterUserData *createUserData(const SWModule *module, const SWKey *key) {
+ virtual BasicFilterUserData *createUserData(const SWModule *module, const SWKey *key) {
return new MyUserData(module, key);
}
- virtual bool handleToken(SWBuf &buf, const char *token, SWFilterUserData *userData);
+ virtual bool handleToken(SWBuf &buf, const char *token, BasicFilterUserData *userData);
public:
OSISPlain();
};
Index: osisrtf.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/osisrtf.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- osisrtf.h 7 Aug 2003 23:23:24 -0000 1.9
+++ osisrtf.h 12 Aug 2003 05:36:30 -0000 1.10
@@ -31,16 +31,16 @@
private:
protected:
- class MyUserData : public SWFilterUserData {
+ class MyUserData : public BasicFilterUserData {
public:
bool osisQToTick;
SWBuf w;
MyUserData(const SWModule *module, const SWKey *key);
};
- virtual SWFilterUserData *createUserData(const SWModule *module, const SWKey *key) {
+ virtual BasicFilterUserData *createUserData(const SWModule *module, const SWKey *key) {
return new MyUserData(module, key);
}
- virtual bool handleToken(SWBuf &buf, const char *token, SWFilterUserData *userData);
+ virtual bool handleToken(SWBuf &buf, const char *token, BasicFilterUserData *userData);
public:
OSISRTF();
};
Index: swbasicfilter.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/swbasicfilter.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- swbasicfilter.h 7 Aug 2003 23:23:24 -0000 1.21
+++ swbasicfilter.h 12 Aug 2003 05:36:30 -0000 1.22
@@ -31,10 +31,11 @@
SWORD_NAMESPACE_START
-class SWFilterUserData {
+// not a protected inner class because MSVC++ sucks and can't handle it
+class BasicFilterUserData {
public:
- SWFilterUserData(const SWModule *module, const SWKey *key) { this->module = module; this->key = key; suspendTextPassThru = false; supressAdjacentWhitespace = false; }
- virtual ~SWFilterUserData() {}
+ BasicFilterUserData(const SWModule *module, const SWKey *key) { this->module = module; this->key = key; suspendTextPassThru = false; supressAdjacentWhitespace = false; }
+ virtual ~BasicFilterUserData() {}
const SWModule *module;
const SWKey *key;
SWBuf lastTextNode;
@@ -77,8 +78,8 @@
protected:
- virtual SWFilterUserData *createUserData(const SWModule *module, const SWKey *key) {
- return new SWFilterUserData(module, key);
+ virtual BasicFilterUserData *createUserData(const SWModule *module, const SWKey *key) {
+ return new BasicFilterUserData(module, key);
}
// STAGEs
@@ -130,8 +131,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, SWFilterUserData *userData);
- virtual bool processStage(char stage, SWBuf &text, char *&from, SWFilterUserData *userData) { return false; }
+ virtual bool handleToken(SWBuf &buf, const char *token, BasicFilterUserData *userData);
+ virtual bool processStage(char stage, SWBuf &text, char *&from, BasicFilterUserData *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 +141,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, SWFilterUserData *userData);
+ virtual bool handleEscapeString(SWBuf &buf, const char *escString, BasicFilterUserData *userData);
};
SWORD_NAMESPACE_END
Index: swbuf.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/swbuf.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- swbuf.h 6 Aug 2003 10:34:36 -0000 1.23
+++ swbuf.h 12 Aug 2003 05:36:30 -0000 1.24
@@ -74,6 +74,7 @@
*
*/
SWBuf(const char *initVal = 0, unsigned long initSize = 0);
+// SWBuf(unsigned long initSize);
/**
* SWBuf Constructor - Creates an SWBuf initialized
Index: thmlhtml.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/thmlhtml.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- thmlhtml.h 7 Aug 2003 23:23:24 -0000 1.11
+++ thmlhtml.h 12 Aug 2003 05:36:30 -0000 1.12
@@ -29,15 +29,15 @@
*/
class SWDLLEXPORT ThMLHTML : public SWBasicFilter {
protected:
- class MyUserData : public SWFilterUserData {
+ class MyUserData : public BasicFilterUserData {
public:
- MyUserData(const SWModule *module, const SWKey *key) : SWFilterUserData(module, key) {}
+ MyUserData(const SWModule *module, const SWKey *key) : BasicFilterUserData(module, key) {}
bool SecHead;
};
- virtual SWFilterUserData *createUserData(const SWModule *module, const SWKey *key) {
+ virtual BasicFilterUserData *createUserData(const SWModule *module, const SWKey *key) {
return new MyUserData(module, key);
}
- virtual bool handleToken(SWBuf &buf, const char *token, SWFilterUserData *userData);
+ virtual bool handleToken(SWBuf &buf, const char *token, BasicFilterUserData *userData);
public:
ThMLHTML();
};
Index: thmlhtmlhref.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/thmlhtmlhref.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- thmlhtmlhref.h 7 Aug 2003 23:23:24 -0000 1.6
+++ thmlhtmlhref.h 12 Aug 2003 05:36:30 -0000 1.7
@@ -29,16 +29,16 @@
*/
class SWDLLEXPORT ThMLHTMLHREF : public SWBasicFilter {
protected:
- class MyUserData : public SWFilterUserData {
+ class MyUserData : public BasicFilterUserData {
public:
- MyUserData(const SWModule *module, const SWKey *key) : SWFilterUserData(module, key) {}
+ MyUserData(const SWModule *module, const SWKey *key) : BasicFilterUserData(module, key) {}
bool inscriptRef;
bool SecHead;
};
- virtual SWFilterUserData *createUserData(const SWModule *module, const SWKey *key) {
+ virtual BasicFilterUserData *createUserData(const SWModule *module, const SWKey *key) {
return new MyUserData(module, key);
}
- virtual bool handleToken(SWBuf &buf, const char *token, SWFilterUserData *userData);
+ virtual bool handleToken(SWBuf &buf, const char *token, BasicFilterUserData *userData);
public:
ThMLHTMLHREF();
};
Index: thmlrtf.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/thmlrtf.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- thmlrtf.h 7 Aug 2003 23:23:24 -0000 1.10
+++ thmlrtf.h 12 Aug 2003 05:36:30 -0000 1.11
@@ -29,15 +29,15 @@
*/
class SWDLLEXPORT ThMLRTF : public SWBasicFilter {
protected:
- class MyUserData : public SWFilterUserData {
+ class MyUserData : public BasicFilterUserData {
public:
- MyUserData(const SWModule *module, const SWKey *key) : SWFilterUserData(module, key) {}
+ MyUserData(const SWModule *module, const SWKey *key) : BasicFilterUserData(module, key) {}
bool sechead;
};
- virtual SWFilterUserData *createUserData(const SWModule *module, const SWKey *key) {
+ virtual BasicFilterUserData *createUserData(const SWModule *module, const SWKey *key) {
return new MyUserData(module, key);
}
- virtual bool handleToken(SWBuf &buf, const char *token, SWFilterUserData *userData);
+ virtual bool handleToken(SWBuf &buf, const char *token, BasicFilterUserData *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.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- thmlwebif.h 7 Aug 2003 23:23:24 -0000 1.4
+++ thmlwebif.h 12 Aug 2003 05:36:30 -0000 1.5
@@ -32,7 +32,7 @@
const SWBuf passageStudyURL;
protected:
- virtual bool handleToken(SWBuf &buf, const char *token, SWFilterUserData *userData);
+ virtual bool handleToken(SWBuf &buf, const char *token, BasicFilterUserData *userData);
public:
ThMLWEBIF();
};
Index: zstr.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/zstr.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- zstr.h 27 Feb 2003 07:39:37 -0000 1.7
+++ zstr.h 12 Aug 2003 05:36:30 -0000 1.8
@@ -68,7 +68,7 @@
void getText(long index, char **idxbuf, char **buf);
void setText(const char *ikey, const char *buf, long len = -1);
void linkEntry(const char *destkey, const char *srckey);
- virtual void rawZFilter(char *buf, long size, char direction = 0) {}
+ virtual void rawZFilter(SWBuf &buf, char direction = 0) {}
static signed char createModule (const char *path);
};
Index: zverse.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/zverse.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- zverse.h 26 Feb 2003 04:49:12 -0000 1.13
+++ zverse.h 12 Aug 2003 05:36:30 -0000 1.14
@@ -50,7 +50,7 @@
virtual ~zVerse();
void findOffset(char testmt, long idxoff, long *start, unsigned short *end);
void zReadText(char testmt, long start, unsigned short size, SWBuf &buf);
- virtual void rawZFilter(char *buf, long size, char direction = 0) {}
+ virtual void rawZFilter(SWBuf &buf, char direction = 0) {}
static char createModule(const char *path, int blockBound);
};
- Previous message: [sword-cvs] sword/src/utilfuns swbuf.cpp,1.12,1.13
- Next message: [sword-cvs] sword/src/modules/filters cipherfil.cpp,1.19,1.20 gbfhtml.cpp,1.28,1.29 gbfhtmlhref.cpp,1.19,1.20 gbfwebif.cpp,1.5,1.6 osishtmlhref.cpp,1.13,1.14 osisplain.cpp,1.12,1.13 osisrtf.cpp,1.23,1.24 swbasicfilter.cpp,1.31,1.32 thmlhtml.cpp,1.29,1.30 thmlhtmlhref.cpp,1.36,1.37 thmlrtf.cpp,1.36,1.37 thmlwebif.cpp,1.7,1.8
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]