telepathy-qt: Use C++ bool type rather than mixing with gboolean

David Edmundson davidedmundson at kemper.freedesktop.org
Wed Apr 27 10:44:44 UTC 2016


Module: telepathy-qt
Branch: master
Commit: 15374115fa910ffa41ac2acce71b7f4fc0937674
URL:    http://cgit.freedesktop.org/telepathy/telepathy-qt/commit/?id=15374115fa910ffa41ac2acce71b7f4fc0937674

Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Tue Apr 26 15:10:44 2016 +0100

Use C++ bool type rather than mixing with gboolean

They are not always the same size.
This fixes a compile error on some systems.

---

 tests/dbus/contacts-capabilities.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/dbus/contacts-capabilities.cpp b/tests/dbus/contacts-capabilities.cpp
index 72ea95e..0095f85 100644
--- a/tests/dbus/contacts-capabilities.cpp
+++ b/tests/dbus/contacts-capabilities.cpp
@@ -111,7 +111,7 @@ void TestContactsCapabilities::testCapabilities()
     QStringList ids = QStringList() << QLatin1String("alice")
         << QLatin1String("bob") << QLatin1String("chris");
 
-    gboolean supportTextChat[] = { TRUE, FALSE, FALSE };
+    bool supportTextChat[] = { true, false, false};
 
     TpHandleRepoIface *serviceRepo =
         tp_base_connection_get_handles(TP_BASE_CONNECTION(mConn->service()),
@@ -135,7 +135,7 @@ void TestContactsCapabilities::testCapabilities()
         QCOMPARE(contact->requestedFeatures().contains(Contact::FeatureCapabilities), true);
         QCOMPARE(contact->actualFeatures().contains(Contact::FeatureCapabilities), true);
 
-        QCOMPARE(contact->capabilities().textChats(), static_cast<bool>(supportTextChat[i]));
+        QCOMPARE(contact->capabilities().textChats(), supportTextChat[i]);
         QCOMPARE(contact->capabilities().streamedMediaCalls(), false);
         QCOMPARE(contact->capabilities().streamedMediaAudioCalls(), false);
         QCOMPARE(contact->capabilities().streamedMediaVideoCalls(), false);



More information about the telepathy-commits mailing list