kdeplasma-addons: decimal point numbers regression fix

regression since f6e923b33523dc1f5f54641924c53d0b929ce308

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

diff --git a/kdeplasma-addons/applets/weatherstation/weatherstation.cpp b/kdeplasma-addons/applets/weatherstation/weatherstation.cpp
index c2dc3c9..03ad14b 100644 (file)
--- a/kdeplasma-addons/applets/weatherstation/weatherstation.cpp
+++ b/kdeplasma-addons/applets/weatherstation/weatherstation.cpp
@@ -156,7 +156,7 @@ QString WeatherStation::tempValue(const QString& value, int unit)
     KTemperature temp(value.toDouble(), static_cast<KTemperature::KTempUnit>(unit));
     KTemperature totemp(0.0, temperatureUnit());
     const double tempvalue = temp.convertTo(totemp.unitEnum());
-    return KTemperature(KTemperature::round(tempvalue, 1), totemp.unitEnum()).toString();
+    return QString::number(KUnitConversion::round(tempvalue, 1));
 }
 
 QString WeatherStation::presValue(const QString& value, int unit)
@@ -167,7 +167,7 @@ QString WeatherStation::presValue(const QString& value, int unit)
     KPressure pres(value.toDouble(), static_cast<KPressure::KPresUnit>(unit));
     KPressure topres(0.0, pressureUnit());
     const double presvalue = pres.convertTo(topres.unitEnum());
-    return KPressure(KPressure::round(presvalue, 1), topres.unitEnum()).toString();
+    return QString::number(KUnitConversion::round(presvalue, 1));
 }
 
 QString WeatherStation::veloValue(const QString& value, int unit)
@@ -178,7 +178,7 @@ QString WeatherStation::veloValue(const QString& value, int unit)
     KVelocity velo(value.toDouble(), static_cast<KVelocity::KVeloUnit>(unit));
     KVelocity tovelo(0.0, speedUnit());
     const double velovalue = velo.convertTo(tovelo.unitEnum());
-    return KVelocity(KVelocity::round(velovalue, 1), tovelo.unitEnum()).toString();
+    return QString::number(KUnitConversion::round(velovalue, 1));
 }
 
 void WeatherStation::dataUpdated(const QString& source, const Plasma::DataEngine::Data &data)
@@ -190,7 +190,7 @@ void WeatherStation::dataUpdated(const QString& source, const Plasma::DataEngine
 
     QString v = data["Temperature"].toString();
     QString temp = tempValue(v, data["Temperature Unit"].toInt());
-    setTemperature(temp, (v.indexOf('.') > -1));
+    setTemperature(temp);
 
     setPressure(conditionIcon(), presValue(data["Pressure"].toString(),
                 data["Pressure Unit"].toInt()),
@@ -278,7 +278,7 @@ void WeatherStation::setPressure(const QString& condition, const QString& pressu
     emit pressureChanged(currentCondition, pressure, pressureUnit(), direction);
 }
 
-void WeatherStation::setTemperature(const QString& temperature, bool hasDigit)
+void WeatherStation::setTemperature(const QString& temperature)
 {
     m_lcdPanel->setLabel("temperature-unit-label", temperatureUnit());
     m_lcdPanel->setNumber("temperature", temperature);

diff --git a/kdeplasma-addons/applets/weatherstation/weatherstation.h b/kdeplasma-addons/applets/weatherstation/weatherstation.h
index ef58808..fef5d92 100644 (file)
--- a/kdeplasma-addons/applets/weatherstation/weatherstation.h
+++ b/kdeplasma-addons/applets/weatherstation/weatherstation.h
@@ -74,7 +74,7 @@ protected:
     void setWind(const QString& speed, const QString& direction);
     void setPressure(const QString& condition, const QString& pressure,
                      const QString& tendency);
-    void setTemperature(const QString& temperature, bool hasDigit);
+    void setTemperature(const QString& temperature);
     void setHumidity(QString humidity);
     void setToolTip(const QString& place);