[SCM] ktp-text-ui packaging branch, master, updated. debian/15.12.1-1-1918-gdf4b0ec
Maximiliano Curia
maxy at moszumanska.debian.org
Sat May 28 00:21:07 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=b46740f
The following commit has been merged in the master branch:
commit b46740f3ba952e2a84797010aca6b872b2bcb274
Author: Lasath Fernando <kde at lasath.org>
Date: Fri Feb 3 13:57:38 2012 +1100
Make AbstractMessageFilter a QObject and parented all Filters properly
to fix memory leaks.
---
lib/filters.h | 8 ++++++++
lib/message-processor.cpp | 7 ++++++-
lib/message-processor.h | 8 ++++++--
lib/url-filter.cpp | 7 +++++++
4 files changed, 27 insertions(+), 3 deletions(-)
diff --git a/lib/filters.h b/lib/filters.h
index 5f69ab1..29a0359 100644
--- a/lib/filters.h
+++ b/lib/filters.h
@@ -18,20 +18,28 @@
#include "message-processor.h"
+#include <QObject>
+
#include <KEmoticons>
class UrlFilter : public AbstractMessageFilter
{
+public:
+ explicit UrlFilter(QObject* parent = 0);
void filterMessage(Message& message);
};
class ImageFilter : public AbstractMessageFilter
{
+public:
+ explicit ImageFilter(QObject* parent = 0);
void filterMessage(Message& message);
};
class EmoticonFilter : public AbstractMessageFilter
{
+public:
+ explicit EmoticonFilter(QObject* parent = 0);
void filterMessage(Message& message);
private:
KEmoticons m_emoticons;
diff --git a/lib/message-processor.cpp b/lib/message-processor.cpp
index e35f97f..0b4fbe9 100644
--- a/lib/message-processor.cpp
+++ b/lib/message-processor.cpp
@@ -22,6 +22,11 @@
MessageProcessor* MessageProcessor::s_instance = 0;
+AbstractMessageFilter::AbstractMessageFilter(QObject* parent)
+ : QObject(parent)
+{
+}
+
AbstractMessageFilter::~AbstractMessageFilter()
{
}
@@ -43,7 +48,7 @@ MessageProcessor* MessageProcessor::instance()
MessageProcessor::MessageProcessor()
{
- m_filters << new UrlFilter() << new EmoticonFilter();
+ m_filters << new UrlFilter(this) << new EmoticonFilter(this) << new ImageFilter(this);
}
diff --git a/lib/message-processor.h b/lib/message-processor.h
index 6c6d3b7..55f57e1 100644
--- a/lib/message-processor.h
+++ b/lib/message-processor.h
@@ -23,10 +23,14 @@
#include "message.h"
#include <QList>
-class AbstractMessageFilter {
+class AbstractMessageFilter : public QObject
+{
+Q_OBJECT
public:
- virtual void filterMessage(Message &message) = 0;
+ explicit AbstractMessageFilter(QObject* parent = 0);
virtual ~AbstractMessageFilter();
+
+ virtual void filterMessage(Message &message) = 0;
};
//each thing that displays message will have an instance of this
diff --git a/lib/url-filter.cpp b/lib/url-filter.cpp
index b5f6600..e203753 100644
--- a/lib/url-filter.cpp
+++ b/lib/url-filter.cpp
@@ -23,6 +23,11 @@
#include <KProtocolInfo>
#include <KDebug>
+UrlFilter::UrlFilter(QObject *parent)
+ : AbstractMessageFilter(parent)
+{
+}
+
void UrlFilter::filterMessage(Message &info) {
QString message = info.mainMessagePart();
//FIXME: make "Urls" into a constant
@@ -83,3 +88,5 @@ void UrlFilter::filterMessage(Message &info) {
info.setProperty("Urls", urls);
info.setMainMessagePart(message);
}
+
+
--
ktp-text-ui packaging
More information about the pkg-kde-commits
mailing list