| Left: | ||
| Right: |
| LEFT | RIGHT |
|---|---|
| 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-2015 Eyeo GmbH | 3 * Copyright (C) 2006-2015 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 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 96 } | 96 } |
| 97 | 97 |
| 98 std::map<std::wstring, std::wstring> CPluginSettings::GetFilterLanguageTitleList () const | 98 std::map<std::wstring, std::wstring> CPluginSettings::GetFilterLanguageTitleList () const |
| 99 { | 99 { |
| 100 auto subscriptions = CPluginClient::GetInstance()->FetchAvailableSubscriptions (); | 100 auto subscriptions = CPluginClient::GetInstance()->FetchAvailableSubscriptions (); |
| 101 | 101 |
| 102 std::map<std::wstring, std::wstring> filterList; | 102 std::map<std::wstring, std::wstring> filterList; |
| 103 for (size_t i = 0; i < subscriptions.size(); i ++) | 103 for (size_t i = 0; i < subscriptions.size(); i ++) |
| 104 { | 104 { |
| 105 auto it = subscriptions[i]; | 105 auto it = subscriptions[i]; |
| 106 filterList.insert(std::make_pair(it.url,it.title)); | 106 filterList.insert(std::make_pair(it.url, it.title)); |
|
sergei
2015/11/25 09:27:08
the space after comma is missed
Eric
2015/11/25 17:31:02
Done.
| |
| 107 } | 107 } |
| 108 return filterList; | 108 return filterList; |
| 109 } | 109 } |
| 110 | 110 |
| 111 bool CPluginSettings::IsWorkingThread(DWORD dwThreadId) const | 111 bool CPluginSettings::IsWorkingThread(DWORD dwThreadId) const |
| 112 { | 112 { |
| 113 if (dwThreadId == 0) | 113 if (dwThreadId == 0) |
| 114 { | 114 { |
| 115 dwThreadId = ::GetCurrentThreadId(); | 115 dwThreadId = ::GetCurrentThreadId(); |
| 116 } | 116 } |
| (...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 253 | 253 |
| 254 for (auto subscription = subscriptions.begin(); subscription != subscriptions. end(); subscription++) | 254 for (auto subscription = subscriptions.begin(); subscription != subscriptions. end(); subscription++) |
| 255 { | 255 { |
| 256 if (subscription->url != aaUrl) | 256 if (subscription->url != aaUrl) |
| 257 { | 257 { |
| 258 return subscription->url; | 258 return subscription->url; |
| 259 } | 259 } |
| 260 } | 260 } |
| 261 return std::wstring(); | 261 return std::wstring(); |
| 262 } | 262 } |
| LEFT | RIGHT |