rename String_or_char_ptr to const_String_or_char_ptr in DOH2swig-2.0

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/swig-2.0@11122 626c5289-ae23-0410-ae9c-e8d60b6d4f22

3 files changed, 51 insertions, 51 deletions

diff --git a/Source/DOH2/doh.cxx b/Source/DOH2/doh.cxx
index d8501ec98..b731e22b6 100644
--- a/Source/DOH2/doh.cxx
+++ b/Source/DOH2/doh.cxx
@@ -118,15 +118,15 @@ namespace doh {
   }
 
 
-  /* class String_or_char_ptr */
+  /* class const_String_or_char_ptr */
 
-  String_or_char_ptr::String_or_char_ptr(const String_or_char_ptr& str)
+  const_String_or_char_ptr::const_String_or_char_ptr(const const_String_or_char_ptr& str)
     :content_str(str.content_str),
     content_charptr(str.content_charptr),
     need_free(0) /* TODO: may potential memory leak/corrupt here */
   {}
 
-  String_or_char_ptr::~String_or_char_ptr() {
+  const_String_or_char_ptr::~const_String_or_char_ptr() {
     if (need_free) {
       delete content_str;
     }
@@ -134,22 +134,22 @@ namespace doh {
 
   // Casters
   // from const char*
-  String_or_char_ptr::String_or_char_ptr(const char *s)
+  const_String_or_char_ptr::const_String_or_char_ptr(const char *s)
     :content_str(0), content_charptr(s),
     need_free(false)
   {}
   // from DOH*
-  String_or_char_ptr::String_or_char_ptr(const DOH* str)
+  const_String_or_char_ptr::const_String_or_char_ptr(const DOH* str)
     :content_str(dynamic_cast<const String*>(str)),
     content_charptr(0),
     need_free(false)
   {}
   // to const char*
-  String_or_char_ptr::operator const char* () const {
+  const_String_or_char_ptr::operator const char* () const {
     return content_charptr ? content_charptr : content_str->c_str();
   }
   // to const String*
-  String_or_char_ptr::operator const String* () const {
+  const_String_or_char_ptr::operator const String* () const {
     if (!content_str) {
       content_str = new String(content_charptr);
       need_free = true;
diff --git a/Source/DOH2/doh.h b/Source/DOH2/doh.h
index 6bcc47251..ce7b6a342 100644
--- a/Source/DOH2/doh.h
+++ b/Source/DOH2/doh.h
@@ -263,18 +263,18 @@ namespace doh {
    * It is the equivalence of
    *    const String_or_char *
    */
-  class String_or_char_ptr {
+  class const_String_or_char_ptr {
   public:
     // Copy constructor
-    String_or_char_ptr(const String_or_char_ptr& str);
+    const_String_or_char_ptr(const const_String_or_char_ptr& str);
     // Destructor
-    ~String_or_char_ptr();
+    ~const_String_or_char_ptr();
 
     /* Casters */
     // from const char*
-    String_or_char_ptr(const char *s);
+    const_String_or_char_ptr(const char *s);
     // from DOH*
-    String_or_char_ptr(const DOH* str);
+    const_String_or_char_ptr(const DOH* str);
     // to const char*
     operator const char* () const;
     // to const String*
@@ -349,24 +349,24 @@ namespace doh {
 
   /* Mapping methods */
   //XXX Removed all the const qulifier of 'DOH *value' argument
-  DOHCaster Getattr(DOH *obj, const String_or_char_ptr name);
-  int Setattr(DOH *obj, const String_or_char_ptr name, const char *value); // Overloaded
-  int Setattr(DOH *obj, const String_or_char_ptr name, DOH *value);
-  int Checkattr(DOH *obj, const String_or_char_ptr name, const String_or_char_ptr value);
+  DOHCaster Getattr(DOH *obj, const_String_or_char_ptr name);
+  int Setattr(DOH *obj, const_String_or_char_ptr name, const char *value); // Overloaded
+  int Setattr(DOH *obj, const_String_or_char_ptr name, DOH *value);
+  int Checkattr(DOH *obj, const_String_or_char_ptr name, const_String_or_char_ptr value);
   DOHCaster Keys(DOH *obj);
-  int GetInt(DOH *obj, const String_or_char_ptr name);
-  void SetInt(DOH *obj, const String_or_char_ptr name, int value);
+  int GetInt(DOH *obj, const_String_or_char_ptr name);
+  void SetInt(DOH *obj, const_String_or_char_ptr name, int value);
   #define DohSetInt SetInt
-  double GetDouble(DOH *obj, const String_or_char_ptr name); // Never
-  double SetDouble(DOH *obj, const String_or_char_ptr name, double); // Never
-  char *GetChar(DOH *obj, const String_or_char_ptr name); // These are redundant 
+  double GetDouble(DOH *obj, const_String_or_char_ptr name); // Never
+  double SetDouble(DOH *obj, const_String_or_char_ptr name, double); // Never
+  char *GetChar(DOH *obj, const_String_or_char_ptr name); // These are redundant 
   void SetChar(DOH *obj, const DOH *name, char *value);
-  DOHCaster GetFlagAttr(DOH *obj, const String_or_char_ptr name);
-  int GetFlag(DOH *obj, const String_or_char_ptr name);
-  void SetFlagAttr(DOH *obj, const String_or_char_ptr name, DOH *attr); // Rare
-  void SetFlag(DOH *obj, const String_or_char_ptr name);
-  void GetVoid(DOH *obj, const String_or_char_ptr name); // Rare, unable to support.  Modules/allegrocl.cxx
-  void *SetVoid(DOH *obj, const String_or_char_ptr name, void *value);
+  DOHCaster GetFlagAttr(DOH *obj, const_String_or_char_ptr name);
+  int GetFlag(DOH *obj, const_String_or_char_ptr name);
+  void SetFlagAttr(DOH *obj, const_String_or_char_ptr name, DOH *attr); // Rare
+  void SetFlag(DOH *obj, const_String_or_char_ptr name);
+  void GetVoid(DOH *obj, const_String_or_char_ptr name); // Rare, unable to support.  Modules/allegrocl.cxx
+  void *SetVoid(DOH *obj, const_String_or_char_ptr name, void *value);
   #define UnsetFlag(o,n)     SetFlagAttr(o,n,NULL)
 
   /* Sequence methods */
@@ -410,9 +410,9 @@ namespace doh {
   void Setfile(DOH *obj, DOH *file);
 
   /* String Methods */
-  int Cmp(String_or_char_ptr obj1, String_or_char_ptr obj2);
-  int Equal(const String_or_char_ptr obj1, const String_or_char_ptr obj2);
-  int Replace(DOH * src, const String_or_char_ptr token, const String_or_char_ptr rep, int flags);
+  int Cmp(const_String_or_char_ptr obj1, const_String_or_char_ptr obj2);
+  int Equal(const_String_or_char_ptr obj1, const_String_or_char_ptr obj2);
+  int Replace(DOH * src, const_String_or_char_ptr token, const_String_or_char_ptr rep, int flags);
   void Chop(DOH * src);
 
   /* Meta-variables */
@@ -445,16 +445,16 @@ namespace doh {
    * ----------------------------------------------------------------------------- */
 
   String *NewStringEmpty(void);
-  String *NewString(String_or_char_ptr c);
-  String *NewStringWithSize(const String_or_char_ptr c, int len);
-  String *NewStringf(const String_or_char_ptr fmt, VA_DECL);
+  String *NewString(const_String_or_char_ptr c);
+  String *NewStringWithSize(const_String_or_char_ptr c, int len);
+  String *NewStringf(const_String_or_char_ptr fmt, VA_DECL);
 
-  const char *Char(const String_or_char_ptr s);
+  const char *Char(const_String_or_char_ptr s);
 
-  int Strcmp(const String_or_char_ptr s1, const String_or_char_ptr s2);
-  int Strncmp(const String_or_char_ptr s1, const String_or_char_ptr s2, int n);
-  const char *Strstr(const String_or_char_ptr s1, const String_or_char_ptr s2);
-  const char *Strchr(const String_or_char_ptr s1, int ch);
+  int Strcmp(const_String_or_char_ptr s1, const_String_or_char_ptr s2);
+  int Strncmp(const_String_or_char_ptr s1, const_String_or_char_ptr s2, int n);
+  const char *Strstr(const_String_or_char_ptr s1, const_String_or_char_ptr s2);
+  const char *Strchr(const_String_or_char_ptr s1, int ch);
 
   /* String replacement flags */
 
@@ -487,7 +487,7 @@ namespace doh {
   List *NewList();
   //void SortList(DOH *lo, int (*cmp) (const DOH *, const DOH *));
   void SortList(DOH *lo, int (*cmp) 
-          (const String_or_char_ptr, const String_or_char_ptr));
+          (const_String_or_char_ptr, const_String_or_char_ptr));
 
   /* -----------------------------------------------------------------------------
    * Hash
diff --git a/Source/DOH2/string.cxx b/Source/DOH2/string.cxx
index 8bed003c1..b313e31bf 100644
--- a/Source/DOH2/string.cxx
+++ b/Source/DOH2/string.cxx
@@ -200,17 +200,17 @@ namespace doh {
     return new String();
   }
 
-  String *NewString(String_or_char_ptr c) {
+  String *NewString(const_String_or_char_ptr c) {
     return new String(c);
   }
 
-  String *NewStringWithSize(const String_or_char_ptr c, int len) {
+  String *NewStringWithSize(const_String_or_char_ptr c, int len) {
     const char *p = c;
     return new String(c, len);
   }
   
   /*XXX const char* fmt is enough */
-  String *NewStringf(const String_or_char_ptr fmt, VA_DEF) {
+  String *NewStringf(const_String_or_char_ptr fmt, VA_DEF) {
     //va_list ap;
     String *r = new String();
     const char * fmtstr = fmt;
@@ -220,21 +220,21 @@ namespace doh {
     return r;
   }
 
-  int Cmp(String_or_char_ptr obj1, String_or_char_ptr obj2) {
+  int Cmp(const_String_or_char_ptr obj1, const_String_or_char_ptr obj2) {
     const String *str1 = obj1; // implicit cast
     const String *str2 = obj2;
     return str1->compare(*str2);
   }
   
-  const char *Char(const String_or_char_ptr s) {
+  const char *Char(const_String_or_char_ptr s) {
     return s;
   }
   
-  int Equal(const String_or_char_ptr obj1, const String_or_char_ptr obj2) {
+  int Equal(const_String_or_char_ptr obj1, const_String_or_char_ptr obj2) {
     return Cmp(obj1, obj2)==0;
   }
 
-  int Strcmp(const String_or_char_ptr s1, const String_or_char_ptr s2) {
+  int Strcmp(const_String_or_char_ptr s1, const_String_or_char_ptr s2) {
     const char *c1 = Char(s1);
     const char *c2 = Char(s2);
     if (c1 && c2) {
@@ -244,16 +244,16 @@ namespace doh {
     }
   }
 
-  int Strncmp(const String_or_char_ptr s1, const String_or_char_ptr s2, int n) {
+  int Strncmp(const_String_or_char_ptr s1, const_String_or_char_ptr s2, int n) {
     return strncmp(Char(s1), Char(s2), n);
   }
-  const char *Strstr(const String_or_char_ptr s1, const String_or_char_ptr s2) {
+  const char *Strstr(const_String_or_char_ptr s1, const_String_or_char_ptr s2) {
     const char *p1 = Char(s1);
     const char *p2 = Char(s2);
     return p1 == 0 || p2 == 0 || *p2 == '\0' ? p1 : strstr(p1, p2);
   }
 
-  const char *Strchr(const String_or_char_ptr s1, int ch) {
+  const char *Strchr(const_String_or_char_ptr s1, int ch) {
     return strchr(Char(s1), ch);
   }
 
@@ -267,8 +267,8 @@ void Chop(DOH *src) {
   so.erase(i, len-i);
 }
   
-int Replace(DOH * src, const String_or_char_ptr token, 
-            const String_or_char_ptr rep, int flags) {
+int Replace(DOH * src, const_String_or_char_ptr token, 
+            const_String_or_char_ptr rep, int flags) {
   String *so = doh_cast<String*>(src);
   so->doh_replace(token, rep, flags);
 }