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

List:       kde-commits
Subject:    KDE/kdebase/workspace/plasma/dataengines/weather/ions
From:       Shawn Starr <shawn.starr () rogers ! com>
Date:       2009-08-07 1:50:59
Message-ID: 1249609859.811237.32174.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1008176 by spstarr:

We don't need i18n() for if statement checks. only data.insert lines. Just incase \
anyone else uses the ions outside of plasma or other applets

 M  +4 -4      ion_bbcukmet.cpp  
 M  +1 -1      ion_envcan.cpp  
 M  +2 -2      ion_noaa.cpp  


--- trunk/KDE/kdebase/workspace/plasma/dataengines/weather/ions/ion_bbcukmet.cpp \
#1008175:1008176 @@ -638,7 +638,7 @@
                 data.temperature_C = observeData[1].split(QChar(176))[0].trimmed();
 
                 // Temperature might be not available
-                if (data.temperature_C.contains(i18n("N/A"))) {
+                if (data.temperature_C.contains("N/A")) {
                     data.temperature_C = i18n("N/A");
                 }
 
@@ -930,7 +930,7 @@
 QMap<QString, QString> UKMETIon::wind(const QString& source) const
 {
     QMap<QString, QString> windInfo;
-    if (d->m_weatherData[source].windSpeed_miles == i18n("N/A")) {
+    if (d->m_weatherData[source].windSpeed_miles == "N/A") {
         windInfo.insert("windSpeed", i18n("N/A"));
         windInfo.insert("windUnit", QString::number(WeatherUtils::NoUnit));
     } else {
@@ -948,7 +948,7 @@
 QMap<QString, QString> UKMETIon::humidity(const QString& source) const
 {
     QMap<QString, QString> humidityInfo;
-    if (d->m_weatherData[source].humidity != i18n("N/A")) {
+    if (d->m_weatherData[source].humidity != "N/A") {
         humidityInfo.insert("humidity", d->m_weatherData[source].humidity);
         humidityInfo.insert("humidityUnit", QString::number(WeatherUtils::Percent));
     } else {
@@ -967,7 +967,7 @@
 QMap<QString, QString> UKMETIon::pressure(const QString& source) const
 {
     QMap<QString, QString> pressureInfo;
-    if (d->m_weatherData[source].pressure == i18n("N/A")) {
+    if (d->m_weatherData[source].pressure == "N/A") {
         pressureInfo.insert("pressure", i18n("N/A"));
         pressureInfo.insert("pressureUnit", QString::number(WeatherUtils::NoUnit));
         pressureInfo.insert("pressureTendency", i18n("N/A"));
--- trunk/KDE/kdebase/workspace/plasma/dataengines/weather/ions/ion_envcan.cpp \
#1008175:1008176 @@ -1434,7 +1434,7 @@
     data.insert("Temperature", dataFields["temperature"]);
 
     // Do we have a comfort temperature? if so display it
-    if (dataFields["comfortTemperature"] != i18n("N/A") && \
!dataFields["comfortTemperature"].isEmpty()) { +    if \
(dataFields["comfortTemperature"] != "N/A" && \
!dataFields["comfortTemperature"].isEmpty()) {  if \
                (dataFields["comfortTemperature"].toFloat() <= 0) {
             data.insert("Windchill", \
QString("%1").arg(dataFields["comfortTemperature"]));  data.insert("Humidex", \
                i18n("N/A"));
--- trunk/KDE/kdebase/workspace/plasma/dataengines/weather/ions/ion_noaa.cpp \
#1008175:1008176 @@ -504,7 +504,7 @@
     data.insert("Temperature Unit", dataFields["temperatureUnit"]);
 
     // Do we have a comfort temperature? if so display it
-    if (dataFields["comfortTemperature"] != i18n("N/A")) {
+    if (dataFields["comfortTemperature"] != "N/A") {
         if (d->m_weatherData[source].windchill_F != "NA") {
             data.insert("Windchill", \
QString("%1").arg(dataFields["comfortTemperature"]));  data.insert("Humidex", \
i18n("N/A")); @@ -679,7 +679,7 @@
     }
 
     // May not always have gusty winds
-    if (d->m_weatherData[source].windGust == "NA" || \
d->m_weatherData[source].windGust == i18n("N/A")) { +    if \
(d->m_weatherData[source].windGust == "NA" || d->m_weatherData[source].windGust == \
"N/A") {  windInfo.insert("windGust", i18n("N/A"));
         windInfo.insert("windGustUnit", QString::number(WeatherUtils::NoUnit));
     } else {


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