[Telepathy-commits] [telepathy-qt4/master] ContactManager: Make it work with QT_NO_CAST_FROM_ASCII.
Andre Moreira Magalhaes (andrunko)
andre.magalhaes at collabora.co.uk
Fri Feb 27 11:42:50 PST 2009
---
TelepathyQt4/Client/contact-manager.cpp | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/TelepathyQt4/Client/contact-manager.cpp b/TelepathyQt4/Client/contact-manager.cpp
index 9144b45..82fc113 100644
--- a/TelepathyQt4/Client/contact-manager.cpp
+++ b/TelepathyQt4/Client/contact-manager.cpp
@@ -642,7 +642,9 @@ void ContactManager::Private::updateContactsPresenceState()
QString ContactManager::ContactListChannel::identifierForType(Type type)
{
static QString identifiers[LastType] = {
- "subscribe", "publish", "stored"
+ QLatin1String("subscribe"),
+ QLatin1String("publish"),
+ QLatin1String("stored"),
};
return identifiers[type];
}
@@ -651,9 +653,9 @@ uint ContactManager::ContactListChannel::typeForIdentifier(const QString &identi
{
static QHash<QString, uint> types;
if (types.isEmpty()) {
- types.insert("subscribe", TypeSubscribe);
- types.insert("publish", TypePublish);
- types.insert("stored", TypeStored);
+ types.insert(QLatin1String("subscribe"), TypeSubscribe);
+ types.insert(QLatin1String("publish"), TypePublish);
+ types.insert(QLatin1String("stored"), TypeStored);
}
if (types.contains(identifier)) {
return types[identifier];
--
1.5.6.5
More information about the telepathy-commits
mailing list