Add 1-version to a few constants and classes in tests

3 files changed, 15 insertions, 15 deletions

diff --git a/tests/dbus/call-channel.cpp b/tests/dbus/call-channel.cpp
index 3f75c98c..385bc21b 100644
--- a/tests/dbus/call-channel.cpp
+++ b/tests/dbus/call-channel.cpp
@@ -239,7 +239,7 @@ void TestCallChannel::onNewChannels(const Tp::ChannelDetailsList &channels)
         qDebug() << " channelType:" << channelType;
         qDebug() << " requested  :" << requested;
 
-        if (channelType == TP_QT_IFACE_CHANNEL_TYPE_CALL && !requested) {
+        if (channelType == TP_QT_IFACE_CHANNEL_TYPE_CALL1 && !requested) {
             mChan = CallChannel::create(mConn->client(), details.channel.path(), details.properties);
             mLoop->exit(0);
         }
@@ -294,12 +294,12 @@ void TestCallChannel::testOutgoingCall()
 
     QVariantMap request;
     request.insert(TP_QT_IFACE_CHANNEL + QLatin1String(".ChannelType"),
-                   TP_QT_IFACE_CHANNEL_TYPE_CALL);
+                   TP_QT_IFACE_CHANNEL_TYPE_CALL1);
     request.insert(TP_QT_IFACE_CHANNEL + QLatin1String(".TargetHandleType"),
                    (uint) Tp::HandleTypeContact);
     request.insert(TP_QT_IFACE_CHANNEL + QLatin1String(".TargetHandle"),
                    otherContact->handle());
-    request.insert(TP_QT_IFACE_CHANNEL_TYPE_CALL + QLatin1String(".InitialAudio"),
+    request.insert(TP_QT_IFACE_CHANNEL_TYPE_CALL1 + QLatin1String(".InitialAudio"),
                    true);
     mChan = CallChannelPtr::qObjectCast(mConn->createChannel(request));
     QVERIFY(mChan);
@@ -598,12 +598,12 @@ void TestCallChannel::testHold()
 
     QVariantMap request;
     request.insert(TP_QT_IFACE_CHANNEL + QLatin1String(".ChannelType"),
-                   TP_QT_IFACE_CHANNEL_TYPE_CALL);
+                   TP_QT_IFACE_CHANNEL_TYPE_CALL1);
     request.insert(TP_QT_IFACE_CHANNEL + QLatin1String(".TargetHandleType"),
                    (uint) Tp::HandleTypeContact);
     request.insert(TP_QT_IFACE_CHANNEL + QLatin1String(".TargetHandle"),
                    otherContact->handle());
-    request.insert(TP_QT_IFACE_CHANNEL_TYPE_CALL + QLatin1String(".InitialAudio"),
+    request.insert(TP_QT_IFACE_CHANNEL_TYPE_CALL1 + QLatin1String(".InitialAudio"),
                    true);
     mChan = CallChannelPtr::qObjectCast(mConn->createChannel(request));
     QVERIFY(mChan);
@@ -668,12 +668,12 @@ void TestCallChannel::testHangup()
 
     QVariantMap request;
     request.insert(TP_QT_IFACE_CHANNEL + QLatin1String(".ChannelType"),
-                   TP_QT_IFACE_CHANNEL_TYPE_CALL);
+                   TP_QT_IFACE_CHANNEL_TYPE_CALL1);
     request.insert(TP_QT_IFACE_CHANNEL + QLatin1String(".TargetHandleType"),
                    (uint) Tp::HandleTypeContact);
     request.insert(TP_QT_IFACE_CHANNEL + QLatin1String(".TargetHandle"),
                    otherContact->handle());
-    request.insert(TP_QT_IFACE_CHANNEL_TYPE_CALL + QLatin1String(".InitialVideo"),
+    request.insert(TP_QT_IFACE_CHANNEL_TYPE_CALL1 + QLatin1String(".InitialVideo"),
                    true);
     mChan = CallChannelPtr::qObjectCast(mConn->createChannel(request));
     QVERIFY(mChan);
@@ -710,12 +710,12 @@ void TestCallChannel::testCallMembers()
 
     QVariantMap request;
     request.insert(TP_QT_IFACE_CHANNEL + QLatin1String(".ChannelType"),
-                   TP_QT_IFACE_CHANNEL_TYPE_CALL);
+                   TP_QT_IFACE_CHANNEL_TYPE_CALL1);
     request.insert(TP_QT_IFACE_CHANNEL + QLatin1String(".TargetHandleType"),
                    (uint) Tp::HandleTypeContact);
     request.insert(TP_QT_IFACE_CHANNEL + QLatin1String(".TargetHandle"),
                    otherContact->handle());
-    request.insert(TP_QT_IFACE_CHANNEL_TYPE_CALL + QLatin1String(".InitialVideo"),
+    request.insert(TP_QT_IFACE_CHANNEL_TYPE_CALL1 + QLatin1String(".InitialVideo"),
                    true);
     mChan = CallChannelPtr::qObjectCast(mConn->createChannel(request));
     QVERIFY(mChan);
@@ -904,12 +904,12 @@ void TestCallChannel::testFeatureCore()
 
     QVariantMap request;
     request.insert(TP_QT_IFACE_CHANNEL + QLatin1String(".ChannelType"),
-                   TP_QT_IFACE_CHANNEL_TYPE_CALL);
+                   TP_QT_IFACE_CHANNEL_TYPE_CALL1);
     request.insert(TP_QT_IFACE_CHANNEL + QLatin1String(".TargetHandleType"),
                    (uint) Tp::HandleTypeContact);
     request.insert(TP_QT_IFACE_CHANNEL + QLatin1String(".TargetHandle"),
                    otherContact->handle());
-    request.insert(TP_QT_IFACE_CHANNEL_TYPE_CALL + QLatin1String(".InitialAudio"),
+    request.insert(TP_QT_IFACE_CHANNEL_TYPE_CALL1 + QLatin1String(".InitialAudio"),
                    true);
     mChan = CallChannelPtr::qObjectCast(mConn->createChannel(request));
     QVERIFY(mChan);
diff --git a/tests/dbus/contacts-avatar.cpp b/tests/dbus/contacts-avatar.cpp
index 172dc127..90a88e6e 100644
--- a/tests/dbus/contacts-avatar.cpp
+++ b/tests/dbus/contacts-avatar.cpp
@@ -192,8 +192,8 @@ void TestContactsAvatar::testAvatar()
     QByteArray a = tmpDir.toLatin1();
     setenv ("XDG_CACHE_HOME", a.constData(), true);
 
-    Client::ConnectionInterfaceAvatarsInterface *connAvatarsInterface =
-        mConn->client()->optionalInterface<Client::ConnectionInterfaceAvatarsInterface>();
+    Client::ConnectionInterfaceAvatars1Interface *connAvatarsInterface =
+        mConn->client()->optionalInterface<Client::ConnectionInterfaceAvatars1Interface>();
 
     /* Check if AvatarRetrieved gets called */
     connect(connAvatarsInterface,
diff --git a/tests/dbus/contacts.cpp b/tests/dbus/contacts.cpp
index f49ed13c..baed0b28 100644
--- a/tests/dbus/contacts.cpp
+++ b/tests/dbus/contacts.cpp
@@ -182,9 +182,9 @@ void TestContacts::testSupport()
     QVERIFY(mConn->lowlevel()->contactAttributeInterfaces().contains(
                 TP_QT_IFACE_CONNECTION));
     QVERIFY(mConn->lowlevel()->contactAttributeInterfaces().contains(
-                TP_QT_IFACE_CONNECTION_INTERFACE_ALIASING));
+                TP_QT_IFACE_CONNECTION_INTERFACE_ALIASING1));
     QVERIFY(mConn->lowlevel()->contactAttributeInterfaces().contains(
-                TP_QT_IFACE_CONNECTION_INTERFACE_AVATARS));
+                TP_QT_IFACE_CONNECTION_INTERFACE_AVATARS1));
     QVERIFY(mConn->lowlevel()->contactAttributeInterfaces().contains(
                 TP_QT_IFACE_CONNECTION_INTERFACE_PRESENCE1));
     QVERIFY(!mConn->lowlevel()->contactAttributeInterfaces().contains(