Refactoring: migrate MemberNameInfoSDict to MemberNameInfoLinkedMap

1 files changed, 26 insertions, 25 deletions

diff --git a/src/classdef.h b/src/classdef.h
index 72ee92d..9c3aaa3 100644
--- a/src/classdef.h
+++ b/src/classdef.h
@@ -1,12 +1,12 @@
 /******************************************************************************
  *
- * 
+ *
  *
  * Copyright (C) 1997-2015 by Dimitri van Heesch.
  *
  * Permission to use, copy, modify, and distribute this software and its
- * documentation under the terms of the GNU General Public License is hereby 
- * granted. No representations are made about the suitability of this software 
+ * documentation under the terms of the GNU General Public License is hereby
+ * granted. No representations are made about the suitability of this software
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
@@ -39,7 +39,7 @@ class BaseClassList;
 class NamespaceDef;
 class MemberDef;
 class ExampleSDict;
-class MemberNameInfoSDict;
+class MemberNameInfoLinkedMap;
 class UsesClassDict;
 class ConstraintClassDict;
 class MemberGroupSDict;
@@ -61,8 +61,8 @@ class ClassDef : virtual public Definition
 {
   public:
     /** The various compound types */
-    enum CompoundType { Class,     //=Entry::CLASS_SEC, 
-                        Struct,    //=Entry::STRUCT_SEC, 
+    enum CompoundType { Class,     //=Entry::CLASS_SEC,
+                        Struct,    //=Entry::STRUCT_SEC,
                         Union,     //=Entry::UNION_SEC,
                         Interface, //=Entry::INTERFACE_SEC,
                         Protocol,  //=Entry::PROTOCOL_SEC,
@@ -76,7 +76,7 @@ class ClassDef : virtual public Definition
 
 
     //-----------------------------------------------------------------------------------
-    // --- getters 
+    // --- getters
     //-----------------------------------------------------------------------------------
 
     /** Used for RTTI, this is a class */
@@ -134,7 +134,7 @@ class ClassDef : virtual public Definition
     /** Returns a dictionary of all members. This includes any inherited
      *  members. Members are sorted alphabetically.
      */
-    virtual MemberNameInfoSDict *memberNameInfoSDict() const = 0;
+    virtual const MemberNameInfoLinkedMap &memberNameInfoLinkedMap() const = 0;
 
     /** Return the protection level (Public,Protected,Private) in which
      *  this compound was found.
@@ -371,6 +371,7 @@ class ClassDef : virtual public Definition
     virtual void removeMemberFromLists(MemberDef *md) = 0;
     virtual void setAnonymousEnumType() = 0;
     virtual void countMembers() = 0;
+    virtual void sortAllMembersList() = 0;
 
     //-----------------------------------------------------------------------------------
     // --- write output ----
@@ -426,13 +427,13 @@ ClassDef *createClassDefAlias(const Definition *newScope,const ClassDef *cd);
 
 //------------------------------------------------------------------------
 
-/** Class that contains information about a usage relation. 
+/** Class that contains information about a usage relation.
  */
 struct UsesClassDef
 {
-  UsesClassDef(ClassDef *cd) : classDef(cd) 
-  { 
-    accessors = new QDict<void>(17); 
+  UsesClassDef(ClassDef *cd) : classDef(cd)
+  {
+    accessors = new QDict<void>(17);
     containment = TRUE;
   }
  ~UsesClassDef()
@@ -460,7 +461,7 @@ struct UsesClassDef
   bool containment;
 };
 
-/** Dictionary of usage relations. 
+/** Dictionary of usage relations.
  */
 class UsesClassDict : public QDict<UsesClassDef>
 {
@@ -469,38 +470,38 @@ class UsesClassDict : public QDict<UsesClassDef>
    ~UsesClassDict() {}
 };
 
-/** Iterator class to iterate over a dictionary of usage relations. 
+/** Iterator class to iterate over a dictionary of usage relations.
  */
 class UsesClassDictIterator : public QDictIterator<UsesClassDef>
 {
   public:
-    UsesClassDictIterator(const QDict<UsesClassDef> &d) 
+    UsesClassDictIterator(const QDict<UsesClassDef> &d)
       : QDictIterator<UsesClassDef>(d) {}
    ~UsesClassDictIterator() {}
 };
 
 //------------------------------------------------------------------------
 
-/** Class that contains information about an inheritance relation. 
+/** Class that contains information about an inheritance relation.
  */
 struct BaseClassDef
 {
   BaseClassDef(ClassDef *cd,const char *n,Protection p,
-               Specifier v,const char *t) : 
+               Specifier v,const char *t) :
         classDef(cd), usedName(n), prot(p), virt(v), templSpecifiers(t) {}
 
   /** Class definition that this relation inherits from. */
   ClassDef *classDef;
 
-  /** name used in the inheritance list 
+  /** name used in the inheritance list
    * (may be a typedef name instead of the class name)
    */
-  QCString   usedName; 
-  
-  /** Protection level of the inheritance relation: 
-   *  Public, Protected, or Private 
+  QCString   usedName;
+
+  /** Protection level of the inheritance relation:
+   *  Public, Protected, or Private
    */
-  Protection prot;     
+  Protection prot;
 
   /** Virtualness of the inheritance relation:
    *  Normal, or Virtual
@@ -512,7 +513,7 @@ struct BaseClassDef
 };
 
 /** List of base classes.
- *  
+ *
  *  The classes are alphabetically sorted on name if inSort() is used.
  */
 class BaseClassList : public QList<BaseClassDef>
@@ -535,7 +536,7 @@ class BaseClassList : public QList<BaseClassDef>
 class BaseClassListIterator : public QListIterator<BaseClassDef>
 {
   public:
-    BaseClassListIterator(const BaseClassList &bcl) : 
+    BaseClassListIterator(const BaseClassList &bcl) :
       QListIterator<BaseClassDef>(bcl) {}
 };