[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    playground/base/plasma/ions
From:       Teemu Rytilahti <tpr () d5k ! net>
Date:       2008-08-01 1:26:27
Message-ID: 1217553987.490565.21685.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 840397 by rytilahti:

adapt to change from WeatherFormula to WeatherUtils

 M  +4 -4      weather.savonia.fi/ion_savonia_fi.cpp  
 M  +5 -5      willab/ion_willab.cpp  


--- trunk/playground/base/plasma/ions/weather.savonia.fi/ion_savonia_fi.cpp \
#840396:840397 @@ -23,7 +23,7 @@
 #include <KJob>
 #include <QDomDocument>
 
-#include <plasma/weather/formulas.h>
+#include <plasma/weather/weatherutils.h>
 
 #define URL "http://weather2.savonia.fi/datas/savoniaweather.xml"
 //#define URL "http://localhost/savoniaweather.xml"
@@ -126,7 +126,7 @@
                     //m_data["Wind Speed Unit"] = unit;
                     m_data["Wind Speed"] =
                             QString::number(value.toDouble() / 1000.0 * \
                3600.0, 'f', 1);
-                    m_data["Wind Speed Unit"] = \
WeatherFormula::Kilometers; +                    m_data["Wind Speed Unit"] \
=WeatherUtils::Kilometers;  }
                 break;
             case 19:
@@ -137,7 +137,7 @@
                 break;
             case 21:
                 if (subId == 0) {
-                    m_data["Pressure Unit"] = \
WeatherFormula::Hectopascals; +                    m_data["Pressure Unit"] \
                =WeatherUtils::Hectopascals;
                     m_data["Pressure"] = QString::number(value.toDouble(), \
'f', 1);  } else if (subId == 1) {
                     m_data["Pressure Tendency"] = value;
@@ -146,7 +146,7 @@
             case 22:
                 if (subId == 0) {
                     m_data["Temperature"] = \
                QString::number(value.toDouble(), 'f', 1);
-                    m_data["Temperature Unit"] = WeatherFormula::Celsius;
+                    m_data["Temperature Unit"] =WeatherUtils::Celsius;
                 }
                 break;
             case 24:
--- trunk/playground/base/plasma/ions/willab/ion_willab.cpp #840396:840397
@@ -21,7 +21,7 @@
 #include <KDebug>
 
 #include <kio/job.h>
-#include <plasma/weather/formulas.h>
+#include <plasma/weather/weatherutils.h>
 
 #include "ion_willab.h"
 
@@ -117,7 +117,7 @@
                 m_data["Observation Period"] = m_reader.readElementText();
             else if(m_reader.name() == "tempnow") {
                 m_data["Temperature"] = m_reader.readElementText();
-                m_data["Temperature Unit"] = WeatherFormula::Celsius;
+                m_data["Temperature Unit"] =WeatherUtils::Celsius;
             }
             else if(m_reader.name() == "temphi")
                 m_data["Record High Temperature"] = \
m_reader.readElementText(); @@ -125,17 +125,17 @@
                 m_data["Record Low Temperature"] = \
m_reader.readElementText();  else if(m_reader.name() == "dewpoint") {
                 m_data["Dewpoint"] = m_reader.readElementText();
-                m_data["Dewpoint Unit"] = WeatherFormula::Celsius; // TODO \
get the attribute +                m_data["Dewpoint Unit"] \
=WeatherUtils::Celsius; // TODO get the attribute  }
             else if(m_reader.name() == "humidity")
                 m_data["Humidity"] = m_reader.readElementText();
             else if(m_reader.name() == "airpressure") {
                 m_data["Pressure"] = m_reader.readElementText();
-                m_data["Pressure Unit"] = WeatherFormula::Hectopascals;
+                m_data["Pressure Unit"] =WeatherUtils::Hectopascals;
             }
             else if(m_reader.name() == "windspeed") {
                 m_data["Wind Speed"] = m_reader.readElementText();
-                m_data["Wind Speed Unit"] = \
WeatherFormula::MetersPerSecond; // TODO get the attribute +                \
m_data["Wind Speed Unit"] =WeatherUtils::MetersPerSecond; // TODO get the \
attribute  }
             else if(m_reader.name() == "windspeedmax")
                 m_data["Wind Gust"] = m_reader.readElementText();


[prev in list] [next in list] [prev in thread] [next in thread]