Merge pull request xbmc#24436 from Rechi/clang-tidy/performance

[clang-tidy] fix modernize-* and performance-* warnings
DaVukovic · Jan 12, 2024 · a4fc27b · a4fc27b
2 parents 39d7860 + 0657b2d
commit a4fc27b
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 11 deletions.
diff --git a/xbmc/filesystem/Directory.cpp b/xbmc/filesystem/Directory.cpp
@@ -306,7 +306,7 @@ bool CDirectory::GetDirectory(const CURL& url,
 }
 
 bool CDirectory::EnumerateDirectory(const std::string& path,
-                                    DirectoryEnumerationCallback callback,
+                                    const DirectoryEnumerationCallback& callback,
                                     bool fileOnly /* = false */,
                                     const std::string& mask /* = "" */,
                                     int flags /* = DIR_FLAG_DEFAULTS */)

diff --git a/xbmc/filesystem/Directory.h b/xbmc/filesystem/Directory.h
@@ -72,7 +72,7 @@ class CDirectory
   using DirectoryEnumerationCallback = std::function<void(const std::shared_ptr<CFileItem>& item)>;
 
   static bool EnumerateDirectory(const std::string& path,
-                                 DirectoryEnumerationCallback callback,
+                                 const DirectoryEnumerationCallback& callback,
                                  bool fileOnly = false,
                                  const std::string& mask = "",
                                  int flags = DIR_FLAG_DEFAULTS);

diff --git a/xbmc/network/upnp/UPnPPlayer.cpp b/xbmc/network/upnp/UPnPPlayer.cpp
@@ -179,7 +179,6 @@ class CUPnPPlayerController : public PLT_MediaControllerDelegate
 CUPnPPlayer::CUPnPPlayer(IPlayerCallback& callback, const char* uuid)
   : IPlayer(callback),
     CThread("UPnPPlayer"),
-    m_control(nullptr),
     m_logger(CServiceBroker::GetLogging().GetLogger(StringUtils::Format("CUPnPPlayer[{}]", uuid)))
 {
   m_control = CUPnP::GetInstance()->m_MediaController;

diff --git a/xbmc/network/upnp/UPnPPlayer.h b/xbmc/network/upnp/UPnPPlayer.h
@@ -64,7 +64,7 @@ class CUPnPPlayer : public IPlayer, public CThread
   void Process() override;
   void OnExit() override;
 
-  PLT_MediaController* m_control;
+  PLT_MediaController* m_control = nullptr;
   std::unique_ptr<CUPnPPlayerController> m_delegate;
   std::string m_current_uri;
   std::string m_current_meta;

diff --git a/xbmc/video/VideoDatabase.cpp b/xbmc/video/VideoDatabase.cpp
@@ -11869,7 +11869,7 @@ void CVideoDatabase::InitializeVideoVersionTypeTable(int schemaVersion)
 
     for (int id = VIDEO_VERSION_ID_BEGIN; id <= VIDEO_VERSION_ID_END; ++id)
     {
-      const std::string type{g_localizeStrings.Get(id)};
+      const std::string& type{g_localizeStrings.Get(id)};
       if (schemaVersion < 127)
       {
         m_pDS->exec(
@@ -11901,7 +11901,7 @@ void CVideoDatabase::UpdateVideoVersionTypeTable()
 
     for (int id = VIDEO_VERSION_ID_BEGIN; id <= VIDEO_VERSION_ID_END; ++id)
     {
-      std::string type = g_localizeStrings.Get(id);
+      const std::string& type = g_localizeStrings.Get(id);
       m_pDS->exec(PrepareSQL("UPDATE videoversiontype SET name = '%s', owner = %i WHERE id = '%i'",
                              type.c_str(), VideoAssetTypeOwner::SYSTEM, id));
     }
@@ -11991,9 +11991,8 @@ void CVideoDatabase::GetVideoVersions(VideoDbContentType itemType,
 
     while (!m_pDS2->eof())
     {
-      versions.push_back(std::make_tuple(m_pDS2->fv("name").get_asString(),
-                                         m_pDS2->fv("id").get_asInt(),
-                                         m_pDS2->fv("idFile").get_asInt()));
+      versions.emplace_back(m_pDS2->fv("name").get_asString(), m_pDS2->fv("id").get_asInt(),
+                            m_pDS2->fv("idFile").get_asInt());
       m_pDS2->next();
     }
     m_pDS2->close();

diff --git a/xbmc/video/dialogs/GUIDialogVideoManagerVersions.cpp b/xbmc/video/dialogs/GUIDialogVideoManagerVersions.cpp
@@ -623,7 +623,7 @@ bool CGUIDialogVideoManagerVersions::GetSimilarMovies(const std::shared_ptr<CFil
 }
 
 bool CGUIDialogVideoManagerVersions::AddSimilarMovieAsVersion(
-    const std::shared_ptr<CFileItem> itemMovie)
+    const std::shared_ptr<CFileItem>& itemMovie)
 {
   // A movie with versions cannot be turned into a version
   if (itemMovie->GetVideoInfoTag()->HasVideoVersions())

diff --git a/xbmc/video/dialogs/GUIDialogVideoManagerVersions.h b/xbmc/video/dialogs/GUIDialogVideoManagerVersions.h
@@ -102,7 +102,7 @@ class CGUIDialogVideoManagerVersions : public CGUIDialogVideoManager
    * \param itemMovie Movie to convert
    * \return True for success, false otherwse
    */
-  bool AddSimilarMovieAsVersion(const std::shared_ptr<CFileItem> itemMovie);
+  bool AddSimilarMovieAsVersion(const std::shared_ptr<CFileItem>& itemMovie);
 
   /*!
    * \brief Populates a list with all movies of the libray, excluding the item provided as parameter.