From 7382f7552b445f1d86f70e2b10c29837db14c870 Mon Sep 17 00:00:00 2001 From: csoler Date: Sun, 6 May 2012 11:48:02 +0000 Subject: [PATCH] utf8 patch for notifyqt from AsamK git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5147 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- retroshare-gui/src/gui/notifyqt.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/retroshare-gui/src/gui/notifyqt.cpp b/retroshare-gui/src/gui/notifyqt.cpp index bdede51c1..40c7f74da 100644 --- a/retroshare-gui/src/gui/notifyqt.cpp +++ b/retroshare-gui/src/gui/notifyqt.cpp @@ -109,7 +109,7 @@ NotifyQt::NotifyQt() : cDialog(NULL) void NotifyQt::notifyErrorMsg(int list, int type, std::string msg) { - emit errorOccurred(list,type,QString::fromStdString(msg)) ; + emit errorOccurred(list,type,QString::fromUtf8(msg.c_str())) ; } void NotifyQt::notifyOwnAvatarChanged() @@ -556,19 +556,19 @@ void NotifyQt::UpdateGUI() { case RS_SYS_ERROR: QMessageBox::critical(MainWindow::getInstance(), - QString::fromStdString(title), - QString::fromStdString(msg)); + QString::fromUtf8(title.c_str()), + QString::fromUtf8(msg.c_str())); break; case RS_SYS_WARNING: QMessageBox::warning(MainWindow::getInstance(), - QString::fromStdString(title), - QString::fromStdString(msg)); + QString::fromUtf8(title.c_str()), + QString::fromUtf8(msg.c_str())); break; default: case RS_SYS_INFO: QMessageBox::information(MainWindow::getInstance(), - QString::fromStdString(title), - QString::fromStdString(msg)); + QString::fromUtf8(title.c_str()), + QString::fromUtf8(msg.c_str())); break; } } @@ -581,8 +581,8 @@ void NotifyQt::UpdateGUI() { case RS_SYS_ERROR: case RS_SYS_WARNING: - case RS_SYS_INFO: emit logInfoChanged(QString(logMesString.c_str())); - default:; + case RS_SYS_INFO: + emit logInfoChanged(QString::fromUtf8(logMesString.c_str())); } } }