arcanis/awesome-widgets
1
0
Fork 0
mirror of https://github.com/arcan1s/awesome-widgets.git synced 2025-07-14 22:35:49 +00:00
Code Issues Projects Releases Wiki Activity

massive changes inside

Browse Source 
* use pass by ref instead of by value if possible
* use reference in interation over collections
* fix no tag inserting
This commit is contained in:
Evgenii Alekseev
2017-05-04 15:00:50 +03:00
parent 6e99e262d4
commit 6e62ceaac7
119 changed files with 645 additions and 634 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sources/extsysmon/extsysmon.cpp
View File

@ -42,7 +42,7 @@ ExtendedSysMon::ExtendedSysMon(QObject *parent, const QVariantList &args)
// init aggregator
m_aggregator = new ExtSysMonAggregator(this, m_configuration);
for (auto source : m_aggregator->sources())
for (auto &source : m_aggregator->sources())
setData(source, m_aggregator->initialData(source));
}
@ -149,7 +149,7 @@ ExtendedSysMon::updateConfiguration(QHash<QString, QString> rawConfig) const
QChar(','), QString::SkipEmptyParts);
QStringList devices;
QRegExp diskRegexp = QRegExp("^/dev/[hms]d[a-z]$");
for (auto device : deviceList)
for (auto &device : deviceList)
if ((QFile::exists(device)) && (device.contains(diskRegexp)))
devices.append(device);
if (devices.isEmpty())
@ -166,7 +166,7 @@ ExtendedSysMon::updateConfiguration(QHash<QString, QString> rawConfig) const
if (rawConfig[QString("PLAYERSYMBOLS")].toInt() <= 0)
rawConfig[QString("PLAYERSYMBOLS")] = QString("10");
for (auto key : rawConfig.keys())
for (auto &key : rawConfig.keys())
qCInfo(LOG_ESM) << key << "=" << rawConfig[key];
return rawConfig;
}

38
sources/extsysmon/extsysmonaggregator.cpp
View File

@ -35,7 +35,7 @@
ExtSysMonAggregator::ExtSysMonAggregator(QObject *parent,
const QHash<QString, QString> config)
const QHash<QString, QString> &config)
: QObject(parent)
{
qCDebug(LOG_ESM) << __PRETTY_FUNCTION__;
@ -52,7 +52,7 @@ ExtSysMonAggregator::~ExtSysMonAggregator()
}
QVariant ExtSysMonAggregator::data(const QString source) const
QVariant ExtSysMonAggregator::data(const QString &source) const
{
qCDebug(LOG_ESM) << "Source" << source;
@ -60,7 +60,7 @@ QVariant ExtSysMonAggregator::data(const QString source) const
}
bool ExtSysMonAggregator::hasSource(const QString source) const
bool ExtSysMonAggregator::hasSource(const QString &source) const
{
qCDebug(LOG_ESM) << "Source" << source;
@ -68,7 +68,7 @@ bool ExtSysMonAggregator::hasSource(const QString source) const
}
QVariantMap ExtSysMonAggregator::initialData(const QString source) const
QVariantMap ExtSysMonAggregator::initialData(const QString &source) const
{
qCDebug(LOG_ESM) << "Source" << source;
@ -83,45 +83,45 @@ 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;
// battery
AbstractExtSysMonSource *batteryItem
= new BatterySource(this, QStringList() << config[QString("ACPIPATH")]);
for (auto source : batteryItem->sources())
for (auto &source : batteryItem->sources())
m_map[source] = batteryItem;
// custom
AbstractExtSysMonSource *customItem = new CustomSource(this, QStringList());
for (auto source : customItem->sources())
for (auto &source : customItem->sources())
m_map[source] = customItem;
// desktop
AbstractExtSysMonSource *desktopItem
= new DesktopSource(this, QStringList());
for (auto source : desktopItem->sources())
for (auto &source : desktopItem->sources())
m_map[source] = desktopItem;
// gpu load
AbstractExtSysMonSource *gpuLoadItem
= new GPULoadSource(this, QStringList() << config[QString("GPUDEV")]);
for (auto source : gpuLoadItem->sources())
for (auto &source : gpuLoadItem->sources())
m_map[source] = gpuLoadItem;
// gpu temperature
AbstractExtSysMonSource *gpuTempItem = new GPUTemperatureSource(
this, QStringList() << config[QString("GPUDEV")]);
for (auto source : gpuTempItem->sources())
for (auto &source : gpuTempItem->sources())
m_map[source] = gpuTempItem;
// hdd temperature
AbstractExtSysMonSource *hddTempItem = new HDDTemperatureSource(
this,
QStringList() << config[QString("HDDDEV")]
<< config[QString("HDDTEMPCMD")]);
for (auto source : hddTempItem->sources())
for (auto &source : hddTempItem->sources())
m_map[source] = hddTempItem;
// network
AbstractExtSysMonSource *networkItem
= new NetworkSource(this, QStringList());
for (auto source : networkItem->sources())
for (auto &source : networkItem->sources())
m_map[source] = networkItem;
// player
AbstractExtSysMonSource *playerItem = new PlayerSource(
@ -130,36 +130,36 @@ void ExtSysMonAggregator::init(const QHash<QString, QString> config)
<< config[QString("MPDADDRESS")]
<< config[QString("MPDPORT")] << config[QString("MPRIS")]
<< config[QString("PLAYERSYMBOLS")]);
for (auto source : playerItem->sources())
for (auto &source : playerItem->sources())
m_map[source] = playerItem;
// processes
AbstractExtSysMonSource *processesItem
= new ProcessesSource(this, QStringList());
for (auto source : processesItem->sources())
for (auto &source : processesItem->sources())
m_map[source] = processesItem;
// network request
AbstractExtSysMonSource *requestItem
= new RequestSource(this, QStringList());
for (auto source : requestItem->sources())
for (auto &source : requestItem->sources())
m_map[source] = requestItem;
// quotes
AbstractExtSysMonSource *quotesItem = new QuotesSource(this, QStringList());
for (auto source : quotesItem->sources())
for (auto &source : quotesItem->sources())
m_map[source] = quotesItem;
// upgrade
AbstractExtSysMonSource *upgradeItem
= new UpgradeSource(this, QStringList());
for (auto source : upgradeItem->sources())
for (auto &source : upgradeItem->sources())
m_map[source] = upgradeItem;
// weather
AbstractExtSysMonSource *weatherItem
= new WeatherSource(this, QStringList());
for (auto source : weatherItem->sources())
for (auto &source : weatherItem->sources())
m_map[source] = weatherItem;
#ifdef BUILD_LOAD
// additional load source
AbstractExtSysMonSource *loadItem = new LoadSource(this, QStringList());
for (auto source : loadItem->sources())
for (auto &source : loadItem->sources())
m_map[source] = loadItem;
#endif /* BUILD_LOAD */
}

10
sources/extsysmon/extsysmonaggregator.h
View File

@ -29,15 +29,15 @@ class ExtSysMonAggregator : public QObject
public:
explicit ExtSysMonAggregator(QObject *parent,
const QHash<QString, QString> config);
const QHash<QString, QString> &config);
virtual ~ExtSysMonAggregator();
QVariant data(const QString source) const;
bool hasSource(const QString source) const;
QVariantMap initialData(const QString source) const;
QVariant data(const QString &source) const;
bool hasSource(const QString &source) const;
QVariantMap initialData(const QString &source) const;
QStringList sources() const;
private:
void init(const QHash<QString, QString> config);
void init(const QHash<QString, QString> &config);
QHash<QString, AbstractExtSysMonSource *> m_map;
};