From 95b191353b5db1db97d2c1afee0510f042c3cdd7 Mon Sep 17 00:00:00 2001
From: f4exb <f4exb06@gmail.com>
Date: Sat, 30 Sep 2017 04:05:32 +0200
Subject: [PATCH] Fixed warnings with g++ 6.3

---
 plugins/channelrx/udpsrc/udpsrc.cpp | 2 +-
 sdrbase/device/devicesinkapi.cpp    | 4 ----
 sdrbase/device/devicesourceapi.cpp  | 4 ----
 sdrbase/gui/audiodialog.cpp         | 6 ++++--
 4 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/plugins/channelrx/udpsrc/udpsrc.cpp b/plugins/channelrx/udpsrc/udpsrc.cpp
index 5a91326b1..3954b6582 100644
--- a/plugins/channelrx/udpsrc/udpsrc.cpp
+++ b/plugins/channelrx/udpsrc/udpsrc.cpp
@@ -476,7 +476,7 @@ void UDPSrc::apply(bool force)
         m_outMovingAverage.resize(m_config.m_outputSampleRate * 0.01, 1e-10); // 10 ms
     }
 
-    if ((m_config.m_audioActive != m_config.m_audioActive) || force)
+    if ((m_config.m_audioActive != m_running.m_audioActive) || force)
     {
         if (m_config.m_audioActive)
         {
diff --git a/sdrbase/device/devicesinkapi.cpp b/sdrbase/device/devicesinkapi.cpp
index e634c5d68..d5e3413b1 100644
--- a/sdrbase/device/devicesinkapi.cpp
+++ b/sdrbase/device/devicesinkapi.cpp
@@ -395,8 +395,6 @@ bool DeviceSinkAPI::ChannelInstanceRegistration::operator<(const ChannelInstance
 
 void DeviceSinkAPI::addSourceBuddy(DeviceSourceAPI* buddy)
 {
-    std::vector<DeviceSourceAPI*>::iterator it = m_sourceBuddies.begin();
-
     m_sourceBuddies.push_back(buddy);
     buddy->m_sinkBuddies.push_back(this);
     qDebug("DeviceSinkAPI::addSourceBuddy: added buddy %s(%s) to the list [%lx] <-> [%lx]",
@@ -408,8 +406,6 @@ void DeviceSinkAPI::addSourceBuddy(DeviceSourceAPI* buddy)
 
 void DeviceSinkAPI::addSinkBuddy(DeviceSinkAPI* buddy)
 {
-    std::vector<DeviceSinkAPI*>::iterator it = m_sinkBuddies.begin();
-
     m_sinkBuddies.push_back(buddy);
     buddy->m_sinkBuddies.push_back(this);
     qDebug("DeviceSinkAPI::addSinkBuddy: added buddy %s(%s) to the list [%lx] <-> [%lx]",
diff --git a/sdrbase/device/devicesourceapi.cpp b/sdrbase/device/devicesourceapi.cpp
index 17afc8233..fb63fc50a 100644
--- a/sdrbase/device/devicesourceapi.cpp
+++ b/sdrbase/device/devicesourceapi.cpp
@@ -398,8 +398,6 @@ bool DeviceSourceAPI::ChannelInstanceRegistration::operator<(const ChannelInstan
 
 void DeviceSourceAPI::addSourceBuddy(DeviceSourceAPI* buddy)
 {
-    std::vector<DeviceSourceAPI*>::iterator it = m_sourceBuddies.begin();
-
     m_sourceBuddies.push_back(buddy);
     buddy->m_sourceBuddies.push_back(this);
     qDebug("DeviceSourceAPI::addSourceBuddy: added buddy %s(%s) [%lx] <-> [%lx]",
@@ -411,8 +409,6 @@ void DeviceSourceAPI::addSourceBuddy(DeviceSourceAPI* buddy)
 
 void DeviceSourceAPI::addSinkBuddy(DeviceSinkAPI* buddy)
 {
-    std::vector<DeviceSinkAPI*>::iterator it = m_sinkBuddies.begin();
-
     m_sinkBuddies.push_back(buddy);
     buddy->m_sourceBuddies.push_back(this);
     qDebug("DeviceSourceAPI::addSinkBuddy: added buddy %s(%s) [%lx] <-> [%lx]",
diff --git a/sdrbase/gui/audiodialog.cpp b/sdrbase/gui/audiodialog.cpp
index 827f336b6..c8874cfa7 100644
--- a/sdrbase/gui/audiodialog.cpp
+++ b/sdrbase/gui/audiodialog.cpp
@@ -54,11 +54,13 @@ AudioDialog::AudioDialog(AudioDeviceInfo* audioDeviceInfo, QWidget* parent) :
         i++;
     }
 
-    if(ui->audioOutTree->currentItem() == NULL)
+    if(ui->audioOutTree->currentItem() == 0) {
         ui->audioOutTree->setCurrentItem(ui->audioOutTree->topLevelItem(0));
+    }
 
-	if(ui->audioInTree->currentItem() == NULL)
+	if(ui->audioInTree->currentItem() == 0) {
 		ui->audioInTree->setCurrentItem(ui->audioInTree->topLevelItem(0));
+	}
 
 	ui->tabWidget->setCurrentIndex(0);