From f8efc14421b36a539b0addc961351422def40960 Mon Sep 17 00:00:00 2001 From: Jon Beniston Date: Mon, 10 Apr 2023 15:57:16 +0100 Subject: [PATCH] Fix Qt6 compilation --- plugins/channelrx/demodnavtex/navtexdemodsink.cpp | 2 +- plugins/channelrx/heatmap/heatmapgui.cpp | 2 +- sdrbase/maincore.cpp | 6 ++++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/plugins/channelrx/demodnavtex/navtexdemodsink.cpp b/plugins/channelrx/demodnavtex/navtexdemodsink.cpp index 14ab40bd3..1d86d759a 100644 --- a/plugins/channelrx/demodnavtex/navtexdemodsink.cpp +++ b/plugins/channelrx/demodnavtex/navtexdemodsink.cpp @@ -355,7 +355,7 @@ void NavtexDemodSink::receiveBit(bool bit) getMessageQueueToChannel()->push(msg); } // Add character to message buffer - m_messageBuffer.append(c); + m_messageBuffer.append(QChar(c)); } else { diff --git a/plugins/channelrx/heatmap/heatmapgui.cpp b/plugins/channelrx/heatmap/heatmapgui.cpp index 63ca5459b..f3e60ab01 100644 --- a/plugins/channelrx/heatmap/heatmapgui.cpp +++ b/plugins/channelrx/heatmap/heatmapgui.cpp @@ -695,7 +695,7 @@ void HeatMapGUI::displaySettings() value = (int)std::log10(m_settings.m_sampleRate); ui->sampleRate->setValue(value); - int idx = std::min(std::max(0, value-2), m_sampleRateTexts.size() - 1); + int idx = std::min(std::max(0, value-2), (int)m_sampleRateTexts.size() - 1); ui->sampleRateText->setText(m_sampleRateTexts[idx]); ui->averagePeriod->setMinimum(std::max(1, static_cast (m_averagePeriodTexts.size()) - value)); diff --git a/sdrbase/maincore.cpp b/sdrbase/maincore.cpp index d9d223a3e..d9ed30619 100644 --- a/sdrbase/maincore.cpp +++ b/sdrbase/maincore.cpp @@ -358,10 +358,12 @@ void MainCore::initPosition() if (m_positionSource) { connect(m_positionSource, &QGeoPositionInfoSource::positionUpdated, this, &MainCore::positionUpdated); - #if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0)) +#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0)) connect(m_positionSource, &QGeoPositionInfoSource::updateTimeout, this, &MainCore::positionUpdateTimeout); - #endif connect(m_positionSource, qOverload(&QGeoPositionInfoSource::error), this, &MainCore::positionError); +#else + connect(m_positionSource, &QGeoPositionInfoSource::errorOccurred, this, &MainCore::positionError); +#endif m_position = m_positionSource->lastKnownPosition(); m_positionSource->setUpdateInterval(1000); m_positionSource->startUpdates();