VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-07-03 17:35:23 -04:00
Code Issues Projects Releases Wiki Activity

Fix Qt6 compilation

Browse Source
This commit is contained in:
Jon Beniston 2023-04-10 15:57:16 +01:00
parent a76d11b3a1
commit f8efc14421
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/channelrx/demodnavtex/navtexdemodsink.cpp
View File

@ -355,7 +355,7 @@ void NavtexDemodSink::receiveBit(bool bit)
getMessageQueueToChannel()->push(msg); getMessageQueueToChannel()->push(msg);
} }
// Add character to message buffer // Add character to message buffer
m_messageBuffer.append(c); m_messageBuffer.append(QChar(c));
} }
else else
{ {

2
plugins/channelrx/heatmap/heatmapgui.cpp
View File

@ -695,7 +695,7 @@ void HeatMapGUI::displaySettings()
value = (int)std::log10(m_settings.m_sampleRate); value = (int)std::log10(m_settings.m_sampleRate);
ui->sampleRate->setValue(value); 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->sampleRateText->setText(m_sampleRateTexts[idx]);
ui->averagePeriod->setMinimum(std::max(1, static_cast<int> (m_averagePeriodTexts.size()) - value)); ui->averagePeriod->setMinimum(std::max(1, static_cast<int> (m_averagePeriodTexts.size()) - value));

4
sdrbase/maincore.cpp
View File

@ -360,8 +360,10 @@ void MainCore::initPosition()
connect(m_positionSource, &QGeoPositionInfoSource::positionUpdated, this, &MainCore::positionUpdated); 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); connect(m_positionSource, &QGeoPositionInfoSource::updateTimeout, this, &MainCore::positionUpdateTimeout);
#endif
connect(m_positionSource, qOverload<QGeoPositionInfoSource::Error>(&QGeoPositionInfoSource::error), this, &MainCore::positionError); connect(m_positionSource, qOverload<QGeoPositionInfoSource::Error>(&QGeoPositionInfoSource::error), this, &MainCore::positionError);
#else
connect(m_positionSource, &QGeoPositionInfoSource::errorOccurred, this, &MainCore::positionError);
#endif
m_position = m_positionSource->lastKnownPosition(); m_position = m_positionSource->lastKnownPosition();
m_positionSource->setUpdateInterval(1000); m_positionSource->setUpdateInterval(1000);
m_positionSource->startUpdates(); m_positionSource->startUpdates();