Enabled stricter compiler warnings and fixed all new warnings

1 files changed, 149 insertions, 152 deletions

diff --git a/src/groupdef.cpp b/src/groupdef.cpp
index 960252d..5af1525 100644
--- a/src/groupdef.cpp
+++ b/src/groupdef.cpp
@@ -54,10 +54,10 @@ class GroupDefImpl : public DefinitionImpl, public GroupDef
     virtual DefType definitionType() const { return TypeGroup; }
     virtual QCString getOutputFileBase() const;
     virtual QCString anchor() const { return QCString(); }
-    virtual QCString displayName(bool=TRUE) const { return hasGroupTitle() ? title : DefinitionImpl::name(); }
-    virtual const char *groupTitle() const { return title; }
+    virtual QCString displayName(bool=TRUE) const { return hasGroupTitle() ? m_title : DefinitionImpl::name(); }
+    virtual const char *groupTitle() const { return m_title; }
     virtual void setGroupTitle( const char *newtitle );
-    virtual bool hasGroupTitle( ) const { return titleSet; }
+    virtual bool hasGroupTitle( ) const { return m_titleSet; }
     virtual void addFile(const FileDef *def); 
     virtual bool addClass(const ClassDef *def);
     virtual bool addNamespace(const NamespaceDef *def);
@@ -87,22 +87,22 @@ class GroupDefImpl : public DefinitionImpl, public GroupDef
     virtual void sortMemberLists();
     virtual bool subGrouping() const { return m_subGrouping; }
 
-    virtual void setGroupScope(Definition *d) { groupScope = d; }
-    virtual Definition *getGroupScope() const { return groupScope; }
+    virtual void setGroupScope(Definition *d) { m_groupScope = d; }
+    virtual Definition *getGroupScope() const { return m_groupScope; }
 
     virtual MemberList *getMemberList(MemberListType lt) const;
     virtual const QList<MemberList> &getMemberLists() const { return m_memberLists; }
 
     /* user defined member groups */
-    virtual MemberGroupSDict *getMemberGroupSDict() const { return memberGroupSDict; }
-
-    virtual FileList *      getFiles() const        { return fileList; }
-    virtual ClassSDict *    getClasses() const      { return classSDict; }
-    virtual NamespaceSDict * getNamespaces() const   { return namespaceSDict; }
-    virtual GroupList *     getSubGroups() const    { return groupList; }
-    virtual PageSDict *     getPages() const        { return pageDict; }
-    virtual DirList *       getDirs() const         { return dirList; }
-    virtual PageSDict *     getExamples() const     { return exampleDict; }
+    virtual MemberGroupSDict *getMemberGroupSDict() const { return m_memberGroupSDict; }
+
+    virtual FileList *      getFiles() const        { return m_fileList; }
+    virtual ClassSDict *    getClasses() const      { return m_classSDict; }
+    virtual NamespaceSDict * getNamespaces() const  { return m_namespaceSDict; }
+    virtual GroupList *     getSubGroups() const    { return m_groupList; }
+    virtual PageSDict *     getPages() const        { return m_pageDict; }
+    virtual DirList *       getDirs() const         { return m_dirList; }
+    virtual PageSDict *     getExamples() const     { return m_exampleDict; }
     virtual bool hasDetailedDescription() const;
     virtual void sortSubGroups();
     
@@ -132,25 +132,22 @@ class GroupDefImpl : public DefinitionImpl, public GroupDef
     void writeSummaryLinks(OutputList &ol) const;
     void updateLanguage(const Definition *);
 
-    QCString title;                      // title of the group
-    bool titleSet;                       // true if title is not the same as the name
-    QCString fileName;                   // base name of the generated file
-    FileList *fileList;                  // list of files in the group
-    ClassSDict *classSDict;              // list of classes in the group
-    NamespaceSDict *namespaceSDict;      // list of namespaces in the group
-    GroupList *groupList;                // list of sub groups.
-    PageSDict *pageDict;                 // list of pages in the group
-    PageSDict *exampleDict;              // list of examples in the group
-    DirList *dirList;                    // list of directories in the group
-
-    MemberList *allMemberList;
-    MemberNameInfoSDict *allMemberNameInfoSDict;
-    
-    Definition *groupScope;
-
-    QList<MemberList> m_memberLists;
-    MemberGroupSDict *memberGroupSDict;
-    bool              m_subGrouping;
+    QCString             m_title;               // title of the group
+    bool                 m_titleSet;            // true if title is not the same as the name
+    QCString             m_fileName;            // base name of the generated file
+    FileList *           m_fileList;            // list of files in the group
+    ClassSDict *         m_classSDict;          // list of classes in the group
+    NamespaceSDict *     m_namespaceSDict;      // list of namespaces in the group
+    GroupList *          m_groupList;           // list of sub groups.
+    PageSDict *          m_pageDict;            // list of pages in the group
+    PageSDict *          m_exampleDict;         // list of examples in the group
+    DirList *            m_dirList;             // list of directories in the group
+    MemberList *         m_allMemberList;
+    MemberNameInfoSDict *m_allMemberNameInfoSDict;
+    Definition *         m_groupScope;
+    QList<MemberList>    m_memberLists;
+    MemberGroupSDict *   m_memberGroupSDict;
+    bool                 m_subGrouping;
 
 };
 
@@ -166,67 +163,67 @@ GroupDef *createGroupDef(const char *fileName,int line,const char *name,
 GroupDefImpl::GroupDefImpl(const char *df,int dl,const char *na,const char *t,
                    const char *refFileName) : DefinitionImpl(df,dl,1,na)
 {
-  fileList = new FileList;
-  classSDict = new ClassSDict(17);
-  groupList = new GroupList;
-  namespaceSDict = new NamespaceSDict(17);
-  pageDict = new PageSDict(17);
-  exampleDict = new PageSDict(17);
-  dirList = new DirList;
-  allMemberNameInfoSDict = new MemberNameInfoSDict(17);
-  allMemberNameInfoSDict->setAutoDelete(TRUE);
+  m_fileList = new FileList;
+  m_classSDict = new ClassSDict(17);
+  m_groupList = new GroupList;
+  m_namespaceSDict = new NamespaceSDict(17);
+  m_pageDict = new PageSDict(17);
+  m_exampleDict = new PageSDict(17);
+  m_dirList = new DirList;
+  m_allMemberNameInfoSDict = new MemberNameInfoSDict(17);
+  m_allMemberNameInfoSDict->setAutoDelete(TRUE);
   if (refFileName)
   {
-    fileName=stripExtension(refFileName);
+    m_fileName=stripExtension(refFileName);
   }
   else
   {
-    fileName = convertNameToFile(QCString("group_")+na);
+    m_fileName = convertNameToFile(QCString("group_")+na);
   }
   setGroupTitle( t );
-  memberGroupSDict = new MemberGroupSDict;
-  memberGroupSDict->setAutoDelete(TRUE);
+  m_memberGroupSDict = new MemberGroupSDict;
+  m_memberGroupSDict->setAutoDelete(TRUE);
 
-  allMemberList = new MemberList(MemberListType_allMembersList);
+  m_allMemberList = new MemberList(MemberListType_allMembersList);
 
   //visited = 0;
-  groupScope = 0;
+  m_groupScope = 0;
   m_subGrouping=Config_getBool(SUBGROUPING);
 }
 
 GroupDefImpl::~GroupDefImpl()
 {
-  delete fileList;
-  delete classSDict;
-  delete groupList;
-  delete namespaceSDict;
-  delete pageDict;
-  delete exampleDict;
-  delete allMemberList;
-  delete allMemberNameInfoSDict;
-  delete memberGroupSDict;
-  delete dirList;
+  delete m_fileList;
+  delete m_classSDict;
+  delete m_groupList;
+  delete m_namespaceSDict;
+  delete m_pageDict;
+  delete m_exampleDict;
+  delete m_allMemberList;
+  delete m_allMemberNameInfoSDict;
+  delete m_memberGroupSDict;
+  delete m_dirList;
 }
 
 void GroupDefImpl::setGroupTitle( const char *t )
 {
-  if ( t && qstrlen(t) )
+  if ( t && *t )
   {
-    title = t;
-    titleSet = TRUE;
+    m_title = t;
+    m_titleSet = TRUE;
   }
   else
   {
-    title = name();
-    title.at(0)=toupper(title.at(0));
-    titleSet = FALSE;
+    m_title = name();
+    m_title[0]=(char)toupper(m_title[0]);
+    m_titleSet = FALSE;
   }
 }
 
 
 void GroupDefImpl::distributeMemberGroupDocumentation()
 {
-  MemberGroupSDict::Iterator mgli(*memberGroupSDict);
+  MemberGroupSDict::Iterator mgli(*m_memberGroupSDict);
   MemberGroup *mg;
   for (;(mg=mgli.current());++mgli)
   {
@@ -237,7 +234,7 @@ void GroupDefImpl::distributeMemberGroupDocumentation()
 void GroupDefImpl::findSectionsInDocumentation()
 {
   docFindSections(documentation(),this,docFile());
-  MemberGroupSDict::Iterator mgli(*memberGroupSDict);
+  MemberGroupSDict::Iterator mgli(*m_memberGroupSDict);
   MemberGroup *mg;
   for (;(mg=mgli.current());++mgli)
   {
@@ -261,9 +258,9 @@ void GroupDefImpl::addFile(const FileDef *def)
   if (def->isHidden()) return;
   updateLanguage(def);
   if (sortBriefDocs)
-    fileList->inSort(def);
+    m_fileList->inSort(def);
   else
-    fileList->append(def);
+    m_fileList->append(def);
 }
 
 bool GroupDefImpl::addClass(const ClassDef *cd)
@@ -272,12 +269,12 @@ bool GroupDefImpl::addClass(const ClassDef *cd)
   if (cd->isHidden()) return FALSE;
   updateLanguage(cd);
   QCString qn = cd->name();
-  if (classSDict->find(qn)==0)
+  if (m_classSDict->find(qn)==0)
   {
     //printf("--- addClass %s sort=%d\n",qn.data(),sortBriefDocs);
     if (sortBriefDocs)
     {
-      classSDict->inSort(qn,cd);
+      m_classSDict->inSort(qn,cd);
     }
     else
     {
@@ -290,23 +287,23 @@ bool GroupDefImpl::addClass(const ClassDef *cd)
         // add nested classes (e.g. A::B, A::C) after their parent (A) in 
         // order of insertion
         QCString scope = qn.left(i);
-        int j=classSDict->findAt(scope);
+        int j=m_classSDict->findAt(scope);
         if (j!=-1)
         {
-          while (j<(int)classSDict->count() && 
-              classSDict->at(j)->qualifiedName().left(i)==scope)
+          while (j<(int)m_classSDict->count() && 
+                        m_classSDict->at(j)->qualifiedName().left(i)==scope)
           {
             //printf("skipping over %s\n",classSDict->at(j)->qualifiedName().data());
             j++;
           }
           //printf("Found scope at index %d\n",j);
-          classSDict->insertAt(j,qn,cd);
+          m_classSDict->insertAt(j,qn,cd);
           found=TRUE;
         }
       }
       if (!found) // no insertion point found -> just append
       {
-        classSDict->append(qn,cd);
+        m_classSDict->append(qn,cd);
       }
     }
     return TRUE;
@@ -319,12 +316,12 @@ bool GroupDefImpl::addNamespace(const NamespaceDef *def)
   static bool sortBriefDocs = Config_getBool(SORT_BRIEF_DOCS);
   if (def->isHidden()) return FALSE;
   updateLanguage(def);
-  if (namespaceSDict->find(def->name())==0)
+  if (m_namespaceSDict->find(def->name())==0)
   {
     if (sortBriefDocs)
-      namespaceSDict->inSort(def->name(),def);  
+      m_namespaceSDict->inSort(def->name(),def);  
     else
-      namespaceSDict->append(def->name(),def);
+      m_namespaceSDict->append(def->name(),def);
     return TRUE;
   }
   return FALSE;
@@ -334,23 +331,23 @@ void GroupDefImpl::addDir(const DirDef *def)
 {
   if (def->isHidden()) return;
   if (Config_getBool(SORT_BRIEF_DOCS))
-    dirList->inSort(def);  
+    m_dirList->inSort(def);  
   else
-    dirList->append(def);
+    m_dirList->append(def);
 }
 
 void GroupDefImpl::addPage(PageDef *def)
 {
   if (def->isHidden()) return;
   //printf("Making page %s part of a group\n",def->name.data());
-  pageDict->append(def->name(),def);
+  m_pageDict->append(def->name(),def);
   def->makePartOfGroup(this);
 }
 
 void GroupDefImpl::addExample(const PageDef *def)
 {
   if (def->isHidden()) return;
-  exampleDict->append(def->name(),def);
+  m_exampleDict->append(def->name(),def);
 }
 
 
@@ -362,12 +359,12 @@ void GroupDefImpl::addMembersToMemberGroup()
   {
     if (ml->listType()&MemberListType_declarationLists)
     {
-      ::addMembersToMemberGroup(ml,&memberGroupSDict,this);
+      ::addMembersToMemberGroup(ml,&m_memberGroupSDict,this);
     }
   }
 
   //printf("GroupDefImpl::addMembersToMemberGroup() memberGroupList=%d\n",memberGroupList->count());
-  MemberGroupSDict::Iterator mgli(*memberGroupSDict);
+  MemberGroupSDict::Iterator mgli(*m_memberGroupSDict);
   MemberGroup *mg;
   for (;(mg=mgli.current());++mgli)
   {
@@ -382,7 +379,7 @@ bool GroupDefImpl::insertMember(MemberDef *md,bool docOnly)
   updateLanguage(md);
   //printf("GroupDef(%s)::insertMember(%s)\n", title.data(), md->name().data());
   MemberNameInfo *mni=0;
-  if ((mni=(*allMemberNameInfoSDict)[md->name()]))
+  if ((mni=(*m_allMemberNameInfoSDict)[md->name()]))
   { // member with this name already found
     MemberNameInfoIterator srcMnii(*mni); 
     const MemberInfo *srcMi;
@@ -427,10 +424,10 @@ bool GroupDefImpl::insertMember(MemberDef *md,bool docOnly)
   {
     mni = new MemberNameInfo(md->name());
     mni->append(new MemberInfo(md,md->protection(),md->virtualness(),FALSE));
-    allMemberNameInfoSDict->append(mni->memberName(),mni);
+    m_allMemberNameInfoSDict->append(mni->memberName(),mni);
   }
   //printf("Added member!\n");
-  allMemberList->append(md); 
+  m_allMemberList->append(md); 
   switch(md->memberType())
   {
     case MemberType_Variable:     
@@ -542,7 +539,7 @@ bool GroupDefImpl::insertMember(MemberDef *md,bool docOnly)
 void GroupDefImpl::removeMember(MemberDef *md)
 {
   // fprintf(stderr, "GroupDef(%s)::removeMember( %s )\n", title.data(), md->name().data());
-  MemberNameInfo *mni = allMemberNameInfoSDict->find(md->name());
+  MemberNameInfo *mni = m_allMemberNameInfoSDict->find(md->name());
   if (mni)
   {
     MemberNameInfoIterator mnii(*mni);
@@ -557,7 +554,7 @@ void GroupDefImpl::removeMember(MemberDef *md)
     }
     if( mni->isEmpty() )
     {
-      allMemberNameInfoSDict->remove(md->name());
+      m_allMemberNameInfoSDict->remove(md->name());
     }
 
     removeMemberFromList(MemberListType_allMembersList,md);
@@ -632,9 +629,9 @@ bool GroupDefImpl::findGroup(const GroupDef *def) const
   {
     return TRUE;
   }
-  else if (groupList)
+  else if (m_groupList)
   {
-    GroupListIterator it(*groupList);
+    GroupListIterator it(*m_groupList);
     GroupDef *gd;
     for (;(gd=it.current());++it)
     {
@@ -653,7 +650,7 @@ void GroupDefImpl::addGroup(const GroupDef *def)
   //if (Config_getBool(SORT_MEMBER_DOCS))
   //  groupList->inSort(def);
   //else
-  groupList->append(def);
+  m_groupList->append(def);
 }
 
 bool GroupDefImpl::isASubGroup() const
@@ -671,9 +668,9 @@ void GroupDefImpl::countMembers()
     ml->countDecMembers();
     ml->countDocMembers();
   }
-  if (memberGroupSDict)
+  if (m_memberGroupSDict)
   {
-    MemberGroupSDict::Iterator mgli(*memberGroupSDict);
+    MemberGroupSDict::Iterator mgli(*m_memberGroupSDict);
     MemberGroup *mg;
     for (;(mg=mgli.current());++mgli)
     {
@@ -685,27 +682,27 @@ void GroupDefImpl::countMembers()
 
 int GroupDefImpl::numDocMembers() const
 {
-  return fileList->count()+
-         classSDict->count()+
-         namespaceSDict->count()+
-         groupList->count()+
-         allMemberList->count()+
-         pageDict->count()+
-         exampleDict->count();
+  return m_fileList->count()+
+         m_classSDict->count()+
+         m_namespaceSDict->count()+
+         m_groupList->count()+
+         m_allMemberList->count()+
+         m_pageDict->count()+
+         m_exampleDict->count();
 }
 
 /*! Compute the HTML anchor names for all members in the group */ 
 void GroupDefImpl::computeAnchors()
 {
   //printf("GroupDefImpl::computeAnchors()\n");
-  setAnchors(allMemberList);
+  setAnchors(m_allMemberList);
 }
 
 void GroupDefImpl::writeTagFile(FTextStream &tagFile)
 {
   tagFile << "  <compound kind=\"group\">" << endl;
   tagFile << "    <name>" << convertToXML(name()) << "</name>" << endl;
-  tagFile << "    <title>" << convertToXML(title) << "</title>" << endl;
+  tagFile << "    <title>" << convertToXML(m_title) << "</title>" << endl;
   tagFile << "    <filename>" << convertToXML(getOutputFileBase()) << Doxygen::htmlFileExtension << "</filename>" << endl;
   QListIterator<LayoutDocEntry> eli(
       LayoutDocManager::instance().docEntries(LayoutDocManager::Group));
@@ -716,9 +713,9 @@ void GroupDefImpl::writeTagFile(FTextStream &tagFile)
     {
       case LayoutDocEntry::GroupClasses:
         {
-          if (classSDict)
+          if (m_classSDict)
           {
-            SDict<ClassDef>::Iterator ci(*classSDict);
+            SDict<ClassDef>::Iterator ci(*m_classSDict);
             ClassDef *cd;
             for (ci.toFirst();(cd=ci.current());++ci)
             {
@@ -733,9 +730,9 @@ void GroupDefImpl::writeTagFile(FTextStream &tagFile)
         break;
       case LayoutDocEntry::GroupNamespaces:
         {
-          if (namespaceSDict)
+          if (m_namespaceSDict)
           {
-            SDict<NamespaceDef>::Iterator ni(*namespaceSDict);
+            SDict<NamespaceDef>::Iterator ni(*m_namespaceSDict);
             NamespaceDef *nd;
             for (ni.toFirst();(nd=ni.current());++ni)
             {
@@ -750,9 +747,9 @@ void GroupDefImpl::writeTagFile(FTextStream &tagFile)
         break;
       case LayoutDocEntry::GroupFiles:
         {
-          if (fileList)
+          if (m_fileList)
           {
-            QListIterator<FileDef> it(*fileList);
+            QListIterator<FileDef> it(*m_fileList);
             FileDef *fd;
             for (;(fd=it.current());++it)
             {
@@ -766,9 +763,9 @@ void GroupDefImpl::writeTagFile(FTextStream &tagFile)
         break;
       case LayoutDocEntry::GroupPageDocs:
         {
-          if (pageDict)
+          if (m_pageDict)
           {
-            PageSDict::Iterator pdi(*pageDict);
+            PageSDict::Iterator pdi(*m_pageDict);
             PageDef *pd=0;
             for (pdi.toFirst();(pd=pdi.current());++pdi)
             {
@@ -783,9 +780,9 @@ void GroupDefImpl::writeTagFile(FTextStream &tagFile)
         break;
       case LayoutDocEntry::GroupDirs:
         {
-          if (dirList)
+          if (m_dirList)
           {
-            QListIterator<DirDef> it(*dirList);
+            QListIterator<DirDef> it(*m_dirList);
             DirDef *dd;
             for (;(dd=it.current());++it)
             {
@@ -799,9 +796,9 @@ void GroupDefImpl::writeTagFile(FTextStream &tagFile)
         break;
       case LayoutDocEntry::GroupNestedGroups:
         {
-          if (groupList)
+          if (m_groupList)
           {
-            QListIterator<GroupDef> it(*groupList);
+            QListIterator<GroupDef> it(*m_groupList);
             GroupDef *gd;
             for (;(gd=it.current());++it)
             {
@@ -825,9 +822,9 @@ void GroupDefImpl::writeTagFile(FTextStream &tagFile)
         break;
       case LayoutDocEntry::MemberGroups:
         {
-          if (memberGroupSDict)
+          if (m_memberGroupSDict)
           {
-            MemberGroupSDict::Iterator mgli(*memberGroupSDict);
+            MemberGroupSDict::Iterator mgli(*m_memberGroupSDict);
             MemberGroup *mg;
             for (;(mg=mgli.current());++mgli)
             {
@@ -851,7 +848,7 @@ void GroupDefImpl::writeDetailedDescription(OutputList &ol,const QCString &title
      )
   {
     ol.pushGeneratorState();
-    if (pageDict->count()!=numDocMembers()) // not only pages -> classical layout
+    if (m_pageDict->count()!=(uint)numDocMembers()) // not only pages -> classical layout
     {
       ol.pushGeneratorState();
         ol.disable(OutputGenerator::Html);
@@ -953,7 +950,7 @@ void GroupDefImpl::writeGroupGraph(OutputList &ol)
       ol.disable(OutputGenerator::Man);
       //ol.startParagraph();
       ol.startGroupCollaboration();
-      ol.parseText(theTranslator->trCollaborationDiagram(title));
+      ol.parseText(theTranslator->trCollaborationDiagram(m_title));
       ol.endGroupCollaboration(graph);
       //ol.endParagraph();
       ol.popGeneratorState();
@@ -964,13 +961,13 @@ void GroupDefImpl::writeGroupGraph(OutputList &ol)
 void GroupDefImpl::writeFiles(OutputList &ol,const QCString &title)
 {
   // write list of files
-  if (fileList->count()>0)
+  if (m_fileList->count()>0)
   {
     ol.startMemberHeader("files");
     ol.parseText(title);
     ol.endMemberHeader();
     ol.startMemberList();
-    QListIterator<FileDef> it(*fileList);
+    QListIterator<FileDef> it(*m_fileList);
     FileDef *fd;
     for (;(fd=it.current());++it)
     {
@@ -996,16 +993,16 @@ void GroupDefImpl::writeFiles(OutputList &ol,const QCString &title)
 void GroupDefImpl::writeNamespaces(OutputList &ol,const QCString &title)
 {
   // write list of namespaces
-  namespaceSDict->writeDeclaration(ol,title);
+  m_namespaceSDict->writeDeclaration(ol,title);
 }
 
 void GroupDefImpl::writeNestedGroups(OutputList &ol,const QCString &title)
 {
   // write list of groups
   int count=0;
-  if (groupList->count()>0)
+  if (m_groupList->count()>0)
   {
-    QListIterator<GroupDef> it(*groupList);
+    QListIterator<GroupDef> it(*m_groupList);
     GroupDef *gd;
     for (;(gd=it.current());++it)
     {
@@ -1020,9 +1017,9 @@ void GroupDefImpl::writeNestedGroups(OutputList &ol,const QCString &title)
     ol.startMemberList();
     if (Config_getBool(SORT_GROUP_NAMES))
     {
-      groupList->sort();
+      m_groupList->sort();
     }
-    QListIterator<GroupDef> it(*groupList);
+    QListIterator<GroupDef> it(*m_groupList);
     GroupDef *gd;
     for (;(gd=it.current());++it)
     {
@@ -1052,13 +1049,13 @@ void GroupDefImpl::writeNestedGroups(OutputList &ol,const QCString &title)
 void GroupDefImpl::writeDirs(OutputList &ol,const QCString &title)
 {
   // write list of directories
-  if (dirList->count()>0)
+  if (m_dirList->count()>0)
   {
     ol.startMemberHeader("dirs");
     ol.parseText(title);
     ol.endMemberHeader();
     ol.startMemberList();
-    QListIterator<DirDef> it(*dirList);
+    QListIterator<DirDef> it(*m_dirList);
     DirDef *dd;
     for (;(dd=it.current());++it)
     {
@@ -1085,18 +1082,18 @@ void GroupDefImpl::writeDirs(OutputList &ol,const QCString &title)
 void GroupDefImpl::writeClasses(OutputList &ol,const QCString &title)
 {
   // write list of classes
-  classSDict->writeDeclaration(ol,0,title,FALSE);
+  m_classSDict->writeDeclaration(ol,0,title,FALSE);
 }
 
 void GroupDefImpl::writeInlineClasses(OutputList &ol)
 {
-  classSDict->writeDocumentation(ol);
+  m_classSDict->writeDocumentation(ol);
 }
 
 void GroupDefImpl::writePageDocumentation(OutputList &ol)
 {
   PageDef *pd=0;
-  PageSDict::Iterator pdi(*pageDict);
+  PageSDict::Iterator pdi(*m_pageDict);
   for (pdi.toFirst();(pd=pdi.current());++pdi)
   {
     if (!pd->isReference())
@@ -1119,11 +1116,11 @@ void GroupDefImpl::writePageDocumentation(OutputList &ol)
 void GroupDefImpl::writeMemberGroups(OutputList &ol)
 {
   /* write user defined member groups */
-  if (memberGroupSDict)
+  if (m_memberGroupSDict)
   {
-    memberGroupSDict->sort();
+    m_memberGroupSDict->sort();
     /* write user defined member groups */
-    MemberGroupSDict::Iterator mgli(*memberGroupSDict);
+    MemberGroupSDict::Iterator mgli(*m_memberGroupSDict);
     MemberGroup *mg;
     for (;(mg=mgli.current());++mgli)
     {
@@ -1186,11 +1183,11 @@ void GroupDefImpl::writeSummaryLinks(OutputList &ol) const
   SrcLangExt lang = getLanguage();
   for (eli.toFirst();(lde=eli.current());++eli)
   {
-    if ((lde->kind()==LayoutDocEntry::GroupClasses && classSDict->declVisible()) || 
-        (lde->kind()==LayoutDocEntry::GroupNamespaces && namespaceSDict->declVisible()) ||
-        (lde->kind()==LayoutDocEntry::GroupFiles && fileList->count()>0) ||
-        (lde->kind()==LayoutDocEntry::GroupNestedGroups && groupList->count()>0) ||
-        (lde->kind()==LayoutDocEntry::GroupDirs && dirList->count()>0)
+    if ((lde->kind()==LayoutDocEntry::GroupClasses && m_classSDict->declVisible()) || 
+        (lde->kind()==LayoutDocEntry::GroupNamespaces && m_namespaceSDict->declVisible()) ||
+        (lde->kind()==LayoutDocEntry::GroupFiles && m_fileList->count()>0) ||
+        (lde->kind()==LayoutDocEntry::GroupNestedGroups && m_groupList->count()>0) ||
+        (lde->kind()==LayoutDocEntry::GroupDirs && m_dirList->count()>0)
        )
     {
       LayoutDocEntrySection *ls = (LayoutDocEntrySection*)lde;
@@ -1224,19 +1221,19 @@ void GroupDefImpl::writeDocumentation(OutputList &ol)
 {
   //static bool generateTreeView = Config_getBool(GENERATE_TREEVIEW);
   ol.pushGeneratorState();
-  startFile(ol,getOutputFileBase(),name(),title,HLI_Modules);
+  startFile(ol,getOutputFileBase(),name(),m_title,HLI_Modules);
 
   ol.startHeaderSection();
   writeSummaryLinks(ol);
   ol.startTitleHead(getOutputFileBase());
   ol.pushGeneratorState();
   ol.disable(OutputGenerator::Man);
-  ol.parseText(title);
+  ol.parseText(m_title);
   ol.popGeneratorState();
   addGroupListToTitle(ol,this);
   ol.pushGeneratorState();
   ol.disable(OutputGenerator::Man);
-  ol.endTitleHead(getOutputFileBase(),title);
+  ol.endTitleHead(getOutputFileBase(),m_title);
   ol.popGeneratorState();
   ol.pushGeneratorState();
   ol.disableAllBut(OutputGenerator::Man);
@@ -1250,14 +1247,14 @@ void GroupDefImpl::writeDocumentation(OutputList &ol)
     Doxygen::searchIndex->setCurrentDoc(this,anchor(),FALSE);
     static QRegExp we("[a-zA-Z_][-a-zA-Z_0-9]*");
     int i=0,p=0,l=0;
-    while ((i=we.match(title,p,&l))!=-1) // foreach word in the title
+    while ((i=we.match(m_title,p,&l))!=-1) // foreach word in the title
     {
-      Doxygen::searchIndex->addWord(title.mid(i,l),TRUE);
+      Doxygen::searchIndex->addWord(m_title.mid(i,l),TRUE);
       p=i+l;
     }
   }
 
-  Doxygen::indexList->addIndexItem(this,0,0,title);
+  Doxygen::indexList->addIndexItem(this,0,0,m_title);
 
   //---------------------------------------- start flexible part -------------------------------
 
@@ -1391,7 +1388,7 @@ void GroupDefImpl::writeDocumentation(OutputList &ol)
 
   if (Config_getBool(SEPARATE_MEMBER_PAGES))
   {
-    allMemberList->sort();
+    m_allMemberList->sort();
     writeMemberPages(ol);
   }
 
@@ -1422,7 +1419,7 @@ void GroupDefImpl::writeQuickMemberLinks(OutputList &ol,const MemberDef *current
   ol.writeString("      <div class=\"navtab\">\n");
   ol.writeString("        <table>\n");
 
-  MemberListIterator mli(*allMemberList);
+  MemberListIterator mli(*m_allMemberList);
   MemberDef *md;
   for (mli.toFirst();(md=mli.current());++mli)
   {
@@ -1653,7 +1650,7 @@ void addExampleToGroups(const Entry *root,PageDef *eg)
 
 QCString GroupDefImpl::getOutputFileBase() const
 {
-  return fileName;
+  return m_fileName;
 }
 
 void GroupDefImpl::addListReferences()
@@ -1668,7 +1665,7 @@ void GroupDefImpl::addListReferences()
              0
             );
   }
-  MemberGroupSDict::Iterator mgli(*memberGroupSDict);
+  MemberGroupSDict::Iterator mgli(*m_memberGroupSDict);
   MemberGroup *mg;
   for (;(mg=mgli.current());++mgli)
   {
@@ -1763,13 +1760,13 @@ void GroupDefImpl::writeMemberDocumentation(OutputList &ol,MemberListType lt,con
 
 void GroupDefImpl::removeMemberFromList(MemberListType lt,MemberDef *md)
 {
-    MemberList *ml = getMemberList(lt);
-    if (ml) ml->remove(md); 
+  MemberList *ml = getMemberList(lt);
+  if (ml) ml->remove(md); 
 }
 
 void GroupDefImpl::sortSubGroups() 
 { 
-    groupList->sort(); 
+  m_groupList->sort(); 
 }
 
 bool GroupDefImpl::isLinkableInProject() const