[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=606ff2f

The following commit has been merged in the master branch:
commit 606ff2fedb45fb8a8f09840b06ffbce3d68e5e49
Author: Lasath Fernando <kde at lasath.org>
Date:   Sat Jan 14 22:51:51 2012 +1100

    Move ConversationsModel's constructor to the top of the file
---
 KTp/Declarative/conversations-model.cpp | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/KTp/Declarative/conversations-model.cpp b/KTp/Declarative/conversations-model.cpp
index e02acee..ba2c9eb 100644
--- a/KTp/Declarative/conversations-model.cpp
+++ b/KTp/Declarative/conversations-model.cpp
@@ -31,6 +31,17 @@ public:
     QList<Conversation*> conversations;
 };
 
+ConversationsModel::ConversationsModel(QObject *parent) :
+        QAbstractListModel(parent),
+        d(new ConversationsModelPrivate)
+{
+    QHash<int, QByteArray> roles;
+    roles[ConversationRole] = "conversation";
+    setRoleNames(roles);
+
+    QObject::connect(&d->watcher, SIGNAL(newConversation(Conversation*)), SLOT(onInconmingConversation(Conversation*)));
+}
+
 QVariant ConversationsModel::data(const QModelIndex& index, int role) const
 {
     QVariant result;
@@ -47,17 +58,6 @@ int ConversationsModel::rowCount(const QModelIndex& parent) const
     return d->conversations.count();
 }
 
-ConversationsModel::ConversationsModel(QObject *parent) :
-        QAbstractListModel(parent),
-        d(new ConversationsModelPrivate)
-{
-    QHash<int, QByteArray> roles;
-    roles[ConversationRole] = "conversation";
-    setRoleNames(roles);
-
-    QObject::connect(&d->watcher, SIGNAL(newConversation(Conversation*)), SLOT(onInconmingConversation(Conversation*)));
-}
-
 void ConversationsModel::onInconmingConversation(Conversation *newConvo)
 {
     //check if conversation's channel is already being handled, if so replace it

-- 
ktp-common-internals packaging