[SCM] ktp-kded-integration-module packaging branch, master, updated. debian/15.12.1-2-382-gbd961c2

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-kded-module.git;a=commitdiff;h=2a3c81d

The following commit has been merged in the master branch:
commit 2a3c81da252be8852b600cce38f08113ee5f672f
Author: Christophe Giboudeaux <cgiboudeaux at gmx.com>
Date:   Sun Feb 5 14:45:24 2012 +0100

    Build with -DQT_STRICT_ITERATORS
---
 contact-request-handler.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/contact-request-handler.cpp b/contact-request-handler.cpp
index 4229aa5..37d9996 100644
--- a/contact-request-handler.cpp
+++ b/contact-request-handler.cpp
@@ -152,7 +152,7 @@ void ContactRequestHandler::onPresencePublicationRequested(const Tp::Contacts& c
             if (m_pendingContacts.contains(contact->id())) {
                 // It's likely we have a simultaneous request
                 bool newReq = true;
-                QHash<QString, Tp::ContactPtr>::const_iterator i = m_pendingContacts.find(contact->id());
+                QHash<QString, Tp::ContactPtr>::const_iterator i = m_pendingContacts.constFind(contact->id());
                 while (i != m_pendingContacts.constEnd() && i.key() == contact->id()) {
                     if (i.value().data() == contact.data()) {
                         newReq = false;
@@ -237,7 +237,7 @@ void ContactRequestHandler::onContactRequestApproved()
 
     if (!contactId.isEmpty()) {
         QList<Tp::PendingOperation*> operations;
-        QHash<QString, Tp::ContactPtr>::const_iterator i = m_pendingContacts.find(contactId);
+        QHash<QString, Tp::ContactPtr>::const_iterator i = m_pendingContacts.constFind(contactId);
         while (i != m_pendingContacts.constEnd() && i.key() == contactId) {
             if (!i.value()->manager().isNull()) {
                 Tp::PendingOperation *op = i.value()->manager()->authorizePresencePublication(QList< Tp::ContactPtr >() << i.value());
@@ -303,7 +303,7 @@ void ContactRequestHandler::onContactRequestDenied()
 
     if (!contactId.isEmpty()) {
         QList<Tp::PendingOperation*> operations;
-        QHash<QString, Tp::ContactPtr>::const_iterator i = m_pendingContacts.find(contactId);
+        QHash<QString, Tp::ContactPtr>::const_iterator i = m_pendingContacts.constFind(contactId);
         while (i != m_pendingContacts.constEnd() && i.key() == contactId) {
             if (!i.value()->manager().isNull()) {
                 Tp::PendingOperation *op = i.value()->manager()->removePresencePublication(QList< Tp::ContactPtr >() << i.value());

-- 
ktp-kded-integration-module packaging