| 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-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 37 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 48 #define SECURITY_BUILTIN_PACKAGE_ANY_PACKAGE        (0x00000001L) | 48 #define SECURITY_BUILTIN_PACKAGE_ANY_PACKAGE        (0x00000001L) | 
| 49 | 49 | 
| 50 | 50 | 
| 51 bool IsWindowsVistaOrLater(); | 51 bool IsWindowsVistaOrLater(); | 
| 52 bool IsWindows8OrLater(); | 52 bool IsWindows8OrLater(); | 
| 53 | 53 | 
| 54 std::string ToUtf8String(const std::wstring& str); | 54 std::string ToUtf8String(const std::wstring& str); | 
| 55 std::wstring ToUtf16String(const std::string& str); | 55 std::wstring ToUtf16String(const std::string& str); | 
| 56 std::vector<std::wstring> ToUtf16Strings(const std::vector<std::string>& value); | 56 std::vector<std::wstring> ToUtf16Strings(const std::vector<std::string>& value); | 
| 57 std::wstring GetDllDir(); | 57 std::wstring GetDllDir(); | 
|  | 58 std::wstring GetExeDir(); | 
| 58 std::wstring GetAppDataPath(); | 59 std::wstring GetAppDataPath(); | 
| 59 void ReplaceString(std::wstring& input, const std::wstring placeholder, const st
    d::wstring replacement); | 60 void ReplaceString(std::wstring& input, const std::wstring& placeholder, const s
    td::wstring& replacement); | 
| 60 | 61 | 
| 61 /** | 62 /** | 
| 62  * Returns the beginning of the URL which includes the scheme and hierarchical | 63  * Returns the beginning of the URL which includes the scheme and hierarchical | 
| 63  * part according to http://en.wikipedia.org/wiki/URI_scheme. | 64  * part according to http://en.wikipedia.org/wiki/URI_scheme. | 
| 64  */ | 65  */ | 
| 65 std::wstring GetSchemeAndHierarchicalPart(const std::wstring& url); | 66 std::wstring GetSchemeAndHierarchicalPart(const std::wstring& url); | 
| 66 | 67 | 
| 67 std::wstring GetQueryString(const std::wstring& url); | 68 std::wstring GetQueryString(const std::wstring& url); | 
| 68 | 69 | 
| 69 template<class T> | 70 template<class T> | 
| 70 T TrimString(T text) | 71 T TrimString(T text) | 
| 71 { | 72 { | 
| 72   // Via http://stackoverflow.com/questions/216823/whats-the-best-way-to-trim-st
    dstring | 73   // Via http://stackoverflow.com/questions/216823/whats-the-best-way-to-trim-st
    dstring | 
| 73   T trimmed(text); | 74   T trimmed(text); | 
| 74   std::function<bool(T::value_type)> isspace = std::bind(&std::isspace<T::value_
    type>, std::placeholders::_1, std::locale::classic()); | 75   std::function<bool(T::value_type)> isspace = std::bind(&std::isspace<T::value_
    type>, std::placeholders::_1, std::locale::classic()); | 
| 75   trimmed.erase(trimmed.begin(), std::find_if(trimmed.begin(), trimmed.end(), st
    d::not1(isspace))); | 76   trimmed.erase(trimmed.begin(), std::find_if(trimmed.begin(), trimmed.end(), st
    d::not1(isspace))); | 
| 76   trimmed.erase(std::find_if(trimmed.rbegin(), trimmed.rend(), std::not1(isspace
    )).base(), trimmed.end()); | 77   trimmed.erase(std::find_if(trimmed.rbegin(), trimmed.rend(), std::not1(isspace
    )).base(), trimmed.end()); | 
| 77   return trimmed; | 78   return trimmed; | 
| 78 } | 79 } | 
| 79 | 80 | 
| 80 #endif // UTILS_H | 81 #endif // UTILS_H | 
| OLD | NEW | 
|---|