sync with crosswire 20021002-1300

4 files changed, 18 insertions, 1 deletions

diff --git a/src/modules/texts/rawgbf/rawgbf.cpp b/src/modules/texts/rawgbf/rawgbf.cpp
index dd2fd47..6b8516f 100644
--- a/src/modules/texts/rawgbf/rawgbf.cpp
+++ b/src/modules/texts/rawgbf/rawgbf.cpp
@@ -19,6 +19,7 @@
 #include <rawverse.h>
 #include <rawgbf.h>
 
+SWORD_NAMESPACE_START
 
 /******************************************************************************
  * RawGBF Constructor - Initializes data for instance of RawGBF
@@ -82,3 +83,5 @@ RawGBF::operator char*()
 
 	return entrybuf;
 }
+
+SWORD_NAMESPACE_END
diff --git a/src/modules/texts/rawtext/rawtext.cpp b/src/modules/texts/rawtext/rawtext.cpp
index 489ea1c..072a341 100644
--- a/src/modules/texts/rawtext/rawtext.cpp
+++ b/src/modules/texts/rawtext/rawtext.cpp
@@ -13,7 +13,7 @@
 #include <unistd.h>
 #endif
 
-#include <string.h>
+#include <string>
 #include <utilfuns.h>
 #include <rawverse.h>
 #include <rawtext.h>
@@ -27,6 +27,12 @@
 #define O_BINARY 0
 #endif
 
+using std::string;
+using std::map;
+using std::list;
+
+SWORD_NAMESPACE_START
+
 /******************************************************************************
  * RawText Constructor - Initializes data for instance of RawText
  *
@@ -580,3 +586,5 @@ void RawText::increment(int steps) {
 	if (tmpkey != key)
 		delete tmpkey;
 }
+
+SWORD_NAMESPACE_END
diff --git a/src/modules/texts/swtext.cpp b/src/modules/texts/swtext.cpp
index dc8ea43..8610dae 100644
--- a/src/modules/texts/swtext.cpp
+++ b/src/modules/texts/swtext.cpp
@@ -5,6 +5,7 @@
 #include <swtext.h>
 #include <listkey.h>
 
+SWORD_NAMESPACE_START
 
 /******************************************************************************
  * SWText Constructor - Initializes data for instance of SWText
@@ -76,3 +77,5 @@ long SWText::Index(long iindex) {
 
 	return Index();
 }
+
+SWORD_NAMESPACE_END
diff --git a/src/modules/texts/ztext/ztext.cpp b/src/modules/texts/ztext/ztext.cpp
index 77a45b1..a51b338 100644
--- a/src/modules/texts/ztext/ztext.cpp
+++ b/src/modules/texts/ztext/ztext.cpp
@@ -20,6 +20,7 @@
 #include <ztext.h>
 //#include <zlib.h>
 
+SWORD_NAMESPACE_START
 
 /******************************************************************************
  * zText Constructor - Initializes data for instance of zText
@@ -259,3 +260,5 @@ void zText::increment(int steps) {
 	if (tmpkey != key)
 		delete tmpkey;
 }
+
+SWORD_NAMESPACE_END