[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: 2008-12-31 0:39:09
Message-ID: 1230683949.254194.25455.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 903606 by spstarr:
krazy cleanups, Check single-char QString operations for efficiency
M +15 -15 ion_bbcukmet.cpp
M +3 -3 ion_envcan.cpp
M +3 -3 ion_noaa.cpp
--- trunk/KDE/kdebase/workspace/plasma/dataengines/weather/ions/ion_bbcukmet.cpp \
#903605:903606 @@ -353,7 +353,7 @@
if (xml.attributes().value("href").toString().contains("5day.wml")) \
{
// Split URL to determine station ID number
- tokens = xml.attributes().value("href").toString().split("=");
+ tokens = xml.attributes().value("href").toString().split('=');
if (xml.attributes().value("href").toString().contains("world")) \
{
url = "http://feeds.bbc.co.uk/weather/feeds/obs/world/" + \
tokens[1] + ".xml"; flag = 0;
@@ -412,7 +412,7 @@
QString place;
QString tmp;
bool flag = false;
- QStringList tokens = url.url().split("=");
+ QStringList tokens = url.url().split('=');
if (url.url().contains("xhtml")) { // We don't care about the first redirection \
(there is two) if (url.url().contains("world")) {
obsUrl = "http://feeds.bbc.co.uk/weather/feeds/obs/world/" + tokens[2] + \
".xml"; @@ -421,7 +421,7 @@
obsUrl = "http://feeds.bbc.co.uk/weather/feeds/obs/id/" + tokens[2] + \
".xml"; flag = true;
}
- place = d->m_jobList[job].split("|")[2]; // Contains the source name (place \
in this case) + place = d->m_jobList[job].split('|')[2]; // Contains the \
source name (place in this case) tmp = QString("bbcukmet|%1").arg(place);
place[0] = place[0].toUpper();
@@ -588,7 +588,7 @@
QString conditionString = xml.readElementText();
// Get the observation time.
- QStringList conditionData = conditionString.split(":");
+ QStringList conditionData = conditionString.split(':');
data.obsTime = conditionData[0];
// Friday at 0200 GMT
@@ -596,25 +596,25 @@
data.iconPeriodHour = d->m_dateFormat.toString("HH").toInt();
//data.iconPeriodAP = d->m_dateFormat.toString("ap");
- data.condition = conditionData[1].split(".")[0].trimmed();
+ data.condition = conditionData[1].split('.')[0].trimmed();
} else if (xml.name() == "link") {
d->m_place[source].XMLforecastURL = xml.readElementText();
} else if (xml.name() == "description") {
QString observeString = xml.readElementText();
- QStringList observeData = observeString.split(":");
+ QStringList observeData = observeString.split(':');
data.temperature_C = observeData[1].split(QChar(176))[0].trimmed();
- data.temperature_F = \
observeData[1].split("(")[1].split(QChar(176))[0]; + \
data.temperature_F = observeData[1].split('(')[1].split(QChar(176))[0];
- data.windDirection = observeData[2].split(",")[0].trimmed();
- data.windSpeed_miles = observeData[3].split(",")[0].split(" ")[1];
+ data.windDirection = observeData[2].split(',')[0].trimmed();
+ data.windSpeed_miles = observeData[3].split(',')[0].split(' ')[1];
- data.humidity = observeData[4].split(",")[0].split(" ")[1];
+ data.humidity = observeData[4].split(',')[0].split(' ')[1];
- data.pressure = observeData[5].split(",")[0].split(" \
")[1].split("mB")[0]; + data.pressure = \
observeData[5].split(',')[0].split(' ')[1].split("mB")[0];
- data.pressureTendency = observeData[5].split(",")[1].trimmed();
+ data.pressureTendency = observeData[5].split(',')[1].trimmed();
data.visibilityStr = observeData[6].trimmed();
@@ -735,7 +735,7 @@
break;
case WindSpeed:
forecast->windSpeed = \
numParser.capturedTexts()[0].remove("Wind").toInt();
- forecast->windDirection = \
dataText.split("(")[1].split(")")[0]; + \
forecast->windDirection = dataText.split('(')[1].split(')')[0]; dataItem = 0;
d->m_weatherData[source].forecasts.append(forecast);
forecast = new WeatherData::ForecastInfo;
@@ -765,10 +765,10 @@
QString placeList;
foreach(const QString &place, d->m_locations) {
if (beginflag) {
- placeList.append(QString("%1|extra|%2").arg(place.split("|")[1]).arg(d->m_place[place].XMLurl));
+ placeList.append(QString("%1|extra|%2").arg(place.split('|')[1]).arg(d->m_place[place].XMLurl));
beginflag = false;
} else {
- placeList.append(QString("|place|%1|extra|%2").arg(place.split("|")[1]).arg(d->m_place[place].XMLurl));
+ placeList.append(QString("|place|%1|extra|%2").arg(place.split('|')[1]).arg(d->m_place[place].XMLurl));
}
}
if (d->m_locations.count() > 1) {
--- trunk/KDE/kdebase/workspace/plasma/dataengines/weather/ions/ion_envcan.cpp \
#903605:903606 @@ -455,7 +455,7 @@
QHash<QString, QString>::const_iterator it = d->m_locations.constBegin();
while (it != d->m_locations.constEnd()) {
if (it.value().toLower().contains(source.toLower())) {
- placeList.append(QString("place|%1").arg(it.value().split("|")[1]));
+ placeList.append(QString("place|%1").arg(it.value().split('|')[1]));
}
++it;
}
@@ -525,7 +525,7 @@
// Demunge source name for key only.
QString dataKey = source;
- dataKey.replace("|weather", "");
+ dataKey.remove("|weather");
url = "http://dd.weatheroffice.ec.gc.ca/EC_sites/xml/" + \
d->m_place[dataKey].territoryName + "/" + d->m_place[dataKey].cityCode + "_e.xml"; \
//url="file:///home/spstarr/Desktop/s0000649_e.xml";
@@ -665,7 +665,7 @@
data.recordLow = 0.0;
QString dataKey = source;
- dataKey.replace("|weather", "");
+ dataKey.remove("|weather");
data.shortTerritoryName = d->m_place[dataKey].territoryName;
while (!xml.atEnd()) {
xml.readNext();
--- trunk/KDE/kdebase/workspace/plasma/dataengines/weather/ions/ion_noaa.cpp \
#903605:903606 @@ -120,7 +120,7 @@
QHash<QString, QString>::const_iterator it = d->m_locations.constBegin();
while (it != d->m_locations.constEnd()) {
if (it.value().toLower().contains(source.toLower())) {
- placeList.append(QString("place|%1").arg(it.value().split("|")[1]));
+ placeList.append(QString("place|%1").arg(it.value().split('|')[1]));
}
++it;
}
@@ -190,7 +190,7 @@
KUrl url;
QString dataKey = source;
- dataKey.replace("|weather", "");
+ dataKey.remove("|weather");
url = d->m_place[dataKey].XMLurl;
kDebug() << "URL Location: " << url.url();
@@ -345,7 +345,7 @@
data.stationID = xml.readElementText();
} else if (xml.name() == "observation_time") {
data.observationTime = xml.readElementText();
- QStringList tmpDateStr = data.observationTime.split(" ");
+ QStringList tmpDateStr = data.observationTime.split(' ');
data.observationTime = QString("%1 \
%2").arg(tmpDateStr[5]).arg(tmpDateStr[6]);
d->m_dateFormat = QDateTime::fromString(data.observationTime, "h:mm \
ap"); data.iconPeriodHour = d->m_dateFormat.toString("HH");
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic