diff --git a/src/plugins/weatherdata/gfs/weatherdatagfs.cpp b/src/plugins/weatherdata/gfs/weatherdatagfs.cpp index 89ac7501c..630681213 100644 --- a/src/plugins/weatherdata/gfs/weatherdatagfs.cpp +++ b/src/plugins/weatherdata/gfs/weatherdatagfs.cpp @@ -76,7 +76,7 @@ namespace BlackWxPlugin const QUrl url = getDownloadUrl().toQUrl(); CLogMessage(this).debug() << "Started to download GFS data from" << url.toString(); QNetworkRequest request(url); - sApp->getFromNetwork(request, { this, &CWeatherDataGfs::ps_parseGfsFile }); + sApp->getFromNetwork(request, { this, &CWeatherDataGfs::parseGfsFile }); } else { @@ -86,7 +86,7 @@ namespace BlackWxPlugin { parseGfsFileImpl(m_gribData); }); - m_parseGribFileWorker->then(this, &CWeatherDataGfs::ps_fetchingWeatherDataFinished); + m_parseGribFileWorker->then(this, &CWeatherDataGfs::fetchingWeatherDataFinished); } } @@ -96,12 +96,12 @@ namespace BlackWxPlugin return m_weatherGrid; } - void CWeatherDataGfs::ps_fetchingWeatherDataFinished() + void CWeatherDataGfs::fetchingWeatherDataFinished() { emit fetchingFinished(); } - void CWeatherDataGfs::ps_parseGfsFile(QNetworkReply *nwReplyPtr) + void CWeatherDataGfs::parseGfsFile(QNetworkReply *nwReplyPtr) { // wrap pointer, make sure any exit cleans up reply // required to use delete later as object is created in a different thread @@ -113,7 +113,7 @@ namespace BlackWxPlugin { parseGfsFileImpl(m_gribData); }); - m_parseGribFileWorker->then(this, &CWeatherDataGfs::ps_fetchingWeatherDataFinished); + m_parseGribFileWorker->then(this, &CWeatherDataGfs::fetchingWeatherDataFinished); } CUrl CWeatherDataGfs::getDownloadUrl() const diff --git a/src/plugins/weatherdata/gfs/weatherdatagfs.h b/src/plugins/weatherdata/gfs/weatherdatagfs.h index aec7e26f6..5829f42bd 100644 --- a/src/plugins/weatherdata/gfs/weatherdatagfs.h +++ b/src/plugins/weatherdata/gfs/weatherdatagfs.h @@ -53,14 +53,6 @@ namespace BlackWxPlugin //! \copydoc BlackCore::IWeatherData::getWeatherData() virtual BlackMisc::Weather::CWeatherGrid getWeatherData() const override; - private slots: - //! Asyncronous fetching finished - //! \threadsafe - void ps_fetchingWeatherDataFinished(); - - //! Parsing - void ps_parseGfsFile(QNetworkReply *nwReplyPtr); - private: enum Grib2CloudLevel { @@ -137,8 +129,12 @@ namespace BlackWxPlugin double surfaceTemperature = 0; }; - BlackMisc::Network::CUrl getDownloadUrl() const; + //! Asyncronous fetching finished + //! \threadsafe + void fetchingWeatherDataFinished(); + void parseGfsFile(QNetworkReply *nwReplyPtr); + BlackMisc::Network::CUrl getDownloadUrl() const; void parseGfsFileImpl(const QByteArray &gribData); void findNextGribMessage(unsigned char *buffer, g2int size, g2int iseek, g2int *lskip, g2int *lgrib); void createWeatherGrid(const gribfield *gfld);