From f8b3b1d7944e7bb5a5dfb7ec349e064faec02329 Mon Sep 17 00:00:00 2001 From: Jeremy Lainé Date: Thu, 13 Sep 2012 10:08:07 +0200 Subject: simplify roster --- examples/GuiClient/rosterItemModel.cpp | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) (limited to 'examples/GuiClient/rosterItemModel.cpp') diff --git a/examples/GuiClient/rosterItemModel.cpp b/examples/GuiClient/rosterItemModel.cpp index eed42804..f7b6c85a 100644 --- a/examples/GuiClient/rosterItemModel.cpp +++ b/examples/GuiClient/rosterItemModel.cpp @@ -47,32 +47,14 @@ void rosterItemModel::addRosterItemIfDontExist(const QString& bareJid) rosterItem* item = new rosterItem(bareJid); m_jidRosterItemMap[bareJid] = item; appendRow(item); - item->setStatusText("Offline"); - item->setBareJid(bareJid); } } void rosterItemModel::updatePresence(const QString& bareJid, const QMap& presences) { addRosterItemIfDontExist(bareJid); - - if(presences.count() > 0) - { - QString statusText = presences.begin().value().statusText(); - QXmppPresence::AvailableStatusType statusType = presences.begin().value().availableStatusType(); - QXmppPresence::Type presenceType = presences.begin().value().type(); - - if(statusText.isEmpty()) - { - if(presenceType == QXmppPresence::Available) - statusText = "Available"; - else if(presenceType == QXmppPresence::Unavailable) - statusText = "Offline"; - } - getRosterItemFromBareJid(bareJid)->setStatusText(statusText); - getRosterItemFromBareJid(bareJid)->setStatusType(statusType); - getRosterItemFromBareJid(bareJid)->setPresenceType(presenceType); - } + if (!presences.isEmpty()) + getRosterItemFromBareJid(bareJid)->setPresence(*presences.begin()); } void rosterItemModel::updateRosterEntry(const QString& bareJid, const QXmppRosterIq::Item& rosterEntry) -- cgit v1.2.3