arcanis/awesome-widgets
1
0
Fork 0
mirror of https://github.com/arcan1s/awesome-widgets.git synced 2025-07-03 08:55:54 +00:00
Code Issues Projects Releases Wiki Activity

fix #60

Browse Source 
some hash improvements
This commit is contained in:
arcan1s
2015-08-06 01:23:43 +03:00
parent e38863ebc2
commit 08cb7d9abe
13 changed files with 72 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
sources/awesomewidgets/extweather.cpp
View File

@ -44,11 +44,11 @@ ExtWeather::ExtWeather(QWidget *parent, const QString weatherName,
ui->setupUi(this);
translate();
values[QString("weatherId")] = 0;
values[QString("weather")] = QString("");
values[QString("humidity")] = 0;
values[QString("pressure")] = 0.0;
values[QString("temperature")] = 0.0;
values[tag(QString("weatherId"))] = 0;
values[tag(QString("weather"))] = QString("");
values[tag(QString("humidity"))] = 0;
values[tag(QString("pressure"))] = 0.0;
values[tag(QString("temperature"))] = 0.0;
manager = new QNetworkAccessManager(this);
connect(manager, SIGNAL(finished(QNetworkReply *)),
@ -271,7 +271,7 @@ void ExtWeather::readConfiguration()
}
QVariantMap ExtWeather::run()
QVariantHash ExtWeather::run()
{
if (debug) qDebug() << PDEBUG;
if ((!isActive()) || (isRunning)) return values;
@ -363,7 +363,7 @@ void ExtWeather::weatherReplyReceived(QNetworkReply *reply)
return;
}
QVariantMap data;
QVariantHash data;
if (m_ts == 0)
data = parseSingleJson(json);
else {
@ -371,15 +371,15 @@ void ExtWeather::weatherReplyReceived(QNetworkReply *reply)
data = parseSingleJson(list.count() <= m_ts ? list[m_ts-1].toMap() : list.last().toMap());
}
for (int i=0; i<data.keys().count(); i++)
values[data.keys()[i]] = data[data.keys()[i]];
values[tag(data.keys()[i])] = data[data.keys()[i]];
}
QVariantMap ExtWeather::parseSingleJson(const QVariantMap json) const
QVariantHash ExtWeather::parseSingleJson(const QVariantMap json) const
{
if (debug) qDebug() << PDEBUG;
QVariantMap output;
QVariantHash output;
// weather status
QVariantList weather = json[QString("weather")].toList();