sync with crosswire 20020930-1300

9 files changed, 8 insertions, 18 deletions

diff --git a/include/hebrewmcim.h b/include/hebrewmcim.h
index c601751..6400bbd 100644
--- a/include/hebrewmcim.h
+++ b/include/hebrewmcim.h
@@ -12,7 +12,6 @@
 
 #include <swinputmeth.h>
 #include <map>
-using namespace std;
 
 class HebrewMCIM : public SWInputMethod {
 
diff --git a/include/localemgr.h b/include/localemgr.h
index 641f067..2e57c03 100644
--- a/include/localemgr.h
+++ b/include/localemgr.h
@@ -2,7 +2,7 @@
  *  localemgr.h   - definition of class LocaleMgr used to interact with
  *				registered locales for a sword installation
  *
- * $Id: localemgr.h,v 1.9 2002/06/19 09:24:44 scribe Exp $
+ * $Id: localemgr.h,v 1.10 2002/09/30 10:34:43 dglassey Exp $
  *
  * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org)
  *	CrossWire Bible Society
@@ -31,7 +31,6 @@
 
 #include <defs.h>
 
-using namespace std;
 
 typedef map < string, SWLocale *, less < string > >LocaleMap;
 
diff --git a/include/multimapwdef.h b/include/multimapwdef.h
index d3f8f90..759818e 100644
--- a/include/multimapwdef.h
+++ b/include/multimapwdef.h
@@ -3,7 +3,6 @@
 
 #include <map>
 
-using namespace std;
 
 // multmap that still lets you use [] to reference FIRST
 // entry of a key if multiples exist
diff --git a/include/swbasicfilter.h b/include/swbasicfilter.h
index 339b7e7..0e6a2a4 100644
--- a/include/swbasicfilter.h
+++ b/include/swbasicfilter.h
@@ -4,7 +4,7 @@
  *  				many filter will need and can use as a starting
  *  				point. 
  *
- * $Id: swbasicfilter.h,v 1.9 2002/06/06 21:08:47 scribe Exp $
+ * $Id: swbasicfilter.h,v 1.10 2002/09/30 10:34:43 dglassey Exp $
  *
  * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org)
  *	CrossWire Bible Society
@@ -29,7 +29,6 @@
 
 #include <defs.h>
 #include <map>
-using namespace std;
 
 /** A filter providing commonly used functionality.
 * This filter has facilities for handling SGML/HTML/XML like tokens and
diff --git a/include/swconfig.h b/include/swconfig.h
index a0a6b0d..80c42b6 100644
--- a/include/swconfig.h
+++ b/include/swconfig.h
@@ -2,7 +2,7 @@
  *  swconfig.h   - definition of Class SWConfig used for saving and retrieval
  *				of configuration information
  *
- * $Id: swconfig.h,v 1.17 2002/07/28 01:48:38 scribe Exp $
+ * $Id: swconfig.h,v 1.18 2002/09/30 10:34:43 dglassey Exp $
  *
  * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org)
  *	CrossWire Bible Society
@@ -31,7 +31,6 @@
 #include <defs.h>
 #include <multimapwdef.h>
 
-using namespace std;
 
 
 
diff --git a/include/swlocale.h b/include/swlocale.h
index a2645fc..eed6adf 100644
--- a/include/swlocale.h
+++ b/include/swlocale.h
@@ -2,7 +2,7 @@
  *  swlocale.h   - definition of Class SWLocale used for retrieval
  *				of locale lookups
  *
- * $Id: swlocale.h,v 1.7 2002/07/28 01:48:38 scribe Exp $
+ * $Id: swlocale.h,v 1.8 2002/09/30 10:34:43 dglassey Exp $
  *
  * Copyright 2000 CrossWire Bible Society (http://www.crosswire.org)
  *	CrossWire Bible Society
@@ -31,7 +31,6 @@
 
 #include <defs.h>
 
-using namespace std;
 
 typedef map < string, string, less < string > >LookupMap;
 
diff --git a/include/swmgr.h b/include/swmgr.h
index 24ad7e6..214a9b0 100644
--- a/include/swmgr.h
+++ b/include/swmgr.h
@@ -2,7 +2,7 @@
 *  swmgr.h   - definition of class SWMgr used to interact with an install
 *				base of sword modules.
 *
-* $Id: swmgr.h,v 1.45 2002/08/08 21:35:05 scribe Exp $
+* $Id: swmgr.h,v 1.46 2002/09/30 10:34:43 dglassey Exp $
 *
 * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org)
 *	CrossWire Bible Society
@@ -50,8 +50,6 @@
 
 #include <defs.h>
 
-using namespace std;
-
 typedef map < string, SWModule *, less < string > >ModMap;
 typedef list < string > OptionsList;
 typedef map < string, SWFilter * >FilterMap;
@@ -64,7 +62,7 @@ typedef map < string, SWFilter * >FilterMap;
 *
 * To get the SWModule objects of the instalelled modules use @ref Modules for this.
 * @see AddRawFilters(), AddRenderFilters(), AddStripFilters()
-* @version $Id: swmgr.h,v 1.45 2002/08/08 21:35:05 scribe Exp $
+* @version $Id: swmgr.h,v 1.46 2002/09/30 10:34:43 dglassey Exp $
 */
 class SWDLLEXPORT SWMgr {
 
diff --git a/include/swmodule.h b/include/swmodule.h
index 0f27df6..b8c2075 100644
--- a/include/swmodule.h
+++ b/include/swmodule.h
@@ -3,7 +3,7 @@
 *		  types of modules (e.g. texts, commentaries, maps, lexicons,
 *		  etc.)
 *
-* $Id: swmodule.h,v 1.53 2002/09/29 03:21:08 scribe Exp $
+* $Id: swmodule.h,v 1.54 2002/09/30 10:34:43 dglassey Exp $
 *
 * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org)
 *	CrossWire Bible Society
@@ -35,7 +35,6 @@
 #include <defs.h>
 #include <multimapwdef.h>
 
-using namespace std;
 
 
 #define SWMODULE_OPERATORS \
diff --git a/src/keys/treekeyidx.cpp b/src/keys/treekeyidx.cpp
index f5d21b5..99bd62f 100644
--- a/src/keys/treekeyidx.cpp
+++ b/src/keys/treekeyidx.cpp
@@ -1,7 +1,7 @@
 /******************************************************************************
  *  versekey.h - code for class 'versekey'- a standard Biblical verse key
  *
- * $Id: treekeyidx.cpp,v 1.8 2002/09/11 07:04:20 scribe Exp $
+ * $Id: treekeyidx.cpp,v 1.9 2002/09/30 10:35:26 dglassey Exp $
  *
  * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org)
  *	CrossWire Bible Society
@@ -32,7 +32,6 @@
 #include <unistd.h>
 #endif
 
-using namespace std;
 static const char nl = '\n';
 static const char *classes[] = {"TreeKeyIdx", "TreeKey", "SWKey", "SWObject", 0};
 SWClass TreeKeyIdx::classdef(classes);