[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=1e4cc62

The following commit has been merged in the master branch:
commit 1e4cc62c4fa63a29587ab4d6f93e6318593360b3
Author: Lasath Fernando <kde at lasath.org>
Date:   Sat Mar 2 02:52:47 2013 -0500

    Make sender properties camel case
    
    In case I ever want to expose those to QML as-is, I may as well
    use legitimate variable names.
---
 KTp/Declarative/messages-model.cpp |  2 +-
 KTp/message.cpp                    | 18 +++++++++---------
 KTp/message.h                      |  4 ++--
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/KTp/Declarative/messages-model.cpp b/KTp/Declarative/messages-model.cpp
index e773e46..11ddc46 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.sender();
+            result = requestedData.senderName();
             break;
         case TextRole:
             result = requestedData.finalizedMessage();
diff --git a/KTp/message.cpp b/KTp/message.cpp
index 12eb24b..0218a5c 100644
--- a/KTp/message.cpp
+++ b/KTp/message.cpp
@@ -64,8 +64,8 @@ Message::Message(const Tp::Message &original, const KTp::MessageContext &context
 
     setMainMessagePart(original.text());
 
-    setProperty("sender", context.account()->nickname());
-    setProperty("sender-avatar", context.account()->avatar().avatarData);
+    setProperty("senderName", context.account()->nickname());
+    setProperty("senderAvatar", context.account()->avatar().avatarData);
 }
 
 Message::Message(const Tp::ReceivedMessage &original, const KTp::MessageContext &context) :
@@ -86,10 +86,10 @@ Message::Message(const Tp::ReceivedMessage &original, const KTp::MessageContext
     setMainMessagePart(original.text());
 
     if (!original.sender().isNull()) {
-        setProperty("sender", original.sender()->alias());
-        setProperty("sender-avatar", original.sender()->avatarData().fileName);
+        setProperty("senderName", original.sender()->alias());
+        setProperty("senderAvatar", original.sender()->avatarData().fileName);
     } else {
-        setProperty("sender", original.senderNickname());
+        setProperty("senderName", original.senderNickname());
     }
 }
 
@@ -109,8 +109,8 @@ Message::Message(const Tpl::TextEventPtr &original, const KTp::MessageContext &c
 
     setMainMessagePart(original->message());
 
-    setProperty("sender", original->sender()->alias());
-    setProperty("sender-avatar", original->sender()->avatarToken());
+    setProperty("senderName", original->sender()->alias());
+    setProperty("senderAvatar", original->sender()->avatarToken());
 }
 
 Message::Message(const Message& other):
@@ -196,9 +196,9 @@ Tp::ChannelTextMessageType Message::type() const
     return d->messageType;
 }
 
-QString Message::sender() const
+QString Message::senderName() const
 {
-    return property("sender").toString();
+    return property("senderName").toString();
 }
 
 int Message::partsSize() const
diff --git a/KTp/message.h b/KTp/message.h
index 983f1c6..147ea53 100644
--- a/KTp/message.h
+++ b/KTp/message.h
@@ -135,8 +135,8 @@ class KTP_EXPORT Message
     QString token() const;
     /*! 
eturn the type of the message*/
     Tp::ChannelTextMessageType type() const;
-    /*! 
eturn the alias of the contact who sent this message */
-    QString sender() const;
+    /*! 
eturn the alias of the contact who composed this message */
+    QString senderName() const;
 
     /*! 
eturn the number of appended parts */
     int partsSize() const;

-- 
ktp-common-internals packaging