| OLD | NEW | 
|---|
| 1 /* | 1 /* | 
| 2  * This file is part of Adblock Plus <https://adblockplus.org/>, | 2  * This file is part of Adblock Plus <https://adblockplus.org/>, | 
| 3  * Copyright (C) 2006-present eyeo GmbH | 3  * Copyright (C) 2006-present eyeo GmbH | 
| 4  * | 4  * | 
| 5  * Adblock Plus is free software: you can redistribute it and/or modify | 5  * Adblock Plus is free software: you can redistribute it and/or modify | 
| 6  * it under the terms of the GNU General Public License version 3 as | 6  * it under the terms of the GNU General Public License version 3 as | 
| 7  * published by the Free Software Foundation. | 7  * published by the Free Software Foundation. | 
| 8  * | 8  * | 
| 9  * Adblock Plus is distributed in the hope that it will be useful, | 9  * Adblock Plus is distributed in the hope that it will be useful, | 
| 10  * but WITHOUT ANY WARRANTY; without even the implied warranty of | 10  * but WITHOUT ANY WARRANTY; without even the implied warranty of | 
| (...skipping 21 matching lines...) Expand all  Loading... | 
| 32     : mID(id), mType(type), mDisabled(false) | 32     : mID(id), mType(type), mDisabled(false) | 
| 33 { | 33 { | 
| 34   annotate_address(this, "Subscription"); | 34   annotate_address(this, "Subscription"); | 
| 35 } | 35 } | 
| 36 | 36 | 
| 37 Subscription::~Subscription() | 37 Subscription::~Subscription() | 
| 38 { | 38 { | 
| 39   knownSubscriptions.erase(mID); | 39   knownSubscriptions.erase(mID); | 
| 40 } | 40 } | 
| 41 | 41 | 
| 42 Filter* Subscription::FilterAt(unsigned index) | 42 Filter* Subscription::FilterAt(Subscription::Filters::size_type index) | 
| 43 { | 43 { | 
| 44   if (index >= mFilters.size()) | 44   if (index >= mFilters.size()) | 
| 45     return nullptr; | 45     return nullptr; | 
| 46 | 46 | 
| 47   FilterPtr result(mFilters[index]); | 47   FilterPtr result(mFilters[index]); | 
| 48   return result.release(); | 48   return result.release(); | 
| 49 } | 49 } | 
| 50 | 50 | 
| 51 int Subscription::IndexOfFilter(Filter* filter) | 51 int Subscription::IndexOfFilter(Filter* filter) | 
| 52 { | 52 { | 
| 53   for (unsigned i = 0; i < mFilters.size(); i++) | 53   for (Filters::size_type i = 0; i < mFilters.size(); i++) | 
| 54     if (mFilters[i] == filter) | 54     if (mFilters[i] == filter) | 
| 55       return i; | 55       return i; | 
| 56   return -1; | 56   return -1; | 
| 57 } | 57 } | 
| 58 | 58 | 
| 59 OwnedString Subscription::Serialize() const | 59 OwnedString Subscription::Serialize() const | 
| 60 { | 60 { | 
| 61   OwnedString result(u"[Subscription]\nurl="_str); | 61   OwnedString result(u"[Subscription]\nurl="_str); | 
| 62   result.append(mID); | 62   result.append(mID); | 
| 63   result.append(u'\n'); | 63   result.append(u'\n'); | 
| (...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 122 | 122 | 
| 123   // This is a hack: we looked up the entry using id but create it using | 123   // This is a hack: we looked up the entry using id but create it using | 
| 124   // subscription->mID. This works because both are equal at this point. | 124   // subscription->mID. This works because both are equal at this point. | 
| 125   // However, id refers to a temporary buffer which will go away. | 125   // However, id refers to a temporary buffer which will go away. | 
| 126   enter_context("Adding to known subscriptions"); | 126   enter_context("Adding to known subscriptions"); | 
| 127   knownSubscription.assign(subscription->mID, subscription.get()); | 127   knownSubscription.assign(subscription->mID, subscription.get()); | 
| 128   exit_context(); | 128   exit_context(); | 
| 129 | 129 | 
| 130   return subscription.release(); | 130   return subscription.release(); | 
| 131 } | 131 } | 
| OLD | NEW | 
|---|