From 092e2104c7ed49ec967742799cfa7bf7053c7cda Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Mon, 26 Nov 2012 20:31:54 +0000
Subject: [PATCH] More consistent use of DOH namespace

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13940 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 Source/Modules/cffi.cxx   | 4 ++--
 Source/Modules/lua.cxx    | 2 +-
 Source/Modules/perl5.cxx  | 2 +-
 Source/Modules/python.cxx | 2 +-
 Source/Modules/s-exp.cxx  | 2 +-
 Source/Swig/include.c     | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Source/Modules/cffi.cxx b/Source/Modules/cffi.cxx
index ceb1bad67..dcc8ef93e 100644
--- a/Source/Modules/cffi.cxx
+++ b/Source/Modules/cffi.cxx
@@ -1051,10 +1051,10 @@ String *CFFI::convert_literal(String *literal, String *type, bool try_to_split)
 
   if (Len(num) >= 2 && s[0] == '0') { /* octal or hex */
     if (s[1] == 'x'){
-      DohReplace(num,"0","#",DOH_REPLACE_FIRST);
+      Replace(num,"0","#",DOH_REPLACE_FIRST);
     }
     else{
-      DohReplace(num,"0","#o",DOH_REPLACE_FIRST);
+      Replace(num,"0","#o",DOH_REPLACE_FIRST);
     }
   }
   return num;
diff --git a/Source/Modules/lua.cxx b/Source/Modules/lua.cxx
index 3d1530331..ef2fa96de 100644
--- a/Source/Modules/lua.cxx
+++ b/Source/Modules/lua.cxx
@@ -62,7 +62,7 @@ char cvsroot_lua_cxx[] = "$Id$";
 void display_mapping(DOH *d) {
   if (d == 0 || !DohIsMapping(d))
     return;
-  for (DohIterator it = DohFirst(d); it.item; it = DohNext(it)) {
+  for (Iterator it = First(d); it.item; it = Next(it)) {
     if (DohIsString(it.item))
       Printf(stdout, "  %s = %s\n", it.key, it.item);
     else if (DohIsMapping(it.item))
diff --git a/Source/Modules/perl5.cxx b/Source/Modules/perl5.cxx
index 1662f3b55..f786a7607 100644
--- a/Source/Modules/perl5.cxx
+++ b/Source/Modules/perl5.cxx
@@ -1669,7 +1669,7 @@ public:
     }
 
     /* Split the input text into lines */
-    List *clist = DohSplitLines(temp);
+    List *clist = SplitLines(temp);
     Delete(temp);
     int initial = 0;
     String *s = 0;
diff --git a/Source/Modules/python.cxx b/Source/Modules/python.cxx
index 43d306b09..2295f7801 100644
--- a/Source/Modules/python.cxx
+++ b/Source/Modules/python.cxx
@@ -1107,7 +1107,7 @@ public:
     }
 
     /* Split the input text into lines */
-    List *clist = DohSplitLines(temp);
+    List *clist = SplitLines(temp);
     Delete(temp);
     int initial = 0;
     String *s = 0;
diff --git a/Source/Modules/s-exp.cxx b/Source/Modules/s-exp.cxx
index 3c50f3076..2c9a0cc99 100644
--- a/Source/Modules/s-exp.cxx
+++ b/Source/Modules/s-exp.cxx
@@ -87,7 +87,7 @@ public:
     Language::top(n);
     Printf(out, "\n");
     Printf(out, ";;; Lisp parse tree produced by SWIG\n");
-    print_circle_hash = DohNewHash();
+    print_circle_hash = NewHash();
     print_circle_count = 0;
     hanging_parens = 0;
     need_whitespace = 0;
diff --git a/Source/Swig/include.c b/Source/Swig/include.c
index 5d37dad7e..5796416a4 100644
--- a/Source/Swig/include.c
+++ b/Source/Swig/include.c
@@ -338,7 +338,7 @@ String *Swig_file_extension(const_String_or_char_ptr filename) {
 
 String *Swig_file_basename(const_String_or_char_ptr filename) {
   String *extension = Swig_file_extension(filename);
-  String *basename = DohNewStringWithSize(filename, Len(filename) - Len(extension));
+  String *basename = NewStringWithSize(filename, Len(filename) - Len(extension));
   Delete(extension);
   return basename;
 }