[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=5ab8289

The following commit has been merged in the master branch:
commit 5ab8289b8d5b1b19a4d2047b976049ad0814f96b
Author: Lasath Fernando <kde at lasath.org>
Date:   Fri Feb 3 19:34:27 2012 +1100

    Create d-pointer for EmoticonFilter and add missing cpp file.
---
 ...lters-private.h => abstract-message-filter.cpp} | 35 ++++++++++------------
 KTp/message-filters-private.h                      |  5 +++-
 2 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/KTp/message-filters-private.h b/KTp/abstract-message-filter.cpp
similarity index 60%
copy from KTp/message-filters-private.h
copy to KTp/abstract-message-filter.cpp
index 29a0359..0e37aab 100644
--- a/KTp/message-filters-private.h
+++ b/KTp/abstract-message-filter.cpp
@@ -16,31 +16,26 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-#include "message-processor.h"
+#include "filters.h"
 
-#include <QObject>
-
-#include <KEmoticons>
-
-class UrlFilter : public AbstractMessageFilter
+class EmoticonFilter::Private
 {
 public:
-    explicit UrlFilter(QObject* parent = 0);
-    void filterMessage(Message& message);
+    KEmoticons emoticons;
 };
 
-class ImageFilter : public AbstractMessageFilter
+EmoticonFilter::EmoticonFilter(QObject *parent)
+    : AbstractMessageFilter(parent),
+      d(new Private)
 {
-public:
-    explicit ImageFilter(QObject* parent = 0);
-    void filterMessage(Message& message);
-};
+}
 
-class EmoticonFilter : public AbstractMessageFilter
+void EmoticonFilter::filterMessage(Message& message)
 {
-public:
-    explicit EmoticonFilter(QObject* parent = 0);
-    void filterMessage(Message& message);
-private:
-    KEmoticons m_emoticons;
-};
\ No newline at end of file
+    message.setMainMessagePart(d->emoticons.theme().parseEmoticons(message.mainMessagePart()));
+}
+
+EmoticonFilter::~EmoticonFilter()
+{
+    delete d;
+}
\ No newline at end of file
diff --git a/KTp/message-filters-private.h b/KTp/message-filters-private.h
index 29a0359..ce5cc06 100644
--- a/KTp/message-filters-private.h
+++ b/KTp/message-filters-private.h
@@ -40,7 +40,10 @@ class EmoticonFilter : public AbstractMessageFilter
 {
 public:
     explicit EmoticonFilter(QObject* parent = 0);
+    virtual ~EmoticonFilter();
+
     void filterMessage(Message& message);
 private:
-    KEmoticons m_emoticons;
+    class Private;
+    Private *d;
 };
\ No newline at end of file

-- 
ktp-common-internals packaging