1
0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00

Merge branch 'pr1874'

This commit is contained in:
tux3 2015-06-24 21:24:51 +02:00
commit c9bfba89c8
No known key found for this signature in database
GPG Key ID: 7E086DD661263264

View File

@ -837,7 +837,7 @@ void Widget::removeFriend(Friend* f, bool fake)
{ {
QMessageBox::StandardButton removeFriendMB; QMessageBox::StandardButton removeFriendMB;
removeFriendMB = QMessageBox::question(0, removeFriendMB = QMessageBox::question(0,
tr("Remove history"), tr("Removal of friend ")+"\""+ f->getDisplayedName()+"\"",
tr("Do you want to remove history as well?"), tr("Do you want to remove history as well?"),
QMessageBox::Yes | QMessageBox::No | QMessageBox::Cancel); QMessageBox::Yes | QMessageBox::No | QMessageBox::Cancel);
if (removeFriendMB == QMessageBox::Cancel) if (removeFriendMB == QMessageBox::Cancel)