bump default gi configuration

Bump API version and add new parameters. Also:

1. Fix function combobox in configuration UI.
2. Drop datasource from time engine as well.
3. Small edit abstractdesources class
This commit is contained in:
2016-03-03 19:57:31 +03:00
parent 89d573450a
commit 071d7fdb78
8 changed files with 24 additions and 11 deletions

View File

@ -57,12 +57,14 @@ QVariant ExtSysMonAggregator::data(const QString source) const
{
qCDebug(LOG_ESM) << "Source" << source;
return hasSource(source) ? m_map[source]->data(source) : QVariant();
return m_map[source]->data(source);
}
bool ExtSysMonAggregator::hasSource(const QString source) const
{
qCDebug(LOG_ESM) << "Source" << source;
return m_map.contains(source);
}
@ -78,9 +80,7 @@ QVariantMap ExtSysMonAggregator::initialData(const QString source) const
QStringList ExtSysMonAggregator::sources() const
{
QStringList sorted = m_map.keys();
sorted.sort();
return sorted;
return m_map.keys();
}

View File

@ -88,7 +88,7 @@ void BatterySource::run()
= (QString(acFile.readLine()).trimmed().toInt() == 1);
acFile.close();
// batterites
// batteries
float currentLevel = 0.0;
float fullLevel = 0.0;
for (int i = 0; i < m_batteriesCount; i++) {