From 96120ef65d74764fcd16f83e7ac89a410beab06f Mon Sep 17 00:00:00 2001 From: Jeremy Lainé Date: Thu, 15 Apr 2010 08:55:39 +0000 Subject: simplify QXmppRoster, now that QXmppRosterEntry == QXmppRosterIq::Item --- source/QXmppRoster.cpp | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) (limited to 'source/QXmppRoster.cpp') diff --git a/source/QXmppRoster.cpp b/source/QXmppRoster.cpp index 3020a282..d7346f22 100644 --- a/source/QXmppRoster.cpp +++ b/source/QXmppRoster.cpp @@ -1,8 +1,9 @@ /* * Copyright (C) 2008-2010 Manjeet Dahiya * - * Author: + * Authors: * Manjeet Dahiya + * Jeremy Lainé * * Source: * http://code.google.com/p/qxmpp @@ -72,14 +73,7 @@ void QXmppRoster::rosterIqReceived(const QXmppRosterIq& rosterIq) for(int i = 0; i < items.count(); ++i) { QString bareJid = items.at(i).bareJid(); - m_entries[bareJid].setBareJid(bareJid); - m_entries[bareJid].setName(items.at(i).name()); - m_entries[bareJid].setSubscriptionType( - static_cast( - items.at(i).subscriptionType())); - m_entries[bareJid].setSubscriptionStatus( - items.at(i).subscriptionStatus()); - m_entries[bareJid].setGroups(items.at(i).groups()); + m_entries[bareJid] = items.at(i); emit rosterChanged(bareJid); } if(rosterIq.type() == QXmppIq::Set) // send result iq @@ -106,14 +100,7 @@ void QXmppRoster::rosterRequestIqReceived(const QXmppRosterIq& rosterIq) for(int i = 0; i < items.count(); ++i) { QString bareJid = items.at(i).bareJid(); - m_entries[bareJid].setBareJid(bareJid); - m_entries[bareJid].setName(items.at(i).name()); - m_entries[bareJid].setSubscriptionType( - static_cast( - items.at(i).subscriptionType())); - m_entries[bareJid].setSubscriptionStatus( - items.at(i).subscriptionStatus()); - m_entries[bareJid].setGroups(items.at(i).groups()); + m_entries[bareJid] = items.at(i); } if(rosterIq.type() == QXmppIq::Set) // send result iq { -- cgit v1.2.3