diff Core/Toolbox.h @ 955:743a75b14bef plugins

merge mainline -> plugins
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 25 Jun 2014 15:37:48 +0200
parents 0570a8c859cb 766a57997121
children 509e146c3cb3
line wrap: on
line diff
--- a/Core/Toolbox.h	Wed Jun 25 11:51:55 2014 +0200
+++ b/Core/Toolbox.h	Wed Jun 25 15:37:48 2014 +0200
@@ -106,7 +106,7 @@
     std::string GetDirectoryOfExecutable();
 
     std::string ConvertToUtf8(const std::string& source,
-                              const char* fromEncoding);
+                              const Encoding sourceEncoding);
 
     std::string ConvertToAscii(const std::string& source);