Merge branch 'master' of github.com:doxygen/doxygen

Author: doxygen

src/classdef.cpp

@@ -2270,7 +2270,7 @@ void ClassDefImpl::writeSummaryLinks(OutputList &ol) const
               innerCd->visibleInParentsDeclList()
              )
           {
-            const LayoutDocEntrySection *ls = (const LayoutDocEntrySection*)lde.get();
+            const LayoutDocEntrySection *ls = dynamic_cast<const LayoutDocEntrySection *>(lde.get());
             ol.writeSummaryLink(QCString(),"nested-classes",ls->title(lang),first);
             first=FALSE;
             break;

src/datetime.cpp

@@ -142,7 +142,7 @@ QCString dateTimeFromString(const QCString &spec,std::tm &dt,int &format)
   }
 
   // find a matching pattern
-  std::string s = spec.str();
+  const std::string &s = spec.str();
   for (const auto &fmt : g_specFormats)
   {
     reg::Match m;

src/debug.cpp

@@ -87,9 +87,9 @@ void Debug::print_(DebugMask mask, int prio, fmt::string_view fmt, fmt::format_a
 }
 
 static char asciiToLower(char in) {
-    if (in <= 'Z' && in >= 'A')
-        return in - ('Z' - 'z');
-    return in;
+  if (in <= 'Z' && in >= 'A')
+    return in - 'A' + 'a';
+  return in;
 }
 
 static uint64_t labelToEnumValue(const QCString &l)

src/definition.cpp

@@ -120,8 +120,7 @@ void DefinitionImpl::Private::setDefFileName(const QCString &df)
 void DefinitionImpl::Private::init(const QCString &df, const QCString &n)
 {
   setDefFileName(df);
-  QCString lname = n;
-  if (lname!="<globalScope>")
+  if (n!="<globalScope>")
   {
     //extractNamespaceName(m_name,m_localName,ns);
     localName=stripScope(n);
@@ -158,7 +157,7 @@ static bool matchExcludedSymbols(const QCString &name)
 {
   const StringVector &exclSyms = Config_getList(EXCLUDE_SYMBOLS);
   if (exclSyms.empty()) return FALSE; // nothing specified
-  std::string symName = name.str();
+  const std::string &symName = name.str();
   for (const auto &pat : exclSyms)
   {
     QCString pattern = pat;

src/docnode.cpp

@@ -1428,10 +1428,9 @@ void DocHtmlSummary::parse()
   Token tok = parser()->tokenizer.lex();
   while (!tok.is_any_of(TokenRetval::TK_NONE, TokenRetval::TK_EOF))
   {
-    HtmlTagType tagId = HtmlTagType::UNKNOWN;
     // check of </summary>
     if (tok.value()==TokenRetval::TK_HTMLTAG &&
-        (tagId=Mappers::htmlTagMapper->map(parser()->context.token->name))==HtmlTagType::XML_SUMMARY &&
+        (Mappers::htmlTagMapper->map(parser()->context.token->name))==HtmlTagType::XML_SUMMARY &&
         parser()->context.token->endTag
        )
     {

src/dotdirdeps.cpp

@@ -52,7 +52,7 @@ class DotDirPropertyBuilder
     DotDirPropertyBuilder &makeTruncated (bool b=true) { m_property.isTruncated =b; return *this; }
     DotDirPropertyBuilder &makeOriginal  (bool b=true) { m_property.isOriginal  =b; return *this; }
     DotDirPropertyBuilder &makePeripheral(bool b=true) { m_property.isPeripheral=b; return *this; }
-    operator DotDirProperty() { return std::move(m_property); }
+    operator DotDirProperty() { return m_property; }
   private:
     DotDirProperty m_property;
 };

src/dotnode.cpp

@@ -197,12 +197,11 @@ QCString DotNode::convertLabel(const QCString &l, LabelStyle style)
 {
   QCString bBefore("\\_/<({[: =-+@%#~?$"); // break before character set
   QCString bAfter(">]),:;|");              // break after  character set
-  QCString p(l);
-  if (p.isEmpty()) return QCString();
+  if (l.isEmpty()) return QCString();
   QCString result;
   char pc=0;
   uint32_t idx = 0;
-  int charsLeft=static_cast<int>(p.length());
+  int charsLeft=static_cast<int>(l.length());
   int sinceLast=0;
   int foldLen = Config_getInt(DOT_WRAP_THRESHOLD); // ideal text length
   QCString br;
@@ -224,9 +223,9 @@ QCString DotNode::convertLabel(const QCString &l, LabelStyle style)
   {
     br = "\\l";
   }
-  while (idx < p.length())
+  while (idx < l.length())
   {
-    char c = p[idx++];
+    char c = l[idx++];
     char cs[2] = { c, 0 };
     const char *replacement = cs;
     if (style!=LabelStyle::Plain)
@@ -279,14 +278,14 @@ QCString DotNode::convertLabel(const QCString &l, LabelStyle style)
       sinceLast=1;
     }
     else if (charsLeft>1+foldLen/4 && sinceLast>foldLen+foldLen/3 &&
-      !isupper(c) && isupper(p[idx]))
+      !isupper(c) && isupper(l[idx]))
     {
       result+=replacement;
       result+=br;
       foldLen = (foldLen+sinceLast+1)/2;
       sinceLast=0;
     }
-    else if (charsLeft>foldLen/3 && sinceLast>foldLen && bAfter.contains(c) && (c!=':' || p[idx]!=':'))
+    else if (charsLeft>foldLen/3 && sinceLast>foldLen && bAfter.contains(c) && (c!=':' || l[idx]!=':'))
     {
       result+=replacement;
       result+=br;

src/doxygen.cpp

@@ -2607,7 +2607,7 @@ static MemberDef *addVariableToFile(
     {
       static const reg::Ex re(R"(\a\w*)");
       reg::Match match;
-      std::string typ = ttype.str();
+      const std::string &typ = ttype.str();
       if (reg::search(typ,match,re))
       {
         QCString typeValue = match.str();
@@ -4552,8 +4552,6 @@ static void findUsedClassesForClass(const Entry *root,
             usedClassName = typeCd->name();
           }
 
-          int sp=usedClassName.find('<');
-          if (sp==-1) sp=0;
           // replace any namespace aliases
           replaceNamespaceAliases(usedClassName);
           // add any template arguments to the class