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

massive refactoring

Browse Source
This commit is contained in:
Evgenii Alekseev
2017-05-05 17:55:52 +03:00
parent 6e62ceaac7
commit d0c96ce829
152 changed files with 3041 additions and 3219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
sources/extsysmon/extsysmonaggregator.cpp
View File

@ -34,13 +34,13 @@
#include "weathersource.h"
ExtSysMonAggregator::ExtSysMonAggregator(QObject *parent,
const QHash<QString, QString> &config)
: QObject(parent)
ExtSysMonAggregator::ExtSysMonAggregator(QObject *_parent,
const QHash<QString, QString> &_config)
: QObject(_parent)
{
qCDebug(LOG_ESM) << __PRETTY_FUNCTION__;
init(config);
init(_config);
}
@ -52,28 +52,28 @@ ExtSysMonAggregator::~ExtSysMonAggregator()
}
QVariant ExtSysMonAggregator::data(const QString &source) const
QVariant ExtSysMonAggregator::data(const QString &_source) const
{
qCDebug(LOG_ESM) << "Source" << source;
qCDebug(LOG_ESM) << "Source" << _source;
return m_map[source]->data(source);
return m_map[_source]->data(_source);
}
bool ExtSysMonAggregator::hasSource(const QString &source) const
bool ExtSysMonAggregator::hasSource(const QString &_source) const
{
qCDebug(LOG_ESM) << "Source" << source;
qCDebug(LOG_ESM) << "Source" << _source;
return m_map.contains(source);
return m_map.contains(_source);
}
QVariantMap ExtSysMonAggregator::initialData(const QString &source) const
QVariantMap ExtSysMonAggregator::initialData(const QString &_source) const
{
qCDebug(LOG_ESM) << "Source" << source;
qCDebug(LOG_ESM) << "Source" << _source;
return hasSource(source) ? m_map[source]->initialData(source)
: QVariantMap();
return hasSource(_source) ? m_map[_source]->initialData(_source)
: QVariantMap();
}
@ -83,13 +83,13 @@ QStringList ExtSysMonAggregator::sources() const
}
void ExtSysMonAggregator::init(const QHash<QString, QString> &config)
void ExtSysMonAggregator::init(const QHash<QString, QString> &_config)
{
qCDebug(LOG_ESM) << "Configuration" << config;
qCDebug(LOG_ESM) << "Configuration" << _config;
// battery
AbstractExtSysMonSource *batteryItem
= new BatterySource(this, QStringList() << config[QString("ACPIPATH")]);
= new BatterySource(this, QStringList() << _config["ACPIPATH"]);
for (auto &source : batteryItem->sources())
m_map[source] = batteryItem;
// custom
@ -103,19 +103,17 @@ void ExtSysMonAggregator::init(const QHash<QString, QString> &config)
m_map[source] = desktopItem;
// gpu load
AbstractExtSysMonSource *gpuLoadItem
= new GPULoadSource(this, QStringList() << config[QString("GPUDEV")]);
= new GPULoadSource(this, QStringList({_config["GPUDEV"]}));
for (auto &source : gpuLoadItem->sources())
m_map[source] = gpuLoadItem;
// gpu temperature
AbstractExtSysMonSource *gpuTempItem = new GPUTemperatureSource(
this, QStringList() << config[QString("GPUDEV")]);
AbstractExtSysMonSource *gpuTempItem
= new GPUTemperatureSource(this, QStringList({_config["GPUDEV"]}));
for (auto &source : gpuTempItem->sources())
m_map[source] = gpuTempItem;
// hdd temperature
AbstractExtSysMonSource *hddTempItem = new HDDTemperatureSource(
this,
QStringList() << config[QString("HDDDEV")]
<< config[QString("HDDTEMPCMD")]);
this, QStringList({_config["HDDDEV"], _config["HDDTEMPCMD"]}));
for (auto &source : hddTempItem->sources())
m_map[source] = hddTempItem;
// network
@ -125,11 +123,9 @@ void ExtSysMonAggregator::init(const QHash<QString, QString> &config)
m_map[source] = networkItem;
// player
AbstractExtSysMonSource *playerItem = new PlayerSource(
this,
QStringList() << config[QString("PLAYER")]
<< config[QString("MPDADDRESS")]
<< config[QString("MPDPORT")] << config[QString("MPRIS")]
<< config[QString("PLAYERSYMBOLS")]);
this, QStringList({_config["PLAYER"], _config["MPDADDRESS"],
_config["MPDPORT"], _config["MPRIS"],
_config["PLAYERSYMBOLS"]}));
for (auto &source : playerItem->sources())
m_map[source] = playerItem;
// processes