Issue 4127 - [emscripten] Convert subscription classes to C++ - Part 2

compiled/subscription/Subscription.cpp

+/*
+ * This file is part of Adblock Plus <https://adblockplus.org/>,
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #include <cstdio>
 #include <cstdlib>
 
 #include "Subscription.h"
 #include "DownloadableSubscription.h"
 #include "UserDefinedSubscription.h"
 #include "../StringMap.h"
 
 namespace
 {
@@ skipping 44 matching lines @@
 
   return result;
 }
 
 OwnedString Subscription::SerializeFilters() const
 {
   if (!mFilters.size())
     return OwnedString();
 
   OwnedString result(u"[Subscription filters]\n"_str);
-  for (unsigned i = 0; i < mFilters.size(); i++)
+  for (const auto& filter : mFilters)
   {
     // TODO: Escape [ characters

[Wladimir Palant, 2017/03/16 18:31:23]

Not fixing this at this point because the serialization code will have to be
replaced anyway as part of https://issues.adblockplus.org/ticket/4128.

-    result.append(mFilters[i]->GetText());
+    result.append(filter->GetText());
     result.append(u'\n');
   }
   return result;
 }
 
 Subscription* Subscription::FromID(const String& id)
 {
   if (id.empty())
   {
     // Generate a new random ID
-    unsigned seed = knownSubscriptions.size();
+    unsigned int seed = knownSubscriptions.size();
     OwnedString randomID(u"~user~000000"_str);
     do
     {
       int number = rand_r(&seed);
       for (int i = randomID.length() - 6; i < randomID.length(); i++)
       {
         randomID[i] = '0' + (number % 10);
         number /= 10;
       }
     } while (knownSubscriptions.find(randomID));
@@ skipping 15 matching lines @@
 
   // This is a hack: we looked up the entry using id but create it using
   // subscription->mID. This works because both are equal at this point.
   // However, id refers to a temporary buffer which will go away.
   enter_context("Adding to known subscriptions");
   knownSubscription.assign(subscription->mID, subscription.get());
   exit_context();
 
   return subscription.release();
 }