Refactoring: replace insert(std::make_pair(...)) by emplace()

Author: doxygen

src/aliases.cpp

@@ -137,14 +137,14 @@ static void addValidAliasToMap(std::string_view alias)
     if (it==g_aliasInfoMap.end()) // insert new alias
     {
       AliasOverloads overloads { { numParams, AliasInfo(aliasValue, separator) } };
-      g_aliasInfoMap.insert(std::make_pair(aliasName,overloads));
+      g_aliasInfoMap.emplace(aliasName,overloads);
     }
     else // replace exiting alias with new definition
     {
       auto it2 = it->second.find(numParams);
       if (it2==it->second.end()) // new alias overload for the given number of parameters
       {
-        it->second.insert(std::make_pair(numParams, AliasInfo(aliasValue,separator)));
+        it->second.emplace(numParams, AliasInfo(aliasValue,separator));
       }
       else // replace alias with new definition
       {

src/cite.cpp

@@ -78,11 +78,7 @@ CitationManager::CitationManager() : p(new Private)
 void CitationManager::insert(const QCString &label)
 {
   QCString lowerCaseLabel = label.lower();
-  p->entries.insert(
-      std::make_pair(
-        lowerCaseLabel.str(),
-        std::make_unique<CiteInfoImpl>(lowerCaseLabel)
-      ));
+  p->entries.emplace(lowerCaseLabel.str(),std::make_unique<CiteInfoImpl>(lowerCaseLabel));
 }
 
 const CiteInfo *CitationManager::find(const QCString &label) const

src/clangparser.cpp

@@ -239,13 +239,13 @@ void ClangTUParser::parse()
   p->ufs[0].Filename = qstrdup(fileName.data());
   p->ufs[0].Contents = p->sources[0].data();
   p->ufs[0].Length   = p->sources[0].length();
-  p->fileMapping.insert({fileName.data(),0});
+  p->fileMapping.emplace(fileName.data(),0);
   size_t i=1;
   for (auto it  = p->filesInSameTU.begin();
             it != p->filesInSameTU.end() && i<numUnsavedFiles;
           ++it, i++)
   {
-    p->fileMapping.insert({it->c_str(),static_cast<uint32_t>(i)});
+    p->fileMapping.emplace(it->c_str(),static_cast<uint32_t>(i));
     p->sources[i]      = detab(fileToString(it->c_str(),filterSourceFiles,TRUE),refIndent);
     p->ufs[i].Filename = qstrdup(it->c_str());
     p->ufs[i].Contents = p->sources[i].data();

src/code.l

@@ -2754,7 +2754,7 @@ static void addUsingDirective(yyscan_t yyscanner,const QCString &name)
     const NamespaceDef *nd = Doxygen::namespaceLinkedMap->find(name);
     if (nd)
     {
-      yyextra->theUsingContext.insert(std::make_pair(name.str(),nd));
+      yyextra->theUsingContext.emplace(name.str(),nd);
     }
   }
 }

src/configimpl.h

@@ -426,7 +426,7 @@ class ConfigImpl
     {
       ConfigString *result = new ConfigString(name,doc);
       m_options.push_back(std::unique_ptr<ConfigOption>(result));
-      m_dict.insert(std::make_pair(name,result));
+      m_dict.emplace(name,result);
       return result;
     }
 
@@ -440,7 +440,7 @@ class ConfigImpl
     {
       ConfigEnum *result = new ConfigEnum(name,doc,defVal);
       m_options.push_back(std::unique_ptr<ConfigOption>(result));
-      m_dict.insert(std::make_pair(name,result));
+      m_dict.emplace(name,result);
       return result;
     }
 
@@ -452,7 +452,7 @@ class ConfigImpl
     {
       ConfigList *result = new ConfigList(name,doc);
       m_options.push_back(std::unique_ptr<ConfigOption>(result));
-      m_dict.insert(std::make_pair(name,result));
+      m_dict.emplace(name,result);
       return result;
     }
 
@@ -467,7 +467,7 @@ class ConfigImpl
     {
       ConfigInt *result = new ConfigInt(name,doc,minVal,maxVal,defVal);
       m_options.push_back(std::unique_ptr<ConfigOption>(result));
-      m_dict.insert(std::make_pair(name,result));
+      m_dict.emplace(name,result);
       return result;
     }
 
@@ -481,23 +481,25 @@ class ConfigImpl
     {
       ConfigBool *result = new ConfigBool(name,doc,defVal);
       m_options.push_back(std::unique_ptr<ConfigOption>(result));
-      m_dict.insert(std::make_pair(name,result));
+      m_dict.emplace(name,result);
       return result;
     }
+
     /*! Adds an option that has become obsolete. */
     ConfigOption *addObsolete(const char *name,ConfigOption::OptionType orgType)
     {
       ConfigObsolete *result = new ConfigObsolete(name,orgType);
       m_obsolete.push_back(std::unique_ptr<ConfigOption>(result));
-      m_dict.insert(std::make_pair(name,result));
+      m_dict.emplace(name,result);
       return result;
     }
+
     /*! Adds an option that has been disabled at compile time. */
     ConfigOption *addDisabled(const char *name)
     {
       ConfigDisabled *result = new ConfigDisabled(name);
       m_disabled.push_back(std::unique_ptr<ConfigOption>(result));
-      m_dict.insert(std::make_pair(name,result));
+      m_dict.emplace(name,result);
       return result;
     }
     /*! @} */

src/definition.cpp

@@ -321,7 +321,7 @@ void DefinitionImpl::setId(const QCString &id)
   if (Doxygen::clangUsrMap)
   {
     //printf("DefinitionImpl::setId '%s'->'%s'\n",id,qPrint(m_impl->name));
-    Doxygen::clangUsrMap->insert(std::make_pair(id.str(),m_impl->def));
+    Doxygen::clangUsrMap->emplace(id.str(),m_impl->def);
   }
 }
 
@@ -648,7 +648,7 @@ class FilterCache
         }
         item.fileSize = size;
         // add location entry to the dictionary
-        m_cache.insert(std::make_pair(fileName.str(),item));
+        m_cache.emplace(fileName.str(),item);
         Debug::print(Debug::FilterOutput,0,"Storing new filter result for %s in %s at offset=%lld size=%zu\n",
                qPrint(fileName),qPrint(Doxygen::filterDBFileName),item.filePos,item.fileSize);
         // update end of file position
@@ -693,7 +693,7 @@ class FilterCache
     void compileLineOffsets(const QCString &fileName,const std::string &str)
     {
       // line 1 (index 0) is at offset 0
-      auto it = m_lineOffsets.insert(std::make_pair(fileName.data(),LineOffsets{0})).first;
+      auto it = m_lineOffsets.emplace(fileName.data(),LineOffsets{0}).first;
       const char *p=str.data();
       while (*p)
       {
@@ -1207,15 +1207,15 @@ void DefinitionImpl::addSourceReferencedBy(MemberDef *md,const QCString &sourceR
 {
   if (md)
   {
-    m_impl->sourceRefByDict.insert({sourceRefName.str(),md});
+    m_impl->sourceRefByDict.emplace(sourceRefName.str(),md);
   }
 }
 
 void DefinitionImpl::addSourceReferences(MemberDef *md,const QCString &sourceRefName)
 {
   if (md)
   {
-    m_impl->sourceRefsDict.insert({sourceRefName.str(),md});
+    m_impl->sourceRefsDict.emplace(sourceRefName.str(),md);
   }
 }
 
@@ -1727,7 +1727,7 @@ void DefinitionImpl::mergeReferencedBy(const Definition *other)
       auto it = m_impl->sourceRefByDict.find(kv.first);
       if (it != m_impl->sourceRefByDict.end())
       {
-        m_impl->sourceRefByDict.insert({kv.first,kv.second});
+        m_impl->sourceRefByDict.emplace(kv.first,kv.second);
       }
     }
   }

src/docgroup.cpp

@@ -129,7 +129,7 @@ void DocGroup::open(Entry *e,const QCString &,int, bool implicit)
         if (it==Doxygen::memberGroupInfoMap.end())
         {
           //printf("    use membergroup %d\n",m_memberGroupId);
-          Doxygen::memberGroupInfoMap.insert(std::make_pair(m_memberGroupId,std::move(info)));
+          Doxygen::memberGroupInfoMap.emplace(m_memberGroupId,std::move(info));
         }
       }
       m_memberGroupRelates = e->relates;

src/docvisitor.cpp

@@ -47,7 +47,7 @@ CodeParserInterface &DocVisitor::getCodeParser(const QCString &extension)
   if (it==m_p->parserFactoryMap.end())
   {
     auto factory = Doxygen::parserManager->getCodeParserFactory(extension);
-    auto result = m_p->parserFactoryMap.insert(std::make_pair(ext,factory()));
+    auto result = m_p->parserFactoryMap.emplace(ext,factory());
     it = result.first;
   }
   return *it->second.get();

src/dotcallgraph.cpp

@@ -69,7 +69,7 @@ void DotCallGraph::buildGraph(DotNode *n,const MemberDef *md,int distance)
         n->addChild(bn,EdgeInfo::Blue,EdgeInfo::Solid);
         bn->addParent(n);
         bn->setDistance(distance);
-        m_usedNodes.insert(std::make_pair(uniqueId.str(),bn));
+        m_usedNodes.emplace(uniqueId.str(),bn);
 
         buildGraph(bn,rmd,distance+1);
       }
@@ -140,7 +140,7 @@ DotCallGraph::DotCallGraph(const MemberDef *md,bool inverse)
     TRUE     // root node
   );
   m_startNode->setDistance(0);
-  m_usedNodes.insert(std::make_pair(uniqueId.str(),m_startNode));
+  m_usedNodes.emplace(uniqueId.str(),m_startNode);
   buildGraph(m_startNode,md,1);
 
   int maxNodes = Config_getInt(DOT_GRAPH_MAX_NODES);

src/dotclassgraph.cpp

@@ -103,7 +103,7 @@ void DotClassGraph::addClass(const ClassDef *cd,DotNode *n,EdgeInfo::Colors colo
       n->addParent(bn);
     }
     bn->setDistance(distance);
-    m_usedNodes.insert(std::make_pair(fullName.str(),bn));
+    m_usedNodes.emplace(fullName.str(),bn);
     //printf(" add new child node '%s' to %s hidden=%d url=%s\n",
     //    qPrint(className),qPrint(n->label()),cd->isHidden(),qPrint(tmp_url));
 
@@ -333,7 +333,7 @@ DotClassGraph::DotClassGraph(const ClassDef *cd,GraphType t)
     cd
   );
   m_startNode->setDistance(0);
-  m_usedNodes.insert(std::make_pair(className.str(),m_startNode));
+  m_usedNodes.emplace(className.str(),m_startNode);
 
   buildGraph(cd,m_startNode,TRUE,1);
   if (t==GraphType::Inheritance) buildGraph(cd,m_startNode,FALSE,1);