Merge pull request doxygen#604 from groleo/const

Dimitri van Heesch · web-flow · commit 3aa86cee3f38 · 2017-09-25T20:57:28.000+02:00
const-ify
diff --git a/src/classdef.cpp b/src/classdef.cpp
@@ -3656,7 +3656,7 @@ void ClassDef::addInnerCompound(Definition *d)
   }
 }
 
-Definition *ClassDef::findInnerCompound(const char *name)
+Definition *ClassDef::findInnerCompound(const char *name) const
 {
   Definition *result=0;
   if (name==0) return 0;
@@ -4394,7 +4394,7 @@ bool ClassDef::isLocal() const
   return m_impl->isLocal;
 }
 
-ClassSDict *ClassDef::getClassSDict()
+ClassSDict *ClassDef::getClassSDict() const
 {
   return m_impl->innerClasses;
 }
diff --git a/src/classdef.h b/src/classdef.h
@@ -122,7 +122,7 @@ class ClassDef : public Definition
     bool isLocal() const;
 
     /** returns the classes nested into this class */
-    ClassSDict *getClassSDict();
+    ClassSDict *getClassSDict() const;
 
     /** returns TRUE if this class has documentation */
     bool hasDocumentation() const;
@@ -244,7 +244,7 @@ class ClassDef : public Definition
      *  available, or 0 otherwise.
      *  @param name The name of the nested compound
      */
-    virtual Definition *findInnerCompound(const char *name);
+    virtual Definition *findInnerCompound(const char *name) const;
 
     /** Returns the template parameter lists that form the template
      *  declaration of this class.
diff --git a/src/definition.cpp b/src/definition.cpp
@@ -1362,7 +1362,7 @@ void Definition::addSourceReferences(MemberDef *md)
   }
 }
 
-Definition *Definition::findInnerCompound(const char *)
+Definition *Definition::findInnerCompound(const char *) const
 {
   return 0;
 }
diff --git a/src/definition.h b/src/definition.h
@@ -261,7 +261,7 @@ class Definition : public DefinitionIntf
 
     QList<ListItemInfo> *xrefListItems() const;
 
-    virtual Definition *findInnerCompound(const char *name);
+    virtual Definition *findInnerCompound(const char *name) const ;
     virtual Definition *getOuterScope() const;
 
     MemberSDict *getReferencesMembers() const;
diff --git a/src/namespacedef.cpp b/src/namespacedef.cpp
@@ -818,7 +818,7 @@ QCString NamespaceDef::getOutputFileBase() const
   return fileName;
 }
 
-Definition *NamespaceDef::findInnerCompound(const char *n)
+Definition *NamespaceDef::findInnerCompound(const char *n) const
 {
   if (n==0) return 0;
   Definition *d = m_innerCompounds->find(n);
diff --git a/src/namespacedef.h b/src/namespacedef.h
@@ -80,7 +80,7 @@ class NamespaceDef : public Definition
     void findSectionsInDocumentation();
     void sortMemberLists();
 
-    virtual Definition *findInnerCompound(const char *name);
+    virtual Definition *findInnerCompound(const char *name) const;
     void addInnerCompound(Definition *d);
     void addListReferences();
     void setFileName(const QCString &fn);
diff --git a/src/sqlite3gen.cpp b/src/sqlite3gen.cpp
@@ -543,7 +543,7 @@ static void insertMemberReference(sqlite3 *db, int refid_src, int refid_dst,
   step(db,xrefs_insert);
 }
 
-static void insertMemberReference(sqlite3 *db, MemberDef *src, MemberDef *dst)
+static void insertMemberReference(sqlite3 *db, const MemberDef *src, const MemberDef *dst)
 {
   QCString qrefid_dst = dst->getOutputFileBase() + "_1" + dst->anchor();
   QCString qrefid_src = src->getOutputFileBase() + "_1" + src->anchor();
@@ -556,7 +556,7 @@ static void insertMemberReference(sqlite3 *db, MemberDef *src, MemberDef *dst)
   }
 }
 
-static void insertMemberFunctionParams(sqlite3 *db,int id_memberdef,MemberDef *md,Definition *def)
+static void insertMemberFunctionParams(sqlite3 *db,int id_memberdef, const MemberDef *md, const Definition *def)
 {
   ArgumentList *declAl = md->declArgumentList();
   ArgumentList *defAl = md->argumentList();
@@ -629,7 +629,7 @@ static void insertMemberFunctionParams(sqlite3 *db,int id_memberdef,MemberDef *m
   }
 }
 
-static void insertMemberDefineParams(sqlite3 *db,int id_memberdef,MemberDef *md,Definition *def)
+static void insertMemberDefineParams(sqlite3 *db,int id_memberdef,const MemberDef *md, const Definition *def)
 {
     if (md->argumentList()->count()==0) // special case for "foo()" to
                                         // disguish it from "foo".
@@ -793,9 +793,9 @@ static void writeInnerNamespaces(sqlite3 *db,const NamespaceSDict *nl)
 
 
 static void writeTemplateArgumentList(sqlite3* db,
-                                      ArgumentList * al,
-                                      Definition * scope,
-                                      FileDef * fileScope)
+                                      const ArgumentList * al,
+                                      const Definition * scope,
+                                      const FileDef * fileScope)
 {
   if (al)
   {
@@ -828,22 +828,22 @@ static void writeTemplateArgumentList(sqlite3* db,
   }
 }
 
-static void writeMemberTemplateLists(sqlite3* db,MemberDef *md)
+static void writeMemberTemplateLists(sqlite3* db,const MemberDef *md)
 {
   ArgumentList *templMd = md->templateArguments();
   if (templMd) // function template prefix
   {
     writeTemplateArgumentList(db,templMd,md->getClassDef(),md->getFileDef());
   }
 }
-static void writeTemplateList(sqlite3*db,ClassDef *cd)
+static void writeTemplateList(sqlite3*db, const ClassDef *cd)
 {
   writeTemplateArgumentList(db,cd->templateArguments(),cd,0);
 }
 ////////////////////////////////////////////
 
 //////////////////////////////////////////////////////////////////////////////
-static void generateSqlite3ForMember(sqlite3*db,MemberDef *md,Definition *def)
+static void generateSqlite3ForMember(sqlite3*db,const MemberDef *md, const Definition *def)
 {
   // + declaration/definition arg lists
   // + reimplements
@@ -976,7 +976,7 @@ static void generateSqlite3ForMember(sqlite3*db,MemberDef *md,Definition *def)
     QCString typeStr = md->typeString();
     stripQualifiers(typeStr);
     StringList l;
-    linkifyText(TextGeneratorSqlite3Impl(l),def,md->getBodyDef(),md,typeStr);
+    linkifyText(TextGeneratorSqlite3Impl(l), def, md->getBodyDef(),md,typeStr);
     if (typeStr.data())
     {
       bindTextParameter(memberdef_insert,":type",typeStr.data(),FALSE);
@@ -1099,8 +1099,10 @@ static void generateSqlite3ForMember(sqlite3*db,MemberDef *md,Definition *def)
 }
 
 static void generateSqlite3Section(sqlite3*db,
-                      Definition *d,
-                      MemberList *ml,const char * /*kind*/,const char * /*header*/=0,
+                      const Definition *d,
+                      const MemberList *ml,
+                      const char * /*kind*/,
+                      const char * /*header*/=0,
                       const char * /*documentation*/=0)
 {
   if (ml==0) return;
@@ -1129,7 +1131,7 @@ static void generateSqlite3Section(sqlite3*db,
 }
 
 
-static void generateSqlite3ForClass(sqlite3 *db, ClassDef *cd)
+static void generateSqlite3ForClass(sqlite3 *db, const ClassDef *cd)
 {
   // + list of direct super classes
   // + list of direct sub classes
@@ -1270,7 +1272,7 @@ static void generateSqlite3ForClass(sqlite3 *db, ClassDef *cd)
   }
 }
 
-static void generateSqlite3ForNamespace(sqlite3 *db, NamespaceDef *nd)
+static void generateSqlite3ForNamespace(sqlite3 *db, const NamespaceDef *nd)
 {
   // + contained class definitions
   // + contained namespace definitions
@@ -1313,7 +1315,7 @@ static void generateSqlite3ForNamespace(sqlite3 *db, NamespaceDef *nd)
   }
 }
 
-static void generateSqlite3ForFile(sqlite3 *db, FileDef *fd)
+static void generateSqlite3ForFile(sqlite3 *db, const FileDef *fd)
 {
   // + includes files
   // + includedby files
@@ -1408,17 +1410,17 @@ static void generateSqlite3ForFile(sqlite3 *db, FileDef *fd)
   }
 }
 
-static void generateSqlite3ForGroup(sqlite3*db,GroupDef *gd)
+static void generateSqlite3ForGroup(sqlite3*db, const GroupDef *gd)
 {
 #warning WorkInProgress
 }
 
-static void generateSqlite3ForDir(sqlite3 *db,DirDef *dd)
+static void generateSqlite3ForDir(sqlite3 *db,const DirDef *dd)
 {
 #warning WorkInProgress
 }
 
-static void generateSqlite3ForPage(sqlite3 *db,PageDef *pd,bool isExample)
+static void generateSqlite3ForPage(sqlite3 *db,const PageDef *pd,bool isExample)
 {
 #warning WorkInProgress
 }
diff --git a/src/util.cpp b/src/util.cpp
diff --git a/src/util.h b/src/util.h

Original file line number	Diff line number	Diff line change
`@@ -3656,7 +3656,7 @@ void ClassDef::addInnerCompound(Definition *d)`
`3656`	`3656`	`}`
`3657`	`3657`	`}`
`3658`	`3658`
`3659`		`-Definition ClassDef::findInnerCompound(const char name)`
	`3659`	`+Definition ClassDef::findInnerCompound(const char name) const`
`3660`	`3660`	`{`
`3661`	`3661`	`Definition *result=0;`
`3662`	`3662`	`if (name==0) return 0;`
`@@ -4394,7 +4394,7 @@ bool ClassDef::isLocal() const`
`4394`	`4394`	`return m_impl->isLocal;`
`4395`	`4395`	`}`
`4396`	`4396`
`4397`		`-ClassSDict *ClassDef::getClassSDict()`
	`4397`	`+ClassSDict *ClassDef::getClassSDict() const`
`4398`	`4398`	`{`
`4399`	`4399`	`return m_impl->innerClasses;`
`4400`	`4400`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1362,7 +1362,7 @@ void Definition::addSourceReferences(MemberDef *md)`
`1362`	`1362`	`}`
`1363`	`1363`	`}`
`1364`	`1364`
`1365`		`-Definition Definition::findInnerCompound(const char )`
	`1365`	`+Definition Definition::findInnerCompound(const char ) const`
`1366`	`1366`	`{`
`1367`	`1367`	`return 0;`
`1368`	`1368`	`}`
Original file line number	Diff line number	Diff line change
`@@ -818,7 +818,7 @@ QCString NamespaceDef::getOutputFileBase() const`
`818`	`818`	`return fileName;`
`819`	`819`	`}`
`820`	`820`
`821`		`-Definition NamespaceDef::findInnerCompound(const char n)`
	`821`	`+Definition NamespaceDef::findInnerCompound(const char n) const`
`822`	`822`	`{`
`823`	`823`	`if (n==0) return 0;`
`824`	`824`	`Definition *d = m_innerCompounds->find(n);`
Original file line number	Diff line number	Diff line change
`@@ -543,7 +543,7 @@ static void insertMemberReference(sqlite3 *db, int refid_src, int refid_dst,`
`543`	`543`	`step(db,xrefs_insert);`
`544`	`544`	`}`
`545`	`545`
`546`		`-static void insertMemberReference(sqlite3 db, MemberDef src, MemberDef *dst)`
	`546`	`+static void insertMemberReference(sqlite3 db, const MemberDef src, const MemberDef *dst)`
`547`	`547`	`{`
`548`	`548`	`QCString qrefid_dst = dst->getOutputFileBase() + "_1" + dst->anchor();`
`549`	`549`	`QCString qrefid_src = src->getOutputFileBase() + "_1" + src->anchor();`
`@@ -556,7 +556,7 @@ static void insertMemberReference(sqlite3 db, MemberDef src, MemberDef *dst)`
`556`	`556`	`}`
`557`	`557`	`}`
`558`	`558`
`559`		`-static void insertMemberFunctionParams(sqlite3 db,int id_memberdef,MemberDef md,Definition *def)`
	`559`	`+static void insertMemberFunctionParams(sqlite3 db,int id_memberdef, const MemberDef md, const Definition *def)`
`560`	`560`	`{`
`561`	`561`	`ArgumentList *declAl = md->declArgumentList();`
`562`	`562`	`ArgumentList *defAl = md->argumentList();`
`@@ -629,7 +629,7 @@ static void insertMemberFunctionParams(sqlite3 db,int id_memberdef,MemberDef m`
`629`	`629`	`}`
`630`	`630`	`}`
`631`	`631`
`632`		`-static void insertMemberDefineParams(sqlite3 db,int id_memberdef,MemberDef md,Definition *def)`
	`632`	`+static void insertMemberDefineParams(sqlite3 db,int id_memberdef,const MemberDef md, const Definition *def)`
`633`	`633`	`{`
`634`	`634`	`if (md->argumentList()->count()==0) // special case for "foo()" to`
`635`	`635`	`// disguish it from "foo".`
`@@ -793,9 +793,9 @@ static void writeInnerNamespaces(sqlite3 db,const NamespaceSDict nl)`
`793`	`793`
`794`	`794`
`795`	`795`	`static void writeTemplateArgumentList(sqlite3* db,`
`796`		`- ArgumentList * al,`
`797`		`- Definition * scope,`
`798`		`- FileDef * fileScope)`
	`796`	`+ const ArgumentList * al,`
	`797`	`+ const Definition * scope,`
	`798`	`+ const FileDef * fileScope)`
`799`	`799`	`{`
`800`	`800`	`if (al)`
`801`	`801`	`{`
`@@ -828,22 +828,22 @@ static void writeTemplateArgumentList(sqlite3* db,`
`828`	`828`	`}`
`829`	`829`	`}`
`830`	`830`
`831`		`-static void writeMemberTemplateLists(sqlite3* db,MemberDef *md)`
	`831`	`+static void writeMemberTemplateLists(sqlite3* db,const MemberDef *md)`
`832`	`832`	`{`
`833`	`833`	`ArgumentList *templMd = md->templateArguments();`
`834`	`834`	`if (templMd) // function template prefix`
`835`	`835`	`{`
`836`	`836`	`writeTemplateArgumentList(db,templMd,md->getClassDef(),md->getFileDef());`
`837`	`837`	`}`
`838`	`838`	`}`
`839`		`-static void writeTemplateList(sqlite3db,ClassDef cd)`
	`839`	`+static void writeTemplateList(sqlite3db, const ClassDef cd)`
`840`	`840`	`{`
`841`	`841`	`writeTemplateArgumentList(db,cd->templateArguments(),cd,0);`
`842`	`842`	`}`
`843`	`843`	`////////////////////////////////////////////`
`844`	`844`
`845`	`845`	`//////////////////////////////////////////////////////////////////////////////`
`846`		`-static void generateSqlite3ForMember(sqlite3db,MemberDef md,Definition *def)`
	`846`	`+static void generateSqlite3ForMember(sqlite3db,const MemberDef md, const Definition *def)`
`847`	`847`	`{`
`848`	`848`	`// + declaration/definition arg lists`
`849`	`849`	`// + reimplements`
`@@ -976,7 +976,7 @@ static void generateSqlite3ForMember(sqlite3db,MemberDef md,Definition *def)`
`976`	`976`	`QCString typeStr = md->typeString();`
`977`	`977`	`stripQualifiers(typeStr);`
`978`	`978`	`StringList l;`
`979`		`- linkifyText(TextGeneratorSqlite3Impl(l),def,md->getBodyDef(),md,typeStr);`
	`979`	`+ linkifyText(TextGeneratorSqlite3Impl(l), def, md->getBodyDef(),md,typeStr);`
`980`	`980`	`if (typeStr.data())`
`981`	`981`	`{`
`982`	`982`	`bindTextParameter(memberdef_insert,":type",typeStr.data(),FALSE);`
`@@ -1099,8 +1099,10 @@ static void generateSqlite3ForMember(sqlite3db,MemberDef md,Definition *def)`
`1099`	`1099`	`}`
`1100`	`1100`
`1101`	`1101`	`static void generateSqlite3Section(sqlite3*db,`
`1102`		`- Definition *d,`
`1103`		`- MemberList ml,const char /kind/,const char * /header/=0,`
	`1102`	`+ const Definition *d,`
	`1103`	`+ const MemberList *ml,`
	`1104`	`+ const char * /kind/,`
	`1105`	`+ const char * /header/=0,`
`1104`	`1106`	`const char * /documentation/=0)`
`1105`	`1107`	`{`
`1106`	`1108`	`if (ml==0) return;`
`@@ -1129,7 +1131,7 @@ static void generateSqlite3Section(sqlite3*db,`
`1129`	`1131`	`}`
`1130`	`1132`
`1131`	`1133`
`1132`		`-static void generateSqlite3ForClass(sqlite3 db, ClassDef cd)`
	`1134`	`+static void generateSqlite3ForClass(sqlite3 db, const ClassDef cd)`
`1133`	`1135`	`{`
`1134`	`1136`	`// + list of direct super classes`
`1135`	`1137`	`// + list of direct sub classes`
`@@ -1270,7 +1272,7 @@ static void generateSqlite3ForClass(sqlite3 db, ClassDef cd)`
`1270`	`1272`	`}`
`1271`	`1273`	`}`
`1272`	`1274`
`1273`		`-static void generateSqlite3ForNamespace(sqlite3 db, NamespaceDef nd)`
	`1275`	`+static void generateSqlite3ForNamespace(sqlite3 db, const NamespaceDef nd)`
`1274`	`1276`	`{`
`1275`	`1277`	`// + contained class definitions`
`1276`	`1278`	`// + contained namespace definitions`
`@@ -1313,7 +1315,7 @@ static void generateSqlite3ForNamespace(sqlite3 db, NamespaceDef nd)`
`1313`	`1315`	`}`
`1314`	`1316`	`}`
`1315`	`1317`
`1316`		`-static void generateSqlite3ForFile(sqlite3 db, FileDef fd)`
	`1318`	`+static void generateSqlite3ForFile(sqlite3 db, const FileDef fd)`
`1317`	`1319`	`{`
`1318`	`1320`	`// + includes files`
`1319`	`1321`	`// + includedby files`
`@@ -1408,17 +1410,17 @@ static void generateSqlite3ForFile(sqlite3 db, FileDef fd)`
`1408`	`1410`	`}`
`1409`	`1411`	`}`
`1410`	`1412`
`1411`		`-static void generateSqlite3ForGroup(sqlite3db,GroupDef gd)`
	`1413`	`+static void generateSqlite3ForGroup(sqlite3db, const GroupDef gd)`
`1412`	`1414`	`{`
`1413`	`1415`	`#warning WorkInProgress`
`1414`	`1416`	`}`
`1415`	`1417`
`1416`		`-static void generateSqlite3ForDir(sqlite3 db,DirDef dd)`
	`1418`	`+static void generateSqlite3ForDir(sqlite3 db,const DirDef dd)`
`1417`	`1419`	`{`
`1418`	`1420`	`#warning WorkInProgress`
`1419`	`1421`	`}`
`1420`	`1422`
`1421`		`-static void generateSqlite3ForPage(sqlite3 db,PageDef pd,bool isExample)`
	`1423`	`+static void generateSqlite3ForPage(sqlite3 db,const PageDef pd,bool isExample)`
`1422`	`1424`	`{`
`1423`	`1425`	`#warning WorkInProgress`
`1424`	`1426`	`}`