[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=cee6724

The following commit has been merged in the master branch:
commit cee672465d710707e35958b1876d02255286c6aa
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Wed Feb 8 22:57:26 2012 +0000

    Add missing consts
---
 KTp/Declarative/messages-model.cpp | 35 +++++++++++++++++++++--------------
 KTp/Declarative/messages-model.h   | 11 ++++++-----
 2 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/KTp/Declarative/messages-model.cpp b/KTp/Declarative/messages-model.cpp
index 54d6949..5b8b4f3 100644
--- a/KTp/Declarative/messages-model.cpp
+++ b/KTp/Declarative/messages-model.cpp
@@ -88,14 +88,17 @@ bool MessagesModel::verifyPendingOperation(Tp::PendingOperation *op)
     return operationSucceeded;
 }
 
-void MessagesModel::setupChannelSignals(Tp::TextChannelPtr channel)
+void MessagesModel::setupChannelSignals(const Tp::TextChannelPtr &channel)
 {
-    QObject::connect(channel.data(),
-                     SIGNAL(messageReceived(Tp::ReceivedMessage)),
-                     SLOT(onMessageReceived(Tp::ReceivedMessage)));
-    QObject::connect(channel.data(),
-                     SIGNAL(messageSent(Tp::Message,Tp::MessageSendingFlags,QString)),
-                     SLOT(onMessageSent(Tp::Message,Tp::MessageSendingFlags,QString)));
+    connect(channel.data(),
+            SIGNAL(messageReceived(Tp::ReceivedMessage)),
+            SLOT(onMessageReceived(Tp::ReceivedMessage)));
+    connect(channel.data(),
+            SIGNAL(messageSent(Tp::Message,Tp::MessageSendingFlags,QString)),
+            SLOT(onMessageSent(Tp::Message,Tp::MessageSendingFlags,QString)));
+    connect(channel.data(),
+            SIGNAL(pendingMessageRemoved(Tp::ReceivedMessage)),
+            SLOT(onPendingMessageRemoved()));
 }
 
 void MessagesModel::setTextChannel(Tp::TextChannelPtr channel)
@@ -127,7 +130,7 @@ void MessagesModel::setTextChannel(Tp::TextChannelPtr channel)
     }
 }
 
-void MessagesModel::onMessageReceived(Tp::ReceivedMessage message)
+void MessagesModel::onMessageReceived(const Tp::ReceivedMessage &message)
 {
     int unreadCount = d->textChannel->messageQueue().size();
     kDebug() << "unreadMessagesCount =" << unreadCount;
@@ -158,10 +161,10 @@ void MessagesModel::onMessageReceived(Tp::ReceivedMessage message)
 
 }
 
-void MessagesModel::onMessageSent(Tp::Message message, Tp::MessageSendingFlags flags, QString token)
+void MessagesModel::onMessageSent(const Tp::Message &message, Tp::MessageSendingFlags flags, const QString &messageToken)
 {
     Q_UNUSED(flags);
-    Q_UNUSED(token);
+    Q_UNUSED(messageToken);
 
     int length = rowCount();
     beginInsertRows(QModelIndex(), length, length);
@@ -178,6 +181,11 @@ void MessagesModel::onMessageSent(Tp::Message message, Tp::MessageSendingFlags f
     endInsertRows();
 }
 
+void MessagesModel::onPendingMessageRemoved()
+{
+    Q_EMIT unreadCountChanged(unreadCount());
+}
+
 QVariant MessagesModel::data(const QModelIndex& index, int role) const
 {
     QVariant result;
@@ -223,7 +231,7 @@ void MessagesModel::sendNewMessage(const QString &message)
     }
 }
 
-void MessagesModel::removeChannelSignals(Tp::TextChannelPtr channel)
+void MessagesModel::removeChannelSignals(const Tp::TextChannelPtr &channel)
 {
     QObject::disconnect(channel.data(),
                         SIGNAL(messageReceived(Tp::ReceivedMessage)),
@@ -298,9 +306,8 @@ void MessagesModel::printallmessages()
     Q_FOREACH(MessageItem msg, d->messages) {
         kDebug() << msg.text;
     }
-    beginResetModel();
-//     d->messages.clear();
-    endResetModel();
 }
 
+
+
 #include "moc_messages-model.cpp"
diff --git a/KTp/Declarative/messages-model.h b/KTp/Declarative/messages-model.h
index 4ae99d3..ec677fe 100644
--- a/KTp/Declarative/messages-model.h
+++ b/KTp/Declarative/messages-model.h
@@ -61,7 +61,7 @@ public:
 Q_SIGNALS:
     void textChannelChanged(Tp::TextChannelPtr newChannel);
     void visibleToUserChanged(bool visible);
-    //TODO: figure out how to check if unread messages have been acknowledged by something else
+
     void unreadCountChanged(int unreadMesssagesCount);
     void popoutRequested();
 
@@ -69,13 +69,14 @@ public Q_SLOTS:
     void sendNewMessage(const QString& message);
 
 private Q_SLOTS:
-    void onMessageReceived(Tp::ReceivedMessage);
-    void onMessageSent(Tp::Message,Tp::MessageSendingFlags,QString);
+    void onMessageReceived(const Tp::ReceivedMessage &message);
+    void onMessageSent(const Tp::Message &message, Tp::MessageSendingFlags flags, const QString &messageToken);
+    void onPendingMessageRemoved();
     bool verifyPendingOperation(Tp::PendingOperation *op);
 
 private:
-    void setupChannelSignals(Tp::TextChannelPtr channel);
-    void removeChannelSignals(Tp::TextChannelPtr channel);
+    void setupChannelSignals(const Tp::TextChannelPtr &channel);
+    void removeChannelSignals(const Tp::TextChannelPtr &channel);
     virtual void selfDequed();
 
     class MessagesModelPrivate;

-- 
ktp-common-internals packaging