Refactoring: remove avoidable const_cast's

Author: doxygen

src/conceptdef.cpp

@@ -766,18 +766,6 @@ ConceptDefMutable *toConceptDefMutable(Definition *d)
   }
 }
 
-ConceptDefMutable *toConceptDefMutable(const Definition *d)
-{
-  if (d && typeid(*d)==typeid(ConceptDefImpl))
-  {
-    return const_cast<ConceptDefMutable*>(static_cast<const ConceptDefMutable*>(d));
-  }
-  else
-  {
-    return nullptr;
-  }
-}
-
 // -- helpers
 
 ConceptDef *getConcept(const QCString &n)

src/conceptdef.h

@@ -83,7 +83,6 @@ ConceptDef        *toConceptDef(Definition *d);
 ConceptDef        *toConceptDef(DefinitionMutable *d);
 const ConceptDef  *toConceptDef(const Definition *d);
 ConceptDefMutable *toConceptDefMutable(Definition *d);
-ConceptDefMutable *toConceptDefMutable(const Definition *d);
 
 // --- Helpers
 

src/definition.cpp

@@ -367,58 +367,6 @@ bool DefinitionImpl::hasSections() const
   return FALSE;
 }
 
-void DefinitionImpl::addSectionsToIndex()
-{
-  if (m_impl->sectionRefs.empty()) return;
-  //printf("DefinitionImpl::addSectionsToIndex()\n");
-  int level=1;
-  for (auto it = m_impl->sectionRefs.begin(); it!=m_impl->sectionRefs.end(); ++it)
-  {
-    const SectionInfo *si = *it;
-    SectionType type = si->type();
-    if (type.isSection())
-    {
-      //printf("  level=%d title=%s\n",level,qPrint(si->title));
-      int nextLevel = type.level();
-      if (nextLevel>level)
-      {
-        for (int i=level;i<nextLevel;i++)
-        {
-          Doxygen::indexList->incContentsDepth();
-        }
-      }
-      else if (nextLevel<level)
-      {
-        for (int i=nextLevel;i<level;i++)
-        {
-          Doxygen::indexList->decContentsDepth();
-        }
-      }
-      QCString title = si->title();
-      if (title.isEmpty()) title = si->label();
-      const MemberDef *md = m_impl->def->definitionType()==Definition::TypeMember ? toMemberDef(m_impl->def) : nullptr;
-      const Definition *scope = m_impl->def->definitionType()==Definition::TypeMember ? m_impl->def->getOuterScope() : m_impl->def;
-      title = parseCommentAsText(scope,md,title,si->fileName(),si->lineNr());
-      // determine if there is a next level inside this item, but be aware of the anchor and table section references.
-      auto it_next = std::next(it);
-      bool isDir = (it_next!=m_impl->sectionRefs.end()) ?
-                       ((*it_next)->type().isSection() && (*it_next)->type().level() > nextLevel) : false;
-      Doxygen::indexList->addContentsItem(isDir,title,
-                                         getReference(),
-                                         m_impl->def->getOutputFileBase(),
-                                         si->label(),
-                                         false,
-                                         true);
-      level = nextLevel;
-    }
-  }
-  while (level>1)
-  {
-    Doxygen::indexList->decContentsDepth();
-    level--;
-  }
-}
-
 void DefinitionImpl::writeDocAnchorsToTagFile(TextStream &tagFile) const
 {
   if (!m_impl->sectionRefs.empty())

src/definition.h

@@ -365,7 +365,6 @@ class DefinitionMutable
     virtual void addSourceReferences(MemberDef *d,const QCString &sourceRefName) = 0;
     virtual void mergeRefItems(Definition *d) = 0;
     virtual void addInnerCompound(Definition *d) = 0;
-    virtual void addSectionsToIndex() = 0;
     virtual void mergeReferences(const Definition *other) = 0;
     virtual void mergeReferencedBy(const Definition *other) = 0;
     virtual void computeTooltip() = 0;

src/definitionimpl.h

@@ -122,7 +122,6 @@ class DefinitionImpl
     QCString pathFragment() const;
     void writeDocAnchorsToTagFile(TextStream &) const;
     void setLocalName(const QCString &name);
-    void addSectionsToIndex();
     void writeToc(OutputList &ol, const LocalToc &lt) const;
     void computeTooltip();
     void _setSymbolName(const QCString &name);
@@ -282,8 +281,6 @@ class DefinitionMixin : public Base
     { m_impl.writeDocAnchorsToTagFile(fs); }
     void setLocalName(const QCString &name) override
     { m_impl.setLocalName(name); }
-    void addSectionsToIndex() override
-    { m_impl.addSectionsToIndex(); }
     void writeToc(OutputList &ol, const LocalToc &lt) const override
     { m_impl.writeToc(ol,lt); }
     void computeTooltip() override

src/dirdef.cpp

@@ -51,7 +51,7 @@ class DirDefImpl : public DefinitionMixin<DirDef>
     const QCString shortName() const override { return m_shortName; }
     void addSubDir(DirDef *subdir) override;
     const FileList &getFiles() const override { return m_fileList; }
-    void addFile(const FileDef *fd) override;
+    void addFile(FileDef *fd) override;
     const DirList &subDirs() const override { return m_subdirs; }
     bool hasSubdirs() const override { return !m_subdirs.empty(); }
     int level() const override { return m_level; }
@@ -173,10 +173,10 @@ void DirDefImpl::setDirIndex(int index)
   m_dirIndex=index;
 }
 
-void DirDefImpl::addFile(const FileDef *fd)
+void DirDefImpl::addFile(FileDef *fd)
 {
   m_fileList.push_back(fd);
-  const_cast<FileDef*>(fd)->setDirDef(this);
+  fd->setDirDef(this);
 }
 
 void DirDefImpl::sort()

src/dirdef.h

@@ -115,7 +115,7 @@ class DirDef : public DefinitionMutable, public Definition
     virtual const QCString shortName() const = 0;
     virtual void addSubDir(DirDef *subdir) = 0;
     virtual const FileList &getFiles() const = 0;
-    virtual void addFile(const FileDef *fd) = 0;
+    virtual void addFile(FileDef *fd) = 0;
     virtual const DirList &subDirs() const = 0;
     virtual bool hasSubdirs() const = 0;
     virtual int level() const = 0;

src/doxygen.cpp

@@ -1484,10 +1484,10 @@ static ClassDefMutable *createTagLessInstance(const ClassDef *rootCd,const Class
       cd->setFileDef(fd);
       fd->insertClass(cd);
     }
-    for (const auto &gd : rootCd->partOfGroups())
+    for (auto &gd : rootCd->partOfGroups())
     {
       cd->makePartOfGroup(gd);
-      const_cast<GroupDef*>(gd)->addClass(cd);
+      gd->addClass(cd);
     }
 
     MemberList *ml = templ->getMemberList(MemberListType::PubAttribs());
@@ -5449,11 +5449,11 @@ static bool findGlobalMember(const Entry *root,
         NamespaceDef *rnd = nullptr;
         if (!namespaceName.isEmpty()) rnd = Doxygen::namespaceLinkedMap->find(namespaceName);
 
-        const ArgumentList &mdAl = const_cast<const MemberDef *>(md.get())->argumentList();
+        const ArgumentList &mdAl = md.get()->argumentList();
         bool matching=
           (mdAl.empty() && root->argList.empty()) ||
           md->isVariable() || md->isTypedef() || /* in case of function pointers */
-          matchArguments2(md->getOuterScope(),const_cast<const MemberDef *>(md.get())->getFileDef(),&mdAl,
+          matchArguments2(md->getOuterScope(),md.get()->getFileDef(),&mdAl,
                           rnd ? rnd : Doxygen::globalScope,fd,&root->argList,
                           FALSE,root->lang);
 

src/groupdef.cpp

@@ -1604,7 +1604,7 @@ void addMemberToGroups(const Entry *root,MemberDef *md)
   // put member into group defined by this entry?
   if (fgd)
   {
-    GroupDef *mgd = const_cast<GroupDef*>(md->getGroupDef());
+    GroupDef *mgd = md->getGroupDef();
     //printf("mgd=%p\n",mgd);
     bool insertit = FALSE;
     if (mgd==nullptr)

src/index.cpp

@@ -3798,7 +3798,7 @@ static bool mainPageHasOwnTitle()
   return !projectName.isEmpty() && mainPageHasTitle() && qstricmp(title,projectName)!=0;
 }
 
-static void writePages(const PageDef *pd,FTVHelp *ftv)
+static void writePages(PageDef *pd,FTVHelp *ftv)
 {
   //printf("writePages()=%s pd=%p mainpage=%p\n",qPrint(pd->name()),(void*)pd,(void*)Doxygen::mainPage.get());
   LayoutNavEntry *lne = LayoutDocManager::instance().rootNavEntry()->find(LayoutNavEntry::Pages);
@@ -3842,7 +3842,7 @@ static void writePages(const PageDef *pd,FTVHelp *ftv)
   }
   if (hasSections)
   {
-    const_cast<PageDef*>(pd)->addSectionsToIndex();
+    pd->addSectionsToIndex();
   }
   for (const auto &subPage : pd->getSubPages())
   {
@@ -4177,7 +4177,7 @@ static void writeGroupTreeNode(OutputList &ol, const GroupDef *gd, int level, FT
           }
           if (hasSections)
           {
-            const_cast<PageDef*>(pd)->addSectionsToIndex();
+            pd->addSectionsToIndex();
           }
           writePages(pd,nullptr);
           if (hasSections || hasSubPages)