9 files changed, 29 insertions, 1 deletions
diff --git a/apps/console/diatheke/corediatheke.cpp b/apps/console/diatheke/corediatheke.cpp
index e87f4da..6c32bbe 100644
--- a/apps/console/diatheke/corediatheke.cpp
+++ b/apps/console/diatheke/corediatheke.cpp
@@ -9,6 +9,12 @@
 #include <string>
 #include <list>
 
+using std::string;
+using std::list;
+using std::cout;
+using std::endl;
+using std::ostream;
+
 void systemquery(const char * key, ostream* output){
 	DiathekeMgr manager;
 	ModMap::iterator it;
diff --git a/apps/console/diatheke/corediatheke.h b/apps/console/diatheke/corediatheke.h
index b265053..45a0569 100644
--- a/apps/console/diatheke/corediatheke.h
+++ b/apps/console/diatheke/corediatheke.h
@@ -36,4 +36,4 @@
 #define ST_MULTIWORD 3 // -2
 
 int hasalpha (char * string);
-void doquery(unsigned long maxverses, unsigned char outputformat, unsigned char outputencoding, unsigned long optionfilters, unsigned char searchtype, const char *text, const char *locale, const char *ref, ostream* output, const char* script, signed short variants); 
+void doquery(unsigned long maxverses, unsigned char outputformat, unsigned char outputencoding, unsigned long optionfilters, unsigned char searchtype, const char *text, const char *locale, const char *ref, std::ostream* output, const char* script, signed short variants); 
diff --git a/apps/console/diatheke/diafiltmgr.h b/apps/console/diatheke/diafiltmgr.h
index cb04fff..2ca34eb 100644
--- a/apps/console/diatheke/diafiltmgr.h
+++ b/apps/console/diatheke/diafiltmgr.h
@@ -23,6 +23,9 @@
 #define FMT_CGI 127
 
 #include <encfiltmgr.h>
+#ifndef NO_SWORD_NAMESPACE
+using namespace sword;
+#endif
 
 class SWDLLEXPORT DiathekeFilterMgr : public EncodingFilterMgr {
 protected:
diff --git a/apps/console/diatheke/diatheke.cpp b/apps/console/diatheke/diatheke.cpp
index f423e6b..58eaf01 100644
--- a/apps/console/diatheke/diatheke.cpp
+++ b/apps/console/diatheke/diatheke.cpp
@@ -4,11 +4,15 @@
 // Licensed under GNU General Public License (GPL)
 // see accompanying LICENSE file for license details
 
+
 #include "corediatheke.h"
 #include "diathekemgr.h"
 #include "diafiltmgr.h"
 #include <iostream>
 
+using std::string;
+using std::cout;
+
 #define RQ_REF 1
 #define RQ_BOOK 2
 
diff --git a/apps/console/diatheke/diathekemgr.cpp b/apps/console/diatheke/diathekemgr.cpp
index 87f9102..3b87967 100644
--- a/apps/console/diatheke/diathekemgr.cpp
+++ b/apps/console/diatheke/diathekemgr.cpp
@@ -28,6 +28,8 @@
 #include "gbfcgi.h"
 #include "thmlcgi.h"
 
+using std::string;
+
 //---------------------------------------------------------------------------
 DiathekeMgr::DiathekeMgr (SWConfig * iconfig, SWConfig * isysconfig, bool autoload, char enc, char mark, bool ibidi, bool ishape)
         : SWMgr(iconfig, isysconfig, autoload, new DiathekeFilterMgr(mark, enc))
diff --git a/apps/console/diatheke/gbfcgi.cpp b/apps/console/diatheke/gbfcgi.cpp
index 1bcd176..28ce7fb 100644
--- a/apps/console/diatheke/gbfcgi.cpp
+++ b/apps/console/diatheke/gbfcgi.cpp
@@ -18,6 +18,8 @@
 #include <string.h>
 #include "gbfcgi.h"
 
+SWORD_NAMESPACE_START
+
 GBFCGI::GBFCGI() {
 	setTokenStart("<");
 	setTokenEnd(">");
@@ -136,3 +138,5 @@ bool GBFCGI::handleToken(char **buf, const char *token, DualStringMap &userData)
 	}
 	return true;
 }
+
+SWORD_NAMESPACE_END
diff --git a/apps/console/diatheke/gbfcgi.h b/apps/console/diatheke/gbfcgi.h
index 51b0d6c..530b5cf 100644
--- a/apps/console/diatheke/gbfcgi.h
+++ b/apps/console/diatheke/gbfcgi.h
@@ -21,6 +21,8 @@
 
 #include <defs.h>
 
+SWORD_NAMESPACE_START
+
 /** this filter converts GBF text to Diatheke/CGI format
  */
 class SWDLLEXPORT GBFCGI : public SWBasicFilter {
@@ -30,4 +32,5 @@ public:
   GBFCGI ();
 };
 
+SWORD_NAMESPACE_END
 #endif
diff --git a/apps/console/diatheke/thmlcgi.cpp b/apps/console/diatheke/thmlcgi.cpp
index 2bb7720..d8370c6 100644
--- a/apps/console/diatheke/thmlcgi.cpp
+++ b/apps/console/diatheke/thmlcgi.cpp
@@ -18,6 +18,8 @@
 #include <string.h>
 #include "thmlcgi.h"
 
+SWORD_NAMESPACE_START
+
 ThMLCGI::ThMLCGI() {
 	setTokenStart("<");
 	setTokenEnd(">");
@@ -190,3 +192,4 @@ bool ThMLCGI::handleToken(char **buf, const char *token, DualStringMap &userData
 
 
 
+SWORD_NAMESPACE_END
diff --git a/apps/console/diatheke/thmlcgi.h b/apps/console/diatheke/thmlcgi.h
index c164f0d..a0723d5 100644
--- a/apps/console/diatheke/thmlcgi.h
+++ b/apps/console/diatheke/thmlcgi.h
@@ -21,6 +21,8 @@
 
 #include <defs.h>
 
+SWORD_NAMESPACE_START
+
 /** this filter converts ThML text to Diatheke/CGI format
  */
 class SWDLLEXPORT ThMLCGI : public SWBasicFilter {
@@ -30,4 +32,5 @@ public:
 	ThMLCGI();
 };
 
+SWORD_NAMESPACE_END
 #endif