[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [ktp-common-internals/mklapetek/SpaceBar] KTp/Declarative: [declarative] Construct MessagesModel in 
From:       Martin Klapetek <mklapetek () kde ! org>
Date:       2016-03-09 22:18:29
Message-ID: E1admR3-0002of-Gd () scm ! kde ! org
[Download RAW message or body]

Git commit 695e8e76bc337a32e7f86c4499dac669e44665ea by Martin Klapetek.
Committed on 09/03/2016 at 22:15.
Pushed by mklapetek into branch 'mklapetek/SpaceBar'.

[declarative] Construct MessagesModel in Conversation always in constructor

M  +6    -10   KTp/Declarative/conversation.cpp

http://commits.kde.org/telepathy-common-internals/695e8e76bc337a32e7f86c4499dac669e44665ea


diff --git a/KTp/Declarative/conversation.cpp b/KTp/Declarative/conversation.cpp
index 6824ee2..cb2aa66 100644
--- a/KTp/Declarative/conversation.cpp
+++ b/KTp/Declarative/conversation.cpp
@@ -81,14 +81,15 @@ Conversation::Conversation(QObject *parent)
     : QObject(parent),
       d(new ConversationPrivate)
 {
+    d->messages = new MessagesModel(Tp::AccountPtr(), this);
+    connect(d->messages, &MessagesModel::unreadCountChanged, this, \
&Conversation::unreadMessagesChanged); +    connect(d->messages, \
&MessagesModel::lastMessageChanged, this, &Conversation::lastMessageChanged);  }
 
 void Conversation::setTextChannel(const Tp::TextChannelPtr &channel)
 {
-    if (!d->messages) {
-        d->messages = new MessagesModel(d->account, this);
-        connect(d->messages, &MessagesModel::unreadCountChanged, this, \
                &Conversation::unreadMessagesChanged);
-        connect(d->messages, &MessagesModel::lastMessageChanged, this, \
&Conversation::lastMessageChanged); +    if (d->messages->account().isNull()) {
+        d->messages->setAccount(d->account);
     }
     if (d->messages->textChannel() != channel) {
         d->messages->setTextChannel(channel);
@@ -203,12 +204,7 @@ Tp::Account* Conversation::accountObject() const
 
 void Conversation::setAccount(const Tp::AccountPtr &account)
 {
-    if (!d->messages && !account.isNull()) {
-        d->messages = new MessagesModel(account, this);
-        connect(d->messages, &MessagesModel::unreadCountChanged, this, \
                &Conversation::unreadMessagesChanged);
-        connect(d->messages, &MessagesModel::lastMessageChanged, this, \
                &Conversation::lastMessageChanged);
-    }
-
+    d->messages->setAccount(account);
     d->account = account;
 }
 


[prev in list] [next in list] [prev in thread] [next in thread]