Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Side by Side Diff: include/AdblockPlus/FilterEngine.h

Issue 29419629: Issue 5164 - Remove NotificationPtr (Closed) Base URL: https://hg.adblockplus.org/libadblockplus/
Patch Set: Added move assignment operator. Created April 24, 2017, 7:08 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | include/AdblockPlus/Notification.h » ('j') | src/Notification.cpp » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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-2017 eyeo GmbH 3 * Copyright (C) 2006-2017 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 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 Subscription(Subscription&& src); 103 Subscription(Subscription&& src);
104 104
105 /** 105 /**
106 * Assignment operator 106 * Assignment operator
107 */ 107 */
108 Subscription& operator=(const Subscription& src); 108 Subscription& operator=(const Subscription& src);
109 109
110 /** 110 /**
111 * Move assignment operator 111 * Move assignment operator
112 */ 112 */
113 Subscription& operator=(Subscription&& src); 113 Subscription& operator=(Subscription&& src);
sergei 2017/04/24 19:28:15 This change seems unrelated to this codereview, th
hub 2017/04/24 20:17:04 I thought for a second I had mixed up code reviews
sergei 2017/04/25 07:37:15 Acknowledged.
114 114
115 /** 115 /**
116 * Checks if this subscription has been added to the list of subscriptions. 116 * Checks if this subscription has been added to the list of subscriptions.
117 * @return `true` if this subscription has been added. 117 * @return `true` if this subscription has been added.
118 */ 118 */
119 bool IsListed() const; 119 bool IsListed() const;
120 120
121 /** 121 /**
122 * Adds this subscription to the list of subscriptions. 122 * Adds this subscription to the list of subscriptions.
123 */ 123 */
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
227 227
228 /** 228 /**
229 * Container of name-value pairs representing a set of preferences. 229 * Container of name-value pairs representing a set of preferences.
230 */ 230 */
231 typedef std::map<std::string, AdblockPlus::JsValue> Prefs; 231 typedef std::map<std::string, AdblockPlus::JsValue> Prefs;
232 232
233 /** 233 /**
234 * Callback type invoked when a new notification should be shown. 234 * Callback type invoked when a new notification should be shown.
235 * The parameter is the Notification object to be shown. 235 * The parameter is the Notification object to be shown.
236 */ 236 */
237 typedef std::function<void(const NotificationPtr&)> ShowNotificationCallback ; 237 typedef std::function<void(Notification&)> ShowNotificationCallback;
238 238
239 /** 239 /**
240 * Callback function returning false when current connection is not 240 * Callback function returning false when current connection is not
241 * allowedConnectionType, e.g. because it is a metered connection. 241 * allowedConnectionType, e.g. because it is a metered connection.
242 */ 242 */
243 typedef std::function<bool(const std::string* allowedConnectionType)> IsConn ectionAllowedCallback; 243 typedef std::function<bool(const std::string* allowedConnectionType)> IsConn ectionAllowedCallback;
244 244
245 /** 245 /**
246 * FilterEngine creation parameters. 246 * FilterEngine creation parameters.
247 */ 247 */
(...skipping 311 matching lines...) Expand 10 before | Expand all | Expand 10 after
559 const JsValueList& param) const; 559 const JsValueList& param) const;
560 FilterPtr GetWhitelistingFilter(const std::string& url, 560 FilterPtr GetWhitelistingFilter(const std::string& url,
561 ContentTypeMask contentTypeMask, const std::string& documentUrl) const; 561 ContentTypeMask contentTypeMask, const std::string& documentUrl) const;
562 FilterPtr GetWhitelistingFilter(const std::string& url, 562 FilterPtr GetWhitelistingFilter(const std::string& url,
563 ContentTypeMask contentTypeMask, 563 ContentTypeMask contentTypeMask,
564 const std::vector<std::string>& documentUrls) const; 564 const std::vector<std::string>& documentUrls) const;
565 }; 565 };
566 } 566 }
567 567
568 #endif 568 #endif
OLDNEW
« no previous file with comments | « no previous file | include/AdblockPlus/Notification.h » ('j') | src/Notification.cpp » ('J')

Powered by Google App Engine
This is Rietveld