[SCM] ktp-text-ui packaging branch, master, updated. debian/15.12.1-1-1918-gdf4b0ec

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=d2d8c22

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

    Replace uses of (pre)processMessage
    
    Since they were renamed in ktp-common-internals to
    processIncomingMessage and processOutgoingMessage, respectively.
    
    REVIEW: 109254
---
 lib/chat-widget.cpp        | 12 ++++++------
 lib/logmanager.cpp         |  2 +-
 logviewer/message-view.cpp |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/chat-widget.cpp b/lib/chat-widget.cpp
index 533ee21..aa2db08 100644
--- a/lib/chat-widget.cpp
+++ b/lib/chat-widget.cpp
@@ -329,7 +329,7 @@ void ChatWidget::dropEvent(QDropEvent *e)
     if (data->hasUrls()) {
         Q_FOREACH(const QUrl &url, data->urls()) {
             if (url.isLocalFile()) {
-		KTp::Actions::startFileTransfer(d->account, d->channel->targetContact(), url.toLocalFile());
+        KTp::Actions::startFileTransfer(d->account, d->channel->targetContact(), url.toLocalFile());
             } else {
                 d->ui.sendMessageBox->append(url.toString());
             }
@@ -358,7 +358,7 @@ void ChatWidget::dropEvent(QDropEvent *e)
         }
 
         Tp::PendingChannelRequest *request;
-	request = KTp::Actions::startFileTransfer(d->account, d->channel->targetContact(), tmpFile.fileName());
+    request = KTp::Actions::startFileTransfer(d->account, d->channel->targetContact(), tmpFile.fileName());
         connect(request, SIGNAL(finished(Tp::PendingOperation*)),
                 this, SLOT(temporaryFileTransferChannelCreated(Tp::PendingOperation*)));
 
@@ -614,7 +614,7 @@ void ChatWidget::handleIncomingMessage(const Tp::ReceivedMessage &message)
         } else {
             AdiumThemeContentInfo messageInfo(AdiumThemeMessageInfo::RemoteToLocal);
 
-            KTp::Message processedMessage(KTp::MessageProcessor::instance()->processMessage(message, d->account, d->channel));
+            KTp::Message processedMessage(KTp::MessageProcessor::instance()->processIncomingMessage(message, d->account, d->channel));
 
             // FIXME: eventually find a way to make MessageProcessor allow per
             //        instance filters.
@@ -664,7 +664,7 @@ void ChatWidget::handleMessageSent(const Tp::Message &message, Tp::MessageSendin
     }
     else {
         AdiumThemeContentInfo messageInfo(AdiumThemeMessageInfo::LocalToRemote);
-        KTp::Message processedMessage(KTp::MessageProcessor::instance()->processMessage(message, d->account, d->channel));
+        KTp::Message processedMessage(KTp::MessageProcessor::instance()->processIncomingMessage(message, d->account, d->channel));
         messageInfo.setMessage(processedMessage.finalizedMessage());
         messageInfo.setScript(processedMessage.finalizedScript());
 
@@ -703,7 +703,7 @@ void ChatWidget::sendMessage()
     QString message = d->ui.sendMessageBox->toPlainText();
 
     if (!message.isEmpty()) {
-        message = KTp::MessageProcessor::instance()->preprocessMessage(
+        message = KTp::MessageProcessor::instance()->processOutgoingMessage(
                     message, d->account, d->channel).finalizedMessage();
 
         if (d->channel->supportsMessageType(Tp::ChannelTextMessageTypeAction) && message.startsWith(QLatin1String("/me "))) {
@@ -936,7 +936,7 @@ void ChatWidget::loadSpellCheckingOption()
     if (configGroup.exists()) {
         spellCheckingLanguage = configGroup.readEntry("language");
     } else {
-	spellCheckingLanguage = KGlobal::locale()->language();
+    spellCheckingLanguage = KGlobal::locale()->language();
     }
     d->ui.sendMessageBox->setSpellCheckingLanguage(spellCheckingLanguage);
 }
diff --git a/lib/logmanager.cpp b/lib/logmanager.cpp
index a80bf1e..a570adf 100644
--- a/lib/logmanager.cpp
+++ b/lib/logmanager.cpp
@@ -181,7 +181,7 @@ void LogManager::onEventsFinished(Tpl::PendingOperation *po)
 
         AdiumThemeContentInfo message(type);
 
-        KTp::Message processedEvent = KTp::MessageProcessor::instance()->processMessage(event, m_account, m_textChannel);
+        KTp::Message processedEvent = KTp::MessageProcessor::instance()->processIncomingMessage(event, m_account, m_textChannel);
 
         message.setMessage(processedEvent.finalizedMessage());
         message.setScript(processedEvent.finalizedScript());
diff --git a/logviewer/message-view.cpp b/logviewer/message-view.cpp
index 44e0e3d..6a59caa 100644
--- a/logviewer/message-view.cpp
+++ b/logviewer/message-view.cpp
@@ -135,7 +135,7 @@ void MessageView::processStoredEvents()
         }
 
         AdiumThemeContentInfo message(type);
-        message.setMessage(KTp::MessageProcessor::instance()->processMessage(textEvent, m_account, Tp::TextChannelPtr()).finalizedMessage());
+        message.setMessage(KTp::MessageProcessor::instance()->processIncomingMessage(textEvent, m_account, Tp::TextChannelPtr()).finalizedMessage());
         message.setService(m_account->serviceName());
         message.setSenderDisplayName(textEvent->sender()->alias());
         message.setSenderScreenName(textEvent->sender()->identifier());

-- 
ktp-text-ui packaging