| OLD | NEW |
| 1 /* | 1 /* |
| 2 * This file is part of Adblock Plus <http://adblockplus.org/>, | 2 * This file is part of Adblock Plus <http://adblockplus.org/>, |
| 3 * Copyright (C) 2006-2014 Eyeo GmbH | 3 * Copyright (C) 2006-2014 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 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 71 void RemoveFromList(); | 71 void RemoveFromList(); |
| 72 | 72 |
| 73 bool operator==(const Filter& filter) const; | 73 bool operator==(const Filter& filter) const; |
| 74 | 74 |
| 75 /** | 75 /** |
| 76 * Creates a wrapper for an existing JavaScript filter object. | 76 * Creates a wrapper for an existing JavaScript filter object. |
| 77 * Normally you shouldn't call this directly, but use | 77 * Normally you shouldn't call this directly, but use |
| 78 * FilterEngine::GetFilter() instead. | 78 * FilterEngine::GetFilter() instead. |
| 79 * @param value JavaScript filter object. | 79 * @param value JavaScript filter object. |
| 80 */ | 80 */ |
| 81 Filter(JsValuePtr value); | 81 Filter(JsValue&& value); |
| 82 }; | 82 }; |
| 83 | 83 |
| 84 /** | 84 /** |
| 85 * Wrapper for a subscription object. | 85 * Wrapper for a subscription object. |
| 86 * There are no accessors for most | 86 * There are no accessors for most |
| 87 * [subscription properties](https://adblockplus.org/jsdoc/adblockplus/symbols
/Subscription.html), | 87 * [subscription properties](https://adblockplus.org/jsdoc/adblockplus/symbols
/Subscription.html), |
| 88 * use `GetProperty()` to retrieve them by name. | 88 * use `GetProperty()` to retrieve them by name. |
| 89 */ | 89 */ |
| 90 class Subscription : public JsValue, | 90 class Subscription : public JsValue, |
| 91 public std::tr1::enable_shared_from_this<Subscription> | 91 public std::tr1::enable_shared_from_this<Subscription> |
| (...skipping 28 matching lines...) Expand all Loading... |
| 120 bool IsUpdating(); | 120 bool IsUpdating(); |
| 121 | 121 |
| 122 bool operator==(const Subscription& subscription) const; | 122 bool operator==(const Subscription& subscription) const; |
| 123 | 123 |
| 124 /** | 124 /** |
| 125 * Creates a wrapper for an existing JavaScript subscription object. | 125 * Creates a wrapper for an existing JavaScript subscription object. |
| 126 * Normally you shouldn't call this directly, but use | 126 * Normally you shouldn't call this directly, but use |
| 127 * FilterEngine::GetSubscription() instead. | 127 * FilterEngine::GetSubscription() instead. |
| 128 * @param value JavaScript subscription object. | 128 * @param value JavaScript subscription object. |
| 129 */ | 129 */ |
| 130 Subscription(JsValuePtr value); | 130 Subscription(JsValue&& value); |
| 131 }; | 131 }; |
| 132 | 132 |
| 133 /** | 133 /** |
| 134 * Shared smart pointer to a `Filter` instance. | 134 * Shared smart pointer to a `Filter` instance. |
| 135 */ | 135 */ |
| 136 typedef std::tr1::shared_ptr<Filter> FilterPtr; | 136 typedef std::tr1::shared_ptr<Filter> FilterPtr; |
| 137 | 137 |
| 138 /** | 138 /** |
| 139 * Shared smart pointer to a `Subscription` instance. | 139 * Shared smart pointer to a `Subscription` instance. |
| 140 */ | 140 */ |
| (...skipping 233 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 374 ContentType contentType, | 374 ContentType contentType, |
| 375 const std::string& documentUrl) const; | 375 const std::string& documentUrl) const; |
| 376 void UpdateAvailable(UpdateAvailableCallback callback, JsValueList& params); | 376 void UpdateAvailable(UpdateAvailableCallback callback, JsValueList& params); |
| 377 void UpdateCheckDone(const std::string& eventName, | 377 void UpdateCheckDone(const std::string& eventName, |
| 378 UpdateCheckDoneCallback callback, JsValueList& params); | 378 UpdateCheckDoneCallback callback, JsValueList& params); |
| 379 void FilterChanged(FilterChangeCallback callback, JsValueList& params); | 379 void FilterChanged(FilterChangeCallback callback, JsValueList& params); |
| 380 }; | 380 }; |
| 381 } | 381 } |
| 382 | 382 |
| 383 #endif | 383 #endif |
| OLD | NEW |