[clang-tidy] modernize-use-emplace

Author: Rechi

.clang-tidy

@@ -2,6 +2,7 @@ Checks: "\
   modernize-make-shared,\
   modernize-make-unique,\
   modernize-use-default-member-init,\
+  modernize-use-emplace,\
   performance-faster-string-find,\
   performance-for-range-copy,\
   performance-implicit-conversion-in-loop,\

xbmc/GUIInfoManager.cpp

@@ -9908,7 +9908,7 @@ void CGUIInfoManager::SplitInfoString(const std::string &infoString, std::vector
       if (!property.empty()) // add our property and parameters
       {
         StringUtils::ToLower(property);
-        info.emplace_back(Property(property, param));
+        info.emplace_back(property, param);
       }
       property.clear();
       param.clear();
@@ -9926,7 +9926,7 @@ void CGUIInfoManager::SplitInfoString(const std::string &infoString, std::vector
   if (!property.empty())
   {
     StringUtils::ToLower(property);
-    info.emplace_back(Property(property, param));
+    info.emplace_back(property, param);
   }
 }
 

xbmc/addons/addoninfo/AddonExtensions.cpp

@@ -55,14 +55,14 @@ const EXT_ELEMENTS CAddonExtensions::GetElements(const std::string& id) const
   for (const auto& child : m_children)
   {
     if (child.first == id)
-      children.push_back(std::make_pair(child.first, child.second));
+      children.emplace_back(child.first, child.second);
   }
   return children;
 }
 
 void CAddonExtensions::Insert(const std::string& id, const std::string& value)
 {
   EXT_VALUE extension;
-  extension.push_back(std::make_pair(id, SExtValue(value)));
-  m_values.push_back(std::make_pair(id, extension));
+  extension.emplace_back(id, SExtValue(value));
+  m_values.emplace_back(id, extension);
 }

xbmc/addons/kodi-dev-kit/include/kodi/addon-instance/Game.h

@@ -52,21 +52,21 @@ class GameControllerLayout
   {
     provides_input = layout.provides_input;
     for (unsigned int i = 0; i < layout.digital_button_count; ++i)
-      digital_buttons.push_back(layout.digital_buttons[i]);
+      digital_buttons.emplace_back(layout.digital_buttons[i]);
     for (unsigned int i = 0; i < layout.analog_button_count; ++i)
-      analog_buttons.push_back(layout.analog_buttons[i]);
+      analog_buttons.emplace_back(layout.analog_buttons[i]);
     for (unsigned int i = 0; i < layout.analog_stick_count; ++i)
-      analog_sticks.push_back(layout.analog_sticks[i]);
+      analog_sticks.emplace_back(layout.analog_sticks[i]);
     for (unsigned int i = 0; i < layout.accelerometer_count; ++i)
-      accelerometers.push_back(layout.accelerometers[i]);
+      accelerometers.emplace_back(layout.accelerometers[i]);
     for (unsigned int i = 0; i < layout.key_count; ++i)
-      keys.push_back(layout.keys[i]);
+      keys.emplace_back(layout.keys[i]);
     for (unsigned int i = 0; i < layout.rel_pointer_count; ++i)
-      rel_pointers.push_back(layout.rel_pointers[i]);
+      rel_pointers.emplace_back(layout.rel_pointers[i]);
     for (unsigned int i = 0; i < layout.abs_pointer_count; ++i)
-      abs_pointers.push_back(layout.abs_pointers[i]);
+      abs_pointers.emplace_back(layout.abs_pointers[i]);
     for (unsigned int i = 0; i < layout.motor_count; ++i)
-      motors.push_back(layout.motors[i]);
+      motors.emplace_back(layout.motors[i]);
   }
   /*! @endcond */
 
@@ -201,7 +201,7 @@ class ATTR_DLL_LOCAL CInstanceGame : public IAddonInstance
     for (unsigned int i = 0; i < m_instanceData->props->proxy_dll_count; ++i)
     {
       if (m_instanceData->props->proxy_dll_paths[i] != nullptr)
-        paths.push_back(m_instanceData->props->proxy_dll_paths[i]);
+        paths.emplace_back(m_instanceData->props->proxy_dll_paths[i]);
     }
     return !paths.empty();
   }
@@ -223,7 +223,7 @@ class ATTR_DLL_LOCAL CInstanceGame : public IAddonInstance
     for (unsigned int i = 0; i < m_instanceData->props->resource_directory_count; ++i)
     {
       if (m_instanceData->props->resource_directories[i] != nullptr)
-        dirs.push_back(m_instanceData->props->resource_directories[i]);
+        dirs.emplace_back(m_instanceData->props->resource_directories[i]);
     }
     return !dirs.empty();
   }
@@ -269,7 +269,7 @@ class ATTR_DLL_LOCAL CInstanceGame : public IAddonInstance
     for (unsigned int i = 0; i < m_instanceData->props->extension_count; ++i)
     {
       if (m_instanceData->props->extensions[i] != nullptr)
-        extensions.push_back(m_instanceData->props->extensions[i]);
+        extensions.emplace_back(m_instanceData->props->extensions[i]);
     }
     return !extensions.empty();
   }
@@ -1079,7 +1079,7 @@ class ATTR_DLL_LOCAL CInstanceGame : public IAddonInstance
     for (size_t i = 0; i < urlCount; ++i)
     {
       if (urls[i] != nullptr)
-        urlList.push_back(urls[i]);
+        urlList.emplace_back(urls[i]);
     }
 
     return static_cast<CInstanceGame*>(instance->toAddon->addonInstance)
@@ -1165,7 +1165,7 @@ class ATTR_DLL_LOCAL CInstanceGame : public IAddonInstance
 
     std::vector<GameControllerLayout> controllerList;
     for (unsigned int i = 0; i < controller_count; ++i)
-      controllerList.push_back(controllers[i]);
+      controllerList.emplace_back(controllers[i]);
 
     static_cast<CInstanceGame*>(instance->toAddon->addonInstance)
         ->SetControllerLayouts(controllerList);

xbmc/addons/settings/AddonSettings.cpp

@@ -350,7 +350,7 @@ bool CAddonSettings::Load(const CXBMCTinyXML& doc)
         settingValue = setting->FirstChild()->ValueStr();
 
       // add the setting to the map
-      settingValues.emplace(std::make_pair(settingId, settingValue));
+      settingValues.emplace(settingId, settingValue);
     };
 
     // check if there were any setting values without a definition
@@ -1106,7 +1106,7 @@ SettingPtr CAddonSettings::InitializeFromOldSettingSelect(
 
       StringSettingOptions options;
       for (const auto& value : values)
-        options.push_back(StringSettingOption(value, value));
+        options.emplace_back(value, value);
       settingString->SetOptions(options);
 
       setting = settingString;
@@ -1119,8 +1119,7 @@ SettingPtr CAddonSettings::InitializeFromOldSettingSelect(
 
       TranslatableIntegerSettingOptions options;
       for (uint32_t i = 0; i < values.size(); ++i)
-        options.push_back(TranslatableIntegerSettingOption(
-            static_cast<int>(strtol(values[i].c_str(), nullptr, 0)), i));
+        options.emplace_back(static_cast<int>(strtol(values[i].c_str(), nullptr, 0)), i);
       settingInt->SetTranslatableOptions(options);
 
       setting = settingInt;
@@ -1263,7 +1262,7 @@ SettingPtr CAddonSettings::InitializeFromOldSettingEnums(
         if (settingEntries.size() > i)
           value = static_cast<int>(strtol(settingEntries[i].c_str(), nullptr, 0));
 
-        options.push_back(IntegerSettingOption(label, value));
+        options.emplace_back(label, value);
       }
 
       settingInt->SetOptions(options);
@@ -1278,7 +1277,7 @@ SettingPtr CAddonSettings::InitializeFromOldSettingEnums(
         if (settingEntries.size() > i)
           value = static_cast<int>(strtol(settingEntries[i].c_str(), nullptr, 0));
 
-        options.push_back(TranslatableIntegerSettingOption(label, value));
+        options.emplace_back(label, value);
       }
 
       settingInt->SetTranslatableOptions(options);
@@ -1306,7 +1305,7 @@ SettingPtr CAddonSettings::InitializeFromOldSettingEnums(
         if (settingEntries.size() > i)
           value = settingEntries[i];
 
-        options.push_back(StringSettingOption(value, value));
+        options.emplace_back(value, value);
       }
 
       settingString->SetOptions(options);
@@ -1321,7 +1320,7 @@ SettingPtr CAddonSettings::InitializeFromOldSettingEnums(
         if (settingEntries.size() > i)
           value = settingEntries[i];
 
-        options.push_back(std::make_pair(label, value));
+        options.emplace_back(label, value);
       }
 
       settingString->SetTranslatableOptions(options);

xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAESink.cpp

@@ -872,7 +872,7 @@ void CActiveAESink::EnumerateOutputDevices(AEDeviceList &devices, bool passthrou
       if (!devInfo.m_displayNameExtra.empty())
         ss << ", " << devInfo.m_displayNameExtra;
 
-      devices.push_back(AEDevice(ss.str(), device));
+      devices.emplace_back(ss.str(), device);
     }
   }
 }

xbmc/cores/AudioEngine/Sinks/osx/AEDeviceEnumerationOSX.cpp

@@ -220,11 +220,11 @@ CADeviceList AEDeviceEnumerationOSX::GetDeviceInfoList() const
         deviceInfo.m_deviceName = getDeviceNameForStream(streamIdx) + ":source" + sourceIdxStr.str();
         deviceInfo.m_displayNameExtra = m_caDevice.GetDataSourceName(sourceList[sourceIdx]);
         devInstance.sourceId = sourceList[sourceIdx];
-        list.push_back(std::make_pair(devInstance, deviceInfo));
+        list.emplace_back(devInstance, deviceInfo);
       }
     }
     else
-      list.push_back(std::make_pair(devInstance, deviceInfo));
+      list.emplace_back(devInstance, deviceInfo);
   }
   return list;
 }

xbmc/cores/VideoPlayer/DVDDemuxers/DemuxMultiSource.cpp

@@ -138,7 +138,7 @@ bool CDemuxMultiSource::Open(const std::shared_ptr<CDVDInputStream>& pInput)
 
       m_demuxerMap[demuxer->GetDemuxerId()] = demuxer;
       m_DemuxerToInputStreamMap[demuxer] = *iter;
-      m_demuxerQueue.push(std::make_pair(-1.0, demuxer));
+      m_demuxerQueue.emplace(-1.0, demuxer);
       ++iter;
     }
   }
@@ -175,7 +175,7 @@ DemuxPacket* CDemuxMultiSource::Read()
       readTime = packet->dts;
     else
       readTime = packet->pts;
-    m_demuxerQueue.push(std::make_pair(readTime, currentDemuxer));
+    m_demuxerQueue.emplace(readTime, currentDemuxer);
   }
   else
   {
@@ -188,7 +188,7 @@ DemuxPacket* CDemuxMultiSource::Read()
                   __FUNCTION__, CURL::GetRedacted(currentDemuxer->GetFileName()));
       }
       else    //maybe add an error counter?
-        m_demuxerQueue.push(std::make_pair(-1.0, currentDemuxer));
+        m_demuxerQueue.emplace(-1.0, currentDemuxer);
     }
   }
 
@@ -203,7 +203,7 @@ bool CDemuxMultiSource::SeekTime(double time, bool backwards, double* startpts)
   {
     if (iter.second->SeekTime(time, false, startpts))
     {
-      demuxerQueue.push(std::make_pair(*startpts, iter.second));
+      demuxerQueue.emplace(*startpts, iter.second);
       CLog::Log(LOGDEBUG, "{} - starting demuxer from: {:f}", __FUNCTION__, time);
       ret = true;
     }

xbmc/cores/VideoPlayer/VideoPlayer.cpp

@@ -4832,7 +4832,7 @@ void CVideoPlayer::UpdatePlayState(double timeout)
         {
           std::string name;
           pChapter->GetChapterName(name, i + 1);
-          state.chapters.push_back(make_pair(name, pChapter->GetChapterPos(i + 1)));
+          state.chapters.emplace_back(name, pChapter->GetChapterPos(i + 1));
         }
       }
       CServiceBroker::GetDataCacheCore().SetChapters(state.chapters);

xbmc/dialogs/GUIDialogBusy.cpp

@@ -127,7 +127,7 @@ void CGUIDialogBusy::DoProcess(unsigned int currentTime, CDirtyRegionList &dirty
 {
   bool visible = CServiceBroker::GetGUI()->GetWindowManager().IsModalDialogTopmost(WINDOW_DIALOG_BUSY);
   if(!visible && m_bLastVisible)
-    dirtyregions.push_back(CDirtyRegion(m_renderRegion));
+    dirtyregions.emplace_back(m_renderRegion);
   m_bLastVisible = visible;
 
   CGUIDialog::DoProcess(currentTime, dirtyregions);