| 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-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 |
| 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 * |
| 14 * You should have received a copy of the GNU General Public License | 14 * You should have received a copy of the GNU General Public License |
| 15 * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. | 15 * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. |
| 16 */ | 16 */ |
| 17 | 17 |
| 18 #ifndef ADBLOCK_PLUS_UTILS_H | 18 #ifndef ADBLOCK_PLUS_UTILS_H |
| 19 #define ADBLOCK_PLUS_UTILS_H | 19 #define ADBLOCK_PLUS_UTILS_H |
| 20 | 20 |
| 21 #include <algorithm> | 21 #include <algorithm> |
| 22 #include <cctype> | 22 #include <cctype> |
| 23 #include <functional> | 23 #include <functional> |
| 24 #include <istream> | |
| 25 #include <string> | 24 #include <string> |
| 26 #include <v8.h> | 25 #include <v8.h> |
| 27 | 26 |
| 28 namespace AdblockPlus | 27 namespace AdblockPlus |
| 29 { | 28 { |
| 30 namespace Utils | 29 namespace Utils |
| 31 { | 30 { |
| 32 std::string Slurp(std::istream& stream); | |
| 33 std::string FromV8String(const v8::Handle<v8::Value>& value); | 31 std::string FromV8String(const v8::Handle<v8::Value>& value); |
| 34 v8::Local<v8::String> ToV8String(v8::Isolate* isolate, const std::string& st
r); | 32 v8::Local<v8::String> ToV8String(v8::Isolate* isolate, const std::string& st
r); |
| 35 void ThrowExceptionInJS(v8::Isolate* isolate, const std::string& str); | 33 void ThrowExceptionInJS(v8::Isolate* isolate, const std::string& str); |
| 36 | 34 |
| 37 // Code for templated function has to be in a header file, can't be in .cpp | 35 // Code for templated function has to be in a header file, can't be in .cpp |
| 38 template<class T> | 36 template<class T> |
| 39 T TrimString(const T& text) | 37 T TrimString(const T& text) |
| 40 { | 38 { |
| 41 // Via http://stackoverflow.com/questions/216823/whats-the-best-way-to-tri
m-stdstring | 39 // Via http://stackoverflow.com/questions/216823/whats-the-best-way-to-tri
m-stdstring |
| 42 T trimmed(text); | 40 T trimmed(text); |
| 43 trimmed.erase(trimmed.begin(), std::find_if(trimmed.begin(), trimmed.end()
, std::not1(std::ptr_fun<int, int>(std::isspace)))); | 41 trimmed.erase(trimmed.begin(), std::find_if(trimmed.begin(), trimmed.end()
, std::not1(std::ptr_fun<int, int>(std::isspace)))); |
| 44 trimmed.erase(std::find_if(trimmed.rbegin(), trimmed.rend(), std::not1(std
::ptr_fun<int, int>(std::isspace))).base(), trimmed.end()); | 42 trimmed.erase(std::find_if(trimmed.rbegin(), trimmed.rend(), std::not1(std
::ptr_fun<int, int>(std::isspace))).base(), trimmed.end()); |
| 45 return trimmed; | 43 return trimmed; |
| 46 } | 44 } |
| 47 #ifdef _WIN32 | 45 #ifdef _WIN32 |
| 48 std::wstring ToUtf16String(const std::string& str); | 46 std::wstring ToUtf16String(const std::string& str); |
| 49 std::string ToUtf8String(const std::wstring& str); | 47 std::string ToUtf8String(const std::wstring& str); |
| 50 std::wstring CanonizeUrl(const std::wstring& url); | 48 std::wstring CanonizeUrl(const std::wstring& url); |
| 51 #endif | 49 #endif |
| 52 } | 50 } |
| 53 } | 51 } |
| 54 | 52 |
| 55 #endif | 53 #endif |
| OLD | NEW |