diff --git a/src/AutoPilotPlugins/APM/APMRemoteParamsDownloader.cc b/src/AutoPilotPlugins/APM/APMRemoteParamsDownloader.cc index 8b4834dbc4b3b1d909973b21020e6d2cf3df6a31..8ab34de35c30b79695faedc56e95460ccc4385bc 100644 --- a/src/AutoPilotPlugins/APM/APMRemoteParamsDownloader.cc +++ b/src/AutoPilotPlugins/APM/APMRemoteParamsDownloader.cc @@ -69,9 +69,8 @@ void APMRemoteParamsDownloader::refreshParamList() QUrl url = FRAME_PARAMS_LIST; m_networkReply->deleteLater(); m_networkReply = m_networkAccessManager.get(QNetworkRequest(url)); - connect(m_networkReply, SIGNAL(finished()), this, SLOT(httpParamListFinished())); - connect(m_networkReply, SIGNAL(downloadProgress(qint64,qint64)), - this, SLOT(updateDataReadProgress(qint64,qint64))); + connect(m_networkReply, &QNetworkReply::finished, this, &APMRemoteParamsDownloader::httpParamListFinished); + connect(m_networkReply, &QNetworkReply::downloadProgress, this, &APMRemoteParamsDownloader::updateDataReadProgress); } /* Returned Json Example @@ -120,9 +119,9 @@ void APMRemoteParamsDownloader::startFileDownloadRequest() m_downloadedParamFile->open(QIODevice::WriteOnly); m_networkReply = m_networkAccessManager.get(QNetworkRequest(url)); - connect(m_networkReply, SIGNAL(finished()), this, SLOT(httpFinished())); - connect(m_networkReply, SIGNAL(readyRead()), this, SLOT(httpReadyRead())); - connect(m_networkReply, SIGNAL(downloadProgress(qint64,qint64)), this, SLOT(updateDataReadProgress(qint64,qint64))); + connect(m_networkReply, &QNetworkReply::finished, this, &APMRemoteParamsDownloader::httpFinished); + connect(m_networkReply, &QNetworkReply::readyRead, this, &APMRemoteParamsDownloader::httpReadyRead); + connect(m_networkReply, &QNetworkReply::downloadProgress, this, &APMRemoteParamsDownloader::updateDataReadProgress); curr++; } diff --git a/src/AutoPilotPlugins/APM/APMRemoteParamsDownloader.h b/src/AutoPilotPlugins/APM/APMRemoteParamsDownloader.h index b635cc77e4ab743f2f448d64267a81c0aa64e7d8..e22a4b137f3c6f0e268ac8471d9eef515e10b8dc 100644 --- a/src/AutoPilotPlugins/APM/APMRemoteParamsDownloader.h +++ b/src/AutoPilotPlugins/APM/APMRemoteParamsDownloader.h @@ -17,18 +17,19 @@ class APMRemoteParamsDownloader : public QObject public: explicit APMRemoteParamsDownloader(const QString& file); QString statusText() const; -public slots: void refreshParamList(); void httpParamListFinished(); void httpFinished(); void httpReadyRead(); void updateDataReadProgress(qint64 bytesRead, qint64 totalBytes); + private: void setStatusText(const QString& text); void startFileDownloadRequest(); void manualListSetup(); void processDownloadedVersionObject(const QByteArray& listObject); void startDownloadingRemoteParams(); + signals: void finished(); private: