[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=76c3172

The following commit has been merged in the master branch:
commit 76c3172d6cc24c6a21407b029603e73ad3f3c086
Author: Lasath Fernando <kde at lasath.org>
Date:   Mon Mar 4 07:45:45 2013 +1100

    Rename processMessage to processIncomingMessage
    
    To distinguish it from preprocessMessage().
---
 KTp/Declarative/messages-model.cpp |  4 ++--
 KTp/message-processor.cpp          | 14 +++++++-------
 KTp/message-processor.h            |  8 ++++----
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/KTp/Declarative/messages-model.cpp b/KTp/Declarative/messages-model.cpp
index 351be0f..2c15c27 100644
--- a/KTp/Declarative/messages-model.cpp
+++ b/KTp/Declarative/messages-model.cpp
@@ -126,7 +126,7 @@ void MessagesModel::onMessageReceived(const Tp::ReceivedMessage &message)
         beginInsertRows(QModelIndex(), length, length);
 
 
-        d->messages.append(KTp::MessageProcessor::instance()->processMessage(
+        d->messages.append(KTp::MessageProcessor::instance()->processIncomingMessage(
                                message, d->account, d->textChannel));
 
         endInsertRows();
@@ -150,7 +150,7 @@ void MessagesModel::onMessageSent(const Tp::Message &message, Tp::MessageSending
     beginInsertRows(QModelIndex(), length, length);
     kDebug() << "text =" << message.text();
 
-    d->messages.append(KTp::MessageProcessor::instance()->processMessage(
+    d->messages.append(KTp::MessageProcessor::instance()->processIncomingMessage(
                            message, d->account, d->textChannel));
 
     endInsertRows();
diff --git a/KTp/message-processor.cpp b/KTp/message-processor.cpp
index 68414bb..30d8d26 100644
--- a/KTp/message-processor.cpp
+++ b/KTp/message-processor.cpp
@@ -139,26 +139,26 @@ QString MessageProcessor::header()
     return out;
 }
 
-KTp::Message MessageProcessor::processMessage(const Tp::Message &message, const Tp::AccountPtr &account, const Tp::TextChannelPtr &channel)
+KTp::Message MessageProcessor::processIncomingMessage(const Tp::Message &message, const Tp::AccountPtr &account, const Tp::TextChannelPtr &channel)
 {
     KTp::MessageContext context(account, channel);
-    return processMessage(KTp::Message(message, context), context);
+    return processIncomingMessage(KTp::Message(message, context), context);
 }
 
-KTp::Message KTp::MessageProcessor::processMessage(const Tp::ReceivedMessage &message, const Tp::AccountPtr &account, const Tp::TextChannelPtr &channel)
+KTp::Message KTp::MessageProcessor::processIncomingMessage(const Tp::ReceivedMessage &message, const Tp::AccountPtr &account, const Tp::TextChannelPtr &channel)
 {
     KTp::MessageContext context(account, channel);
-    return processMessage(KTp::Message(message, context), context);
+    return processIncomingMessage(KTp::Message(message, context), context);
 }
 
-KTp::Message KTp::MessageProcessor::processMessage(const Tpl::TextEventPtr &message, const Tp::AccountPtr &account, const Tp::TextChannelPtr &channel)
+KTp::Message KTp::MessageProcessor::processIncomingMessage(const Tpl::TextEventPtr &message, const Tp::AccountPtr &account, const Tp::TextChannelPtr &channel)
 {
     KTp::MessageContext context(account, channel);
-    return processMessage(KTp::Message(message, context), context);
+    return processIncomingMessage(KTp::Message(message, context), context);
 }
 
 
-KTp::Message MessageProcessor::processMessage(KTp::Message message, const KTp::MessageContext &context)
+KTp::Message MessageProcessor::processIncomingMessage(KTp::Message message, const KTp::MessageContext &context)
 {
     Q_FOREACH (AbstractMessageFilter *filter, d->filters) {
         kDebug() << "running filter :" << filter->metaObject()->className();
diff --git a/KTp/message-processor.h b/KTp/message-processor.h
index d6992b8..e51f586 100644
--- a/KTp/message-processor.h
+++ b/KTp/message-processor.h
@@ -54,14 +54,14 @@ class KTP_EXPORT MessageProcessor : public QObject
     QString header();
 
     //text-ui will call this somewhere in handleIncommingMessage just before displaying it
-    KTp::Message processMessage(const Tp::Message &message, const Tp::AccountPtr &account, const Tp::TextChannelPtr &channel);
-    KTp::Message processMessage(const Tp::ReceivedMessage &message, const Tp::AccountPtr &account, const Tp::TextChannelPtr &channel);
-    KTp::Message processMessage(const Tpl::TextEventPtr &message, const Tp::AccountPtr &account, const Tp::TextChannelPtr &channel);
+    KTp::Message processIncomingMessage(const Tp::Message &message, const Tp::AccountPtr &account, const Tp::TextChannelPtr &channel);
+    KTp::Message processIncomingMessage(const Tp::ReceivedMessage &message, const Tp::AccountPtr &account, const Tp::TextChannelPtr &channel);
+    KTp::Message processIncomingMessage(const Tpl::TextEventPtr &message, const Tp::AccountPtr &account, const Tp::TextChannelPtr &channel);
 
     KTp::Message preprocessMessage(const QString &messageText, const Tp::AccountPtr &account, const Tp::TextChannelPtr &channel);
 
   protected:
-    KTp::Message processMessage(KTp::Message message, const KTp::MessageContext &context);
+    KTp::Message processIncomingMessage(KTp::Message message, const KTp::MessageContext &context);
     explicit MessageProcessor();
 
   private:

-- 
ktp-common-internals packaging