[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=55a852c

The following commit has been merged in the master branch:
commit 55a852cfcc7ccb406487f19d89604f63aaadd5c9
Author: Lasath Fernando <kde at lasath.org>
Date:   Sun Mar 3 10:18:22 2013 +1100

    Rename Message::senderName() to senderAlias()
    
    To be consistent with Tp::Message.
    
    REVIEW: 109182
---
 KTp/Declarative/messages-model.cpp | 2 +-
 KTp/message.cpp                    | 2 +-
 KTp/message.h                      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/KTp/Declarative/messages-model.cpp b/KTp/Declarative/messages-model.cpp
index 11ddc46..351be0f 100644
--- a/KTp/Declarative/messages-model.cpp
+++ b/KTp/Declarative/messages-model.cpp
@@ -170,7 +170,7 @@ QVariant MessagesModel::data(const QModelIndex &index, int role) const
 
         switch (role) {
         case UserRole:
-            result = requestedData.senderName();
+            result = requestedData.senderAlias();
             break;
         case TextRole:
             result = requestedData.finalizedMessage();
diff --git a/KTp/message.cpp b/KTp/message.cpp
index 1b409d3..eb35e1a 100644
--- a/KTp/message.cpp
+++ b/KTp/message.cpp
@@ -200,7 +200,7 @@ Tp::ChannelTextMessageType Message::type() const
     return d->messageType;
 }
 
-QString Message::senderName() const
+QString Message::senderAlias() const
 {
     return property("senderName").toString();
 }
diff --git a/KTp/message.h b/KTp/message.h
index 5e914a1..796d5ea 100644
--- a/KTp/message.h
+++ b/KTp/message.h
@@ -136,7 +136,7 @@ class KTP_EXPORT Message
     /*! 
eturn the type of the message*/
     Tp::ChannelTextMessageType type() const;
     /*! 
eturn the alias of the contact who composed this message */
-    QString senderName() const;
+    QString senderAlias() const;
     /*! 
eturn the Id of the contact who composed this message */
     QString senderId() const;
 

-- 
ktp-common-internals packaging