diff --git a/plugins/channelrx/demodam/amdemod.cpp b/plugins/channelrx/demodam/amdemod.cpp index 8533e7309..aba67ccb7 100644 --- a/plugins/channelrx/demodam/amdemod.cpp +++ b/plugins/channelrx/demodam/amdemod.cpp @@ -806,13 +806,14 @@ void AMDemod::webapiReverseSendSettings(QList& channelSettingsKeys, con m_networkRequest.setUrl(QUrl(channelSettingsURL)); m_networkRequest.setHeader(QNetworkRequest::ContentTypeHeader, "application/json"); - QBuffer *buffer=new QBuffer(); + QBuffer *buffer = new QBuffer(); buffer->open((QBuffer::ReadWrite)); buffer->write(swgChannelSettings->asJson().toUtf8()); buffer->seek(0); // Always use PATCH to avoid passing reverse API settings - m_networkManager->sendCustomRequest(m_networkRequest, "PATCH", buffer); + QNetworkReply *reply = m_networkManager->sendCustomRequest(m_networkRequest, "PATCH", buffer); + buffer->setParent(reply); delete swgChannelSettings; } @@ -827,10 +828,13 @@ void AMDemod::networkManagerFinished(QNetworkReply *reply) << " error(" << (int) replyError << "): " << replyError << ": " << reply->errorString(); - return; + } + else + { + QString answer = reply->readAll(); + answer.chop(1); // remove last \n + qDebug("AMDemod::networkManagerFinished: reply:\n%s", answer.toStdString().c_str()); } - QString answer = reply->readAll(); - answer.chop(1); // remove last \n - qDebug("AMDemod::networkManagerFinished: reply:\n%s", answer.toStdString().c_str()); + reply->deleteLater(); } diff --git a/plugins/channelrx/demodbfm/bfmdemod.cpp b/plugins/channelrx/demodbfm/bfmdemod.cpp index eba835a49..4d62d371d 100644 --- a/plugins/channelrx/demodbfm/bfmdemod.cpp +++ b/plugins/channelrx/demodbfm/bfmdemod.cpp @@ -865,13 +865,14 @@ void BFMDemod::webapiReverseSendSettings(QList& channelSettingsKeys, co m_networkRequest.setUrl(QUrl(channelSettingsURL)); m_networkRequest.setHeader(QNetworkRequest::ContentTypeHeader, "application/json"); - QBuffer *buffer=new QBuffer(); + QBuffer *buffer = new QBuffer(); buffer->open((QBuffer::ReadWrite)); buffer->write(swgChannelSettings->asJson().toUtf8()); buffer->seek(0); // Always use PATCH to avoid passing reverse API settings - m_networkManager->sendCustomRequest(m_networkRequest, "PATCH", buffer); + QNetworkReply *reply = m_networkManager->sendCustomRequest(m_networkRequest, "PATCH", buffer); + buffer->setParent(reply); delete swgChannelSettings; } @@ -886,10 +887,13 @@ void BFMDemod::networkManagerFinished(QNetworkReply *reply) << " error(" << (int) replyError << "): " << replyError << ": " << reply->errorString(); - return; + } + else + { + QString answer = reply->readAll(); + answer.chop(1); // remove last \n + qDebug("BFMDemod::networkManagerFinished: reply:\n%s", answer.toStdString().c_str()); } - QString answer = reply->readAll(); - answer.chop(1); // remove last \n - qDebug("BFMDemod::networkManagerFinished: reply:\n%s", answer.toStdString().c_str()); + reply->deleteLater(); } diff --git a/plugins/channelrx/demoddsd/dsddemod.cpp b/plugins/channelrx/demoddsd/dsddemod.cpp index 8eef9a0d0..ed1c62946 100644 --- a/plugins/channelrx/demoddsd/dsddemod.cpp +++ b/plugins/channelrx/demoddsd/dsddemod.cpp @@ -1155,13 +1155,14 @@ void DSDDemod::webapiReverseSendSettings(QList& channelSettingsKeys, co m_networkRequest.setUrl(QUrl(channelSettingsURL)); m_networkRequest.setHeader(QNetworkRequest::ContentTypeHeader, "application/json"); - QBuffer *buffer=new QBuffer(); + QBuffer *buffer = new QBuffer(); buffer->open((QBuffer::ReadWrite)); buffer->write(swgChannelSettings->asJson().toUtf8()); buffer->seek(0); // Always use PATCH to avoid passing reverse API settings - m_networkManager->sendCustomRequest(m_networkRequest, "PATCH", buffer); + QNetworkReply *reply = m_networkManager->sendCustomRequest(m_networkRequest, "PATCH", buffer); + buffer->setParent(reply); delete swgChannelSettings; } @@ -1176,10 +1177,13 @@ void DSDDemod::networkManagerFinished(QNetworkReply *reply) << " error(" << (int) replyError << "): " << replyError << ": " << reply->errorString(); - return; + } + else + { + QString answer = reply->readAll(); + answer.chop(1); // remove last \n + qDebug("DSDDemod::networkManagerFinished: reply:\n%s", answer.toStdString().c_str()); } - QString answer = reply->readAll(); - answer.chop(1); // remove last \n - qDebug("DSDDemod::networkManagerFinished: reply:\n%s", answer.toStdString().c_str()); + reply->deleteLater(); } diff --git a/plugins/channelrx/demodfreedv/freedvdemod.cpp b/plugins/channelrx/demodfreedv/freedvdemod.cpp index 894d6aa6f..af2c02934 100644 --- a/plugins/channelrx/demodfreedv/freedvdemod.cpp +++ b/plugins/channelrx/demodfreedv/freedvdemod.cpp @@ -1058,13 +1058,14 @@ void FreeDVDemod::webapiReverseSendSettings(QList& channelSettingsKeys, m_networkRequest.setUrl(QUrl(channelSettingsURL)); m_networkRequest.setHeader(QNetworkRequest::ContentTypeHeader, "application/json"); - QBuffer *buffer=new QBuffer(); + QBuffer *buffer = new QBuffer(); buffer->open((QBuffer::ReadWrite)); buffer->write(swgChannelSettings->asJson().toUtf8()); buffer->seek(0); // Always use PATCH to avoid passing reverse API settings - m_networkManager->sendCustomRequest(m_networkRequest, "PATCH", buffer); + QNetworkReply *reply = m_networkManager->sendCustomRequest(m_networkRequest, "PATCH", buffer); + buffer->setParent(reply); delete swgChannelSettings; } @@ -1079,12 +1080,15 @@ void FreeDVDemod::networkManagerFinished(QNetworkReply *reply) << " error(" << (int) replyError << "): " << replyError << ": " << reply->errorString(); - return; + } + else + { + QString answer = reply->readAll(); + answer.chop(1); // remove last \n + qDebug("FreeDVDemod::networkManagerFinished: reply:\n%s", answer.toStdString().c_str()); } - QString answer = reply->readAll(); - answer.chop(1); // remove last \n - qDebug("FreeDVDemod::networkManagerFinished: reply:\n%s", answer.toStdString().c_str()); + reply->deleteLater(); } void FreeDVDemod::timerHandlerFunction() diff --git a/plugins/channelrx/demodnfm/nfmdemod.cpp b/plugins/channelrx/demodnfm/nfmdemod.cpp index f750ec1b9..679c65390 100644 --- a/plugins/channelrx/demodnfm/nfmdemod.cpp +++ b/plugins/channelrx/demodnfm/nfmdemod.cpp @@ -937,13 +937,14 @@ void NFMDemod::webapiReverseSendSettings(QList& channelSettingsKeys, co m_networkRequest.setUrl(QUrl(channelSettingsURL)); m_networkRequest.setHeader(QNetworkRequest::ContentTypeHeader, "application/json"); - QBuffer *buffer=new QBuffer(); + QBuffer *buffer = new QBuffer(); buffer->open((QBuffer::ReadWrite)); buffer->write(swgChannelSettings->asJson().toUtf8()); buffer->seek(0); // Always use PATCH to avoid passing reverse API settings - m_networkManager->sendCustomRequest(m_networkRequest, "PATCH", buffer); + QNetworkReply *reply = m_networkManager->sendCustomRequest(m_networkRequest, "PATCH", buffer); + buffer->setParent(reply); delete swgChannelSettings; } @@ -958,10 +959,13 @@ void NFMDemod::networkManagerFinished(QNetworkReply *reply) << " error(" << (int) replyError << "): " << replyError << ": " << reply->errorString(); - return; + } + else + { + QString answer = reply->readAll(); + answer.chop(1); // remove last \n + qDebug("NFMDemod::networkManagerFinished: reply:\n%s", answer.toStdString().c_str()); } - QString answer = reply->readAll(); - answer.chop(1); // remove last \n - qDebug("NFMDemod::networkManagerFinished: reply:\n%s", answer.toStdString().c_str()); + reply->deleteLater(); } diff --git a/plugins/channelrx/demodssb/ssbdemod.cpp b/plugins/channelrx/demodssb/ssbdemod.cpp index f870adbe6..2ff37758f 100644 --- a/plugins/channelrx/demodssb/ssbdemod.cpp +++ b/plugins/channelrx/demodssb/ssbdemod.cpp @@ -950,13 +950,14 @@ void SSBDemod::webapiReverseSendSettings(QList& channelSettingsKeys, co m_networkRequest.setUrl(QUrl(channelSettingsURL)); m_networkRequest.setHeader(QNetworkRequest::ContentTypeHeader, "application/json"); - QBuffer *buffer=new QBuffer(); + QBuffer *buffer = new QBuffer(); buffer->open((QBuffer::ReadWrite)); buffer->write(swgChannelSettings->asJson().toUtf8()); buffer->seek(0); // Always use PATCH to avoid passing reverse API settings - m_networkManager->sendCustomRequest(m_networkRequest, "PATCH", buffer); + QNetworkReply *reply = m_networkManager->sendCustomRequest(m_networkRequest, "PATCH", buffer); + buffer->setParent(reply); delete swgChannelSettings; } @@ -971,10 +972,13 @@ void SSBDemod::networkManagerFinished(QNetworkReply *reply) << " error(" << (int) replyError << "): " << replyError << ": " << reply->errorString(); - return; + } + else + { + QString answer = reply->readAll(); + answer.chop(1); // remove last \n + qDebug("SSBDemod::networkManagerFinished: reply:\n%s", answer.toStdString().c_str()); } - QString answer = reply->readAll(); - answer.chop(1); // remove last \n - qDebug("SSBDemod::networkManagerFinished: reply:\n%s", answer.toStdString().c_str()); + reply->deleteLater(); } diff --git a/plugins/channelrx/demodwfm/wfmdemod.cpp b/plugins/channelrx/demodwfm/wfmdemod.cpp index eb93adbb1..6f4ad5515 100644 --- a/plugins/channelrx/demodwfm/wfmdemod.cpp +++ b/plugins/channelrx/demodwfm/wfmdemod.cpp @@ -665,13 +665,14 @@ void WFMDemod::webapiReverseSendSettings(QList& channelSettingsKeys, co m_networkRequest.setUrl(QUrl(channelSettingsURL)); m_networkRequest.setHeader(QNetworkRequest::ContentTypeHeader, "application/json"); - QBuffer *buffer=new QBuffer(); + QBuffer *buffer = new QBuffer(); buffer->open((QBuffer::ReadWrite)); buffer->write(swgChannelSettings->asJson().toUtf8()); buffer->seek(0); // Always use PATCH to avoid passing reverse API settings - m_networkManager->sendCustomRequest(m_networkRequest, "PATCH", buffer); + QNetworkReply *reply = m_networkManager->sendCustomRequest(m_networkRequest, "PATCH", buffer); + buffer->setParent(reply); delete swgChannelSettings; } @@ -686,10 +687,13 @@ void WFMDemod::networkManagerFinished(QNetworkReply *reply) << " error(" << (int) replyError << "): " << replyError << ": " << reply->errorString(); - return; + } + else + { + QString answer = reply->readAll(); + answer.chop(1); // remove last \n + qDebug("WFMDemod::networkManagerFinished: reply:\n%s", answer.toStdString().c_str()); } - QString answer = reply->readAll(); - answer.chop(1); // remove last \n - qDebug("WFMDemod::networkManagerFinished: reply:\n%s", answer.toStdString().c_str()); + reply->deleteLater(); } diff --git a/plugins/channelrx/freqtracker/freqtracker.cpp b/plugins/channelrx/freqtracker/freqtracker.cpp index 586ad38d6..4bf95a756 100644 --- a/plugins/channelrx/freqtracker/freqtracker.cpp +++ b/plugins/channelrx/freqtracker/freqtracker.cpp @@ -760,13 +760,14 @@ void FreqTracker::webapiReverseSendSettings(QList& channelSettingsKeys, m_networkRequest.setUrl(QUrl(channelSettingsURL)); m_networkRequest.setHeader(QNetworkRequest::ContentTypeHeader, "application/json"); - QBuffer *buffer=new QBuffer(); + QBuffer *buffer = new QBuffer(); buffer->open((QBuffer::ReadWrite)); buffer->write(swgChannelSettings->asJson().toUtf8()); buffer->seek(0); // Always use PATCH to avoid passing reverse API settings - m_networkManager->sendCustomRequest(m_networkRequest, "PATCH", buffer); + QNetworkReply *reply = m_networkManager->sendCustomRequest(m_networkRequest, "PATCH", buffer); + buffer->setParent(reply); delete swgChannelSettings; } @@ -781,12 +782,15 @@ void FreqTracker::networkManagerFinished(QNetworkReply *reply) << " error(" << (int) replyError << "): " << replyError << ": " << reply->errorString(); - return; + } + else + { + QString answer = reply->readAll(); + answer.chop(1); // remove last \n + qDebug("FreqTracker::networkManagerFinished: reply:\n%s", answer.toStdString().c_str()); } - QString answer = reply->readAll(); - answer.chop(1); // remove last \n - qDebug("FreqTracker::networkManagerFinished: reply:\n%s", answer.toStdString().c_str()); + reply->deleteLater(); } void FreqTracker::tick() diff --git a/plugins/channelrx/localsink/localsink.cpp b/plugins/channelrx/localsink/localsink.cpp index faeed9e71..b2d5cfefb 100644 --- a/plugins/channelrx/localsink/localsink.cpp +++ b/plugins/channelrx/localsink/localsink.cpp @@ -515,13 +515,14 @@ void LocalSink::webapiReverseSendSettings(QList& channelSettingsKeys, c m_networkRequest.setUrl(QUrl(channelSettingsURL)); m_networkRequest.setHeader(QNetworkRequest::ContentTypeHeader, "application/json"); - QBuffer *buffer=new QBuffer(); + QBuffer *buffer = new QBuffer(); buffer->open((QBuffer::ReadWrite)); buffer->write(swgChannelSettings->asJson().toUtf8()); buffer->seek(0); // Always use PATCH to avoid passing reverse API settings - m_networkManager->sendCustomRequest(m_networkRequest, "PATCH", buffer); + QNetworkReply *reply = m_networkManager->sendCustomRequest(m_networkRequest, "PATCH", buffer); + buffer->setParent(reply); delete swgChannelSettings; } @@ -536,10 +537,13 @@ void LocalSink::networkManagerFinished(QNetworkReply *reply) << " error(" << (int) replyError << "): " << replyError << ": " << reply->errorString(); - return; + } + else + { + QString answer = reply->readAll(); + answer.chop(1); // remove last \n + qDebug("LocalSink::networkManagerFinished: reply:\n%s", answer.toStdString().c_str()); } - QString answer = reply->readAll(); - answer.chop(1); // remove last \n - qDebug("LocalSink::networkManagerFinished: reply:\n%s", answer.toStdString().c_str()); + reply->deleteLater(); } diff --git a/plugins/channelrx/remotesink/remotesink.cpp b/plugins/channelrx/remotesink/remotesink.cpp index 60e6e2355..80bd1e67b 100644 --- a/plugins/channelrx/remotesink/remotesink.cpp +++ b/plugins/channelrx/remotesink/remotesink.cpp @@ -657,13 +657,14 @@ void RemoteSink::webapiReverseSendSettings(QList& channelSettingsKeys, m_networkRequest.setUrl(QUrl(channelSettingsURL)); m_networkRequest.setHeader(QNetworkRequest::ContentTypeHeader, "application/json"); - QBuffer *buffer=new QBuffer(); + QBuffer *buffer = new QBuffer(); buffer->open((QBuffer::ReadWrite)); buffer->write(swgChannelSettings->asJson().toUtf8()); buffer->seek(0); // Always use PATCH to avoid passing reverse API settings - m_networkManager->sendCustomRequest(m_networkRequest, "PATCH", buffer); + QNetworkReply *reply = m_networkManager->sendCustomRequest(m_networkRequest, "PATCH", buffer); + buffer->setParent(reply); delete swgChannelSettings; } @@ -678,10 +679,13 @@ void RemoteSink::networkManagerFinished(QNetworkReply *reply) << " error(" << (int) replyError << "): " << replyError << ": " << reply->errorString(); - return; + } + else + { + QString answer = reply->readAll(); + answer.chop(1); // remove last \n + qDebug("RemoteSink::networkManagerFinished: reply:\n%s", answer.toStdString().c_str()); } - QString answer = reply->readAll(); - answer.chop(1); // remove last \n - qDebug("RemoteSink::networkManagerFinished: reply:\n%s", answer.toStdString().c_str()); + reply->deleteLater(); } diff --git a/plugins/channelrx/udpsink/udpsink.cpp b/plugins/channelrx/udpsink/udpsink.cpp index 683cf332b..594c77a4d 100644 --- a/plugins/channelrx/udpsink/udpsink.cpp +++ b/plugins/channelrx/udpsink/udpsink.cpp @@ -1012,13 +1012,14 @@ void UDPSink::webapiReverseSendSettings(QList& channelSettingsKeys, con m_networkRequest.setUrl(QUrl(channelSettingsURL)); m_networkRequest.setHeader(QNetworkRequest::ContentTypeHeader, "application/json"); - QBuffer *buffer=new QBuffer(); + QBuffer *buffer = new QBuffer(); buffer->open((QBuffer::ReadWrite)); buffer->write(swgChannelSettings->asJson().toUtf8()); buffer->seek(0); // Always use PATCH to avoid passing reverse API settings - m_networkManager->sendCustomRequest(m_networkRequest, "PATCH", buffer); + QNetworkReply *reply = m_networkManager->sendCustomRequest(m_networkRequest, "PATCH", buffer); + buffer->setParent(reply); delete swgChannelSettings; } @@ -1033,10 +1034,13 @@ void UDPSink::networkManagerFinished(QNetworkReply *reply) << " error(" << (int) replyError << "): " << replyError << ": " << reply->errorString(); - return; + } + else + { + QString answer = reply->readAll(); + answer.chop(1); // remove last \n + qDebug("UDPSink::networkManagerFinished: reply:\n%s", answer.toStdString().c_str()); } - QString answer = reply->readAll(); - answer.chop(1); // remove last \n - qDebug("UDPSink::networkManagerFinished: reply:\n%s", answer.toStdString().c_str()); + reply->deleteLater(); } diff --git a/plugins/samplesource/airspy/airspyinput.cpp b/plugins/samplesource/airspy/airspyinput.cpp index a8e482db1..35ee6ee58 100644 --- a/plugins/samplesource/airspy/airspyinput.cpp +++ b/plugins/samplesource/airspy/airspyinput.cpp @@ -865,13 +865,14 @@ void AirspyInput::webapiReverseSendSettings(QList& deviceSettingsKeys, m_networkRequest.setUrl(QUrl(deviceSettingsURL)); m_networkRequest.setHeader(QNetworkRequest::ContentTypeHeader, "application/json"); - QBuffer *buffer=new QBuffer(); + QBuffer *buffer = new QBuffer(); buffer->open((QBuffer::ReadWrite)); buffer->write(swgDeviceSettings->asJson().toUtf8()); buffer->seek(0); // Always use PATCH to avoid passing reverse API settings - m_networkManager->sendCustomRequest(m_networkRequest, "PATCH", buffer); + QNetworkReply *reply = m_networkManager->sendCustomRequest(m_networkRequest, "PATCH", buffer); + buffer->setParent(reply); delete swgDeviceSettings; } @@ -890,17 +891,19 @@ void AirspyInput::webapiReverseSendStartStop(bool start) m_networkRequest.setUrl(QUrl(deviceSettingsURL)); m_networkRequest.setHeader(QNetworkRequest::ContentTypeHeader, "application/json"); - QBuffer *buffer=new QBuffer(); + QBuffer *buffer = new QBuffer(); buffer->open((QBuffer::ReadWrite)); buffer->write(swgDeviceSettings->asJson().toUtf8()); buffer->seek(0); + QNetworkReply *reply; if (start) { - m_networkManager->sendCustomRequest(m_networkRequest, "POST", buffer); + reply = m_networkManager->sendCustomRequest(m_networkRequest, "POST", buffer); } else { - m_networkManager->sendCustomRequest(m_networkRequest, "DELETE", buffer); + reply = m_networkManager->sendCustomRequest(m_networkRequest, "DELETE", buffer); } + buffer->setParent(reply); delete swgDeviceSettings; } @@ -914,10 +917,13 @@ void AirspyInput::networkManagerFinished(QNetworkReply *reply) << " error(" << (int) replyError << "): " << replyError << ": " << reply->errorString(); - return; + } + else + { + QString answer = reply->readAll(); + answer.chop(1); // remove last \n + qDebug("AirspyInput::networkManagerFinished: reply:\n%s", answer.toStdString().c_str()); } - QString answer = reply->readAll(); - answer.chop(1); // remove last \n - qDebug("AirspyInput::networkManagerFinished: reply:\n%s", answer.toStdString().c_str()); + reply->deleteLater(); } diff --git a/plugins/samplesource/airspyhf/airspyhfinput.cpp b/plugins/samplesource/airspyhf/airspyhfinput.cpp index 6f6992e99..c996e8c21 100644 --- a/plugins/samplesource/airspyhf/airspyhfinput.cpp +++ b/plugins/samplesource/airspyhf/airspyhfinput.cpp @@ -889,13 +889,14 @@ void AirspyHFInput::webapiReverseSendSettings(QList& deviceSettingsKeys m_networkRequest.setUrl(QUrl(deviceSettingsURL)); m_networkRequest.setHeader(QNetworkRequest::ContentTypeHeader, "application/json"); - QBuffer *buffer=new QBuffer(); + QBuffer *buffer = new QBuffer(); buffer->open((QBuffer::ReadWrite)); buffer->write(swgDeviceSettings->asJson().toUtf8()); buffer->seek(0); // Always use PATCH to avoid passing reverse API settings - m_networkManager->sendCustomRequest(m_networkRequest, "PATCH", buffer); + QNetworkReply *reply = m_networkManager->sendCustomRequest(m_networkRequest, "PATCH", buffer); + buffer->setParent(reply); delete swgDeviceSettings; } @@ -914,17 +915,19 @@ void AirspyHFInput::webapiReverseSendStartStop(bool start) m_networkRequest.setUrl(QUrl(deviceSettingsURL)); m_networkRequest.setHeader(QNetworkRequest::ContentTypeHeader, "application/json"); - QBuffer *buffer=new QBuffer(); + QBuffer *buffer = new QBuffer(); buffer->open((QBuffer::ReadWrite)); buffer->write(swgDeviceSettings->asJson().toUtf8()); buffer->seek(0); + QNetworkReply *reply; if (start) { - m_networkManager->sendCustomRequest(m_networkRequest, "POST", buffer); + reply = m_networkManager->sendCustomRequest(m_networkRequest, "POST", buffer); } else { - m_networkManager->sendCustomRequest(m_networkRequest, "DELETE", buffer); + reply = m_networkManager->sendCustomRequest(m_networkRequest, "DELETE", buffer); } + buffer->setParent(reply); delete swgDeviceSettings; } @@ -938,10 +941,13 @@ void AirspyHFInput::networkManagerFinished(QNetworkReply *reply) << " error(" << (int) replyError << "): " << replyError << ": " << reply->errorString(); - return; + } + else + { + QString answer = reply->readAll(); + answer.chop(1); // remove last \n + qDebug("AirspyHFInput::networkManagerFinished: reply:\n%s", answer.toStdString().c_str()); } - QString answer = reply->readAll(); - answer.chop(1); // remove last \n - qDebug("AirspyHFInput::networkManagerFinished: reply:\n%s", answer.toStdString().c_str()); + reply->deleteLater(); } diff --git a/plugins/samplesource/bladerf1input/bladerf1input.cpp b/plugins/samplesource/bladerf1input/bladerf1input.cpp index 49ddbb375..5dcc17197 100644 --- a/plugins/samplesource/bladerf1input/bladerf1input.cpp +++ b/plugins/samplesource/bladerf1input/bladerf1input.cpp @@ -832,13 +832,14 @@ void Bladerf1Input::webapiReverseSendSettings(QList& deviceSettingsKeys m_networkRequest.setUrl(QUrl(deviceSettingsURL)); m_networkRequest.setHeader(QNetworkRequest::ContentTypeHeader, "application/json"); - QBuffer *buffer=new QBuffer(); + QBuffer *buffer = new QBuffer(); buffer->open((QBuffer::ReadWrite)); buffer->write(swgDeviceSettings->asJson().toUtf8()); buffer->seek(0); // Always use PATCH to avoid passing reverse API settings - m_networkManager->sendCustomRequest(m_networkRequest, "PATCH", buffer); + QNetworkReply *reply = m_networkManager->sendCustomRequest(m_networkRequest, "PATCH", buffer); + buffer->setParent(reply); delete swgDeviceSettings; } @@ -857,17 +858,19 @@ void Bladerf1Input::webapiReverseSendStartStop(bool start) m_networkRequest.setUrl(QUrl(deviceSettingsURL)); m_networkRequest.setHeader(QNetworkRequest::ContentTypeHeader, "application/json"); - QBuffer *buffer=new QBuffer(); + QBuffer *buffer = new QBuffer(); buffer->open((QBuffer::ReadWrite)); buffer->write(swgDeviceSettings->asJson().toUtf8()); buffer->seek(0); + QNetworkReply *reply; if (start) { - m_networkManager->sendCustomRequest(m_networkRequest, "POST", buffer); + reply = m_networkManager->sendCustomRequest(m_networkRequest, "POST", buffer); } else { - m_networkManager->sendCustomRequest(m_networkRequest, "DELETE", buffer); + reply = m_networkManager->sendCustomRequest(m_networkRequest, "DELETE", buffer); } + buffer->setParent(reply); delete swgDeviceSettings; } @@ -881,10 +884,13 @@ void Bladerf1Input::networkManagerFinished(QNetworkReply *reply) << " error(" << (int) replyError << "): " << replyError << ": " << reply->errorString(); - return; + } + else + { + QString answer = reply->readAll(); + answer.chop(1); // remove last \n + qDebug("Bladerf1Input::networkManagerFinished: reply:\n%s", answer.toStdString().c_str()); } - QString answer = reply->readAll(); - answer.chop(1); // remove last \n - qDebug("Bladerf1Input::networkManagerFinished: reply:\n%s", answer.toStdString().c_str()); + reply->deleteLater(); } diff --git a/plugins/samplesource/bladerf2input/bladerf2input.cpp b/plugins/samplesource/bladerf2input/bladerf2input.cpp index 0c6d6fb4e..500be6130 100644 --- a/plugins/samplesource/bladerf2input/bladerf2input.cpp +++ b/plugins/samplesource/bladerf2input/bladerf2input.cpp @@ -1309,13 +1309,14 @@ void BladeRF2Input::webapiReverseSendSettings(QList& deviceSettingsKeys m_networkRequest.setUrl(QUrl(deviceSettingsURL)); m_networkRequest.setHeader(QNetworkRequest::ContentTypeHeader, "application/json"); - QBuffer *buffer=new QBuffer(); + QBuffer *buffer = new QBuffer(); buffer->open((QBuffer::ReadWrite)); buffer->write(swgDeviceSettings->asJson().toUtf8()); buffer->seek(0); // Always use PATCH to avoid passing reverse API settings - m_networkManager->sendCustomRequest(m_networkRequest, "PATCH", buffer); + QNetworkReply *reply = m_networkManager->sendCustomRequest(m_networkRequest, "PATCH", buffer); + buffer->setParent(reply); delete swgDeviceSettings; } @@ -1334,17 +1335,19 @@ void BladeRF2Input::webapiReverseSendStartStop(bool start) m_networkRequest.setUrl(QUrl(deviceSettingsURL)); m_networkRequest.setHeader(QNetworkRequest::ContentTypeHeader, "application/json"); - QBuffer *buffer=new QBuffer(); + QBuffer *buffer = new QBuffer(); buffer->open((QBuffer::ReadWrite)); buffer->write(swgDeviceSettings->asJson().toUtf8()); buffer->seek(0); + QNetworkReply *reply; if (start) { - m_networkManager->sendCustomRequest(m_networkRequest, "POST", buffer); + reply = m_networkManager->sendCustomRequest(m_networkRequest, "POST", buffer); } else { - m_networkManager->sendCustomRequest(m_networkRequest, "DELETE", buffer); + reply = m_networkManager->sendCustomRequest(m_networkRequest, "DELETE", buffer); } + buffer->setParent(reply); delete swgDeviceSettings; } @@ -1358,10 +1361,13 @@ void BladeRF2Input::networkManagerFinished(QNetworkReply *reply) << " error(" << (int) replyError << "): " << replyError << ": " << reply->errorString(); - return; + } + else + { + QString answer = reply->readAll(); + answer.chop(1); // remove last \n + qDebug("BladeRF2Input::networkManagerFinished: reply:\n%s", answer.toStdString().c_str()); } - QString answer = reply->readAll(); - answer.chop(1); // remove last \n - qDebug("BladeRF2Input::networkManagerFinished: reply:\n%s", answer.toStdString().c_str()); + reply->deleteLater(); } diff --git a/plugins/samplesource/fcdpro/fcdproinput.cpp b/plugins/samplesource/fcdpro/fcdproinput.cpp index eb8805c35..b252c5ddf 100644 --- a/plugins/samplesource/fcdpro/fcdproinput.cpp +++ b/plugins/samplesource/fcdpro/fcdproinput.cpp @@ -1121,13 +1121,14 @@ void FCDProInput::webapiReverseSendSettings(QList& deviceSettingsKeys, m_networkRequest.setUrl(QUrl(deviceSettingsURL)); m_networkRequest.setHeader(QNetworkRequest::ContentTypeHeader, "application/json"); - QBuffer *buffer=new QBuffer(); + QBuffer *buffer = new QBuffer(); buffer->open((QBuffer::ReadWrite)); buffer->write(swgDeviceSettings->asJson().toUtf8()); buffer->seek(0); // Always use PATCH to avoid passing reverse API settings - m_networkManager->sendCustomRequest(m_networkRequest, "PATCH", buffer); + QNetworkReply *reply = m_networkManager->sendCustomRequest(m_networkRequest, "PATCH", buffer); + buffer->setParent(reply); delete swgDeviceSettings; } @@ -1146,17 +1147,19 @@ void FCDProInput::webapiReverseSendStartStop(bool start) m_networkRequest.setUrl(QUrl(deviceSettingsURL)); m_networkRequest.setHeader(QNetworkRequest::ContentTypeHeader, "application/json"); - QBuffer *buffer=new QBuffer(); + QBuffer *buffer = new QBuffer(); buffer->open((QBuffer::ReadWrite)); buffer->write(swgDeviceSettings->asJson().toUtf8()); buffer->seek(0); + QNetworkReply *reply; if (start) { - m_networkManager->sendCustomRequest(m_networkRequest, "POST", buffer); + reply = m_networkManager->sendCustomRequest(m_networkRequest, "POST", buffer); } else { - m_networkManager->sendCustomRequest(m_networkRequest, "DELETE", buffer); + reply = m_networkManager->sendCustomRequest(m_networkRequest, "DELETE", buffer); } + buffer->setParent(reply); delete swgDeviceSettings; } @@ -1170,10 +1173,13 @@ void FCDProInput::networkManagerFinished(QNetworkReply *reply) << " error(" << (int) replyError << "): " << replyError << ": " << reply->errorString(); - return; + } + else + { + QString answer = reply->readAll(); + answer.chop(1); // remove last \n + qDebug("FCDProInput::networkManagerFinished: reply:\n%s", answer.toStdString().c_str()); } - QString answer = reply->readAll(); - answer.chop(1); // remove last \n - qDebug("FCDProInput::networkManagerFinished: reply:\n%s", answer.toStdString().c_str()); + reply->deleteLater(); } diff --git a/plugins/samplesource/fcdproplus/fcdproplusinput.cpp b/plugins/samplesource/fcdproplus/fcdproplusinput.cpp index 7cbbfc22f..0369b1c99 100644 --- a/plugins/samplesource/fcdproplus/fcdproplusinput.cpp +++ b/plugins/samplesource/fcdproplus/fcdproplusinput.cpp @@ -785,13 +785,14 @@ void FCDProPlusInput::webapiReverseSendSettings(QList& deviceSettingsKe m_networkRequest.setUrl(QUrl(deviceSettingsURL)); m_networkRequest.setHeader(QNetworkRequest::ContentTypeHeader, "application/json"); - QBuffer *buffer=new QBuffer(); + QBuffer *buffer = new QBuffer(); buffer->open((QBuffer::ReadWrite)); buffer->write(swgDeviceSettings->asJson().toUtf8()); buffer->seek(0); // Always use PATCH to avoid passing reverse API settings - m_networkManager->sendCustomRequest(m_networkRequest, "PATCH", buffer); + QNetworkReply *reply = m_networkManager->sendCustomRequest(m_networkRequest, "PATCH", buffer); + buffer->setParent(reply); delete swgDeviceSettings; } @@ -810,17 +811,19 @@ void FCDProPlusInput::webapiReverseSendStartStop(bool start) m_networkRequest.setUrl(QUrl(deviceSettingsURL)); m_networkRequest.setHeader(QNetworkRequest::ContentTypeHeader, "application/json"); - QBuffer *buffer=new QBuffer(); + QBuffer *buffer = new QBuffer(); buffer->open((QBuffer::ReadWrite)); buffer->write(swgDeviceSettings->asJson().toUtf8()); buffer->seek(0); + QNetworkReply *reply; if (start) { - m_networkManager->sendCustomRequest(m_networkRequest, "POST", buffer); + reply = m_networkManager->sendCustomRequest(m_networkRequest, "POST", buffer); } else { - m_networkManager->sendCustomRequest(m_networkRequest, "DELETE", buffer); + reply = m_networkManager->sendCustomRequest(m_networkRequest, "DELETE", buffer); } + buffer->setParent(reply); delete swgDeviceSettings; } @@ -834,10 +837,13 @@ void FCDProPlusInput::networkManagerFinished(QNetworkReply *reply) << " error(" << (int) replyError << "): " << replyError << ": " << reply->errorString(); - return; + } + else + { + QString answer = reply->readAll(); + answer.chop(1); // remove last \n + qDebug("FCDProPlusInput::networkManagerFinished: reply:\n%s", answer.toStdString().c_str()); } - QString answer = reply->readAll(); - answer.chop(1); // remove last \n - qDebug("FCDProPlusInput::networkManagerFinished: reply:\n%s", answer.toStdString().c_str()); + reply->deleteLater(); } diff --git a/plugins/samplesource/fileinput/fileinput.cpp b/plugins/samplesource/fileinput/fileinput.cpp index 264e666bd..2eafef0e8 100644 --- a/plugins/samplesource/fileinput/fileinput.cpp +++ b/plugins/samplesource/fileinput/fileinput.cpp @@ -629,13 +629,14 @@ void FileInput::webapiReverseSendSettings(QList& deviceSettingsKeys, co m_networkRequest.setUrl(QUrl(deviceSettingsURL)); m_networkRequest.setHeader(QNetworkRequest::ContentTypeHeader, "application/json"); - QBuffer *buffer=new QBuffer(); + QBuffer *buffer = new QBuffer(); buffer->open((QBuffer::ReadWrite)); buffer->write(swgDeviceSettings->asJson().toUtf8()); buffer->seek(0); // Always use PATCH to avoid passing reverse API settings - m_networkManager->sendCustomRequest(m_networkRequest, "PATCH", buffer); + QNetworkReply *reply = m_networkManager->sendCustomRequest(m_networkRequest, "PATCH", buffer); + buffer->setParent(reply); delete swgDeviceSettings; } @@ -654,17 +655,19 @@ void FileInput::webapiReverseSendStartStop(bool start) m_networkRequest.setUrl(QUrl(deviceSettingsURL)); m_networkRequest.setHeader(QNetworkRequest::ContentTypeHeader, "application/json"); - QBuffer *buffer=new QBuffer(); + QBuffer *buffer = new QBuffer(); buffer->open((QBuffer::ReadWrite)); buffer->write(swgDeviceSettings->asJson().toUtf8()); buffer->seek(0); + QNetworkReply *reply; if (start) { - m_networkManager->sendCustomRequest(m_networkRequest, "POST", buffer); + reply = m_networkManager->sendCustomRequest(m_networkRequest, "POST", buffer); } else { - m_networkManager->sendCustomRequest(m_networkRequest, "DELETE", buffer); + reply = m_networkManager->sendCustomRequest(m_networkRequest, "DELETE", buffer); } + buffer->setParent(reply); delete swgDeviceSettings; } @@ -678,10 +681,13 @@ void FileInput::networkManagerFinished(QNetworkReply *reply) << " error(" << (int) replyError << "): " << replyError << ": " << reply->errorString(); - return; + } + else + { + QString answer = reply->readAll(); + answer.chop(1); // remove last \n + qDebug("FileInput::networkManagerFinished: reply:\n%s", answer.toStdString().c_str()); } - QString answer = reply->readAll(); - answer.chop(1); // remove last \n - qDebug("FileInput::networkManagerFinished: reply:\n%s", answer.toStdString().c_str()); + reply->deleteLater(); } diff --git a/plugins/samplesource/hackrfinput/hackrfinput.cpp b/plugins/samplesource/hackrfinput/hackrfinput.cpp index cc903dab3..068f83639 100644 --- a/plugins/samplesource/hackrfinput/hackrfinput.cpp +++ b/plugins/samplesource/hackrfinput/hackrfinput.cpp @@ -819,13 +819,14 @@ void HackRFInput::webapiReverseSendSettings(QList& deviceSettingsKeys, m_networkRequest.setUrl(QUrl(deviceSettingsURL)); m_networkRequest.setHeader(QNetworkRequest::ContentTypeHeader, "application/json"); - QBuffer *buffer=new QBuffer(); + QBuffer *buffer = new QBuffer(); buffer->open((QBuffer::ReadWrite)); buffer->write(swgDeviceSettings->asJson().toUtf8()); buffer->seek(0); // Always use PATCH to avoid passing reverse API settings - m_networkManager->sendCustomRequest(m_networkRequest, "PATCH", buffer); + QNetworkReply *reply = m_networkManager->sendCustomRequest(m_networkRequest, "PATCH", buffer); + buffer->setParent(reply); delete swgDeviceSettings; } @@ -844,17 +845,19 @@ void HackRFInput::webapiReverseSendStartStop(bool start) m_networkRequest.setUrl(QUrl(deviceSettingsURL)); m_networkRequest.setHeader(QNetworkRequest::ContentTypeHeader, "application/json"); - QBuffer *buffer=new QBuffer(); + QBuffer *buffer = new QBuffer(); buffer->open((QBuffer::ReadWrite)); buffer->write(swgDeviceSettings->asJson().toUtf8()); buffer->seek(0); + QNetworkReply *reply; if (start) { - m_networkManager->sendCustomRequest(m_networkRequest, "POST", buffer); + reply = m_networkManager->sendCustomRequest(m_networkRequest, "POST", buffer); } else { - m_networkManager->sendCustomRequest(m_networkRequest, "DELETE", buffer); + reply = m_networkManager->sendCustomRequest(m_networkRequest, "DELETE", buffer); } + buffer->setParent(reply); delete swgDeviceSettings; } @@ -868,10 +871,13 @@ void HackRFInput::networkManagerFinished(QNetworkReply *reply) << " error(" << (int) replyError << "): " << replyError << ": " << reply->errorString(); - return; + } + else + { + QString answer = reply->readAll(); + answer.chop(1); // remove last \n + qDebug("HackRFInput::networkManagerFinished: reply:\n%s", answer.toStdString().c_str()); } - QString answer = reply->readAll(); - answer.chop(1); // remove last \n - qDebug("HackRFInput::networkManagerFinished: reply:\n%s", answer.toStdString().c_str()); + reply->deleteLater(); } diff --git a/plugins/samplesource/kiwisdr/kiwisdrinput.cpp b/plugins/samplesource/kiwisdr/kiwisdrinput.cpp index 065ba0217..7e4ee8086 100644 --- a/plugins/samplesource/kiwisdr/kiwisdrinput.cpp +++ b/plugins/samplesource/kiwisdr/kiwisdrinput.cpp @@ -517,13 +517,14 @@ void KiwiSDRInput::webapiReverseSendSettings(QList& deviceSettingsKeys, m_networkRequest.setUrl(QUrl(deviceSettingsURL)); m_networkRequest.setHeader(QNetworkRequest::ContentTypeHeader, "application/json"); - QBuffer *buffer=new QBuffer(); + QBuffer *buffer = new QBuffer(); buffer->open((QBuffer::ReadWrite)); buffer->write(swgDeviceSettings->asJson().toUtf8()); buffer->seek(0); // Always use PATCH to avoid passing reverse API settings - m_networkManager->sendCustomRequest(m_networkRequest, "PATCH", buffer); + QNetworkReply *reply = m_networkManager->sendCustomRequest(m_networkRequest, "PATCH", buffer); + buffer->setParent(reply); delete swgDeviceSettings; } @@ -542,17 +543,19 @@ void KiwiSDRInput::webapiReverseSendStartStop(bool start) m_networkRequest.setUrl(QUrl(deviceSettingsURL)); m_networkRequest.setHeader(QNetworkRequest::ContentTypeHeader, "application/json"); - QBuffer *buffer=new QBuffer(); + QBuffer *buffer = new QBuffer(); buffer->open((QBuffer::ReadWrite)); buffer->write(swgDeviceSettings->asJson().toUtf8()); buffer->seek(0); + QNetworkReply *reply; if (start) { - m_networkManager->sendCustomRequest(m_networkRequest, "POST", buffer); + reply = m_networkManager->sendCustomRequest(m_networkRequest, "POST", buffer); } else { - m_networkManager->sendCustomRequest(m_networkRequest, "DELETE", buffer); + reply = m_networkManager->sendCustomRequest(m_networkRequest, "DELETE", buffer); } + buffer->setParent(reply); delete swgDeviceSettings; } @@ -566,10 +569,13 @@ void KiwiSDRInput::networkManagerFinished(QNetworkReply *reply) << " error(" << (int) replyError << "): " << replyError << ": " << reply->errorString(); - return; + } + else + { + QString answer = reply->readAll(); + answer.chop(1); // remove last \n + qDebug("KiwiSDRInput::networkManagerFinished: reply:\n%s", answer.toStdString().c_str()); } - QString answer = reply->readAll(); - answer.chop(1); // remove last \n - qDebug("KiwiSDRInput::networkManagerFinished: reply:\n%s", answer.toStdString().c_str()); + reply->deleteLater(); } diff --git a/plugins/samplesource/limesdrinput/limesdrinput.cpp b/plugins/samplesource/limesdrinput/limesdrinput.cpp index f0b42a86b..cd86b9f39 100644 --- a/plugins/samplesource/limesdrinput/limesdrinput.cpp +++ b/plugins/samplesource/limesdrinput/limesdrinput.cpp @@ -1762,13 +1762,14 @@ void LimeSDRInput::webapiReverseSendSettings(QList& deviceSettingsKeys, m_networkRequest.setUrl(QUrl(deviceSettingsURL)); m_networkRequest.setHeader(QNetworkRequest::ContentTypeHeader, "application/json"); - QBuffer *buffer=new QBuffer(); + QBuffer *buffer = new QBuffer(); buffer->open((QBuffer::ReadWrite)); buffer->write(swgDeviceSettings->asJson().toUtf8()); buffer->seek(0); // Always use PATCH to avoid passing reverse API settings - m_networkManager->sendCustomRequest(m_networkRequest, "PATCH", buffer); + QNetworkReply *reply = m_networkManager->sendCustomRequest(m_networkRequest, "PATCH", buffer); + buffer->setParent(reply); delete swgDeviceSettings; } @@ -1787,17 +1788,19 @@ void LimeSDRInput::webapiReverseSendStartStop(bool start) m_networkRequest.setUrl(QUrl(deviceSettingsURL)); m_networkRequest.setHeader(QNetworkRequest::ContentTypeHeader, "application/json"); - QBuffer *buffer=new QBuffer(); + QBuffer *buffer = new QBuffer(); buffer->open((QBuffer::ReadWrite)); buffer->write(swgDeviceSettings->asJson().toUtf8()); buffer->seek(0); + QNetworkReply *reply; if (start) { - m_networkManager->sendCustomRequest(m_networkRequest, "POST", buffer); + reply = m_networkManager->sendCustomRequest(m_networkRequest, "POST", buffer); } else { - m_networkManager->sendCustomRequest(m_networkRequest, "DELETE", buffer); + reply = m_networkManager->sendCustomRequest(m_networkRequest, "DELETE", buffer); } + buffer->setParent(reply); delete swgDeviceSettings; } @@ -1811,10 +1814,13 @@ void LimeSDRInput::networkManagerFinished(QNetworkReply *reply) << " error(" << (int) replyError << "): " << replyError << ": " << reply->errorString(); - return; + } + else + { + QString answer = reply->readAll(); + answer.chop(1); // remove last \n + qDebug("LimeSDRInput::networkManagerFinished: reply:\n%s", answer.toStdString().c_str()); } - QString answer = reply->readAll(); - answer.chop(1); // remove last \n - qDebug("LimeSDRInput::networkManagerFinished: reply:\n%s", answer.toStdString().c_str()); + reply->deleteLater(); } diff --git a/plugins/samplesource/localinput/localinput.cpp b/plugins/samplesource/localinput/localinput.cpp index 3b87f5fe6..da9fd6418 100644 --- a/plugins/samplesource/localinput/localinput.cpp +++ b/plugins/samplesource/localinput/localinput.cpp @@ -430,13 +430,14 @@ void LocalInput::webapiReverseSendSettings(QList& deviceSettingsKeys, c m_networkRequest.setUrl(QUrl(deviceSettingsURL)); m_networkRequest.setHeader(QNetworkRequest::ContentTypeHeader, "application/json"); - QBuffer *buffer=new QBuffer(); + QBuffer *buffer = new QBuffer(); buffer->open((QBuffer::ReadWrite)); buffer->write(swgDeviceSettings->asJson().toUtf8()); buffer->seek(0); // Always use PATCH to avoid passing reverse API settings - m_networkManager->sendCustomRequest(m_networkRequest, "PATCH", buffer); + QNetworkReply *reply = m_networkManager->sendCustomRequest(m_networkRequest, "PATCH", buffer); + buffer->setParent(reply); delete swgDeviceSettings; } @@ -455,17 +456,19 @@ void LocalInput::webapiReverseSendStartStop(bool start) m_networkRequest.setUrl(QUrl(deviceSettingsURL)); m_networkRequest.setHeader(QNetworkRequest::ContentTypeHeader, "application/json"); - QBuffer *buffer=new QBuffer(); + QBuffer *buffer = new QBuffer(); buffer->open((QBuffer::ReadWrite)); buffer->write(swgDeviceSettings->asJson().toUtf8()); buffer->seek(0); + QNetworkReply *reply; if (start) { - m_networkManager->sendCustomRequest(m_networkRequest, "POST", buffer); + reply = m_networkManager->sendCustomRequest(m_networkRequest, "POST", buffer); } else { - m_networkManager->sendCustomRequest(m_networkRequest, "DELETE", buffer); + reply = m_networkManager->sendCustomRequest(m_networkRequest, "DELETE", buffer); } + buffer->setParent(reply); delete swgDeviceSettings; } @@ -479,10 +482,13 @@ void LocalInput::networkManagerFinished(QNetworkReply *reply) << " error(" << (int) replyError << "): " << replyError << ": " << reply->errorString(); - return; + } + else + { + QString answer = reply->readAll(); + answer.chop(1); // remove last \n + qDebug("LocalInput::networkManagerFinished: reply:\n%s", answer.toStdString().c_str()); } - QString answer = reply->readAll(); - answer.chop(1); // remove last \n - qDebug("LocalInput::networkManagerFinished: reply:\n%s", answer.toStdString().c_str()); + reply->deleteLater(); } diff --git a/plugins/samplesource/perseus/perseusinput.cpp b/plugins/samplesource/perseus/perseusinput.cpp index cfe4bd91f..17778e1a7 100644 --- a/plugins/samplesource/perseus/perseusinput.cpp +++ b/plugins/samplesource/perseus/perseusinput.cpp @@ -670,13 +670,14 @@ void PerseusInput::webapiReverseSendSettings(QList& deviceSettingsKeys, m_networkRequest.setUrl(QUrl(deviceSettingsURL)); m_networkRequest.setHeader(QNetworkRequest::ContentTypeHeader, "application/json"); - QBuffer *buffer=new QBuffer(); + QBuffer *buffer = new QBuffer(); buffer->open((QBuffer::ReadWrite)); buffer->write(swgDeviceSettings->asJson().toUtf8()); buffer->seek(0); // Always use PATCH to avoid passing reverse API settings - m_networkManager->sendCustomRequest(m_networkRequest, "PATCH", buffer); + QNetworkReply *reply = m_networkManager->sendCustomRequest(m_networkRequest, "PATCH", buffer); + buffer->setParent(reply); delete swgDeviceSettings; } @@ -695,17 +696,19 @@ void PerseusInput::webapiReverseSendStartStop(bool start) m_networkRequest.setUrl(QUrl(deviceSettingsURL)); m_networkRequest.setHeader(QNetworkRequest::ContentTypeHeader, "application/json"); - QBuffer *buffer=new QBuffer(); + QBuffer *buffer = new QBuffer(); buffer->open((QBuffer::ReadWrite)); buffer->write(swgDeviceSettings->asJson().toUtf8()); buffer->seek(0); + QNetworkReply *reply; if (start) { - m_networkManager->sendCustomRequest(m_networkRequest, "POST", buffer); + reply = m_networkManager->sendCustomRequest(m_networkRequest, "POST", buffer); } else { - m_networkManager->sendCustomRequest(m_networkRequest, "DELETE", buffer); + reply = m_networkManager->sendCustomRequest(m_networkRequest, "DELETE", buffer); } + buffer->setParent(reply); delete swgDeviceSettings; } @@ -719,10 +722,13 @@ void PerseusInput::networkManagerFinished(QNetworkReply *reply) << " error(" << (int) replyError << "): " << replyError << ": " << reply->errorString(); - return; + } + else + { + QString answer = reply->readAll(); + answer.chop(1); // remove last \n + qDebug("PerseusInput::networkManagerFinished: reply:\n%s", answer.toStdString().c_str()); } - QString answer = reply->readAll(); - answer.chop(1); // remove last \n - qDebug("PerseusInput::networkManagerFinished: reply:\n%s", answer.toStdString().c_str()); + reply->deleteLater(); } diff --git a/plugins/samplesource/plutosdrinput/plutosdrinput.cpp b/plugins/samplesource/plutosdrinput/plutosdrinput.cpp index 4585e9974..a3b8d7ec8 100644 --- a/plugins/samplesource/plutosdrinput/plutosdrinput.cpp +++ b/plugins/samplesource/plutosdrinput/plutosdrinput.cpp @@ -1045,13 +1045,14 @@ void PlutoSDRInput::webapiReverseSendSettings(QList& deviceSettingsKeys m_networkRequest.setUrl(QUrl(deviceSettingsURL)); m_networkRequest.setHeader(QNetworkRequest::ContentTypeHeader, "application/json"); - QBuffer *buffer=new QBuffer(); + QBuffer *buffer = new QBuffer(); buffer->open((QBuffer::ReadWrite)); buffer->write(swgDeviceSettings->asJson().toUtf8()); buffer->seek(0); // Always use PATCH to avoid passing reverse API settings - m_networkManager->sendCustomRequest(m_networkRequest, "PATCH", buffer); + QNetworkReply *reply = m_networkManager->sendCustomRequest(m_networkRequest, "PATCH", buffer); + buffer->setParent(reply); delete swgDeviceSettings; } @@ -1070,17 +1071,19 @@ void PlutoSDRInput::webapiReverseSendStartStop(bool start) m_networkRequest.setUrl(QUrl(deviceSettingsURL)); m_networkRequest.setHeader(QNetworkRequest::ContentTypeHeader, "application/json"); - QBuffer *buffer=new QBuffer(); + QBuffer *buffer = new QBuffer(); buffer->open((QBuffer::ReadWrite)); buffer->write(swgDeviceSettings->asJson().toUtf8()); buffer->seek(0); + QNetworkReply *reply; if (start) { - m_networkManager->sendCustomRequest(m_networkRequest, "POST", buffer); + reply = m_networkManager->sendCustomRequest(m_networkRequest, "POST", buffer); } else { - m_networkManager->sendCustomRequest(m_networkRequest, "DELETE", buffer); + reply = m_networkManager->sendCustomRequest(m_networkRequest, "DELETE", buffer); } + buffer->setParent(reply); delete swgDeviceSettings; } @@ -1094,10 +1097,13 @@ void PlutoSDRInput::networkManagerFinished(QNetworkReply *reply) << " error(" << (int) replyError << "): " << replyError << ": " << reply->errorString(); - return; + } + else + { + QString answer = reply->readAll(); + answer.chop(1); // remove last \n + qDebug("PlutoSDRInput::networkManagerFinished: reply:\n%s", answer.toStdString().c_str()); } - QString answer = reply->readAll(); - answer.chop(1); // remove last \n - qDebug("PlutoSDRInput::networkManagerFinished: reply:\n%s", answer.toStdString().c_str()); + reply->deleteLater(); } diff --git a/plugins/samplesource/remoteinput/remoteinput.cpp b/plugins/samplesource/remoteinput/remoteinput.cpp index 383f662b8..f40f8ac98 100644 --- a/plugins/samplesource/remoteinput/remoteinput.cpp +++ b/plugins/samplesource/remoteinput/remoteinput.cpp @@ -479,13 +479,14 @@ void RemoteInput::webapiReverseSendSettings(QList& deviceSettingsKeys, m_networkRequest.setUrl(QUrl(deviceSettingsURL)); m_networkRequest.setHeader(QNetworkRequest::ContentTypeHeader, "application/json"); - QBuffer *buffer=new QBuffer(); + QBuffer *buffer = new QBuffer(); buffer->open((QBuffer::ReadWrite)); buffer->write(swgDeviceSettings->asJson().toUtf8()); buffer->seek(0); // Always use PATCH to avoid passing reverse API settings - m_networkManager->sendCustomRequest(m_networkRequest, "PATCH", buffer); + QNetworkReply *reply = m_networkManager->sendCustomRequest(m_networkRequest, "PATCH", buffer); + buffer->setParent(reply); delete swgDeviceSettings; } @@ -504,17 +505,19 @@ void RemoteInput::webapiReverseSendStartStop(bool start) m_networkRequest.setUrl(QUrl(deviceSettingsURL)); m_networkRequest.setHeader(QNetworkRequest::ContentTypeHeader, "application/json"); - QBuffer *buffer=new QBuffer(); + QBuffer *buffer = new QBuffer(); buffer->open((QBuffer::ReadWrite)); buffer->write(swgDeviceSettings->asJson().toUtf8()); buffer->seek(0); + QNetworkReply *reply; if (start) { - m_networkManager->sendCustomRequest(m_networkRequest, "POST", buffer); + reply = m_networkManager->sendCustomRequest(m_networkRequest, "POST", buffer); } else { - m_networkManager->sendCustomRequest(m_networkRequest, "DELETE", buffer); + reply = m_networkManager->sendCustomRequest(m_networkRequest, "DELETE", buffer); } + buffer->setParent(reply); delete swgDeviceSettings; } @@ -528,10 +531,13 @@ void RemoteInput::networkManagerFinished(QNetworkReply *reply) << " error(" << (int) replyError << "): " << replyError << ": " << reply->errorString(); - return; + } + else + { + QString answer = reply->readAll(); + answer.chop(1); // remove last \n + qDebug("RemoteInput::networkManagerFinished: reply:\n%s", answer.toStdString().c_str()); } - QString answer = reply->readAll(); - answer.chop(1); // remove last \n - qDebug("RemoteInput::networkManagerFinished: reply:\n%s", answer.toStdString().c_str()); + reply->deleteLater(); } diff --git a/plugins/samplesource/remoteinput/remoteinputgui.cpp b/plugins/samplesource/remoteinput/remoteinputgui.cpp index 31dd0649d..3a5415a13 100644 --- a/plugins/samplesource/remoteinput/remoteinputgui.cpp +++ b/plugins/samplesource/remoteinput/remoteinputgui.cpp @@ -580,38 +580,41 @@ void RemoteInputGui::networkManagerFinished(QNetworkReply *reply) { ui->apiAddressLabel->setStyleSheet("QLabel { background:rgb(79,79,79); }"); ui->statusText->setText(reply->errorString()); - return; } - - QString answer = reply->readAll(); - - try + else { - QByteArray jsonBytes(answer.toStdString().c_str()); - QJsonParseError error; - QJsonDocument doc = QJsonDocument::fromJson(jsonBytes, &error); + QString answer = reply->readAll(); - if (error.error == QJsonParseError::NoError) + try { - ui->apiAddressLabel->setStyleSheet("QLabel { background-color : green; }"); - ui->statusText->setText(QString("API OK")); - analyzeApiReply(doc.object()); + QByteArray jsonBytes(answer.toStdString().c_str()); + QJsonParseError error; + QJsonDocument doc = QJsonDocument::fromJson(jsonBytes, &error); + + if (error.error == QJsonParseError::NoError) + { + ui->apiAddressLabel->setStyleSheet("QLabel { background-color : green; }"); + ui->statusText->setText(QString("API OK")); + analyzeApiReply(doc.object()); + } + else + { + ui->apiAddressLabel->setStyleSheet("QLabel { background:rgb(79,79,79); }"); + QString errorMsg = QString("Reply JSON error: ") + error.errorString() + QString(" at offset ") + QString::number(error.offset); + ui->statusText->setText(QString("JSON error. See log")); + qInfo().noquote() << "RemoteInputGui::networkManagerFinished" << errorMsg; + } } - else + catch (const std::exception& ex) { ui->apiAddressLabel->setStyleSheet("QLabel { background:rgb(79,79,79); }"); - QString errorMsg = QString("Reply JSON error: ") + error.errorString() + QString(" at offset ") + QString::number(error.offset); - ui->statusText->setText(QString("JSON error. See log")); + QString errorMsg = QString("Error parsing request: ") + ex.what(); + ui->statusText->setText("Error parsing request. See log for details"); qInfo().noquote() << "RemoteInputGui::networkManagerFinished" << errorMsg; } } - catch (const std::exception& ex) - { - ui->apiAddressLabel->setStyleSheet("QLabel { background:rgb(79,79,79); }"); - QString errorMsg = QString("Error parsing request: ") + ex.what(); - ui->statusText->setText("Error parsing request. See log for details"); - qInfo().noquote() << "RemoteInputGui::networkManagerFinished" << errorMsg; - } + + reply->deleteLater(); } void RemoteInputGui::analyzeApiReply(const QJsonObject& jsonObject) diff --git a/plugins/samplesource/rtlsdr/rtlsdrinput.cpp b/plugins/samplesource/rtlsdr/rtlsdrinput.cpp index d1d4b78c0..b8903a07e 100644 --- a/plugins/samplesource/rtlsdr/rtlsdrinput.cpp +++ b/plugins/samplesource/rtlsdr/rtlsdrinput.cpp @@ -833,13 +833,14 @@ void RTLSDRInput::webapiReverseSendSettings(QList& deviceSettingsKeys, m_networkRequest.setUrl(QUrl(channelSettingsURL)); m_networkRequest.setHeader(QNetworkRequest::ContentTypeHeader, "application/json"); - QBuffer *buffer=new QBuffer(); + QBuffer *buffer = new QBuffer(); buffer->open((QBuffer::ReadWrite)); buffer->write(swgDeviceSettings->asJson().toUtf8()); buffer->seek(0); // Always use PATCH to avoid passing reverse API settings - m_networkManager->sendCustomRequest(m_networkRequest, "PATCH", buffer); + QNetworkReply *reply = m_networkManager->sendCustomRequest(m_networkRequest, "PATCH", buffer); + buffer->setParent(reply); delete swgDeviceSettings; } @@ -858,17 +859,19 @@ void RTLSDRInput::webapiReverseSendStartStop(bool start) m_networkRequest.setUrl(QUrl(channelSettingsURL)); m_networkRequest.setHeader(QNetworkRequest::ContentTypeHeader, "application/json"); - QBuffer *buffer=new QBuffer(); + QBuffer *buffer = new QBuffer(); buffer->open((QBuffer::ReadWrite)); buffer->write(swgDeviceSettings->asJson().toUtf8()); buffer->seek(0); + QNetworkReply *reply; if (start) { - m_networkManager->sendCustomRequest(m_networkRequest, "POST", buffer); + reply = m_networkManager->sendCustomRequest(m_networkRequest, "POST", buffer); } else { - m_networkManager->sendCustomRequest(m_networkRequest, "DELETE", buffer); + reply = m_networkManager->sendCustomRequest(m_networkRequest, "DELETE", buffer); } + buffer->setParent(reply); delete swgDeviceSettings; } @@ -882,10 +885,13 @@ void RTLSDRInput::networkManagerFinished(QNetworkReply *reply) << " error(" << (int) replyError << "): " << replyError << ": " << reply->errorString(); - return; + } + else + { + QString answer = reply->readAll(); + answer.chop(1); // remove last \n + qDebug("RTLSDRInput::networkManagerFinished: reply:\n%s", answer.toStdString().c_str()); } - QString answer = reply->readAll(); - answer.chop(1); // remove last \n - qDebug("RTLSDRInput::networkManagerFinished: reply:\n%s", answer.toStdString().c_str()); + reply->deleteLater(); } diff --git a/plugins/samplesource/sdrplay/sdrplayinput.cpp b/plugins/samplesource/sdrplay/sdrplayinput.cpp index 6f17bf56a..3fc912cbc 100644 --- a/plugins/samplesource/sdrplay/sdrplayinput.cpp +++ b/plugins/samplesource/sdrplay/sdrplayinput.cpp @@ -921,13 +921,14 @@ void SDRPlayInput::webapiReverseSendSettings(QList& deviceSettingsKeys, m_networkRequest.setUrl(QUrl(deviceSettingsURL)); m_networkRequest.setHeader(QNetworkRequest::ContentTypeHeader, "application/json"); - QBuffer *buffer=new QBuffer(); + QBuffer *buffer = new QBuffer(); buffer->open((QBuffer::ReadWrite)); buffer->write(swgDeviceSettings->asJson().toUtf8()); buffer->seek(0); // Always use PATCH to avoid passing reverse API settings - m_networkManager->sendCustomRequest(m_networkRequest, "PATCH", buffer); + QNetworkReply *reply = m_networkManager->sendCustomRequest(m_networkRequest, "PATCH", buffer); + buffer->setParent(reply); delete swgDeviceSettings; } @@ -946,17 +947,19 @@ void SDRPlayInput::webapiReverseSendStartStop(bool start) m_networkRequest.setUrl(QUrl(deviceSettingsURL)); m_networkRequest.setHeader(QNetworkRequest::ContentTypeHeader, "application/json"); - QBuffer *buffer=new QBuffer(); + QBuffer *buffer = new QBuffer(); buffer->open((QBuffer::ReadWrite)); buffer->write(swgDeviceSettings->asJson().toUtf8()); buffer->seek(0); + QNetworkReply *reply; if (start) { - m_networkManager->sendCustomRequest(m_networkRequest, "POST", buffer); + reply = m_networkManager->sendCustomRequest(m_networkRequest, "POST", buffer); } else { - m_networkManager->sendCustomRequest(m_networkRequest, "DELETE", buffer); + reply = m_networkManager->sendCustomRequest(m_networkRequest, "DELETE", buffer); } + buffer->setParent(reply); delete swgDeviceSettings; } @@ -970,12 +973,15 @@ void SDRPlayInput::networkManagerFinished(QNetworkReply *reply) << " error(" << (int) replyError << "): " << replyError << ": " << reply->errorString(); - return; + } + else + { + QString answer = reply->readAll(); + answer.chop(1); // remove last \n + qDebug("SDRPlayInput::networkManagerFinished: reply:\n%s", answer.toStdString().c_str()); } - QString answer = reply->readAll(); - answer.chop(1); // remove last \n - qDebug("SDRPlayInput::networkManagerFinished: reply:\n%s", answer.toStdString().c_str()); + reply->deleteLater(); } // ==================================================================== diff --git a/plugins/samplesource/soapysdrinput/soapysdrinput.cpp b/plugins/samplesource/soapysdrinput/soapysdrinput.cpp index 056e150fe..58b2d2e5b 100644 --- a/plugins/samplesource/soapysdrinput/soapysdrinput.cpp +++ b/plugins/samplesource/soapysdrinput/soapysdrinput.cpp @@ -2010,13 +2010,14 @@ void SoapySDRInput::webapiReverseSendSettings(QList& deviceSettingsKeys m_networkRequest.setUrl(QUrl(deviceSettingsURL)); m_networkRequest.setHeader(QNetworkRequest::ContentTypeHeader, "application/json"); - QBuffer *buffer=new QBuffer(); + QBuffer *buffer = new QBuffer(); buffer->open((QBuffer::ReadWrite)); buffer->write(swgDeviceSettings->asJson().toUtf8()); buffer->seek(0); // Always use PATCH to avoid passing reverse API settings - m_networkManager->sendCustomRequest(m_networkRequest, "PATCH", buffer); + QNetworkReply *reply = m_networkManager->sendCustomRequest(m_networkRequest, "PATCH", buffer); + buffer->setParent(reply); delete swgDeviceSettings; } @@ -2035,17 +2036,19 @@ void SoapySDRInput::webapiReverseSendStartStop(bool start) m_networkRequest.setUrl(QUrl(deviceSettingsURL)); m_networkRequest.setHeader(QNetworkRequest::ContentTypeHeader, "application/json"); - QBuffer *buffer=new QBuffer(); + QBuffer *buffer = new QBuffer(); buffer->open((QBuffer::ReadWrite)); buffer->write(swgDeviceSettings->asJson().toUtf8()); buffer->seek(0); + QNetworkReply *reply; if (start) { - m_networkManager->sendCustomRequest(m_networkRequest, "POST", buffer); + reply = m_networkManager->sendCustomRequest(m_networkRequest, "POST", buffer); } else { - m_networkManager->sendCustomRequest(m_networkRequest, "DELETE", buffer); + reply = m_networkManager->sendCustomRequest(m_networkRequest, "DELETE", buffer); } + buffer->setParent(reply); delete swgDeviceSettings; } @@ -2059,10 +2062,13 @@ void SoapySDRInput::networkManagerFinished(QNetworkReply *reply) << " error(" << (int) replyError << "): " << replyError << ": " << reply->errorString(); - return; + } + else + { + QString answer = reply->readAll(); + answer.chop(1); // remove last \n + qDebug("SoapySDRInput::networkManagerFinished: reply:\n%s", answer.toStdString().c_str()); } - QString answer = reply->readAll(); - answer.chop(1); // remove last \n - qDebug("SoapySDRInput::networkManagerFinished: reply:\n%s", answer.toStdString().c_str()); + reply->deleteLater(); } diff --git a/plugins/samplesource/testsource/testsourceinput.cpp b/plugins/samplesource/testsource/testsourceinput.cpp index d8c296b42..886f0caae 100644 --- a/plugins/samplesource/testsource/testsourceinput.cpp +++ b/plugins/samplesource/testsource/testsourceinput.cpp @@ -697,7 +697,7 @@ void TestSourceInput::webapiReverseSendSettings(QList& deviceSettingsKe m_networkRequest.setUrl(QUrl(channelSettingsURL)); m_networkRequest.setHeader(QNetworkRequest::ContentTypeHeader, "application/json"); - QBuffer *buffer=new QBuffer(); + QBuffer *buffer = new QBuffer(); buffer->open((QBuffer::ReadWrite)); buffer->write(swgDeviceSettings->asJson().toUtf8()); buffer->seek(0); @@ -705,7 +705,8 @@ void TestSourceInput::webapiReverseSendSettings(QList& deviceSettingsKe // qDebug("TestSourceInput::webapiReverseSendSettings: query:\n%s", swgDeviceSettings->asJson().toStdString().c_str()); // Always use PATCH to avoid passing reverse API settings - m_networkManager->sendCustomRequest(m_networkRequest, "PATCH", buffer); + QNetworkReply *reply = m_networkManager->sendCustomRequest(m_networkRequest, "PATCH", buffer); + buffer->setParent(reply); delete swgDeviceSettings; } @@ -724,17 +725,19 @@ void TestSourceInput::webapiReverseSendStartStop(bool start) m_networkRequest.setUrl(QUrl(channelSettingsURL)); m_networkRequest.setHeader(QNetworkRequest::ContentTypeHeader, "application/json"); - QBuffer *buffer=new QBuffer(); + QBuffer *buffer = new QBuffer(); buffer->open((QBuffer::ReadWrite)); buffer->write(swgDeviceSettings->asJson().toUtf8()); buffer->seek(0); + QNetworkReply *reply; if (start) { - m_networkManager->sendCustomRequest(m_networkRequest, "POST", buffer); + reply = m_networkManager->sendCustomRequest(m_networkRequest, "POST", buffer); } else { - m_networkManager->sendCustomRequest(m_networkRequest, "DELETE", buffer); + reply = m_networkManager->sendCustomRequest(m_networkRequest, "DELETE", buffer); } + buffer->setParent(reply); delete swgDeviceSettings; } @@ -748,10 +751,13 @@ void TestSourceInput::networkManagerFinished(QNetworkReply *reply) << " error(" << (int) replyError << "): " << replyError << ": " << reply->errorString(); - return; + } + else + { + QString answer = reply->readAll(); + answer.chop(1); // remove last \n + qDebug("TestSourceInput::networkManagerFinished: reply:\n%s", answer.toStdString().c_str()); } - QString answer = reply->readAll(); - answer.chop(1); // remove last \n - qDebug("TestSourceInput::networkManagerFinished: reply:\n%s", answer.toStdString().c_str()); + reply->deleteLater(); } diff --git a/plugins/samplesource/xtrxinput/xtrxinput.cpp b/plugins/samplesource/xtrxinput/xtrxinput.cpp index dbd3e22ac..f62519051 100644 --- a/plugins/samplesource/xtrxinput/xtrxinput.cpp +++ b/plugins/samplesource/xtrxinput/xtrxinput.cpp @@ -1612,13 +1612,14 @@ void XTRXInput::webapiReverseSendSettings(QList& deviceSettingsKeys, co m_networkRequest.setUrl(QUrl(deviceSettingsURL)); m_networkRequest.setHeader(QNetworkRequest::ContentTypeHeader, "application/json"); - QBuffer *buffer=new QBuffer(); + QBuffer *buffer = new QBuffer(); buffer->open((QBuffer::ReadWrite)); buffer->write(swgDeviceSettings->asJson().toUtf8()); buffer->seek(0); // Always use PATCH to avoid passing reverse API settings - m_networkManager->sendCustomRequest(m_networkRequest, "PATCH", buffer); + QNetworkReply *reply = m_networkManager->sendCustomRequest(m_networkRequest, "PATCH", buffer); + buffer->setParent(reply); delete swgDeviceSettings; } @@ -1637,17 +1638,19 @@ void XTRXInput::webapiReverseSendStartStop(bool start) m_networkRequest.setUrl(QUrl(deviceSettingsURL)); m_networkRequest.setHeader(QNetworkRequest::ContentTypeHeader, "application/json"); - QBuffer *buffer=new QBuffer(); + QBuffer *buffer = new QBuffer(); buffer->open((QBuffer::ReadWrite)); buffer->write(swgDeviceSettings->asJson().toUtf8()); buffer->seek(0); + QNetworkReply *reply; if (start) { - m_networkManager->sendCustomRequest(m_networkRequest, "POST", buffer); + reply = m_networkManager->sendCustomRequest(m_networkRequest, "POST", buffer); } else { - m_networkManager->sendCustomRequest(m_networkRequest, "DELETE", buffer); + reply = m_networkManager->sendCustomRequest(m_networkRequest, "DELETE", buffer); } + buffer->setParent(reply); delete swgDeviceSettings; } @@ -1661,10 +1664,13 @@ void XTRXInput::networkManagerFinished(QNetworkReply *reply) << " error(" << (int) replyError << "): " << replyError << ": " << reply->errorString(); - return; + } + else + { + QString answer = reply->readAll(); + answer.chop(1); // remove last \n + qDebug("XTRXInput::networkManagerFinished: reply:\n%s", answer.toStdString().c_str()); } - QString answer = reply->readAll(); - answer.chop(1); // remove last \n - qDebug("XTRXInput::networkManagerFinished: reply:\n%s", answer.toStdString().c_str()); + reply->deleteLater(); }