Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

utf8 patch for notifyqt from AsamK

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5147 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2012-05-06 11:48:02 +00:00
parent 78fd91ce4a
commit 7382f7552b
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
retroshare-gui/src/gui/notifyqt.cpp
View File

@ -109,7 +109,7 @@ NotifyQt::NotifyQt() : cDialog(NULL)
void NotifyQt::notifyErrorMsg(int list, int type, std::string msg) 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() void NotifyQt::notifyOwnAvatarChanged()
@ -556,19 +556,19 @@ void NotifyQt::UpdateGUI()
{ {
case RS_SYS_ERROR: case RS_SYS_ERROR:
QMessageBox::critical(MainWindow::getInstance(), QMessageBox::critical(MainWindow::getInstance(),
QString::fromStdString(title), QString::fromUtf8(title.c_str()),
QString::fromStdString(msg)); QString::fromUtf8(msg.c_str()));
break; break;
case RS_SYS_WARNING: case RS_SYS_WARNING:
QMessageBox::warning(MainWindow::getInstance(), QMessageBox::warning(MainWindow::getInstance(),
QString::fromStdString(title), QString::fromUtf8(title.c_str()),
QString::fromStdString(msg)); QString::fromUtf8(msg.c_str()));
break; break;
default: default:
case RS_SYS_INFO: case RS_SYS_INFO:
QMessageBox::information(MainWindow::getInstance(), QMessageBox::information(MainWindow::getInstance(),
QString::fromStdString(title), QString::fromUtf8(title.c_str()),
QString::fromStdString(msg)); QString::fromUtf8(msg.c_str()));
break; break;
} }
} }
@ -581,8 +581,8 @@ void NotifyQt::UpdateGUI()
{ {
case RS_SYS_ERROR: case RS_SYS_ERROR:
case RS_SYS_WARNING: case RS_SYS_WARNING:
case RS_SYS_INFO: emit logInfoChanged(QString(logMesString.c_str())); case RS_SYS_INFO:
default:; emit logInfoChanged(QString::fromUtf8(logMesString.c_str()));
} }
} }
} }