From 2b8c7059a289121f2f96b6dce8107b71544f9a47 Mon Sep 17 00:00:00 2001 From: Thomas Flueeli Date: Thu, 28 Oct 2010 15:36:25 +0200 Subject: [PATCH 2/5] fix expression warnings This fixes the following warning on MSVC9: warning C4806: '==' : unsafe operation: no value of type 'bool' promoted to type 'int' can equal the given constant --- TelepathyQt4/capabilities-base.cpp | 8 ++++---- TelepathyQt4/connection-capabilities.cpp | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/TelepathyQt4/capabilities-base.cpp b/TelepathyQt4/capabilities-base.cpp index b25268c..bc8e8d0 100644 --- a/TelepathyQt4/capabilities-base.cpp +++ b/TelepathyQt4/capabilities-base.cpp @@ -160,7 +160,7 @@ bool CapabilitiesBase::supportsTextChats() const QString channelType; uint targetHandleType; foreach (const RequestableChannelClass &cls, mPriv->classes) { - if (!cls.fixedProperties.size() == 2) { + if (!(cls.fixedProperties.size() == 2)) { continue; } @@ -193,7 +193,7 @@ bool CapabilitiesBase::supportsMediaCalls() const QString channelType; uint targetHandleType; foreach (const RequestableChannelClass &cls, mPriv->classes) { - if (!cls.fixedProperties.size() == 2) { + if (!(cls.fixedProperties.size() == 2)) { continue; } @@ -236,7 +236,7 @@ bool CapabilitiesBase::supportsAudioCalls() const QString channelType; uint targetHandleType; foreach (const RequestableChannelClass &cls, mPriv->classes) { - if (!cls.fixedProperties.size() == 2) { + if (!(cls.fixedProperties.size() == 2)) { continue; } @@ -272,7 +272,7 @@ bool CapabilitiesBase::supportsVideoCalls(bool withAudio) const QString channelType; uint targetHandleType; foreach (const RequestableChannelClass &cls, mPriv->classes) { - if (!cls.fixedProperties.size() == 2) { + if (!(cls.fixedProperties.size() == 2)) { continue; } diff --git a/TelepathyQt4/connection-capabilities.cpp b/TelepathyQt4/connection-capabilities.cpp index 4519c0a..561fdc6 100644 --- a/TelepathyQt4/connection-capabilities.cpp +++ b/TelepathyQt4/connection-capabilities.cpp @@ -80,7 +80,7 @@ bool ConnectionCapabilities::supportsTextChatrooms() const uint targetHandleType; RequestableChannelClassList classes = requestableChannelClasses(); foreach (const RequestableChannelClass &cls, classes) { - if (!cls.fixedProperties.size() == 2) { + if (!(cls.fixedProperties.size() == 2)) { continue; } -- 1.7.2.3