Delta Between Two Patch Sets: src/shared/Utils.h
Issue 29331055:
Issue #1234 - Remove 'CString' from PluginFilter.* (Closed)
Left Patch Set:
Created Nov. 29, 2015, 3:49 p.m.
Right Patch Set: fix whitespace nit
Created May 17, 2016, 6:40 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with change/comment
|
« src/plugin/PluginFilter.cpp ('k')
|
test/UtilTest.cpp » ('j')
|
no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| 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-2016 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 |
| 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| 12 * GNU General Public License for more details. | 12 * GNU General Public License for more details. |
| 13 * | 13 * |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 63 | 63 |
| 64 /** | 64 /** |
| 65 * Returns the beginning of the URL which includes the scheme and hierarchical | 65 * Returns the beginning of the URL which includes the scheme and hierarchical |
| 66 * part according to http://en.wikipedia.org/wiki/URI_scheme. | 66 * part according to http://en.wikipedia.org/wiki/URI_scheme. |
| 67 */ | 67 */ |
| 68 std::wstring GetSchemeAndHierarchicalPart(const std::wstring& url); | 68 std::wstring GetSchemeAndHierarchicalPart(const std::wstring& url); |
| 69 | 69 |
| 70 std::wstring GetQueryString(const std::wstring& url); | 70 std::wstring GetQueryString(const std::wstring& url); |
| 71 | 71 |
| 72 /* | 72 /* |
| 73 * Th method used below for trimming strings is taken from here: | 73 * The method used below for trimming strings is taken from here: |
| 74 * http://stackoverflow.com/questions/216823/whats-the-best-way-to-trim-stdstr ing | 74 * http://stackoverflow.com/questions/216823/whats-the-best-way-to-trim-stdstr ing |
| 75 */ | 75 */ |
| 76 template<class C> | 76 template<class C> |
| 77 bool isNotWhitespace(C x) | 77 bool isNotWhitespace(C x) |
| 78 { | 78 { |
| 79 return !std::isspace(x, std::locale::classic()); | 79 return !std::isspace(x, std::locale::classic()); |
| 80 }; | 80 }; |
| 81 | 81 |
| 82 template<class T> | 82 template<class T> |
| 83 void TrimStringInPlaceLeft(T& text) | 83 void TrimStringInPlaceLeft(T& text) |
| (...skipping 30 matching lines...) Expand all Loading... | |
| 114 | 114 |
| 115 template<class T> | 115 template<class T> |
| 116 T TrimString(T text) | 116 T TrimString(T text) |
| 117 { | 117 { |
| 118 TrimStringInPlaceRight(text); | 118 TrimStringInPlaceRight(text); |
| 119 TrimStringInPlaceLeft(text); | 119 TrimStringInPlaceLeft(text); |
| 120 return text; | 120 return text; |
| 121 } | 121 } |
| 122 | 122 |
| 123 #endif // UTILS_H | 123 #endif // UTILS_H |
| LEFT | RIGHT |
« src/plugin/PluginFilter.cpp ('k')
|
test/UtilTest.cpp » ('j')
|
Toggle Intra-line Diffs ('i')
|
Expand Comments ('e')
|
Collapse Comments ('c')
|
Toggle Comments ('s')
