Improved const correctness and added support for inline namespaces

1 files changed, 39 insertions, 41 deletions

diff --git a/src/util.h b/src/util.h
index 31691af..3e98c22 100644
--- a/src/util.h
+++ b/src/util.h
@@ -143,12 +143,12 @@ bool getDefs(const QCString &scopeName,
                     const QCString &memberName,
                     const char *,
                     MemberDef *&md,
-                    ClassDef *&cd,
-                    FileDef *&fd,
-                    NamespaceDef *&nd,
-                    GroupDef *&gd,
+                    const ClassDef *&cd,
+                    const FileDef *&fd,
+                    const NamespaceDef *&nd,
+                    const GroupDef *&gd,
                     bool forceEmptyScope=FALSE,
-                    FileDef *currentFile=0,
+                    const FileDef *currentFile=0,
                     bool checkCV=FALSE,
                     const char *forceTagFile=0
                    );
@@ -158,17 +158,17 @@ QCString getFileFilter(const char* name,bool isSourceCode);
 bool resolveRef(/* in */  const char *scName,
                 /* in */  const char *name,
                 /* in */  bool inSeeBlock,
-                /* out */ Definition **resContext,
-                /* out */ MemberDef  **resMember,
+                /* out */ const Definition **resContext,
+                /* out */ const MemberDef  **resMember,
                 /* in */  bool lookForSpecializations = TRUE,
-                /* in */  FileDef *currentFile = 0,
+                /* in */  const FileDef *currentFile = 0,
                 /* in */  bool checkScope = FALSE
                );
 
 bool resolveLink(/* in */  const char *scName,
                  /* in */  const char *lr,
                  /* in */  bool inSeeBlock,
-                 /* out */ Definition **resContext,
+                 /* out */ const Definition **resContext,
                  /* out */ QCString &resAnchor
                 );
 
@@ -183,10 +183,10 @@ void generateFileRef(OutputDocInterface &od,const char *,
 
 void writePageRef(OutputDocInterface &od,const char *cn,const char *mn);
 
-QCString getCanonicalTemplateSpec(Definition *d,FileDef *fs,const QCString& spec);
+QCString getCanonicalTemplateSpec(const Definition *d,const FileDef *fs,const QCString& spec);
 
-bool matchArguments2(Definition *srcScope,FileDef *srcFileScope,ArgumentList *srcAl,
-                     Definition *dstScope,FileDef *dstFileScope,ArgumentList *dstAl,
+bool matchArguments2(const Definition *srcScope,const FileDef *srcFileScope,ArgumentList *srcAl,
+                     const Definition *dstScope,const FileDef *dstFileScope,ArgumentList *dstAl,
                      bool checkCV
                     );
 
@@ -231,9 +231,9 @@ inline bool isId(int c)
 
 QCString removeRedundantWhiteSpace(const QCString &s);
 
-QCString argListToString(ArgumentList *al,bool useCanonicalType=FALSE,bool showDefVals=TRUE);
+QCString argListToString(const ArgumentList *al,bool useCanonicalType=FALSE,bool showDefVals=TRUE);
 
-QCString tempArgListToString(ArgumentList *al,SrcLangExt lang);
+QCString tempArgListToString(const ArgumentList *al,SrcLangExt lang);
 
 QCString generateMarker(int id);
 
@@ -260,13 +260,13 @@ QCString replaceAnonymousScopes(const QCString &s,const char *replacement=0);
 
 void initClassHierarchy(ClassSDict *cl);
 
-bool hasVisibleRoot(BaseClassList *bcl);
-bool classHasVisibleChildren(ClassDef *cd);
-bool namespaceHasVisibleChild(NamespaceDef *nd,bool includeClasses,bool filterClasses,ClassDef::CompoundType ct);
-bool classVisibleInIndex(ClassDef *cd);
+bool hasVisibleRoot(const BaseClassList *bcl);
+bool classHasVisibleChildren(const ClassDef *cd);
+bool namespaceHasVisibleChild(const NamespaceDef *nd,bool includeClasses,bool filterClasses,ClassDef::CompoundType ct);
+bool classVisibleInIndex(const ClassDef *cd);
 
 int minClassDistance(const ClassDef *cd,const ClassDef *bcd,int level=0);
-Protection classInheritedProtectionLevel(ClassDef *cd,ClassDef *bcd,Protection prot=Public,int level=0);
+Protection classInheritedProtectionLevel(const ClassDef *cd,const ClassDef *bcd,Protection prot=Public,int level=0);
 
 QCString convertNameToFile(const char *name,bool allowDots=FALSE,bool allowUnderscore=FALSE);
 
@@ -292,16 +292,16 @@ QCString convertToJSString(const char *s, bool applyTextDir = true);
 
 QCString getOverloadDocs();
 
-void addMembersToMemberGroup(/* in */     MemberList *ml,
+void addMembersToMemberGroup(/* in,out */ MemberList *ml,
                              /* in,out */ MemberGroupSDict **ppMemberGroupSDict,
-                             /* in */     Definition *context);
+                             /* in */     const Definition *context);
 
 int extractClassNameFromType(const QCString &type,int &pos,
                               QCString &name,QCString &templSpec,SrcLangExt=SrcLangExt_Unknown);
 
 QCString normalizeNonTemplateArgumentsInString(
        const QCString &name,
-       Definition *context,
+       const Definition *context,
        const ArgumentList *formalArgs);
 
 QCString substituteTemplateArgumentsInString(
@@ -315,8 +315,8 @@ QCString stripTemplateSpecifiersFromScope(const QCString &fullName,
                                           bool parentOnly=TRUE,
                                           QCString *lastScopeStripped=0);
 
-QCString resolveTypeDef(Definition *d,const QCString &name,
-                        Definition **typedefContext=0);
+QCString resolveTypeDef(const Definition *d,const QCString &name,
+                        const Definition **typedefContext=0);
 
 QCString mergeScopes(const QCString &leftScope,const QCString &rightScope);
 
@@ -328,18 +328,20 @@ void addRefItem(const QList<ListItemInfo> *sli,const char *prefix,
                 const char *key,
                 const char *name,const char *title,const char *args,Definition *scope);
 
-PageDef *addRelatedPage(const char *name,const QCString &ptitle,
-                           const QCString &doc,QList<SectionInfo> *anchors,
-                           const char *fileName,int startLine,
-                           const QList<ListItemInfo> *sli,
-                           GroupDef *gd=0,
-                           TagInfo *tagInfo=0,
-                           SrcLangExt lang=SrcLangExt_Unknown
-                          );
+PageDef *addRelatedPage(const char *name,
+                        const QCString &ptitle,
+                        const QCString &doc,
+                        const QList<SectionInfo> *anchors,
+                        const char *fileName,int startLine,
+                        const QList<ListItemInfo> *sli,
+                        GroupDef *gd=0,
+                        TagInfo *tagInfo=0,
+                        SrcLangExt lang=SrcLangExt_Unknown
+                       );
 
 QCString escapeCharsInString(const char *name,bool allowDots,bool allowUnderscore=FALSE);
 
-void addGroupListToTitle(OutputList &ol,Definition *d);
+void addGroupListToTitle(OutputList &ol,const Definition *d);
 
 void filterLatexString(FTextStream &t,const char *str,
                        bool insideTabbing=FALSE,
@@ -385,18 +387,14 @@ bool findAndRemoveWord(QCString &s,const QCString &word);
 
 QCString stripLeadingAndTrailingEmptyLines(const QCString &s,int &docLine);
 
-//void stringToSearchIndex(const QCString &docUrlBase,const QCString &title,
-//                         const QCString &str, bool priority=FALSE,
-//                         const QCString &anchor="");
-
 bool updateLanguageMapping(const QCString &extension,const QCString &parser);
 SrcLangExt getLanguageFromFileName(const QCString& fileName);
 void initDefaultExtensionMapping();
 void addCodeOnlyMappings();
 
-MemberDef *getMemberFromSymbol(Definition *scope,FileDef *fileScope,
+MemberDef *getMemberFromSymbol(const Definition *scope,const FileDef *fileScope,
                                 const char *n);
-bool checkIfTypedef(Definition *scope,FileDef *fileScope,const char *n);
+bool checkIfTypedef(const Definition *scope,const FileDef *fileScope,const char *n);
 
 ClassDef *newResolveTypedef(const FileDef *fileScope,MemberDef *md,
                             MemberDef **pMemType=0,QCString *pTemplSpec=0,
@@ -418,7 +416,7 @@ int countAliasArguments(const QCString argList);
 QCString resolveAliasCmd(const QCString aliasCmd);
 QCString expandAlias(const QCString &aliasName,const QCString &aliasValue);
 
-void writeTypeConstraints(OutputList &ol,Definition *d,ArgumentList *al);
+void writeTypeConstraints(OutputList &ol,const Definition *d,ArgumentList *al);
 
 QCString convertCharEntitiesToUTF8(const QCString &s);
 
@@ -463,7 +461,7 @@ QCString stripIndentation(const QCString &s);
 
 QCString getDotImageExtension(void);
 
-bool fileVisibleInIndex(FileDef *fd,bool &genSourceFile);
+bool fileVisibleInIndex(const FileDef *fd,bool &genSourceFile);
 
 void addDocCrossReference(MemberDef *src,MemberDef *dst);