Issue 5013 - Improve some const-correctness

src/FilterEngine.cpp

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
- * Copyright (C) 2006-2016 Eyeo GmbH
+ * Copyright (C) 2006-2017 eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
@@ skipping 254 matching lines @@
   ContentTypeMap::const_iterator it = contentTypes.find(contentType);
   if (it != contentTypes.end())
     return it->second;
   throw std::invalid_argument("Argument is not a valid ContentType");
 }
 
 FilterEngine::ContentType FilterEngine::StringToContentType(const std::string& contentType)
 {
   std::string contentTypeUpper = contentType;
   std::transform(contentType.begin(), contentType.end(), contentTypeUpper.begin(), ::toupper);
-  for (auto it = contentTypes.cbegin(); it != contentTypes.cend(); it++)
-  {
-    if (it->second == contentTypeUpper)
-      return it->first;
+  for (const auto& contentType : contentTypes)
+  {
+    if (contentType.second == contentTypeUpper)
+      return contentType.first;
   }
   throw std::invalid_argument("Cannot convert argument to ContentType");
 }
 
 bool FilterEngine::IsFirstRun() const
 {
   return firstRun;
 }
 
 FilterPtr FilterEngine::GetFilter(const std::string& text)
@@ skipping 78 matching lines @@
 }
 
 AdblockPlus::FilterPtr FilterEngine::Matches(const std::string& url,
     ContentTypeMask contentTypeMask,
     const std::vector<std::string>& documentUrls) const
 {
   if (documentUrls.empty())
     return CheckFilterMatch(url, contentTypeMask, "");
 
   std::string lastDocumentUrl = documentUrls.front();
-  for (auto it = documentUrls.cbegin(); it != documentUrls.cend(); it++) {
-    const std::string documentUrl = *it;
+  for (const auto& documentUrl : documentUrls) {
     AdblockPlus::FilterPtr match = CheckFilterMatch(documentUrl,
                                                     CONTENT_TYPE_DOCUMENT,
                                                     lastDocumentUrl);
     if (match && match->GetType() == AdblockPlus::Filter::TYPE_EXCEPTION)
       return match;
     lastDocumentUrl = documentUrl;
   }
 
   return CheckFilterMatch(url, contentTypeMask, lastDocumentUrl);
 }
@@ skipping 26 matching lines @@
     return FilterPtr();
 }
 
 std::vector<std::string> FilterEngine::GetElementHidingSelectors(const std::string& domain) const
 {
   JsValuePtr func = jsEngine->Evaluate("API.getElementHidingSelectors");
   JsValueList params;
   params.push_back(jsEngine->NewValue(domain));
   JsValueList result = func->Call(params)->AsList();
   std::vector<std::string> selectors;
-  for (auto it = result.cbegin(); it != result.cend(); ++it)
-    selectors.push_back((*it)->AsString());
+  for (const auto& r: result)
+    selectors.push_back(r->AsString());
   return selectors;
 }
 
 JsValuePtr FilterEngine::GetPref(const std::string& pref) const
 {
   JsValuePtr func = jsEngine->Evaluate("API.getPref");
   JsValueList params;
   params.push_back(jsEngine->NewValue(pref));
   return func->Call(params);
 }
@@ skipping 142 matching lines @@
     FilterPtr filter = GetWhitelistingFilter(currentUrl, contentTypeMask, parentUrl);
     if (filter)
     {
       return filter;
     }
     currentUrl = parentUrl;
   }
   while (urlIterator != documentUrls.end());
   return FilterPtr();
 }