[SCM] kodi-pvr-vdr-vnsi/master: VNSIChannels: use range-based "for"

[tiber-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 47329cfb393ce96604361d25cf1f85d91ff1a19d
Author: Max Kellermann <max at duempel.org>
Date:   Thu Nov 5 11:29:15 2015 +0100

    VNSIChannels: use range-based "for"

diff --git a/src/VNSIChannels.cpp b/src/VNSIChannels.cpp
index e36afa0..a31e889 100644
--- a/src/VNSIChannels.cpp
+++ b/src/VNSIChannels.cpp
@@ -76,23 +76,23 @@ CVNSIChannels::CVNSIChannels()
 
 void CVNSIChannels::CreateProviders()
 {
-  std::vector<CChannel>::iterator c_it;
   std::vector<CProvider>::iterator p_it;
   CProvider provider;
   m_providers.clear();
-  for (c_it=m_channels.begin(); c_it!=m_channels.end(); ++c_it)
+
+  for (const auto &channel : m_channels)
   {
-    provider.m_name = c_it->m_provider;
-    for(unsigned int i=0; i<c_it->m_caids.size(); i++)
+    provider.m_name = channel.m_provider;
+    for (auto caid : channel.m_caids)
     {
-      provider.m_caid = c_it->m_caids[i];
+      provider.m_caid = caid;
       p_it = std::find(m_providers.begin(), m_providers.end(), provider);
       if (p_it == m_providers.end())
       {
         m_providers.push_back(provider);
       }
     }
-    if (c_it->m_caids.empty())
+    if (channel.m_caids.empty())
     {
       provider.m_caid = 0;
       p_it = std::find(m_providers.begin(), m_providers.end(), provider);
@@ -109,15 +109,14 @@ void CVNSIChannels::LoadProviderWhitelist()
   std::vector<CProvider>::iterator p_it;
 
   bool select = m_providerWhitelist.empty();
-  for(p_it=m_providers.begin(); p_it!=m_providers.end(); ++p_it)
+  for (auto &provider : m_providers)
   {
-    p_it->m_whitelist = select;
+    provider.m_whitelist = select;
   }
 
-  std::vector<CProvider>::iterator w_it;
-  for(w_it=m_providerWhitelist.begin(); w_it!=m_providerWhitelist.end(); ++w_it)
+  for (auto &w : m_providerWhitelist)
   {
-    p_it = std::find(m_providers.begin(), m_providers.end(), *w_it);
+    p_it = std::find(m_providers.begin(), m_providers.end(), w);
     if(p_it != m_providers.end())
     {
       p_it->m_whitelist = true;
@@ -128,9 +127,9 @@ void CVNSIChannels::LoadProviderWhitelist()
 void CVNSIChannels::LoadChannelBlacklist()
 {
   std::map<int, int>::iterator it;
-  for(unsigned int i=0; i<m_channelBlacklist.size(); i++)
+  for (auto b : m_channelBlacklist)
   {
-    it = m_channelsMap.find(m_channelBlacklist[i]);
+    it = m_channelsMap.find(b);
     if(it!=m_channelsMap.end())
     {
       int idx = it->second;
@@ -141,12 +140,11 @@ void CVNSIChannels::LoadChannelBlacklist()
 
 void CVNSIChannels::ExtractProviderWhitelist()
 {
-  std::vector<CProvider>::iterator it;
   m_providerWhitelist.clear();
-  for(it=m_providers.begin(); it!=m_providers.end(); ++it)
+  for (const auto &provider : m_providers)
   {
-    if(it->m_whitelist)
-      m_providerWhitelist.push_back(*it);
+    if(provider.m_whitelist)
+      m_providerWhitelist.push_back(provider);
   }
   if(m_providerWhitelist.size() == m_providers.size())
   {
@@ -165,10 +163,10 @@ void CVNSIChannels::ExtractProviderWhitelist()
 void CVNSIChannels::ExtractChannelBlacklist()
 {
   m_channelBlacklist.clear();
-  for(unsigned int i=0; i<m_channels.size(); i++)
+  for (const auto &channel : m_channels)
   {
-    if(m_channels[i].m_blacklist)
-      m_channelBlacklist.push_back(m_channels[i].m_id);
+    if(channel.m_blacklist)
+      m_channelBlacklist.push_back(channel.m_id);
   }
 }
 
@@ -184,9 +182,9 @@ bool CVNSIChannels::IsWhitelist(CChannel &channel)
     if(p_it!=m_providers.end() && p_it->m_whitelist)
       return true;
   }
-  for(unsigned int i=0; i<channel.m_caids.size(); i++)
+  for (auto caid : channel.m_caids)
   {
-    provider.m_caid = channel.m_caids[i];
+    provider.m_caid = caid;
     p_it = std::find(m_providers.begin(), m_providers.end(), provider);
     if(p_it!=m_providers.end() && p_it->m_whitelist)
       return true;

-- 
kodi-pvr-vdr-vnsi packaging