Cleanup CPVRGUIProgressHandler: Get rid of some unneeded narrowing ca…

…sts.
Rechi · Dec 18, 2024 · f93f5ea · f93f5ea
1 parent a1da2d0
commit f93f5ea
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 24 deletions.
diff --git a/xbmc/pvr/addons/PVRClients.cpp b/xbmc/pvr/addons/PVRClients.cpp
@@ -167,12 +167,11 @@ void CPVRClients::UpdateClients(
     auto progressHandler = std::make_unique<CPVRGUIProgressHandler>(
         g_localizeStrings.Get(19239)); // Creating PVR clients
 
-    unsigned int i = 0;
+    size_t i = 0;
     for (const auto& client : clientsToCreate)
     {
-      progressHandler->UpdateProgress(
-          client->Name(), i++,
-          static_cast<unsigned int>(clientsToCreate.size() + clientsToReCreate.size()));
+      progressHandler->UpdateProgress(client->Name(), i++,
+                                      clientsToCreate.size() + clientsToReCreate.size());
 
       const ADDON_STATUS status = client->Create();
 
@@ -192,9 +191,8 @@ void CPVRClients::UpdateClients(
 
     for (const auto& clientInfo : clientsToReCreate)
     {
-      progressHandler->UpdateProgress(
-          clientInfo.second, i++,
-          static_cast<unsigned int>(clientsToCreate.size() + clientsToReCreate.size()));
+      progressHandler->UpdateProgress(clientInfo.second, i++,
+                                      clientsToCreate.size() + clientsToReCreate.size());
 
       // stop and recreate client
       StopClient(clientInfo.first, true /* restart */);

diff --git a/xbmc/pvr/epg/EpgContainer.cpp b/xbmc/pvr/epg/EpgContainer.cpp
@@ -733,7 +733,6 @@ bool CPVREpgContainer::UpdateEPG(bool bOnlyPending /* = false */)
 
   std::vector<std::shared_ptr<CPVREpg>> invalidTables;
 
-  unsigned int iCounter = 0;
   const std::shared_ptr<CPVREpgDatabase> database = GetEpgDatabase();
 
   m_critSection.lock();
@@ -745,6 +744,7 @@ bool CPVREpgContainer::UpdateEPG(bool bOnlyPending /* = false */)
     progressHandler = std::make_unique<CPVRGUIProgressHandler>(
         g_localizeStrings.Get(19004)); // Loading programme guide
 
+  size_t counter = 0;
   for (const auto& epgEntry : epgsToUpdate)
   {
     if (InterruptUpdate())
@@ -758,8 +758,8 @@ bool CPVREpgContainer::UpdateEPG(bool bOnlyPending /* = false */)
       continue;
 
     if (progressHandler)
-      progressHandler->UpdateProgress(epg->GetChannelData()->ChannelName(), ++iCounter,
-                                      static_cast<unsigned int>(epgsToUpdate.size()));
+      progressHandler->UpdateProgress(epg->GetChannelData()->ChannelName(), ++counter,
+                                      epgsToUpdate.size());
 
     if ((!bOnlyPending || epg->UpdatePending()) &&
         epg->Update(start,

diff --git a/xbmc/pvr/guilib/PVRGUIChannelIconUpdater.cpp b/xbmc/pvr/guilib/PVRGUIChannelIconUpdater.cpp
@@ -65,13 +65,12 @@ void CPVRGUIChannelIconUpdater::SearchAndUpdateMissingChannelIcons() const
   for (const auto& group : m_groups)
   {
     const std::vector<std::shared_ptr<CPVRChannelGroupMember>> members = group->GetMembers();
-    int channelIndex = 0;
+    size_t channelIndex = 0;
     for (const auto& member : members)
     {
       const std::shared_ptr<CPVRChannel> channel = member->Channel();
 
-      progressHandler->UpdateProgress(channel->ChannelName(), channelIndex++,
-                                      static_cast<unsigned int>(members.size()));
+      progressHandler->UpdateProgress(channel->ChannelName(), channelIndex++, members.size());
 
       // skip if an icon is already set and exists
       if (CFileUtils::Exists(channel->IconPath()))

diff --git a/xbmc/pvr/guilib/PVRGUIProgressHandler.cpp b/xbmc/pvr/guilib/PVRGUIProgressHandler.cpp
@@ -43,15 +43,15 @@ void CPVRGUIProgressHandler::UpdateProgress(const std::string& strText, float fP
   }
 }
 
-void CPVRGUIProgressHandler::UpdateProgress(const std::string& strText,
-                                            unsigned int iCurrent,
-                                            unsigned int iMax)
+void CPVRGUIProgressHandler::UpdateProgress(const std::string& text,
+                                            size_t currentValue,
+                                            size_t maxValue)
 {
-  float fPercentage = (iCurrent * 100.0f) / iMax;
-  if (!std::isnan(fPercentage))
-    fPercentage = std::min(100.0f, fPercentage);
+  float percentage = (currentValue * 100.0f) / maxValue;
+  if (!std::isnan(percentage))
+    percentage = std::min(100.0f, percentage);
 
-  UpdateProgress(strText, fPercentage);
+  UpdateProgress(text, percentage);
 }
 
 void CPVRGUIProgressHandler::Process()

diff --git a/xbmc/pvr/guilib/PVRGUIProgressHandler.h b/xbmc/pvr/guilib/PVRGUIProgressHandler.h
@@ -37,11 +37,11 @@ namespace PVR
 
     /*!
      * @brief Update the progress dialogs's content.
-     * @param strText The new progress text.
-     * @param iCurrent The new current progress value, must be less or equal iMax.
-     * @param iMax The new maximum progress value, must be greater or equal iCurrent.
+     * @param text The new progress text.
+     * @param currentValue The new current progress value, must be less or equal iMax.
+     * @param maxValue The new maximum progress value, must be greater or equal iCurrent.
      */
-    void UpdateProgress(const std::string& strText, unsigned int iCurrent, unsigned int iMax);
+    void UpdateProgress(const std::string& text, size_t currentValue, size_t maxValue);
 
   protected:
     // CThread implementation