[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=676a902

The following commit has been merged in the master branch:
commit 676a9025de6cd99267fc72efbb66a565a2387bd6
Author: Aleix Pol <aleixpol at kde.org>
Date:   Wed Aug 13 10:34:46 2014 +0200

    Use the method name suggested by David
---
 KTp/Declarative/conversations-model.cpp | 2 +-
 KTp/Declarative/conversations-model.h   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/KTp/Declarative/conversations-model.cpp b/KTp/Declarative/conversations-model.cpp
index 8ba92cd..fa9f237 100644
--- a/KTp/Declarative/conversations-model.cpp
+++ b/KTp/Declarative/conversations-model.cpp
@@ -207,7 +207,7 @@ int ConversationsModel::activeChatIndex() const
     return d->activeChatIndex;
 }
 
-void ConversationsModel::clearConversations()
+void ConversationsModel::closeAllConversations()
 {
     Q_FOREACH(Conversation *c, d->conversations) {
         c->requestClose();
diff --git a/KTp/Declarative/conversations-model.h b/KTp/Declarative/conversations-model.h
index c1ae1a5..3756dde 100644
--- a/KTp/Declarative/conversations-model.h
+++ b/KTp/Declarative/conversations-model.h
@@ -50,7 +50,7 @@ class ConversationsModel : public QAbstractListModel, public Tp::AbstractClientH
         ConversationRole = Qt::UserRole
     };
 
-    Q_INVOKABLE void clearConversations();
+    Q_INVOKABLE void closeAllConversations();
 
     void handleChannels(const Tp::MethodInvocationContextPtr<> &context,
                         const Tp::AccountPtr &account,

-- 
ktp-common-internals packaging