diff options
| author | Andre Moreira Magalhaes (andrunko) <andre.magalhaes@collabora.co.uk> | 2011-11-22 18:39:46 -0200 |
|---|---|---|
| committer | Andre Moreira Magalhaes (andrunko) <andre.magalhaes@collabora.co.uk> | 2011-11-24 14:45:45 -0200 |
| commit | 64f2fb1d8406000815294b81035228af041358e0 (patch) | |
| tree | ad3732e4f1371d3e4983af60bf7156dbd38af4fd /tests/lib | |
| parent | c9201a5bb28ac31e21762b468e8814cae081d78f (diff) | |
Only generate QLatin1String macros for errors/constants.
Diffstat (limited to 'tests/lib')
| -rw-r--r-- | tests/lib/glib-helpers/test-conn-helper.cpp | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/tests/lib/glib-helpers/test-conn-helper.cpp b/tests/lib/glib-helpers/test-conn-helper.cpp index 46ba4183..e12f8052 100644 --- a/tests/lib/glib-helpers/test-conn-helper.cpp +++ b/tests/lib/glib-helpers/test-conn-helper.cpp @@ -247,11 +247,11 @@ Tp::ChannelPtr TestConnHelper::createChannel(const QVariantMap &request) Tp::ChannelPtr TestConnHelper::createChannel(const QString &channelType, const Tp::ContactPtr &target) { QVariantMap request; - request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".ChannelType"), + request.insert(TP_QT_IFACE_CHANNEL + QLatin1String(".ChannelType"), channelType); - request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".TargetHandleType"), + request.insert(TP_QT_IFACE_CHANNEL + QLatin1String(".TargetHandleType"), (uint) Tp::HandleTypeContact); - request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".TargetHandle"), + request.insert(TP_QT_IFACE_CHANNEL + QLatin1String(".TargetHandle"), target->handle()[0]); return createChannel(request); } @@ -260,11 +260,11 @@ Tp::ChannelPtr TestConnHelper::createChannel(const QString &channelType, Tp::HandleType targetHandleType, uint targetHandle) { QVariantMap request; - request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".ChannelType"), + request.insert(TP_QT_IFACE_CHANNEL + QLatin1String(".ChannelType"), channelType); - request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".TargetHandleType"), + request.insert(TP_QT_IFACE_CHANNEL + QLatin1String(".TargetHandleType"), (uint) targetHandleType); - request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".TargetHandle"), + request.insert(TP_QT_IFACE_CHANNEL + QLatin1String(".TargetHandle"), targetHandle); return createChannel(request); } @@ -273,11 +273,11 @@ Tp::ChannelPtr TestConnHelper::createChannel(const QString &channelType, Tp::HandleType targetHandleType, const QString &targetID) { QVariantMap request; - request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".ChannelType"), + request.insert(TP_QT_IFACE_CHANNEL + QLatin1String(".ChannelType"), channelType); - request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".TargetHandleType"), + request.insert(TP_QT_IFACE_CHANNEL + QLatin1String(".TargetHandleType"), (uint) targetHandleType); - request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".TargetID"), + request.insert(TP_QT_IFACE_CHANNEL + QLatin1String(".TargetID"), targetID); return ensureChannel(request); } @@ -301,11 +301,11 @@ Tp::ChannelPtr TestConnHelper::ensureChannel(const QVariantMap &request) Tp::ChannelPtr TestConnHelper::ensureChannel(const QString &channelType, const Tp::ContactPtr &target) { QVariantMap request; - request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".ChannelType"), + request.insert(TP_QT_IFACE_CHANNEL + QLatin1String(".ChannelType"), channelType); - request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".TargetHandleType"), + request.insert(TP_QT_IFACE_CHANNEL + QLatin1String(".TargetHandleType"), (uint) Tp::HandleTypeContact); - request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".TargetHandle"), + request.insert(TP_QT_IFACE_CHANNEL + QLatin1String(".TargetHandle"), target->handle()[0]); return ensureChannel(request); } @@ -314,11 +314,11 @@ Tp::ChannelPtr TestConnHelper::ensureChannel(const QString &channelType, Tp::HandleType targetHandleType, uint targetHandle) { QVariantMap request; - request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".ChannelType"), + request.insert(TP_QT_IFACE_CHANNEL + QLatin1String(".ChannelType"), channelType); - request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".TargetHandleType"), + request.insert(TP_QT_IFACE_CHANNEL + QLatin1String(".TargetHandleType"), (uint) targetHandleType); - request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".TargetHandle"), + request.insert(TP_QT_IFACE_CHANNEL + QLatin1String(".TargetHandle"), targetHandle); return ensureChannel(request); } @@ -327,11 +327,11 @@ Tp::ChannelPtr TestConnHelper::ensureChannel(const QString &channelType, Tp::HandleType targetHandleType, const QString &targetID) { QVariantMap request; - request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".ChannelType"), + request.insert(TP_QT_IFACE_CHANNEL + QLatin1String(".ChannelType"), channelType); - request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".TargetHandleType"), + request.insert(TP_QT_IFACE_CHANNEL + QLatin1String(".TargetHandleType"), (uint) targetHandleType); - request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".TargetID"), + request.insert(TP_QT_IFACE_CHANNEL + QLatin1String(".TargetID"), targetID); return ensureChannel(request); } |