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

The following commit has been merged in the master branch:
commit 2ce53e984aafa640ccea55b53afb14c7a9f7db4a
Author: Aleix Pol <aleixpol at kde.org>
Date:   Wed Feb 11 17:46:36 2015 +0100

    Use QStringLiteral to construct QString from a literal
---
 KTp/types.h | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/KTp/types.h b/KTp/types.h
index d0e4fd6..7d80fc2 100644
--- a/KTp/types.h
+++ b/KTp/types.h
@@ -91,21 +91,21 @@ namespace KTp
     };
 }
 
-static const QString S_KPEOPLE_PROPERTY_ACCOUNT_PATH = QString::fromLatin1("telepathy-accountPath");
-static const QString S_KPEOPLE_PROPERTY_CONTACT_ID = QString::fromLatin1("telepathy-contactId");
-static const QString S_KPEOPLE_PROPERTY_PRESENCE = QString::fromLatin1("telepathy-presence");
-static const QString S_KPEOPLE_PROPERTY_IS_BLOCKED = QString::fromLatin1("telepathy-isBlocked");
+static const QString S_KPEOPLE_PROPERTY_ACCOUNT_PATH = QStringLiteral("telepathy-accountPath");
+static const QString S_KPEOPLE_PROPERTY_CONTACT_ID = QStringLiteral("telepathy-contactId");
+static const QString S_KPEOPLE_PROPERTY_PRESENCE = QStringLiteral("telepathy-presence");
+static const QString S_KPEOPLE_PROPERTY_IS_BLOCKED = QStringLiteral("telepathy-isBlocked");
 
 const QHash<Tp::ConnectionPresenceType, QString> s_presenceStrings = {
     { Tp::ConnectionPresenceTypeUnset, QString() },
-    { Tp::ConnectionPresenceTypeOffline, QString::fromLatin1("offline") },
-    { Tp::ConnectionPresenceTypeAvailable, QString::fromLatin1("available") },
-    { Tp::ConnectionPresenceTypeAway, QString::fromLatin1("away") },
-    { Tp::ConnectionPresenceTypeExtendedAway, QString::fromLatin1("xa") },
-    { Tp::ConnectionPresenceTypeHidden, QString::fromLatin1("hidden") }, //or 'offline' ?
-    { Tp::ConnectionPresenceTypeBusy, QString::fromLatin1("busy") },
-    { Tp::ConnectionPresenceTypeUnknown, QString::fromLatin1("unknown") },
-    { Tp::ConnectionPresenceTypeError, QString::fromLatin1("error") }
+    { Tp::ConnectionPresenceTypeOffline, QStringLiteral("offline") },
+    { Tp::ConnectionPresenceTypeAvailable, QStringLiteral("available") },
+    { Tp::ConnectionPresenceTypeAway, QStringLiteral("away") },
+    { Tp::ConnectionPresenceTypeExtendedAway, QStringLiteral("xa") },
+    { Tp::ConnectionPresenceTypeHidden, QStringLiteral("hidden") }, //or 'offline' ?
+    { Tp::ConnectionPresenceTypeBusy, QStringLiteral("busy") },
+    { Tp::ConnectionPresenceTypeUnknown, QStringLiteral("unknown") },
+    { Tp::ConnectionPresenceTypeError, QStringLiteral("error") }
 };
 
 Q_DECLARE_METATYPE(Tp::AccountPtr)

-- 
ktp-common-internals packaging