Release-1.8.2-20121118

1 files changed, 57 insertions, 54 deletions

diff --git a/src/defgen.cpp b/src/defgen.cpp
index 6f31851..fedb4a0 100644
--- a/src/defgen.cpp
+++ b/src/defgen.cpp
@@ -18,7 +18,6 @@
 
 #include <stdlib.h>
 
-#include "qtbc.h"
 #include "defgen.h"
 #include "doxygen.h"
 #include "message.h"
@@ -29,6 +28,10 @@
 #include "outputgen.h"
 #include "dot.h"
 #include "arguments.h"
+#include "memberlist.h"
+#include "namespacedef.h"
+#include "filedef.h"
+#include "filename.h"
 
 #include <qdir.h>
 #include <qfile.h>
@@ -69,7 +72,7 @@ void generateDEFForMember(MemberDef *md,
   // - source referenced by
   // - include code 
 
-  if (md->memberType()==MemberDef::EnumValue) return;
+  if (md->memberType()==MemberType_EnumValue) return;
 
   QCString scopeName;
   if (md->getClassDef()) 
@@ -86,18 +89,18 @@ void generateDEFForMember(MemberDef *md,
   bool isFunc=FALSE;
   switch (md->memberType())
   {
-    case MemberDef::Define:      memType="define";    break;
-    case MemberDef::EnumValue:   ASSERT(0);           break;
-    case MemberDef::Property:    memType="property";  break;
-    case MemberDef::Event:       memType="event";     break;
-    case MemberDef::Variable:    memType="variable";  break;
-    case MemberDef::Typedef:     memType="typedef";   break;
-    case MemberDef::Enumeration: memType="enum";      break;
-    case MemberDef::Function:    memType="function";  isFunc=TRUE; break;
-    case MemberDef::Signal:      memType="signal";    isFunc=TRUE; break;
-    case MemberDef::Friend:      memType="friend";    isFunc=TRUE; break;
-    case MemberDef::DCOP:        memType="dcop";      isFunc=TRUE; break;
-    case MemberDef::Slot:        memType="slot";      isFunc=TRUE; break;
+    case MemberType_Define:      memType="define";    break;
+    case MemberType_EnumValue:   ASSERT(0);           break;
+    case MemberType_Property:    memType="property";  break;
+    case MemberType_Event:       memType="event";     break;
+    case MemberType_Variable:    memType="variable";  break;
+    case MemberType_Typedef:     memType="typedef";   break;
+    case MemberType_Enumeration: memType="enum";      break;
+    case MemberType_Function:    memType="function";  isFunc=TRUE; break;
+    case MemberType_Signal:      memType="signal";    isFunc=TRUE; break;
+    case MemberType_Friend:      memType="friend";    isFunc=TRUE; break;
+    case MemberType_DCOP:        memType="dcop";      isFunc=TRUE; break;
+    case MemberType_Slot:        memType="slot";      isFunc=TRUE; break;
   }
 
   t << memPrefix << "kind = '" << memType << "';" << endl;
@@ -123,8 +126,8 @@ void generateDEFForMember(MemberDef *md,
     case Package:   t << "package;"   << endl; break;
   }
 
-  if (md->memberType()!=MemberDef::Define &&
-      md->memberType()!=MemberDef::Enumeration
+  if (md->memberType()!=MemberType_Define &&
+      md->memberType()!=MemberType_Enumeration
      )
   {
     QCString typeStr = replaceAnonymousScopes(md->typeString());
@@ -190,7 +193,7 @@ void generateDEFForMember(MemberDef *md,
     }
     delete declAl;
   }
-  else if (  md->memberType()==MemberDef::Define
+  else if (  md->memberType()==MemberType_Define
       && md->argsString()!=0)
   {
     ArgumentListIterator ali(*md->argumentList());
@@ -211,7 +214,7 @@ void generateDEFForMember(MemberDef *md,
       << md->initializer() << endl << "_EnD_oF_dEf_TeXt_;" << endl;
   }
   // TODO: exceptions, const volatile
-  if (md->memberType()==MemberDef::Enumeration) // enum
+  if (md->memberType()==MemberType_Enumeration) // enum
   {
     LockingPtr<MemberList> enumList = md->enumFieldList();
     if (enumList!=0)
@@ -417,36 +420,36 @@ void generateDEFForClass(ClassDef *cd,FTextStream &t)
   MemberList *ml;
   for (mli.toFirst();(ml=mli.current());++mli)
   {
-    if ((ml->listType()&MemberList::detailedLists)==0)
+    if ((ml->listType()&MemberListType_detailedLists)==0)
     {
       numMembers+=ml->count();
     }
   }
   if (numMembers>0)
   {
-    generateDEFClassSection(cd,t,cd->getMemberList(MemberList::pubTypes),"public-type");
-    generateDEFClassSection(cd,t,cd->getMemberList(MemberList::pubMethods),"public-func");
-    generateDEFClassSection(cd,t,cd->getMemberList(MemberList::pubAttribs),"public-attrib");
-    generateDEFClassSection(cd,t,cd->getMemberList(MemberList::pubSlots),"public-slot");
-    generateDEFClassSection(cd,t,cd->getMemberList(MemberList::signals),"signal");
-    generateDEFClassSection(cd,t,cd->getMemberList(MemberList::dcopMethods),"dcop-func");
-    generateDEFClassSection(cd,t,cd->getMemberList(MemberList::properties),"property");
-    generateDEFClassSection(cd,t,cd->getMemberList(MemberList::pubStaticMethods),"public-static-func");
-    generateDEFClassSection(cd,t,cd->getMemberList(MemberList::pubStaticAttribs),"public-static-attrib");
-    generateDEFClassSection(cd,t,cd->getMemberList(MemberList::proTypes),"protected-type");
-    generateDEFClassSection(cd,t,cd->getMemberList(MemberList::proMethods),"protected-func");
-    generateDEFClassSection(cd,t,cd->getMemberList(MemberList::proAttribs),"protected-attrib");
-    generateDEFClassSection(cd,t,cd->getMemberList(MemberList::proSlots),"protected-slot");
-    generateDEFClassSection(cd,t,cd->getMemberList(MemberList::proStaticMethods),"protected-static-func");
-    generateDEFClassSection(cd,t,cd->getMemberList(MemberList::proStaticAttribs),"protected-static-attrib");
-    generateDEFClassSection(cd,t,cd->getMemberList(MemberList::priTypes),"private-type");
-    generateDEFClassSection(cd,t,cd->getMemberList(MemberList::priMethods),"private-func");
-    generateDEFClassSection(cd,t,cd->getMemberList(MemberList::priAttribs),"private-attrib");
-    generateDEFClassSection(cd,t,cd->getMemberList(MemberList::priSlots),"private-slot");
-    generateDEFClassSection(cd,t,cd->getMemberList(MemberList::priStaticMethods),"private-static-func");
-    generateDEFClassSection(cd,t,cd->getMemberList(MemberList::priStaticAttribs),"private-static-attrib");
-    generateDEFClassSection(cd,t,cd->getMemberList(MemberList::friends),"signal");
-    generateDEFClassSection(cd,t,cd->getMemberList(MemberList::related),"related");
+    generateDEFClassSection(cd,t,cd->getMemberList(MemberListType_pubTypes),"public-type");
+    generateDEFClassSection(cd,t,cd->getMemberList(MemberListType_pubMethods),"public-func");
+    generateDEFClassSection(cd,t,cd->getMemberList(MemberListType_pubAttribs),"public-attrib");
+    generateDEFClassSection(cd,t,cd->getMemberList(MemberListType_pubSlots),"public-slot");
+    generateDEFClassSection(cd,t,cd->getMemberList(MemberListType_signals),"signal");
+    generateDEFClassSection(cd,t,cd->getMemberList(MemberListType_dcopMethods),"dcop-func");
+    generateDEFClassSection(cd,t,cd->getMemberList(MemberListType_properties),"property");
+    generateDEFClassSection(cd,t,cd->getMemberList(MemberListType_pubStaticMethods),"public-static-func");
+    generateDEFClassSection(cd,t,cd->getMemberList(MemberListType_pubStaticAttribs),"public-static-attrib");
+    generateDEFClassSection(cd,t,cd->getMemberList(MemberListType_proTypes),"protected-type");
+    generateDEFClassSection(cd,t,cd->getMemberList(MemberListType_proMethods),"protected-func");
+    generateDEFClassSection(cd,t,cd->getMemberList(MemberListType_proAttribs),"protected-attrib");
+    generateDEFClassSection(cd,t,cd->getMemberList(MemberListType_proSlots),"protected-slot");
+    generateDEFClassSection(cd,t,cd->getMemberList(MemberListType_proStaticMethods),"protected-static-func");
+    generateDEFClassSection(cd,t,cd->getMemberList(MemberListType_proStaticAttribs),"protected-static-attrib");
+    generateDEFClassSection(cd,t,cd->getMemberList(MemberListType_priTypes),"private-type");
+    generateDEFClassSection(cd,t,cd->getMemberList(MemberListType_priMethods),"private-func");
+    generateDEFClassSection(cd,t,cd->getMemberList(MemberListType_priAttribs),"private-attrib");
+    generateDEFClassSection(cd,t,cd->getMemberList(MemberListType_priSlots),"private-slot");
+    generateDEFClassSection(cd,t,cd->getMemberList(MemberListType_priStaticMethods),"private-static-func");
+    generateDEFClassSection(cd,t,cd->getMemberList(MemberListType_priStaticAttribs),"private-static-attrib");
+    generateDEFClassSection(cd,t,cd->getMemberList(MemberListType_friends),"signal");
+    generateDEFClassSection(cd,t,cd->getMemberList(MemberListType_related),"related");
   }
 
   t << "  cp-filename  = '" << cd->getDefFileName() << "';" << endl;
@@ -501,12 +504,12 @@ void generateDEFForNamespace(NamespaceDef *nd,FTextStream &t)
   writeDEFString(t,nd->name());
   t << ';' << endl;
 
-  generateDEFSection(nd,t,nd->getMemberList(MemberList::decDefineMembers),"define");
-  generateDEFSection(nd,t,nd->getMemberList(MemberList::decProtoMembers),"prototype");
-  generateDEFSection(nd,t,nd->getMemberList(MemberList::decTypedefMembers),"typedef");
-  generateDEFSection(nd,t,nd->getMemberList(MemberList::decEnumMembers),"enum");
-  generateDEFSection(nd,t,nd->getMemberList(MemberList::decFuncMembers),"func");
-  generateDEFSection(nd,t,nd->getMemberList(MemberList::decVarMembers),"var");
+  generateDEFSection(nd,t,nd->getMemberList(MemberListType_decDefineMembers),"define");
+  generateDEFSection(nd,t,nd->getMemberList(MemberListType_decProtoMembers),"prototype");
+  generateDEFSection(nd,t,nd->getMemberList(MemberListType_decTypedefMembers),"typedef");
+  generateDEFSection(nd,t,nd->getMemberList(MemberListType_decEnumMembers),"enum");
+  generateDEFSection(nd,t,nd->getMemberList(MemberListType_decFuncMembers),"func");
+  generateDEFSection(nd,t,nd->getMemberList(MemberListType_decVarMembers),"var");
 
   t << "  ns-filename  = '" << nd->getDefFileName() << "';" << endl;
   t << "  ns-fileline  = '" << nd->getDefLine()     << "';" << endl;
@@ -528,12 +531,12 @@ void generateDEFForFile(FileDef *fd,FTextStream &t)
   writeDEFString(t,fd->name());
   t << ';' << endl;
 
-  generateDEFSection(fd,t,fd->getMemberList(MemberList::decDefineMembers),"define");
-  generateDEFSection(fd,t,fd->getMemberList(MemberList::decProtoMembers),"prototype");
-  generateDEFSection(fd,t,fd->getMemberList(MemberList::decTypedefMembers),"typedef");
-  generateDEFSection(fd,t,fd->getMemberList(MemberList::decEnumMembers),"enum");
-  generateDEFSection(fd,t,fd->getMemberList(MemberList::decFuncMembers),"func");
-  generateDEFSection(fd,t,fd->getMemberList(MemberList::decVarMembers),"var");
+  generateDEFSection(fd,t,fd->getMemberList(MemberListType_decDefineMembers),"define");
+  generateDEFSection(fd,t,fd->getMemberList(MemberListType_decProtoMembers),"prototype");
+  generateDEFSection(fd,t,fd->getMemberList(MemberListType_decTypedefMembers),"typedef");
+  generateDEFSection(fd,t,fd->getMemberList(MemberListType_decEnumMembers),"enum");
+  generateDEFSection(fd,t,fd->getMemberList(MemberListType_decFuncMembers),"func");
+  generateDEFSection(fd,t,fd->getMemberList(MemberListType_decVarMembers),"var");
 
   t << "  file-full-name  = '" << fd->getDefFileName() << "';" << endl;
   t << "  file-first-line = '" << fd->getDefLine()     << "';" << endl;