[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:05 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=d4d3a0f
The following commit has been merged in the master branch:
commit d4d3a0fbb390ab505d09b1649b956d49b9f5ec5c
Author: David Edmundson <kde at davidedmundson.co.uk>
Date: Wed Feb 1 23:27:53 2012 +0000
Strip incorrect KTp namespace
Add process outgoing message
---
lib/chat-widget.cpp | 3 ++-
lib/filters.h | 4 ++--
lib/message-processor.cpp | 18 ++++++++++++++----
lib/message-processor.h | 7 +++++--
lib/message.cpp | 4 +---
lib/message.h | 3 ---
6 files changed, 24 insertions(+), 15 deletions(-)
diff --git a/lib/chat-widget.cpp b/lib/chat-widget.cpp
index 1d5feae..1e54b2d 100644
--- a/lib/chat-widget.cpp
+++ b/lib/chat-widget.cpp
@@ -638,7 +638,8 @@ void ChatWidget::handleMessageSent(const Tp::Message &message, Tp::MessageSendin
}
else {
AdiumThemeContentInfo messageInfo(AdiumThemeMessageInfo::LocalToRemote);
- messageInfo.setMessage(message.text());
+ messageInfo.setMessage(MessageProcessor::instance()->processOutgoingMessage(message).finalizedMessage());
+
messageInfo.setTime(message.sent());
messageInfo.setSenderDisplayName(sender->alias());
diff --git a/lib/filters.h b/lib/filters.h
index b3976ee..8824e01 100644
--- a/lib/filters.h
+++ b/lib/filters.h
@@ -8,7 +8,7 @@
class UrlFilter : public AbstractMessageFilter
{
- virtual void filterMessage(KTp::Message &info) {
+ virtual void filterMessage(Message &info) {
QString message = info.mainMessagePart();
// link detection
@@ -76,4 +76,4 @@ class UrlFilter : public AbstractMessageFilter
info.setMainMessagePart(message);
}
-};
\ No newline at end of file
+};
diff --git a/lib/message-processor.cpp b/lib/message-processor.cpp
index 6e603f2..1854549 100644
--- a/lib/message-processor.cpp
+++ b/lib/message-processor.cpp
@@ -46,17 +46,27 @@ MessageProcessor::MessageProcessor()
m_filters << new UrlFilter();
}
-KTp::Message MessageProcessor::processIncomingMessage(Tp::ReceivedMessage receivedMessage)
+
+MessageProcessor::~MessageProcessor()
+{
+}
+
+Message MessageProcessor::processIncomingMessage(const Tp::ReceivedMessage &receivedMessage)
{
- KTp::Message message(receivedMessage);
+ Message message(receivedMessage);
Q_FOREACH(AbstractMessageFilter *filter, MessageProcessor::m_filters) {
filter->filterMessage(message);
}
return message;
}
-MessageProcessor::~MessageProcessor()
+Message MessageProcessor::processOutgoingMessage(const Tp::Message &sentMessage)
{
-
+ Message message(sentMessage);
+ Q_FOREACH(AbstractMessageFilter *filter, MessageProcessor::m_filters) {
+ filter->filterMessage(message);
+ }
+ return message;
}
+
diff --git a/lib/message-processor.h b/lib/message-processor.h
index 43413e1..6c6d3b7 100644
--- a/lib/message-processor.h
+++ b/lib/message-processor.h
@@ -25,7 +25,7 @@
class AbstractMessageFilter {
public:
- virtual void filterMessage(KTp::Message&) = 0;
+ virtual void filterMessage(Message &message) = 0;
virtual ~AbstractMessageFilter();
};
@@ -39,7 +39,10 @@ public:
~MessageProcessor();
//text-ui will call this somewhere in handleIncommingMessage just before displaying it
- KTp::Message processIncomingMessage(Tp::ReceivedMessage);
+ Message processIncomingMessage(const Tp::ReceivedMessage &message);
+ Message processOutgoingMessage(const Tp::Message &message);
+
+
protected:
explicit MessageProcessor();
diff --git a/lib/message.cpp b/lib/message.cpp
index 0e11dd2..24f94e3 100644
--- a/lib/message.cpp
+++ b/lib/message.cpp
@@ -23,8 +23,6 @@
#include <QtGui/QTextDocument> //needed for Qt::escape
-using namespace KTp;
-
Message::Message(const Tp::Message &original)
: m_originalMessage(original)
{
@@ -65,7 +63,7 @@ QVariant Message::property(const QString &name) const
return m_properties[name];
}
-void KTp::Message::setProperty(const QString &name, const QVariant &value)
+void Message::setProperty(const QString &name, const QVariant &value)
{
m_properties[name]=value;
}
diff --git a/lib/message.h b/lib/message.h
index 1ccdd41..5b4a8f3 100644
--- a/lib/message.h
+++ b/lib/message.h
@@ -22,8 +22,6 @@
#include <TelepathyQt/Message>
-namespace KTp {
-
class Message {
public:
@@ -48,6 +46,5 @@ private:
};
};
-}
#endif // KTP_MESSAGE_H
--
ktp-text-ui packaging
More information about the pkg-kde-commits
mailing list