comparison Core/Toolbox.h @ 953:f894be6e7cc1 query-retrieve

merge mainline -> query-retrieve
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 25 Jun 2014 15:34:40 +0200
parents 766a57997121
children 98d6ba37c7dc 743a75b14bef 886652370ff2
comparison
equal deleted inserted replaced
947:c2c28dd17e87 953:f894be6e7cc1
104 std::string GetPathToExecutable(); 104 std::string GetPathToExecutable();
105 105
106 std::string GetDirectoryOfExecutable(); 106 std::string GetDirectoryOfExecutable();
107 107
108 std::string ConvertToUtf8(const std::string& source, 108 std::string ConvertToUtf8(const std::string& source,
109 const char* fromEncoding); 109 const Encoding sourceEncoding);
110 110
111 std::string ConvertToAscii(const std::string& source); 111 std::string ConvertToAscii(const std::string& source);
112 112
113 std::string StripSpaces(const std::string& source); 113 std::string StripSpaces(const std::string& source);
114 114