diff options
| author | Jeremy Lainé <jeremy.laine@m4x.org> | 2010-04-15 08:55:39 +0000 |
|---|---|---|
| committer | Jeremy Lainé <jeremy.laine@m4x.org> | 2010-04-15 08:55:39 +0000 |
| commit | 96120ef65d74764fcd16f83e7ac89a410beab06f (patch) | |
| tree | 6d0ca95b5fe574e03453249e9805b0569d660ee9 /source | |
| parent | 6596b6d0f23e85c0dbd3c593ccbcb1b90b5855cc (diff) | |
| download | qxmpp-96120ef65d74764fcd16f83e7ac89a410beab06f.tar.gz | |
simplify QXmppRoster, now that QXmppRosterEntry == QXmppRosterIq::Item
Diffstat (limited to 'source')
| -rw-r--r-- | source/QXmppRoster.cpp | 21 | ||||
| -rw-r--r-- | source/QXmppRoster.h | 7 |
2 files changed, 7 insertions, 21 deletions
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<QXmppRosterEntry::SubscriptionType>( - 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<QXmppRosterEntry::SubscriptionType>( - 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 { diff --git a/source/QXmppRoster.h b/source/QXmppRoster.h index e4342fbd..0c608432 100644 --- a/source/QXmppRoster.h +++ b/source/QXmppRoster.h @@ -1,8 +1,9 @@ /* * Copyright (C) 2008-2010 Manjeet Dahiya * - * Author: + * Authors: * Manjeet Dahiya + * Jeremy Lainé * * Source: * http://code.google.com/p/qxmpp @@ -64,9 +65,7 @@ class QXmppRoster : public QObject public: // FIXME : is this class really necessary? - class QXmppRosterEntry : public QXmppRosterIq::Item - { - }; + typedef QXmppRosterIq::Item QXmppRosterEntry; QXmppRoster(QXmppStream* stream); ~QXmppRoster(); |