[sword-cvs] sword/src/modules swmodule.cpp,1.53,1.54

sword@www.crosswire.org sword@www.crosswire.org
Sat, 28 Feb 2004 13:14:32 -0700


Update of /cvs/core/sword/src/modules
In directory www:/tmp/cvs-serv6163/src/modules

Modified Files:
	swmodule.cpp 
Log Message:


Index: swmodule.cpp
===================================================================
RCS file: /cvs/core/sword/src/modules/swmodule.cpp,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- swmodule.cpp	16 Jan 2004 03:42:41 -0000	1.53
+++ swmodule.cpp	28 Feb 2004 20:14:29 -0000	1.54
@@ -238,14 +238,14 @@
  * RET:	pointer to disp
  */
 
-SWDisplay *SWModule::Disp(SWDisplay *idisp)
-{
-	if (idisp)
-		disp = idisp;
-
+SWDisplay *SWModule::getDisplay() const {
 	return disp;
 }
 
+void SWModule::setDisplay(SWDisplay *idisp) {
+	disp = idisp;
+}
+
 
 /******************************************************************************
  * SWModule::Display - Calls this modules display object and passes itself
@@ -253,8 +253,7 @@
  * RET:	error status
  */
 
-char SWModule::Display()
-{
+char SWModule::Display() {
 	disp->Display(*this);
 	return 0;
 }
@@ -375,6 +374,7 @@
  */
 
 ListKey &SWModule::search(const char *istr, int searchType, int flags, SWKey *scope, bool *justCheckIfSupported, void (*percent)(char, void *), void *percentUserData) {
+
 	SWKey *savekey = 0;
 	SWKey *searchkey = 0;
 	regex_t preg;
@@ -613,8 +613,7 @@
  * RET: this module's text at specified key location massaged by Strip filters
  */
 
-const char *SWModule::StripText(const char *buf, int len)
-{
+const char *SWModule::StripText(const char *buf, int len) {
 	return RenderText(buf, len, false);
 }
 
@@ -668,8 +667,7 @@
  * RET: this module's text at specified key location massaged by RenderFilers
  */
 
- const char *SWModule::RenderText(SWKey *tmpKey)
-{
+ const char *SWModule::RenderText(SWKey *tmpKey) {
 	SWKey *savekey;
 	const char *retVal;
 
@@ -700,8 +698,7 @@
  * RET: this module's text at specified key location massaged by Strip filters
  */
 
-const char *SWModule::StripText(SWKey *tmpKey)
-{
+const char *SWModule::StripText(SWKey *tmpKey) {
 	SWKey *savekey;
 	const char *retVal;