[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=2964a8b

The following commit has been merged in the master branch:
commit 2964a8bafc6b74b6665146b88b30714d039d29cd
Author: Lasath Fernando <kde at lasath.org>
Date:   Fri Feb 3 23:04:22 2012 +1100

    Move esaping code to a new filter called EscapeFilter
---
 ...essage-filter.cpp => message-escape-filter.cpp} | 26 ++++++++++------------
 KTp/message-filters-private.h                      |  7 ++++++
 KTp/message-processor.cpp                          |  2 +-
 KTp/message.cpp                                    | 12 +---------
 4 files changed, 21 insertions(+), 26 deletions(-)

diff --git a/KTp/abstract-message-filter.cpp b/KTp/message-escape-filter.cpp
similarity index 50%
copy from KTp/abstract-message-filter.cpp
copy to KTp/message-escape-filter.cpp
index 0e37aab..7cb7bbe 100644
--- a/KTp/abstract-message-filter.cpp
+++ b/KTp/message-escape-filter.cpp
@@ -18,24 +18,22 @@
 
 #include "filters.h"
 
-class EmoticonFilter::Private
-{
-public:
-    KEmoticons emoticons;
-};
+#include <QtGui/QTextDocument> //needed for Qt::escape
 
-EmoticonFilter::EmoticonFilter(QObject *parent)
-    : AbstractMessageFilter(parent),
-      d(new Private)
+EscapeFilter::EscapeFilter(QObject *parent)
+    : AbstractMessageFilter(parent)
 {
 }
 
-void EmoticonFilter::filterMessage(Message& message)
+void EscapeFilter::filterMessage(Message& message)
 {
-    message.setMainMessagePart(d->emoticons.theme().parseEmoticons(message.mainMessagePart()));
-}
+    QString escapedMessage = Qt::escape(message.mainMessagePart());
 
-EmoticonFilter::~EmoticonFilter()
-{
-    delete d;
+    escapedMessage.replace(QLatin1String("
 "), QLatin1String("<br/> ")); //keep leading whitespaces
+    escapedMessage.replace(QLatin1Char('
'), QLatin1String("<br/>"));
+    escapedMessage.replace(QLatin1Char('	'), QLatin1String("    ")); // replace tabs by 4 spaces
+    escapedMessage.replace(QLatin1String("  "), QLatin1String("  ")); // keep multiple whitespaces
+    escapedMessage.replace(QLatin1Char('\'), QLatin1String("\\")); //replace a single backslash with two backslashes.
+
+    message.setMainMessagePart(escapedMessage);
 }
\ No newline at end of file
diff --git a/KTp/message-filters-private.h b/KTp/message-filters-private.h
index ce5cc06..8e49ea2 100644
--- a/KTp/message-filters-private.h
+++ b/KTp/message-filters-private.h
@@ -46,4 +46,11 @@ public:
 private:
     class Private;
     Private *d;
+};
+
+class EscapeFilter : public AbstractMessageFilter
+{
+public:
+    explicit EscapeFilter(QObject* parent = 0);
+    virtual void filterMessage(Message& message);
 };
\ No newline at end of file
diff --git a/KTp/message-processor.cpp b/KTp/message-processor.cpp
index 0b4fbe9..39eb1ff 100644
--- a/KTp/message-processor.cpp
+++ b/KTp/message-processor.cpp
@@ -48,7 +48,7 @@ MessageProcessor* MessageProcessor::instance()
 
 MessageProcessor::MessageProcessor()
 {
-    m_filters << new UrlFilter(this) << new EmoticonFilter(this) << new ImageFilter(this);
+    m_filters << new UrlFilter(this) << new EmoticonFilter(this) << new ImageFilter(this) << new EscapeFilter(this);
 }
 
 
diff --git a/KTp/message.cpp b/KTp/message.cpp
index 30bc0ba..72a04a7 100644
--- a/KTp/message.cpp
+++ b/KTp/message.cpp
@@ -20,20 +20,10 @@
 #include "message.h"
 #include <KDebug>
 
-#include <QtGui/QTextDocument> //needed for Qt::escape
-
-
 Message::Message(const Tp::Message &original)
     : m_originalMessage(original)
 {
-    QString htmlMessage= Qt::escape(m_originalMessage.text());
-    htmlMessage.replace(QLatin1String("
 "), QLatin1String("<br/> ")); //keep leading whitespaces
-    htmlMessage.replace(QLatin1Char('
'), QLatin1String("<br/>"));
-    htmlMessage.replace(QLatin1Char('	'), QLatin1String("    ")); // replace tabs by 4 spaces
-    htmlMessage.replace(QLatin1String("  "), QLatin1String("  ")); // keep multiple whitespaces
-    htmlMessage.replace(QLatin1Char('\'), QLatin1String("\\")); //replace a single backslash with two backslashes.
-
-    setMainMessagePart(htmlMessage);
+    setMainMessagePart(original.text());
 }
 
 QString Message::mainMessagePart() const

-- 
ktp-common-internals packaging