| 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 26 matching lines...) Expand all  Loading... | 
| 37     FILTER_REMOVED, | 37     FILTER_REMOVED, | 
| 38     FILTER_DISABLED, | 38     FILTER_DISABLED, | 
| 39     FILTER_HITCOUNT, | 39     FILTER_HITCOUNT, | 
| 40     FILTER_LASTHIT, | 40     FILTER_LASTHIT, | 
| 41     SUBSCRIPTION_ADDED, | 41     SUBSCRIPTION_ADDED, | 
| 42     SUBSCRIPTION_REMOVED, | 42     SUBSCRIPTION_REMOVED, | 
| 43     SUBSCRIPTION_MOVED, | 43     SUBSCRIPTION_MOVED, | 
| 44     SUBSCRIPTION_TITLE, | 44     SUBSCRIPTION_TITLE, | 
| 45     SUBSCRIPTION_DISABLED, | 45     SUBSCRIPTION_DISABLED, | 
| 46     SUBSCRIPTION_FIXEDTITLE, | 46     SUBSCRIPTION_FIXEDTITLE, | 
|  | 47     SUBSCRIPTION_BEFORE_FILTERS_REPLACED, | 
|  | 48     SUBSCRIPTION_FILTERS_REPLACED, | 
| 47     SUBSCRIPTION_HOMEPAGE, | 49     SUBSCRIPTION_HOMEPAGE, | 
| 48     SUBSCRIPTION_LASTCHECK, | 50     SUBSCRIPTION_LASTCHECK, | 
| 49     SUBSCRIPTION_LASTDOWNLOAD, | 51     SUBSCRIPTION_LASTDOWNLOAD, | 
| 50     SUBSCRIPTION_DOWNLOADSTATUS, | 52     SUBSCRIPTION_DOWNLOADSTATUS, | 
| 51     SUBSCRIPTION_ERRORS, | 53     SUBSCRIPTION_ERRORS, | 
| 52   }; | 54   }; | 
| 53 | 55 | 
| 54   template<typename T> | 56   template<typename T> | 
| 55   inline T lexical_cast(Topic); | 57   inline T lexical_cast(Topic); | 
| 56 | 58 | 
| (...skipping 18 matching lines...) Expand all  Loading... | 
| 75       printfTopic("  [%i, 'filter.removed'],\n", Topic::FILTER_REMOVED); | 77       printfTopic("  [%i, 'filter.removed'],\n", Topic::FILTER_REMOVED); | 
| 76       printfTopic("  [%i, 'filter.disabled'],\n", Topic::FILTER_DISABLED); | 78       printfTopic("  [%i, 'filter.disabled'],\n", Topic::FILTER_DISABLED); | 
| 77       printfTopic("  [%i, 'filter.hitCount'],\n", Topic::FILTER_HITCOUNT); | 79       printfTopic("  [%i, 'filter.hitCount'],\n", Topic::FILTER_HITCOUNT); | 
| 78       printfTopic("  [%i, 'filter.lastHit'],\n", Topic::FILTER_LASTHIT); | 80       printfTopic("  [%i, 'filter.lastHit'],\n", Topic::FILTER_LASTHIT); | 
| 79       printfTopic("  [%i, 'subscription.added'],\n", Topic::SUBSCRIPTION_ADDED); | 81       printfTopic("  [%i, 'subscription.added'],\n", Topic::SUBSCRIPTION_ADDED); | 
| 80       printfTopic("  [%i, 'subscription.removed'],\n", Topic::SUBSCRIPTION_REMOV
     ED); | 82       printfTopic("  [%i, 'subscription.removed'],\n", Topic::SUBSCRIPTION_REMOV
     ED); | 
| 81       printfTopic("  [%i, 'subscription.moved'],\n", Topic::SUBSCRIPTION_MOVED); | 83       printfTopic("  [%i, 'subscription.moved'],\n", Topic::SUBSCRIPTION_MOVED); | 
| 82       printfTopic("  [%i, 'subscription.title'],\n", Topic::SUBSCRIPTION_TITLE); | 84       printfTopic("  [%i, 'subscription.title'],\n", Topic::SUBSCRIPTION_TITLE); | 
| 83       printfTopic("  [%i, 'subscription.disabled'],\n", Topic::SUBSCRIPTION_DISA
     BLED); | 85       printfTopic("  [%i, 'subscription.disabled'],\n", Topic::SUBSCRIPTION_DISA
     BLED); | 
| 84       printfTopic("  [%i, 'subscription.fixedTitle'],\n", Topic::SUBSCRIPTION_FI
     XEDTITLE); | 86       printfTopic("  [%i, 'subscription.fixedTitle'],\n", Topic::SUBSCRIPTION_FI
     XEDTITLE); | 
|  | 87       printfTopic("  [%i, 'subscription.beforefiltersreplaced'],\n", Topic::SUBS
     CRIPTION_BEFORE_FILTERS_REPLACED); | 
|  | 88       printfTopic("  [%i, 'subscription.filtersreplaced'],\n", Topic::SUBSCRIPTI
     ON_FILTERS_REPLACED); | 
| 85       printfTopic("  [%i, 'subscription.homepage'],\n", Topic::SUBSCRIPTION_HOME
     PAGE); | 89       printfTopic("  [%i, 'subscription.homepage'],\n", Topic::SUBSCRIPTION_HOME
     PAGE); | 
| 86       printfTopic("  [%i, 'subscription.lastCheck'],\n", Topic::SUBSCRIPTION_LAS
     TCHECK); | 90       printfTopic("  [%i, 'subscription.lastCheck'],\n", Topic::SUBSCRIPTION_LAS
     TCHECK); | 
| 87       printfTopic("  [%i, 'subscription.lastDownload'],\n", Topic::SUBSCRIPTION_
     LASTDOWNLOAD); | 91       printfTopic("  [%i, 'subscription.lastDownload'],\n", Topic::SUBSCRIPTION_
     LASTDOWNLOAD); | 
| 88       printfTopic("  [%i, 'subscription.downloadStatus'],\n", Topic::SUBSCRIPTIO
     N_DOWNLOADSTATUS); | 92       printfTopic("  [%i, 'subscription.downloadStatus'],\n", Topic::SUBSCRIPTIO
     N_DOWNLOADSTATUS); | 
| 89       printfTopic("  [%i, 'subscription.errors'],\n", Topic::SUBSCRIPTION_ERRORS
     ); | 93       printfTopic("  [%i, 'subscription.errors'],\n", Topic::SUBSCRIPTION_ERRORS
     ); | 
| 90       printf("]);"); | 94       printf("]);"); | 
| 91     } | 95     } | 
| 92   } | 96   } | 
| 93 | 97 | 
| 94   inline void FilterChange(Topic topic, Filter& filter, | 98   inline void FilterChange(Topic topic, Filter& filter, | 
| 95       Subscription* subscription = nullptr, unsigned int position = 0) | 99       Subscription* subscription = nullptr, unsigned int position = 0) | 
| 96   { | 100   { | 
| 97     JSNotifyFilterChange(topic, filter, subscription, position); | 101     JSNotifyFilterChange(topic, filter, subscription, position); | 
| 98   } | 102   } | 
| 99 | 103 | 
| 100   inline void SubscriptionChange(Topic topic, Subscription& subscription) | 104   inline void SubscriptionChange(Topic topic, Subscription& subscription) | 
| 101   { | 105   { | 
| 102     JSNotifySubscriptionChange(topic, subscription); | 106     JSNotifySubscriptionChange(topic, subscription); | 
| 103   } | 107   } | 
| 104 } | 108 } | 
| 105 | 109 | 
| 106 ABP_NS_END | 110 ABP_NS_END | 
| OLD | NEW | 
|---|