SVN commit 1011542 by spstarr: Some minor cleanups. No point passing back data when it's already a reference adjust functions accordingly M +2 -3 ion_envcan.cpp M +1 -1 ion_envcan.h M +2 -3 ion_noaa.cpp M +1 -1 ion_noaa.h --- trunk/KDE/kdebase/workspace/plasma/dataengines/weather/ions/ion_envcan.cpp #1011541:1011542 @@ -718,7 +718,7 @@ return (success && !d->m_xmlSetup.error()); } -WeatherData EnvCanadaIon::parseWeatherSite(WeatherData& data, QXmlStreamReader& xml) +void EnvCanadaIon::parseWeatherSite(WeatherData& data, QXmlStreamReader& xml) { while (!xml.atEnd()) { xml.readNext(); @@ -750,7 +750,6 @@ } } } - return data; } // Parse Weather data main loop, from here we have to decend into each tag pair @@ -775,7 +774,7 @@ if (xml.isStartElement()) { if (xml.name() == "siteData") { - data = parseWeatherSite(data, xml); + parseWeatherSite(data, xml); } else { parseUnknownElement(xml); } --- trunk/KDE/kdebase/workspace/plasma/dataengines/weather/ions/ion_envcan.h #1011541:1011542 @@ -212,7 +212,7 @@ void parseUnknownElement(QXmlStreamReader& xml) const; // Parse weather XML data - WeatherData parseWeatherSite(WeatherData& data, QXmlStreamReader& xml); + void parseWeatherSite(WeatherData& data, QXmlStreamReader& xml); void parseDateTime(WeatherData& data, QXmlStreamReader& xml, WeatherData::WeatherEvent* event = NULL); void parseLocations(WeatherData& data, QXmlStreamReader& xml); void parseConditions(WeatherData& data, QXmlStreamReader& xml); --- trunk/KDE/kdebase/workspace/plasma/dataengines/weather/ions/ion_noaa.cpp #1011541:1011542 @@ -348,7 +348,7 @@ return (!d->m_xmlSetup.error() && success); } -WeatherData NOAAIon::parseWeatherSite(WeatherData& data, QXmlStreamReader& xml) +void NOAAIon::parseWeatherSite(WeatherData& data, QXmlStreamReader& xml) { data.temperature_C = i18n("N/A"); data.temperature_F = i18n("N/A"); @@ -422,7 +422,6 @@ } } } - return data; } // Parse Weather data main loop, from here we have to decend into each tag pair @@ -439,7 +438,7 @@ if (xml.isStartElement()) { if (xml.name() == "current_observation") { - data = parseWeatherSite(data, xml); + parseWeatherSite(data, xml); } else { parseUnknownElement(xml); } --- trunk/KDE/kdebase/workspace/plasma/dataengines/weather/ions/ion_noaa.h #1011541:1011542 @@ -130,7 +130,7 @@ void parseUnknownElement(QXmlStreamReader& xml) const; // Parse weather XML data - WeatherData parseWeatherSite(WeatherData& data, QXmlStreamReader& xml); + void parseWeatherSite(WeatherData& data, QXmlStreamReader& xml); void parseStationID(void); void parseStationList(void);