[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=630c48c

The following commit has been merged in the master branch:
commit 630c48c534509dcd917d568f4dfee20c41a181a6
Author: Martin Klapetek <mklapetek at kde.org>
Date:   Mon Feb 9 01:51:35 2015 +0100

    Do QStringLiterals without QString
    
    Somehow I had stuck in my head that this wouldn't work otherwise.
    I was wrong.
---
 KTp/contact.cpp                                     | 6 +++---
 kpeople/datasourceplugin/im-persons-data-source.cpp | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/KTp/contact.cpp b/KTp/contact.cpp
index 6efaf51..f5ffa5a 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(QStringLiteral("%1/.cache")).arg(QLatin1String(qgetenv("HOME")));
+        cacheDir = 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(QStringLiteral("%1/telepathy/avatars/%2/%3")).
+    QString path = QStringLiteral("%1/telepathy/avatars/%2/%3").
         arg(cacheDir).arg(conn->cmName()).arg(conn->protocolName());
 
-    QString avatarFileName = QString(QStringLiteral("%1/%2")).arg(path).arg(Tp::escapeAsIdentifier(avatarToken));
+    QString avatarFileName = QStringLiteral("%1/%2").arg(path).arg(Tp::escapeAsIdentifier(avatarToken));
 
     return avatarFileName;
 }
diff --git a/kpeople/datasourceplugin/im-persons-data-source.cpp b/kpeople/datasourceplugin/im-persons-data-source.cpp
index 9ceb08c..4197d0a 100644
--- a/kpeople/datasourceplugin/im-persons-data-source.cpp
+++ b/kpeople/datasourceplugin/im-persons-data-source.cpp
@@ -164,7 +164,7 @@ void KTpAllContacts::loadCache(const QString &accountId)
     KConfig config(QLatin1String("ktelepathy-avatarsrc"));
     QString cacheDir = QString::fromLatin1(qgetenv("XDG_CACHE_HOME"));
     if (cacheDir.isEmpty()) {
-        cacheDir = QString(QStringLiteral("%1/.cache")).arg(QLatin1String(qgetenv("HOME")));
+        cacheDir = QStringLiteral("%1/.cache").arg(QLatin1String(qgetenv("HOME")));
     }
 
     while (query.next()) {
@@ -182,10 +182,10 @@ void KTpAllContacts::loadCache(const QString &accountId)
             if (!avatarToken.isEmpty()) {
                 // the accountId is in form of "connection manager name / protocol / username...",
                 // so let's look for the first / after the very first / (ie. second /)
-                QString path = QString(QStringLiteral("%1/telepathy/avatars/%2")).
+                QString path = QStringLiteral("%1/telepathy/avatars/%2").
                     arg(cacheDir).arg(accountId.left(accountId.indexOf(QLatin1Char('/'), accountId.indexOf(QLatin1Char('/')) + 1)));
 
-                avatarFileName = QString(QStringLiteral("%1/%2")).arg(path).arg(Tp::escapeAsIdentifier(avatarToken));
+                avatarFileName = QStringLiteral("%1/%2").arg(path).arg(Tp::escapeAsIdentifier(avatarToken));
             }
         }
 

-- 
ktp-common-internals packaging