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

The following commit has been merged in the master branch:
commit c38807a2eb0a95de6e90a2fd3261c76ee93cd1fd
Author: Lasath Fernando <kde at lasath.org>
Date:   Sat Dec 3 00:13:19 2011 +1100

    Added a dialog
    
    Plus optimization in MessagesModel
---
 KTp/Declarative/messages-model.cpp | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/KTp/Declarative/messages-model.cpp b/KTp/Declarative/messages-model.cpp
index d87f454..989752e 100644
--- a/KTp/Declarative/messages-model.cpp
+++ b/KTp/Declarative/messages-model.cpp
@@ -65,7 +65,7 @@ bool MessagesModel::verifyPendingOperation ( Tp::PendingOperation* op )
 {
     bool success = !op->isError();
     if(!success) {
-        kWarning() << op->errorName() + QLatin1Char(':') + op->errorMessage();
+        kWarning() << op->errorName() << "+" << op->errorMessage();
     }
     return success;
 }
@@ -96,7 +96,8 @@ void MessagesModel::setTextChannel(Tp::TextChannelPtr channel)
 void MessagesModel::onMessageReceived(Tp::ReceivedMessage message)
 {
     kDebug();
-    beginInsertRows(QModelIndex(), d->messages.count(), d->messages.count());
+    int length = rowCount();
+    beginInsertRows(QModelIndex(), length, length);
 
     MessageItem newMessage = {
         message.sender()->alias(),
@@ -113,7 +114,8 @@ void MessagesModel::onMessageSent(Tp::Message message, Tp::MessageSendingFlags f
 {
     Q_UNUSED(flags);
     Q_UNUSED(token);
-    beginInsertRows(QModelIndex(), d->messages.count(), d->messages.count());
+    int length = rowCount();
+    beginInsertRows(QModelIndex(), length, length);
 
     MessageItem newMessage = {
         tr("Me"),   //FIXME : use actual nickname from Tp::AccountPtr
@@ -157,20 +159,20 @@ QVariant MessagesModel::data(const QModelIndex& index, int role) const
 
 int MessagesModel::rowCount(const QModelIndex& parent) const
 {
-    kDebug() << "size =" << d->messages.size();
     Q_UNUSED(parent);
-
     return d->messages.size();
 }
 
 Tp::PendingSendMessage* MessagesModel::sendNewMessage ( QString message )
 {
     Tp::PendingSendMessage* msg = 0;
+
     if(message.isEmpty()) {
         kWarning() << "Attempting to send empty string";
     } else {
         msg = d->textChannel->send(message);
-        connect(msg, SIGNAL(finished(Tp::PendingOperation*)), SLOT(verifyPendingOperation(Tp::PendingOperation*)));
+        connect(msg, SIGNAL(finished(Tp::PendingOperation*)),
+                SLOT(verifyPendingOperation(Tp::PendingOperation*)));
     }
 
     return msg;

-- 
ktp-common-internals packaging