From 4dee4eeefb626315852063cb8e7b927287a73677 Mon Sep 17 00:00:00 2001 From: Manjeet Dahiya Date: Fri, 10 Sep 2010 06:29:22 +0000 Subject: chatDialog display fix --- examples/GuiClient/chatDialog.cpp | 2 +- examples/GuiClient/mainDialog.cpp | 2 +- examples/GuiClient/rosterItemModel.cpp | 5 ----- 3 files changed, 2 insertions(+), 7 deletions(-) (limited to 'examples/GuiClient') diff --git a/examples/GuiClient/chatDialog.cpp b/examples/GuiClient/chatDialog.cpp index 91c15334..84aca502 100644 --- a/examples/GuiClient/chatDialog.cpp +++ b/examples/GuiClient/chatDialog.cpp @@ -75,7 +75,7 @@ void chatDialog::setBareJid(const QString& str) void chatDialog::setDisplayName(const QString& str) { m_displayName = str; - setWindowTitle(QString("Chat with %1").arg(m_displayName)); + setWindowTitle(QString("Chat with %1").arg(m_bareJid)); QFont font; font.setBold(true); diff --git a/examples/GuiClient/mainDialog.cpp b/examples/GuiClient/mainDialog.cpp index a24440d7..20f0f8c5 100644 --- a/examples/GuiClient/mainDialog.cpp +++ b/examples/GuiClient/mainDialog.cpp @@ -253,7 +253,7 @@ chatDialog* mainDialog::getChatDialog(const QString& bareJid) m_chatDlgsList[bareJid]->setDisplayName(m_rosterItemModel. getRosterItemFromBareJid(bareJid)->getName()); else - m_chatDlgsList[bareJid]->setDisplayName(bareJid.split(QChar('@')).at(0)); + m_chatDlgsList[bareJid]->setDisplayName(jidToUser(bareJid)); m_chatDlgsList[bareJid]->setQXmppClient(&m_xmppClient); } diff --git a/examples/GuiClient/rosterItemModel.cpp b/examples/GuiClient/rosterItemModel.cpp index 18d4f655..0049278c 100644 --- a/examples/GuiClient/rosterItemModel.cpp +++ b/examples/GuiClient/rosterItemModel.cpp @@ -80,11 +80,6 @@ void rosterItemModel::updateRosterEntry(const QString& bareJid, const QXmppRoste addRosterItemIfDontExist(bareJid); QString name = rosterEntry.name(); - if(name.isEmpty()) - { - name = bareJid; - } - if(getRosterItemFromBareJid(bareJid)) getRosterItemFromBareJid(bareJid)->setName(name); } -- cgit v1.2.3