[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:04 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=a0a79d4
The following commit has been merged in the master branch:
commit a0a79d485ae8e84df0c990b08378706833189d0a
Author: David Edmundson <kde at davidedmundson.co.uk>
Date: Wed Feb 1 23:17:19 2012 +0000
Various cleanup in lib/message
---
lib/adium-theme-message-info.cpp | 1 -
lib/message.cpp | 26 +++++++++++++++++---------
lib/message.h | 12 +++++++-----
3 files changed, 24 insertions(+), 15 deletions(-)
diff --git a/lib/adium-theme-message-info.cpp b/lib/adium-theme-message-info.cpp
index e9aa300..c5ad5de 100644
--- a/lib/adium-theme-message-info.cpp
+++ b/lib/adium-theme-message-info.cpp
@@ -21,7 +21,6 @@
#include <QtCore/QString>
#include <QtCore/QStringList>
#include <QtCore/QDateTime>
-#include <QtGui/QTextDocument> //needed for Qt::escape
class AdiumThemeMessageInfoPrivate
diff --git a/lib/message.cpp b/lib/message.cpp
index 163ed7c..0e11dd2 100644
--- a/lib/message.cpp
+++ b/lib/message.cpp
@@ -20,12 +20,15 @@
#include "message.h"
#include <KDebug>
+#include <QtGui/QTextDocument> //needed for Qt::escape
+
+
using namespace KTp;
-Message::Message(Tp::Message &original)
- : originalMessage(original)
+Message::Message(const Tp::Message &original)
+ : m_originalMessage(original)
{
- QString htmlMessage= Qt::escape(originalMessage.text());
+ 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
@@ -37,27 +40,32 @@ Message::Message(Tp::Message &original)
QString Message::mainMessagePart() const
{
- return content[Message::MainMessage];
+ return m_content[Message::MainMessage];
}
void Message::setMainMessagePart(const QString& message)
{
- content[Message::MainMessage] = message;
+ m_content[Message::MainMessage] = message;
}
void Message::appendMessagePart(const QString& part)
{
- content << part;
+ m_content << part;
}
QString Message::finalizedMessage() const
{
- QString msg = content.join(QLatin1String("
"));
+ QString msg = m_content.join(QLatin1String("
"));
kDebug() << msg;
return msg;
}
-QVariantMap& Message::miscData()
+QVariant Message::property(const QString &name) const
+{
+ return m_properties[name];
+}
+
+void KTp::Message::setProperty(const QString &name, const QVariant &value)
{
- return m_miscData;
+ m_properties[name]=value;
}
diff --git a/lib/message.h b/lib/message.h
index c4a1aae..1ccdd41 100644
--- a/lib/message.h
+++ b/lib/message.h
@@ -27,7 +27,7 @@ namespace KTp {
class Message {
public:
- Message(Tp::Message& original);
+ Message(const Tp::Message& original);
QString mainMessagePart() const;
void setMainMessagePart(const QString& message);
@@ -35,11 +35,13 @@ public:
QString finalizedMessage() const;
- QVariantMap& miscData();
+ QVariant property(const QString &name) const;
+ void setProperty(const QString &name, const QVariant &value);
+
private:
- Tp::Message originalMessage;
- QVariantMap m_miscData;
- QStringList content;
+ Tp::Message m_originalMessage;
+ QVariantMap m_properties;
+ QStringList m_content;
enum MessageParts {
MainMessage = 0
--
ktp-text-ui packaging
More information about the pkg-kde-commits
mailing list