From 93fe5c0e92964cb72dae88849b3fa1e37eae15eb Mon Sep 17 00:00:00 2001 From: Jeremy Lainé Date: Thu, 13 Sep 2012 09:45:25 +0200 Subject: refactor vCard update --- examples/GuiClient/mainDialog.cpp | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) (limited to 'examples/GuiClient/mainDialog.cpp') diff --git a/examples/GuiClient/mainDialog.cpp b/examples/GuiClient/mainDialog.cpp index 3e45ed07..714a0331 100644 --- a/examples/GuiClient/mainDialog.cpp +++ b/examples/GuiClient/mainDialog.cpp @@ -518,23 +518,22 @@ void mainDialog::showLoginStatusWithCounter(const QString& msg, int time) void mainDialog::updateVCard(const QString& bareJid) { - if(bareJid != m_xmppClient.configuration().jidBare()) - { - m_rosterItemModel.updateAvatar(bareJid, - m_vCardCache.getAvatar(bareJid)); - m_rosterItemModel.updateName(bareJid, m_vCardCache.getVCard(bareJid).fullName()); - } - else - { - QXmppVCardIq& vCard = m_vCardCache.getVCard(m_xmppClient.configuration().jidBare()); - QString fullName = vCard.fullName(); + const QXmppVCardIq vCard = m_vCardCache.getVCard(bareJid); + const QImage avatar = m_vCardCache.getAvatar(bareJid); - if(fullName.isEmpty()) - fullName = m_xmppClient.configuration().jidBare(); + // determine full name + QString fullName = vCard.fullName(); + if (fullName.isEmpty()) + fullName = bareJid; + if (bareJid == m_xmppClient.configuration().jidBare()) { + // update our own information + m_statusWidget.setAvatar(avatar); m_statusWidget.setDisplayName(fullName); - - m_statusWidget.setAvatar(m_vCardCache.getAvatar(bareJid)); + } else { + // update roster information + m_rosterItemModel.updateAvatar(bareJid, avatar); + m_rosterItemModel.updateName(bareJid, fullName); } } -- cgit v1.2.3