[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=2a504e9

The following commit has been merged in the master branch:
commit 2a504e9645a4db1463493c1d62304fc902e37f92
Author: Martin Klapetek <mklapetek at kde.org>
Date:   Sun Feb 8 21:18:59 2015 +0100

    Use proper QStringLiterals
---
 KTp/contact.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/KTp/contact.cpp b/KTp/contact.cpp
index 1ec037b..6efaf51 100644
--- a/KTp/contact.cpp
+++ b/KTp/contact.cpp
@@ -221,7 +221,7 @@ QString KTp::Contact::buildAvatarPath(const QString &avatarToken)
 {
     QString cacheDir = QString::fromLatin1(qgetenv("XDG_CACHE_HOME"));
     if (cacheDir.isEmpty()) {
-        cacheDir = QString::fromLatin1("%1/.cache").arg(QLatin1String(qgetenv("HOME")));
+        cacheDir = QString(QStringLiteral("%1/.cache")).arg(QLatin1String(qgetenv("HOME")));
     }
 
     if (manager().isNull()) {
@@ -233,10 +233,10 @@ QString KTp::Contact::buildAvatarPath(const QString &avatarToken)
     }
 
     Tp::ConnectionPtr conn = manager()->connection();
-    QString path = QString::fromLatin1("%1/telepathy/avatars/%2/%3").
+    QString path = QString(QStringLiteral("%1/telepathy/avatars/%2/%3")).
         arg(cacheDir).arg(conn->cmName()).arg(conn->protocolName());
 
-    QString avatarFileName = QString::fromLatin1("%1/%2").arg(path).arg(Tp::escapeAsIdentifier(avatarToken));
+    QString avatarFileName = QString(QStringLiteral("%1/%2")).arg(path).arg(Tp::escapeAsIdentifier(avatarToken));
 
     return avatarFileName;
 }

-- 
ktp-common-internals packaging