Fixed utf8 issue with avatar cache and server logging.

src/gui/qt/qttools/nonqthelper/nonqthelper.cpp

@@ -37,6 +37,12 @@ NonQtHelper::stringToUtf8(const std::string &myString)
 	return ConvHelper::NativeToUtf8(myString);
 }
 
+std::string
+NonQtHelper::stringFromUtf8(const std::string &myString)
+{
+	return ConvHelper::Utf8ToNative(myString);
+}
+
 std::string
 NonQtHelper::getDefaultLanguage()
 {

src/gui/qt/qttools/nonqthelper/nonqthelper.h

@@ -35,6 +35,7 @@ public:
 	~NonQtHelper();
 
 	std::string stringToUtf8(const std::string &);
+	std::string stringFromUtf8(const std::string &);
 	std::string getDefaultLanguage();
 
 	std::string getDataPathStdString(const char *argv0);

src/gui/qt/qttools/nonqttoolswrapper.cpp

@@ -45,6 +45,7 @@ NonQtToolsWrapper::~NonQtToolsWrapper()
 }
 
 std::string NonQtToolsWrapper::stringToUtf8(const std::string &myString) { return myQtHelper->stringToUtf8(myString); }
+std::string NonQtToolsWrapper::stringFromUtf8(const std::string &myString) { return myQtHelper->stringFromUtf8(myString); }
 std::string NonQtToolsWrapper::getDefaultLanguage() { return myQtHelper->getDefaultLanguage(); }
 std::string NonQtToolsWrapper::getDataPathStdString(const char * argv0) { return myQtHelper->getDataPathStdString(argv0); }
 

src/gui/qt/qttools/nonqttoolswrapper.h

@@ -33,6 +33,7 @@ public:
 	~NonQtToolsWrapper();
 
 	std::string stringToUtf8(const std::string &myString);
+	std::string stringFromUtf8(const std::string &myString);
 	std::string getDefaultLanguage();
 	std::string getDataPathStdString(const char *argv0);
 

src/gui/qt/qttools/qthelper/qthelper.cpp

@@ -31,6 +31,12 @@ std::string QtHelper::stringToUtf8(const std::string &myString) {
 	return myUtf8String;
 }
 
+std::string QtHelper::stringFromUtf8(const std::string &myString) {
+	QString tmpString = QString::fromUtf8(myString.c_str());
+	
+	return tmpString.toStdString();
+}
+
 std::string QtHelper::getDefaultLanguage() { return QLocale::system().name().toStdString(); }
 
 std::string QtHelper::getDataPathStdString(const char * /*argv0*/)

src/gui/qt/qttools/qthelper/qthelper.h

@@ -29,6 +29,7 @@ public:
 	~QtHelper();
 
 	std::string stringToUtf8(const std::string &);
+	std::string stringFromUtf8(const std::string &);
 	std::string getDefaultLanguage();
 
 	std::string getDataPathStdString(const char *argv0);

src/gui/qt/qttools/qttoolswrapper.cpp

@@ -45,6 +45,7 @@ QtToolsWrapper::~QtToolsWrapper()
 }
 
 std::string QtToolsWrapper::stringToUtf8(const std::string &myString) { return myQtHelper->stringToUtf8(myString); }
+std::string QtToolsWrapper::stringFromUtf8(const std::string &myString) { return myQtHelper->stringFromUtf8(myString); }
 std::string QtToolsWrapper::getDefaultLanguage() { return myQtHelper->getDefaultLanguage(); }
 std::string QtToolsWrapper::getDataPathStdString(const char * argv0) { return myQtHelper->getDataPathStdString(argv0); }
 

src/gui/qt/qttools/qttoolswrapper.h

@@ -34,6 +34,7 @@ public:
     ~QtToolsWrapper();
 
 	std::string stringToUtf8(const std::string &myString);
+	std::string stringFromUtf8(const std::string &myString);
 	std::string getDefaultLanguage();
 	std::string getDataPathStdString(const char *argv0);
 

src/gui/qttoolsinterface.h

@@ -28,10 +28,13 @@ public:
 
 	//qthelper.cpp
 	virtual std::string stringToUtf8(const std::string &) =0;
+	virtual std::string stringFromUtf8(const std::string &) =0;
 	virtual std::string getDefaultLanguage() =0;
 	virtual std::string getDataPathStdString(const char *argv0) =0;
 	
 
 };
 
+QtToolsInterface *CreateQtToolsWrapper();
+
 #endif