From bb25211b299d3a634dc6857e3b07e0ebb5d6e841 Mon Sep 17 00:00:00 2001 From: f4exb Date: Mon, 27 Dec 2021 23:30:18 +0100 Subject: [PATCH] Make code compatible with Qt 5.12 --- plugins/channelrx/noisefigure/noisefigure.cpp | 8 ++++++++ .../channelrx/radioastronomy/radioastronomy.cpp | 8 ++++++++ .../satellitetracker/satellitetrackerworker.cpp | 16 ++++++++++++++++ sdrbase/commands/command.cpp | 4 ++++ 4 files changed, 36 insertions(+) diff --git a/plugins/channelrx/noisefigure/noisefigure.cpp b/plugins/channelrx/noisefigure/noisefigure.cpp index b8d575ef9..a6a08d413 100644 --- a/plugins/channelrx/noisefigure/noisefigure.cpp +++ b/plugins/channelrx/noisefigure/noisefigure.cpp @@ -355,7 +355,11 @@ void NoiseFigure::powerOn() if (!command.isEmpty()) { +#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) QStringList allArgs = command.split(" ", Qt::SkipEmptyParts); +#else + QStringList allArgs = command.split(" ", QString::SkipEmptyParts); +#endif QString program = allArgs[0]; allArgs.pop_front(); QProcess::execute(program, allArgs); @@ -374,7 +378,11 @@ void NoiseFigure::powerOff() if (!command.isEmpty()) { +#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) QStringList allArgs = command.split(" ", Qt::SkipEmptyParts); +#else + QStringList allArgs = command.split(" ", QString::SkipEmptyParts); +#endif QString program = allArgs[0]; allArgs.pop_front(); QProcess::execute(program, allArgs); diff --git a/plugins/channelrx/radioastronomy/radioastronomy.cpp b/plugins/channelrx/radioastronomy/radioastronomy.cpp index 5a60b467d..5d42e9386 100644 --- a/plugins/channelrx/radioastronomy/radioastronomy.cpp +++ b/plugins/channelrx/radioastronomy/radioastronomy.cpp @@ -303,7 +303,11 @@ void RadioAstronomy::startCal(bool hot) // Execute command to enable calibration if (!m_settings.m_startCalCommand.isEmpty()) { +#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) QStringList allArgs = m_settings.m_startCalCommand.split(" ", Qt::SkipEmptyParts); +#else + QStringList allArgs = m_settings.m_startCalCommand.split(" ", QString::SkipEmptyParts); +#endif QString program = allArgs[0]; allArgs.pop_front(); QProcess::startDetached(program, allArgs); @@ -340,7 +344,11 @@ void RadioAstronomy::calComplete(MsgCalComplete* report) // Execute command to disable calibration if (!m_settings.m_stopCalCommand.isEmpty()) { +#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) QStringList allArgs = m_settings.m_stopCalCommand.split(" ", Qt::SkipEmptyParts); +#else + QStringList allArgs = m_settings.m_stopCalCommand.split(" ", QString::SkipEmptyParts); +#endif QString program = allArgs[0]; allArgs.pop_front(); QProcess::startDetached(program, allArgs); diff --git a/plugins/feature/satellitetracker/satellitetrackerworker.cpp b/plugins/feature/satellitetracker/satellitetrackerworker.cpp index 72ea95809..8d122b706 100644 --- a/plugins/feature/satellitetracker/satellitetrackerworker.cpp +++ b/plugins/feature/satellitetracker/satellitetrackerworker.cpp @@ -544,7 +544,11 @@ void SatelliteTrackerWorker::applyDeviceAOSSettings(const QString& name) if (!m_settings.m_aosCommand.isEmpty()) { qDebug() << "SatelliteTrackerWorker::aos: executing command: " << m_settings.m_aosCommand; +#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) QStringList allArgs = m_settings.m_aosCommand.split(" ", Qt::SkipEmptyParts); +#else + QStringList allArgs = m_settings.m_aosCommand.split(" ", QString::SkipEmptyParts); +#endif QString program = allArgs[0]; allArgs.pop_front(); QProcess::startDetached(program, allArgs); @@ -617,7 +621,11 @@ void SatelliteTrackerWorker::applyDeviceAOSSettings(const QString& name) if (!devSettings->m_aosCommand.isEmpty()) { qDebug() << "SatelliteTrackerWorker::aos: executing command: " << devSettings->m_aosCommand; +#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) QStringList allArgs = m_settings.m_aosCommand.split(" ", Qt::SkipEmptyParts); +#else + QStringList allArgs = m_settings.m_aosCommand.split(" ", QString::SkipEmptyParts); +#endif QString program = allArgs[0]; allArgs.pop_front(); QProcess::startDetached(program, allArgs); @@ -758,7 +766,11 @@ void SatelliteTrackerWorker::los(SatWorkerState *satWorkerState) if (!m_settings.m_losCommand.isEmpty()) { qDebug() << "SatelliteTrackerWorker::los: executing command: " << m_settings.m_losCommand; +#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) QStringList allArgs = m_settings.m_losCommand.split(" ", Qt::SkipEmptyParts); +#else + QStringList allArgs = m_settings.m_losCommand.split(" ", QString::SkipEmptyParts); +#endif QString program = allArgs[0]; allArgs.pop_front(); QProcess::startDetached(program, allArgs); @@ -801,7 +813,11 @@ void SatelliteTrackerWorker::los(SatWorkerState *satWorkerState) if (!devSettings->m_losCommand.isEmpty()) { qDebug() << "SatelliteTrackerWorker::los: executing command: " << devSettings->m_losCommand; +#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) QStringList allArgs = devSettings->m_losCommand.split(" ", Qt::SkipEmptyParts); +#else + QStringList allArgs = devSettings->m_losCommand.split(" ", QString::SkipEmptyParts); +#endif QString program = allArgs[0]; allArgs.pop_front(); QProcess::startDetached(program, allArgs); diff --git a/sdrbase/commands/command.cpp b/sdrbase/commands/command.cpp index 8d98c9c8c..5036e33a7 100644 --- a/sdrbase/commands/command.cpp +++ b/sdrbase/commands/command.cpp @@ -203,7 +203,11 @@ void Command::run(const QString& apiAddress, int apiPort, int deviceSetIndex) m_currentProcess->setProcessChannelMode(QProcess::MergedChannels); m_currentProcessStartTimeStampms = TimeUtil::nowms(); +#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) QStringList allArgs = args.split(" ", Qt::SkipEmptyParts); +#else + QStringList allArgs = args.split(" ", QString::SkipEmptyParts); +#endif m_currentProcess->start(m_command, allArgs); }