From d61a2b07117bba0e2da453c35fc3147d2fb15080 Mon Sep 17 00:00:00 2001
From: Tristan Matthews <tristan.matthews@savoirfairelinux.com>
Date: Thu, 26 May 2011 17:41:01 -0400
Subject: [PATCH] * #5950: remove "converting to non-pointer type 'int' from
NULL" warnings
This consists of using 0 instead of NULL where necessary
---
sflphone-common/src/audio/audiortp/AudioRtpFactory.cpp | 4 ++--
sflphone-common/src/call.h | 2 +-
sflphone-common/src/iax/iaxvoiplink.cpp | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/sflphone-common/src/audio/audiortp/AudioRtpFactory.cpp b/sflphone-common/src/audio/audiortp/AudioRtpFactory.cpp
index bc21a2ff47..bd1afcda1a 100644
--- a/sflphone-common/src/audio/audiortp/AudioRtpFactory.cpp
+++ b/sflphone-common/src/audio/audiortp/AudioRtpFactory.cpp
@@ -299,7 +299,7 @@ void AudioRtpFactory::updateDestinationIpAddress (void)
sfl::AudioSymmetricRtpSession * AudioRtpFactory::getAudioSymetricRtpSession()
{
- if ( (_rtpSessionType == Symmetric) && (_rtpSessionType != NULL)) {
+ if ( (_rtpSessionType == Symmetric) && (_rtpSessionType != 0)) {
return static_cast<AudioSymmetricRtpSession *> (_rtpSession);
} else {
throw AudioRtpFactoryException ("RTP: Error: _rtpSession is NULL in getAudioSymetricRtpSession");
@@ -308,7 +308,7 @@ sfl::AudioSymmetricRtpSession * AudioRtpFactory::getAudioSymetricRtpSession()
sfl::AudioZrtpSession * AudioRtpFactory::getAudioZrtpSession()
{
- if ( (_rtpSessionType == Zrtp) && (_rtpSessionType != NULL)) {
+ if ( (_rtpSessionType == Zrtp) && (_rtpSessionType != 0)) {
return static_cast<AudioZrtpSession *> (_rtpSession);
} else {
throw AudioRtpFactoryException ("RTP: Error: _rtpSession is NULL in getAudioZrtpSession");
diff --git a/sflphone-common/src/call.h b/sflphone-common/src/call.h
index f566774c2c..698cfd862e 100644
--- a/sflphone-common/src/call.h
+++ b/sflphone-common/src/call.h
@@ -40,7 +40,7 @@
#define SIP_SCHEME "sip:"
#define SIPS_SCHEME "sips:"
-#define CallConfigNULL NULL
+#define CallConfigNULL 0
/*
* @file call.h
diff --git a/sflphone-common/src/iax/iaxvoiplink.cpp b/sflphone-common/src/iax/iaxvoiplink.cpp
index fac27823de..da2c6b2daa 100644
--- a/sflphone-common/src/iax/iaxvoiplink.cpp
+++ b/sflphone-common/src/iax/iaxvoiplink.cpp
@@ -62,7 +62,7 @@ IAXVoIPLink::IAXVoIPLink (const AccountID& accountID) : VoIPLink (accountID)
, spkrDataDecoded (NULL)
, spkrDataConverted (NULL)
, converter (NULL)
- , converterSamplingRate (NULL)
+ , converterSamplingRate (0)
, urlhook (NULL)
{
_evThread = new EventThread (this);
--
GitLab