[Opalvoip-svn] SF.net SVN: opalvoip:[31331] ptlib/trunk/include/ptlib/pstring.h

[<rjo...@us...>]

Revision: 31331
          http://sourceforge.net/p/opalvoip/code/31331
Author:   rjongbloed
Date:     2014-01-31 05:47:30 +0000 (Fri, 31 Jan 2014)
Log Message:
-----------
Fixed compatibility between PStringArray and PArray<PString>, PStringList and PList<PString>, PSortedStringList and PSortedList<PString> and PStringSet and PSet<PString>

Modified Paths:
--------------
    ptlib/trunk/include/ptlib/pstring.h

Modified: ptlib/trunk/include/ptlib/pstring.h
===================================================================
--- ptlib/trunk/include/ptlib/pstring.h	2014-01-31 05:07:59 UTC (rev 31330)
+++ ptlib/trunk/include/ptlib/pstring.h	2014-01-31 05:47:30 UTC (rev 31331)
@@ -2290,20 +2290,25 @@
 */
 class PStringArray : public PArray<PString>
 {
-    typedef PArray<PString> ParentClass;
-    PCLASSINFO(PStringArray, ParentClass);
+    typedef PArray<PString> BaseClass;
+    PCLASSINFO(PStringArray, BaseClass);
 
   protected:
     inline PStringArray(int dummy, const PStringArray * c)
-      : ParentClass(dummy, c) { }
+      : BaseClass(dummy, c)
+    {
+    }
 
   public:
   /**@name Construction */
   //@{
     /// Create an empty PString array.
-    inline PStringArray(PINDEX initialSize = 0)
-      : ParentClass(initialSize) { }
+    __inline PStringArray(PINDEX initialSize = 0)
+      : BaseClass(initialSize) { }
 
+    __inline PStringArray(const BaseClass & other)
+      : BaseClass(other) { }
+
     /**Create a PStringArray from the array of C strings. If count is
        P_MAX_INDEX then strarr is assumed to point to an array of strings
        where the last pointer is NULL.
@@ -2471,21 +2476,24 @@
  */
 class PStringList : public PList<PString>
 {
-    typedef PList<PString> ParentClass;
-    PCLASSINFO(PStringList, ParentClass);
+    typedef PList<PString> BaseClass;
+    PCLASSINFO(PStringList, BaseClass);
 
   protected:
     PStringList(int dummy, const PStringList * c)
-      : ParentClass(dummy, c) { }
+      : BaseClass(dummy, c) { }
 
   public:
   /**@name Construction */
   //@{
     /**Create an empty PStringList.
      */
-    PStringList()
-      : ParentClass() { }
+    __inline PStringList()
+      : BaseClass() { }
 
+    __inline PStringList(const BaseClass & other)
+      : BaseClass(other) { }
+
     /**Create a PStringList from the array of C strings.
      */
     PStringList(
@@ -2602,13 +2610,26 @@
 
    See the PAbstractSortedList and PSortedList classes for more information.
  */
-#ifdef DOC_PLUS_PLUS
-class PSortedStringList : public PSortedList {
-#endif
-PDECLARE_SORTED_LIST(PSortedStringList, PString);
+class PSortedStringList : public PSortedList<PString>
+{
+    typedef PSortedList<PString> BaseClass;
+    PCLASSINFO(PSortedStringList, BaseClass);
+
+  protected:
+    PSortedStringList(int dummy, const PSortedStringList * c)
+      : BaseClass(dummy, c) { }
+
   public:
   /**@name Construction */
   //@{
+    /**Create an empty PStringList.
+     */
+    __inline PSortedStringList()
+      : BaseClass() { }
+
+    __inline PSortedStringList(const BaseClass & other)
+      : BaseClass(other) { }
+
     /**Create a PStringArray from the array of C strings.
      */
     PSortedStringList(
@@ -2719,6 +2740,9 @@
     PStringSet(PBoolean initialDeleteObjects = true)
       : BaseClass(initialDeleteObjects) { }
 
+    PStringSet(const BaseClass & other)
+      : BaseClass(other) { }
+
     /**Create a PStringSet from the array of C strings.
      */
     PStringSet(
@@ -2798,8 +2822,8 @@
  */
 template <class K> class PStringDictionary : public PDictionary<K, PString>
 {
-  typedef PDictionary<K, PString> ParentClass;
-  PCLASSINFO(PStringDictionary, ParentClass);
+  typedef PDictionary<K, PString> BaseClass;
+  PCLASSINFO(PStringDictionary, BaseClass);
 
   public:
   /**@name Construction */
@@ -2811,7 +2835,7 @@
        destroyed.
      */
     PStringDictionary()
-      : ParentClass() { }
+      : BaseClass() { }
   //@}
 
   /**@name Overrides from class PObject */
@@ -2864,7 +2888,7 @@
 
   protected:
     PStringDictionary(int dummy, const PStringDictionary * c)
-      : ParentClass(dummy, c) { }
+      : BaseClass(dummy, c) { }
 };
 
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.