[SCM] ktp-common-internals packaging branch, master, updated. debian/15.12.1-2-1839-gf0635e9

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=f8e2b08

The following commit has been merged in the master branch:
commit f8e2b083fc39a562772843e4efe9f7165d4c1b23
Author: Lasath Fernando <kde at lasath.org>
Date:   Tue Jan 10 13:33:26 2012 +1100

    Changed instances of constData() to data(), and fixed some more formatting issues.
---
 KTp/Declarative/messages-model.cpp          | 24 ++++++++++++------------
 KTp/Declarative/telepathy-text-observer.cpp |  1 +
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/KTp/Declarative/messages-model.cpp b/KTp/Declarative/messages-model.cpp
index e81c5af..f0dbba6 100644
--- a/KTp/Declarative/messages-model.cpp
+++ b/KTp/Declarative/messages-model.cpp
@@ -76,19 +76,22 @@ Tp::TextChannelPtr MessagesModel::textChannel()
 
 bool MessagesModel::verifyPendingOperation(Tp::PendingOperation* op)
 {
+    bool operationSucceeded = true;
+
     if (op->isError()) {
         kWarning() << op->errorName() << "+" << op->errorMessage();
-        return false;
+        operationSucceeded = false;
     }
-    return true;
+
+    return operationSucceeded;
 }
 
 void MessagesModel::setupChannelSignals(Tp::TextChannelPtr channel)
 {
-    QObject::connect(channel.constData(),
+    QObject::connect(channel.data(),
                      SIGNAL(messageReceived(Tp::ReceivedMessage)),
                      SLOT(onMessageReceived(Tp::ReceivedMessage)));
-    QObject::connect(channel.constData(),
+    QObject::connect(channel.data(),
                      SIGNAL(messageSent(Tp::Message,Tp::MessageSendingFlags,QString)),
                      SLOT(onMessageSent(Tp::Message,Tp::MessageSendingFlags,QString)));
 }
@@ -219,12 +222,12 @@ void MessagesModel::sendNewMessage(QString message)
 
 void MessagesModel::removeChannelSignals(Tp::TextChannelPtr channel)
 {
-    QObject::disconnect(channel.constData(),
+    QObject::disconnect(channel.data(),
                         SIGNAL(messageReceived(Tp::ReceivedMessage)),
                         this,
                         SLOT(onMessageReceived(Tp::ReceivedMessage))
                        );
-    QObject::disconnect(channel.constData(),
+    QObject::disconnect(channel.data(),
                         SIGNAL(messageSent(Tp::Message,Tp::MessageSendingFlags,QString)),
                         this,
                         SLOT(onMessageSent(Tp::Message,Tp::MessageSendingFlags,QString))
@@ -241,14 +244,11 @@ void MessagesModel::acknowledgeAllMessages()
     QList<Tp::ReceivedMessage> queue
     = d->textChannel->messageQueue();
 
-    kDebug() << "Conversation Visible, Acknowledging " << queue
-    .size() << " messages.";
+    kDebug() << "Conversation Visible, Acknowledging " << queue.size() << " messages.";
 
-    d->textChannel->acknowledge(queue
-                               );
+    d->textChannel->acknowledge(queue);
     removeSelfFromQue();
-    Q_EMIT unreadCountChanged(queue
-                              .size());
+    Q_EMIT unreadCountChanged(queue.size());
 }
 
 void MessagesModel::selfDequed()
diff --git a/KTp/Declarative/telepathy-text-observer.cpp b/KTp/Declarative/telepathy-text-observer.cpp
index 7224dcf..0dc9ced 100644
--- a/KTp/Declarative/telepathy-text-observer.cpp
+++ b/KTp/Declarative/telepathy-text-observer.cpp
@@ -49,6 +49,7 @@ public:
     {
         kDebug();
 
+        //check that the channel is of type text
         Tp::TextChannelPtr textChannel;
         Q_FOREACH(const Tp::ChannelPtr & channel, channels) {
             textChannel = Tp::TextChannelPtr::dynamicCast(channel);

-- 
ktp-common-internals packaging