Differential D22087 Diff 60630 dataengines/powermanagement/powermanagementengine.cpp

Changeset View

Standalone View

View Options

dataengines/powermanagement/powermanagementengine.cpp

Show First 20 Lines • Show All 149 Lines • ▼ Show 20 Line(s)149 if (listBattery.isEmpty()) {
150 setData(QStringLiteral("Battery"), QStringLiteral("Has Battery"), false); 150​ setData(QStringLiteral("Battery"), QStringLiteral("Has Battery"), false);
151 setData(QStringLiteral("Battery"), QStringLiteral("Has Cumulative"), false); 151​ setData(QStringLiteral("Battery"), QStringLiteral("Has Cumulative"), false);
152 return true; 152​ return true;
153 } 153​ }
154 154​
155 uint index = 0; 155​ uint index = 0;
156 QStringList batterySources; 156​ QStringList batterySources;
157 157​
158 foreach (const Solid::Device &deviceBattery, listBattery) { 158​ for (const Solid::Device &deviceBattery : listBattery) {
159 const Solid::Battery* battery = deviceBattery.as<Solid::Battery>(); 159​ const Solid::Battery* battery = deviceBattery.as<Solid::Battery>();
160 160​
161 const QString source = QStringLiteral("Battery%1").arg(index++); 161​ const QString source = QStringLiteral("Battery%1").arg(index++);
162 162​
163 batterySources << source; 163​ batterySources << source;
164 m_batterySources[deviceBattery.udi()] = source; 164​ m_batterySources[deviceBattery.udi()] = source;
165 165​
166 connect(battery, &Solid::Battery::chargeStateChanged, this, 166​ connect(battery, &Solid::Battery::chargeStateChanged, this,
▲ Show 20 Lines • Show All 267 Lines • ▼ Show 20 Line(s)
434{ 434​{
435 const QString source = m_batterySources[udi]; 435​ const QString source = m_batterySources[udi];
436 setData(source, QStringLiteral("Is Power Supply"), newState); 436​ setData(source, QStringLiteral("Is Power Supply"), newState);
437} 437​}
438 438​
439void PowermanagementEngine::updateBatteryNames() 439​void PowermanagementEngine::updateBatteryNames()
440{ 440​{
441 uint unnamedBatteries = 0; 441​ uint unnamedBatteries = 0;
442 foreach (QString source, m_batterySources) { 442​ for (QString source : qAsConst(m_batterySources)) {
apolUnsubmitted
Done

const &

apol: const &
443 DataContainer *batteryDataContainer = containerForSource(source); 443​ DataContainer *batteryDataContainer = containerForSource(source);
444 if (batteryDataContainer) { 444​ if (batteryDataContainer) {
445 const QString batteryVendor = batteryDataContainer->data()[QStringLiteral("Vendor")].toString(); 445​ const QString batteryVendor = batteryDataContainer->data()[QStringLiteral("Vendor")].toString();
446 const QString batteryProduct = batteryDataContainer->data()[QStringLiteral("Product")].toString(); 446​ const QString batteryProduct = batteryDataContainer->data()[QStringLiteral("Product")].toString();
447 447​
448 // Don't show battery name for primary power supply batteries. They usually have cryptic serial number names. 448​ // Don't show battery name for primary power supply batteries. They usually have cryptic serial number names.
449 const bool showBatteryName = batteryDataContainer->data()[QStringLiteral("Type")].toString() != QLatin1String("Battery") || 449​ const bool showBatteryName = batteryDataContainer->data()[QStringLiteral("Type")].toString() != QLatin1String("Battery") ||
450 !batteryDataContainer->data()[QStringLiteral("Is Power Supply")].toBool(); 450​ !batteryDataContainer->data()[QStringLiteral("Is Power Supply")].toBool();
Show All 24 Lines471{
475 double energy = 0; 475​ double energy = 0;
476 double totalEnergy = 0; 476​ double totalEnergy = 0;
477 bool allFullyCharged = true; 477​ bool allFullyCharged = true;
478 bool charging = false; 478​ bool charging = false;
479 bool noCharge = false; 479​ bool noCharge = false;
480 double totalPercentage = 0; 480​ double totalPercentage = 0;
481 int count = 0; 481​ int count = 0;
482 482​
483 foreach (const Solid::Device &deviceBattery, listBattery) { 483​ for (const Solid::Device &deviceBattery : listBattery) {
484 const Solid::Battery* battery = deviceBattery.as<Solid::Battery>(); 484​ const Solid::Battery* battery = deviceBattery.as<Solid::Battery>();
485 485​
486 if (battery && battery->isPowerSupply()) { 486​ if (battery && battery->isPowerSupply()) {
487 hasCumulative = true; 487​ hasCumulative = true;
488 488​
489 energy += battery->energy(); 489​ energy += battery->energy();
490 totalEnergy += battery->energyFull(); 490​ totalEnergy += battery->energyFull();
491 totalPercentage += battery->chargePercent(); 491​ totalPercentage += battery->chargePercent();
▲ Show 20 Lines • Show All 190 Lines • Show Last 20 Lines