Katana_mirror/kde-workspace
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kde-workspace.git synced 2025-02-24 10:52:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

plasma: correct WeatherWidget method naming

Browse source 
oh, yes - I coded that till the early morning, half-asleep..

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2023-09-23 18:12:53 +03:00
parent ef3236ca3c
commit a540b834b8
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
plasma/applets/weather/weather.cpp
View file

@ -193,7 +193,7 @@ private Q_SLOTS:
private: private:
void startGeoJob(); void startGeoJob();
void startWeatherjob(const QString &source, const float latitude, const float longitude); void startWeatherJob(const QString &source, const float latitude, const float longitude);
WeatherApplet* m_weather; WeatherApplet* m_weather;
QGraphicsLinearLayout* m_layout; QGraphicsLinearLayout* m_layout;
@ -302,7 +302,7 @@ void WeatherWidget::setup(const QString &source, const float latitude, const flo
return; return;
} }
startWeatherjob(source, latitude, longitude); startWeatherJob(source, latitude, longitude);
} }
void WeatherWidget::startGeoJob() void WeatherWidget::startGeoJob()
@ -321,7 +321,7 @@ void WeatherWidget::startGeoJob()
); );
} }
void WeatherWidget::startWeatherjob(const QString &source, const float latitude, const float longitude) void WeatherWidget::startWeatherJob(const QString &source, const float latitude, const float longitude)
{ {
Q_ASSERT(m_weatherjob == nullptr); Q_ASSERT(m_weatherjob == nullptr);
m_forecastframe->setText(source.isEmpty() ? i18n("Unknown") : source); m_forecastframe->setText(source.isEmpty() ? i18n("Unknown") : source);
@ -349,7 +349,7 @@ void WeatherWidget::slotGeoResult(KJob *kjob)
if (kjob->error() != KJob::NoError) { if (kjob->error() != KJob::NoError) {
kWarning() << "geo job error" << kjob->errorString(); kWarning() << "geo job error" << kjob->errorString();
kjob->deleteLater(); kjob->deleteLater();
startWeatherjob(ktimezone.name(), ktimezone.latitude(), ktimezone.longitude()); startWeatherJob(ktimezone.name(), ktimezone.latitude(), ktimezone.longitude());
return; return;
} }
kDebug() << "geo job completed" << m_geojob->url(); kDebug() << "geo job completed" << m_geojob->url();
@ -359,7 +359,7 @@ void WeatherWidget::slotGeoResult(KJob *kjob)
// qDebug() << Q_FUNC_INFO << geodata; // qDebug() << Q_FUNC_INFO << geodata;
if (geojson.isNull()) { if (geojson.isNull()) {
kWarning() << "null geo json document" << geojson.errorString(); kWarning() << "null geo json document" << geojson.errorString();
startWeatherjob(ktimezone.name(), ktimezone.latitude(), ktimezone.longitude()); startWeatherJob(ktimezone.name(), ktimezone.latitude(), ktimezone.longitude());
return; return;
} }
const QVariantMap geomap = geojson.toVariant().toMap(); const QVariantMap geomap = geojson.toVariant().toMap();
@ -372,7 +372,7 @@ void WeatherWidget::slotGeoResult(KJob *kjob)
const float geolatitude = geomap.value("geoplugin_latitude").toFloat(); const float geolatitude = geomap.value("geoplugin_latitude").toFloat();
const float geolongitude = geomap.value("geoplugin_longitude").toFloat(); const float geolongitude = geomap.value("geoplugin_longitude").toFloat();
const QString weathersource = QString::fromLatin1("%1 (%2)").arg(georegion, geocountry); const QString weathersource = QString::fromLatin1("%1 (%2)").arg(georegion, geocountry);
startWeatherjob(weathersource, geolatitude, geolongitude); startWeatherJob(weathersource, geolatitude, geolongitude);
} }
void WeatherWidget::slotWeatherResult(KJob *kjob) void WeatherWidget::slotWeatherResult(KJob *kjob)