[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=e448d2e

The following commit has been merged in the master branch:
commit e448d2e87a2df446b3a4ae0d5d840ae4b4408993
Author: Aleix Pol <aleixpol at kde.org>
Date:   Wed Jun 10 20:30:46 2015 +0200

    Cleanup
    
    Properly construct strings
    Don't mark as unused if it's used
---
 KTp/message.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/KTp/message.cpp b/KTp/message.cpp
index 2a2640a..566241e 100644
--- a/KTp/message.cpp
+++ b/KTp/message.cpp
@@ -41,7 +41,6 @@ Message::Message(Message::Private *dd):
 Message::Message(const Tp::Message &original, const KTp::MessageContext &context) :
     d(new Private)
 {
-    Q_UNUSED(context)
     d->sentTime = original.sent();
     d->token = original.messageToken();
     d->messageType = original.messageType();
@@ -117,7 +116,7 @@ void Message::appendScript(const QString& script)
 
 QString Message::finalizedMessage() const
 {
-    QString msg = d->mainPart + QLatin1String("
") +
+    QString msg = d->mainPart + QLatin1Char('
') +
         d->parts.join(QLatin1String("
"));
 
 //     qCDebug(KTP_COMMONINTERNALS) << msg;
@@ -130,7 +129,7 @@ QString Message::finalizedScript() const
         return QString();
     }
 
-    QString finalScript = d->scripts.join(QLatin1String(""));
+    QString finalScript = d->scripts.join(QString());
 
     if (!finalScript.isEmpty()) {
         finalScript.append(QLatin1String("false;"));

-- 
ktp-common-internals packaging