aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJeremy Lainé <jeremy.laine@m4x.org>2012-08-30 10:59:51 +0200
committerJeremy Lainé <jeremy.laine@m4x.org>2012-08-30 10:59:51 +0200
commite1f26e6a77f708b83547d42225e69734e451ebb9 (patch)
tree4c2223a358154378873f5558e027a80f327202f3 /src
parent50734ee3a33dd1277c7586ffdbed5d43a82875c1 (diff)
parent7218362c01c8897c49d9aca5bffb69cc7d18eea1 (diff)
downloadqxmpp-e1f26e6a77f708b83547d42225e69734e451ebb9.tar.gz
Merge branch 'master' of https://code.google.com/p/qxmpp
Diffstat (limited to 'src')
-rw-r--r--src/client/QXmppRosterManager.cpp5
-rw-r--r--src/client/QXmppRosterManager.h5
2 files changed, 0 insertions, 10 deletions
diff --git a/src/client/QXmppRosterManager.cpp b/src/client/QXmppRosterManager.cpp
index 9f437065..1318e85d 100644
--- a/src/client/QXmppRosterManager.cpp
+++ b/src/client/QXmppRosterManager.cpp
@@ -159,9 +159,6 @@ bool QXmppRosterManager::handleStanza(const QDomElement &element)
// notify the user that the item changed
emit itemChanged(bareJid);
}
-
- // FIXME: remove legacy signal
- emit rosterChanged(bareJid);
}
}
}
@@ -172,8 +169,6 @@ bool QXmppRosterManager::handleStanza(const QDomElement &element)
foreach (const QXmppRosterIq::Item &item, items) {
const QString bareJid = item.bareJid();
d->entries.insert(bareJid, item);
- if (!isInitial)
- emit rosterChanged(bareJid);
}
if (isInitial)
{
diff --git a/src/client/QXmppRosterManager.h b/src/client/QXmppRosterManager.h
index bfc5dbb8..27af6d82 100644
--- a/src/client/QXmppRosterManager.h
+++ b/src/client/QXmppRosterManager.h
@@ -102,11 +102,6 @@ signals:
/// This signal is emitted when the presence of a particular bareJid and resource changes.
void presenceChanged(const QString& bareJid, const QString& resource);
- /// \cond
- // deprecated in release 0.4.0
- void rosterChanged(const QString& bareJid);
- /// \endcond
-
/// This signal is emitted when a contact asks to subscribe to your presence.
///
/// You can either accept the request by calling acceptSubscription() or refuse it