arcanis/awesome-widgets
1
0
Fork 0
mirror of https://github.com/arcan1s/awesome-widgets.git synced 2025-07-16 07:09:58 +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

8
sources/extsysmonsources/abstractextsysmonsource.h
View File

@ -28,15 +28,15 @@ class AbstractExtSysMonSource : public QObject
Q_OBJECT
public:
explicit AbstractExtSysMonSource(QObject *parent, const QStringList)
explicit AbstractExtSysMonSource(QObject *parent, const QStringList &)
: QObject(parent){};
virtual ~AbstractExtSysMonSource(){};
virtual QVariant data(QString source) = 0;
virtual QVariantMap initialData(QString source) const = 0;
virtual QVariant data(const QString &source) = 0;
virtual QVariantMap initialData(const QString &source) const = 0;
virtual void run() = 0;
virtual QStringList sources() const = 0;
// used by extensions
int index(const QString source) const
int index(const QString &source) const
{
QRegExp rx(QString("\\d+"));
rx.indexIn(source);

6
sources/extsysmonsources/batterysource.cpp
View File

@ -23,7 +23,7 @@
#include "awdebug.h"
BatterySource::BatterySource(QObject *parent, const QStringList args)
BatterySource::BatterySource(QObject *parent, const QStringList &args)
: AbstractExtSysMonSource(parent, args)
{
Q_ASSERT(args.count() == 1);
@ -59,7 +59,7 @@ QStringList BatterySource::getSources()
}
QVariant BatterySource::data(QString source)
QVariant BatterySource::data(const QString &source)
{
qCDebug(LOG_ESS) << "Source" << source;
@ -70,7 +70,7 @@ QVariant BatterySource::data(QString source)
}
QVariantMap BatterySource::initialData(QString source) const
QVariantMap BatterySource::initialData(const QString &source) const
{
qCDebug(LOG_ESS) << "Source" << source;

6
sources/extsysmonsources/batterysource.h
View File

@ -28,11 +28,11 @@ class BatterySource : public AbstractExtSysMonSource
Q_OBJECT
public:
explicit BatterySource(QObject *parent, const QStringList args);
explicit BatterySource(QObject *parent, const QStringList &args);
virtual ~BatterySource();
QStringList getSources();
QVariant data(QString source);
QVariantMap initialData(QString source) const;
QVariant data(const QString &source);
QVariantMap initialData(const QString &source) const;
void run();
QStringList sources() const;

8
sources/extsysmonsources/customsource.cpp
View File

@ -22,7 +22,7 @@
#include "extscript.h"
CustomSource::CustomSource(QObject *parent, const QStringList args)
CustomSource::CustomSource(QObject *parent, const QStringList &args)
: AbstractExtSysMonSource(parent, args)
{
Q_ASSERT(args.count() == 0);
@ -43,7 +43,7 @@ CustomSource::~CustomSource()
}
QVariant CustomSource::data(QString source)
QVariant CustomSource::data(const QString &source)
{
qCDebug(LOG_ESS) << "Source" << source;
@ -52,7 +52,7 @@ QVariant CustomSource::data(QString source)
}
QVariantMap CustomSource::initialData(QString source) const
QVariantMap CustomSource::initialData(const QString &source) const
{
qCDebug(LOG_ESS) << "Source" << source;
@ -78,7 +78,7 @@ QStringList CustomSource::sources() const
QStringList CustomSource::getSources()
{
QStringList sources;
for (auto item : m_extScripts->activeItems())
for (auto &item : m_extScripts->activeItems())
sources.append(QString("custom/%1").arg(item->tag(QString("custom"))));
return sources;

6
sources/extsysmonsources/customsource.h
View File

@ -31,10 +31,10 @@ class CustomSource : public AbstractExtSysMonSource
Q_OBJECT
public:
explicit CustomSource(QObject *parent, const QStringList args);
explicit CustomSource(QObject *parent, const QStringList &args);
virtual ~CustomSource();
QVariant data(QString source);
QVariantMap initialData(QString source) const;
QVariant data(const QString &source);
QVariantMap initialData(const QString &source) const;
void run(){};
QStringList sources() const;

6
sources/extsysmonsources/desktopsource.cpp
View File

@ -23,7 +23,7 @@
#include "awdebug.h"
DesktopSource::DesktopSource(QObject *parent, const QStringList args)
DesktopSource::DesktopSource(QObject *parent, const QStringList &args)
: AbstractExtSysMonSource(parent, args)
{
Q_ASSERT(args.count() == 0);
@ -37,7 +37,7 @@ DesktopSource::~DesktopSource()
}
QVariant DesktopSource::data(QString source)
QVariant DesktopSource::data(const QString &source)
{
qCDebug(LOG_ESS) << "Source" << source;
@ -61,7 +61,7 @@ QVariant DesktopSource::data(QString source)
}
QVariantMap DesktopSource::initialData(QString source) const
QVariantMap DesktopSource::initialData(const QString &source) const
{
qCDebug(LOG_ESS) << "Source" << source;

6
sources/extsysmonsources/desktopsource.h
View File

@ -28,10 +28,10 @@ class DesktopSource : public AbstractExtSysMonSource
Q_OBJECT
public:
explicit DesktopSource(QObject *parent, const QStringList args);
explicit DesktopSource(QObject *parent, const QStringList &args);
virtual ~DesktopSource();
QVariant data(QString source);
QVariantMap initialData(QString source) const;
QVariant data(const QString &source);
QVariantMap initialData(const QString &source) const;
void run(){};
QStringList sources() const;
};

10
sources/extsysmonsources/gpuloadsource.cpp
View File

@ -25,7 +25,7 @@
#include "awdebug.h"
GPULoadSource::GPULoadSource(QObject *parent, const QStringList args)
GPULoadSource::GPULoadSource(QObject *parent, const QStringList &args)
: AbstractExtSysMonSource(parent, args)
{
Q_ASSERT(args.count() == 1);
@ -74,7 +74,7 @@ QString GPULoadSource::autoGpu()
}
QVariant GPULoadSource::data(QString source)
QVariant GPULoadSource::data(const QString &source)
{
qCDebug(LOG_ESS) << "Source" << source;
@ -85,7 +85,7 @@ QVariant GPULoadSource::data(QString source)
}
QVariantMap GPULoadSource::initialData(QString source) const
QVariantMap GPULoadSource::initialData(const QString &source) const
{
qCDebug(LOG_ESS) << "Source" << source;
@ -138,7 +138,7 @@ void GPULoadSource::updateValue()
qCInfo(LOG_ESS) << "Output" << qoutput;
if (m_device == QString("nvidia")) {
for (auto str : qoutput.split(QChar('\n'), QString::SkipEmptyParts)) {
for (auto &str : qoutput.split(QChar('\n'), QString::SkipEmptyParts)) {
if (!str.contains(QString("<gpu_util>")))
continue;
QString load = str.remove(QString("<gpu_util>"))
@ -148,7 +148,7 @@ void GPULoadSource::updateValue()
break;
}
} else if (m_device == QString("ati")) {
for (auto str : qoutput.split(QChar('\n'), QString::SkipEmptyParts)) {
for (auto &str : qoutput.split(QChar('\n'), QString::SkipEmptyParts)) {
if (!str.contains(QString("load")))
continue;
QString load

6
sources/extsysmonsources/gpuloadsource.h
View File

@ -30,11 +30,11 @@ class GPULoadSource : public AbstractExtSysMonSource
Q_OBJECT
public:
explicit GPULoadSource(QObject *parent, const QStringList args);
explicit GPULoadSource(QObject *parent, const QStringList &args);
virtual ~GPULoadSource();
static QString autoGpu();
QVariant data(QString source);
QVariantMap initialData(QString source) const;
QVariant data(const QString &source);
QVariantMap initialData(const QString &source) const;
void run();
QStringList sources() const;

10
sources/extsysmonsources/gputempsource.cpp
View File

@ -26,7 +26,7 @@
GPUTemperatureSource::GPUTemperatureSource(QObject *parent,
const QStringList args)
const QStringList &args)
: AbstractExtSysMonSource(parent, args)
{
Q_ASSERT(args.count() == 1);
@ -75,7 +75,7 @@ QString GPUTemperatureSource::autoGpu()
}
QVariant GPUTemperatureSource::data(QString source)
QVariant GPUTemperatureSource::data(const QString &source)
{
qCDebug(LOG_ESS) << "Source" << source;
@ -86,7 +86,7 @@ QVariant GPUTemperatureSource::data(QString source)
}
QVariantMap GPUTemperatureSource::initialData(QString source) const
QVariantMap GPUTemperatureSource::initialData(const QString &source) const
{
qCDebug(LOG_ESS) << "Source" << source;
@ -139,7 +139,7 @@ void GPUTemperatureSource::updateValue()
qCInfo(LOG_ESS) << "Output" << qoutput;
if (m_device == QString("nvidia")) {
for (auto str : qoutput.split(QChar('\n'), QString::SkipEmptyParts)) {
for (auto &str : qoutput.split(QChar('\n'), QString::SkipEmptyParts)) {
if (!str.contains(QString("<gpu_temp>")))
continue;
QString temp = str.remove(QString("<gpu_temp>"))
@ -148,7 +148,7 @@ void GPUTemperatureSource::updateValue()
break;
}
} else if (m_device == QString("ati")) {
for (auto str : qoutput.split(QChar('\n'), QString::SkipEmptyParts)) {
for (auto &str : qoutput.split(QChar('\n'), QString::SkipEmptyParts)) {
if (!str.contains(QString("Temperature")))
continue;
QString temp = str.split(QChar(' '), QString::SkipEmptyParts).at(4);

6
sources/extsysmonsources/gputempsource.h
View File

@ -30,11 +30,11 @@ class GPUTemperatureSource : public AbstractExtSysMonSource
Q_OBJECT
public:
explicit GPUTemperatureSource(QObject *parent, const QStringList args);
explicit GPUTemperatureSource(QObject *parent, const QStringList &args);
virtual ~GPUTemperatureSource();
static QString autoGpu();
QVariant data(QString source);
QVariantMap initialData(QString source) const;
QVariant data(const QString &source);
QVariantMap initialData(const QString &source) const;
void run();
QStringList sources() const;

20
sources/extsysmonsources/hddtempsource.cpp
View File

@ -26,7 +26,7 @@
HDDTemperatureSource::HDDTemperatureSource(QObject *parent,
const QStringList args)
const QStringList &args)
: AbstractExtSysMonSource(parent, args)
{
Q_ASSERT(args.count() == 2);
@ -38,7 +38,7 @@ HDDTemperatureSource::HDDTemperatureSource(QObject *parent,
m_smartctl = m_cmd.contains(QString("smartctl"));
qCInfo(LOG_ESS) << "Parse as smartctl" << m_smartctl;
for (auto device : m_devices) {
for (auto &device : m_devices) {
m_processes[device] = new QProcess(nullptr);
// fucking magic from http://doc.qt.io/qt-5/qprocess.html#finished
connect(m_processes[device],
@ -56,7 +56,7 @@ HDDTemperatureSource::~HDDTemperatureSource()
{
qCDebug(LOG_ESS) << __PRETTY_FUNCTION__;
for (auto device : m_devices) {
for (auto &device : m_devices) {
m_processes[device]->kill();
m_processes[device]->deleteLater();
}
@ -76,11 +76,12 @@ QStringList HDDTemperatureSource::allHdd()
}
QVariant HDDTemperatureSource::data(QString source)
QVariant HDDTemperatureSource::data(const QString &source)
{
qCDebug(LOG_ESS) << "Source" << source;
QString device = source.remove(QString("hdd/temperature"));
QString device = source;
device.remove("hdd/temperature");
// run cmd
if (m_processes[device]->state() == QProcess::NotRunning)
m_processes[device]->start(QString("%1 %2").arg(m_cmd).arg(device));
@ -89,11 +90,12 @@ QVariant HDDTemperatureSource::data(QString source)
}
QVariantMap HDDTemperatureSource::initialData(QString source) const
QVariantMap HDDTemperatureSource::initialData(const QString &source) const
{
qCDebug(LOG_ESS) << "Source" << source;
QString device = source.remove(QString("hdd/temperature"));
QString device = source;
device.remove("hdd/temperature");
QVariantMap data;
data[QString("min")] = 0.0;
data[QString("max")] = 0.0;
@ -108,7 +110,7 @@ QVariantMap HDDTemperatureSource::initialData(QString source) const
QStringList HDDTemperatureSource::sources() const
{
QStringList sources;
for (auto device : m_devices)
for (auto &device : m_devices)
sources.append(QString("hdd/temperature%1").arg(device));
return sources;
@ -134,7 +136,7 @@ void HDDTemperatureSource::updateValue(const QString &device)
// parse
if (m_smartctl) {
QStringList lines = qoutput.split(QChar('\n'), QString::SkipEmptyParts);
for (auto str : lines) {
for (auto &str : lines) {
if (!str.startsWith(QString("194")))
continue;
if (str.split(QChar(' '), QString::SkipEmptyParts).count() < 9)

6
sources/extsysmonsources/hddtempsource.h
View File

@ -30,11 +30,11 @@ class HDDTemperatureSource : public AbstractExtSysMonSource
Q_OBJECT
public:
explicit HDDTemperatureSource(QObject *parent, const QStringList args);
explicit HDDTemperatureSource(QObject *parent, const QStringList &args);
virtual ~HDDTemperatureSource();
static QStringList allHdd();
QVariant data(QString source);
QVariantMap initialData(QString source) const;
QVariant data(const QString &source);
QVariantMap initialData(const QString &source) const;
void run(){};
QStringList sources() const;

11
sources/extsysmonsources/loadsource.cpp
View File

@ -21,7 +21,7 @@
#include "awdebug.h"
LoadSource::LoadSource(QObject *parent, const QStringList args)
LoadSource::LoadSource(QObject *parent, const QStringList &args)
: AbstractExtSysMonSource(parent, args)
{
Q_ASSERT(args.count() == 0);
@ -35,16 +35,17 @@ LoadSource::~LoadSource()
}
QVariant LoadSource::data(QString source)
QVariant LoadSource::data(const QString &source)
{
qCDebug(LOG_ESS) << "Source" << source;
source.remove(QString("load/load"));
return source.toInt();
auto data = source;
data.remove("load/load");
return data.toInt();
}
QVariantMap LoadSource::initialData(QString source) const
QVariantMap LoadSource::initialData(const QString &source) const
{
qCDebug(LOG_ESS) << "Source" << source;

6
sources/extsysmonsources/loadsource.h
View File

@ -28,10 +28,10 @@ class LoadSource : public AbstractExtSysMonSource
Q_OBJECT
public:
explicit LoadSource(QObject *parent, const QStringList args);
explicit LoadSource(QObject *parent, const QStringList &args);
virtual ~LoadSource();
QVariant data(QString source);
QVariantMap initialData(QString source) const;
QVariant data(const QString &source);
QVariantMap initialData(const QString &source) const;
void run(){};
QStringList sources() const;
};

8
sources/extsysmonsources/networksource.cpp
View File

@ -23,7 +23,7 @@
#include "awdebug.h"
NetworkSource::NetworkSource(QObject *parent, const QStringList args)
NetworkSource::NetworkSource(QObject *parent, const QStringList &args)
: AbstractExtSysMonSource(parent, args)
{
Q_ASSERT(args.count() == 0);
@ -37,7 +37,7 @@ NetworkSource::~NetworkSource()
}
QVariant NetworkSource::data(QString source)
QVariant NetworkSource::data(const QString &source)
{
qCDebug(LOG_ESS) << "Source" << source;
@ -46,7 +46,7 @@ QVariant NetworkSource::data(QString source)
QList<QNetworkInterface> rawInterfaceList
= QNetworkInterface::allInterfaces();
qCInfo(LOG_ESS) << "Devices" << rawInterfaceList;
for (auto interface : rawInterfaceList) {
for (auto &interface : rawInterfaceList) {
if ((interface.flags().testFlag(QNetworkInterface::IsLoopBack))
|| (interface.flags().testFlag(
QNetworkInterface::IsPointToPoint)))
@ -63,7 +63,7 @@ QVariant NetworkSource::data(QString source)
}
QVariantMap NetworkSource::initialData(QString source) const
QVariantMap NetworkSource::initialData(const QString &source) const
{
qCDebug(LOG_ESS) << "Source" << source;

6
sources/extsysmonsources/networksource.h
View File

@ -28,10 +28,10 @@ class NetworkSource : public AbstractExtSysMonSource
Q_OBJECT
public:
explicit NetworkSource(QObject *parent, const QStringList args);
explicit NetworkSource(QObject *parent, const QStringList &args);
virtual ~NetworkSource();
QVariant data(QString source);
QVariantMap initialData(QString source) const;
QVariant data(const QString &source);
QVariantMap initialData(const QString &source) const;
void run(){};
QStringList sources() const;
};

12
sources/extsysmonsources/playersource.cpp
View File

@ -28,7 +28,7 @@
#include "awdebug.h"
PlayerSource::PlayerSource(QObject *parent, const QStringList args)
PlayerSource::PlayerSource(QObject *parent, const QStringList &args)
: AbstractExtSysMonSource(parent, args)
{
Q_ASSERT(args.count() == 5);
@ -58,7 +58,7 @@ PlayerSource::~PlayerSource()
}
QVariant PlayerSource::data(QString source)
QVariant PlayerSource::data(const QString &source)
{
qCDebug(LOG_ESS) << "Source" << source;
@ -77,7 +77,7 @@ QString PlayerSource::getAutoMpris() const
return QString();
QStringList arguments = listServices.arguments().first().toStringList();
for (auto arg : arguments) {
for (auto &arg : arguments) {
if (!arg.startsWith(QString("org.mpris.MediaPlayer2.")))
continue;
qCInfo(LOG_ESS) << "Service found" << arg;
@ -90,7 +90,7 @@ QString PlayerSource::getAutoMpris() const
}
QVariantMap PlayerSource::initialData(QString source) const
QVariantMap PlayerSource::initialData(const QString &source) const
{
qCDebug(LOG_ESS) << "Source" << source;
@ -276,7 +276,7 @@ void PlayerSource::mpdSocketReadyRead()
qCInfo(LOG_ESS) << "Output" << qoutput;
// parse
for (auto str : qoutput.split(QChar('\n'), QString::SkipEmptyParts)) {
for (auto &str : qoutput.split(QChar('\n'), QString::SkipEmptyParts)) {
if (str.split(QString(": "), QString::SkipEmptyParts).count() == 2) {
// "Metadata: data"
QString metadata = str.split(QString(": "), QString::SkipEmptyParts)
@ -337,7 +337,7 @@ QVariantHash PlayerSource::getPlayerMpdInfo()
}
QVariantHash PlayerSource::getPlayerMprisInfo(const QString mpris) const
QVariantHash PlayerSource::getPlayerMprisInfo(const QString &mpris) const
{
qCDebug(LOG_ESS) << "MPRIS" << mpris;

8
sources/extsysmonsources/playersource.h
View File

@ -34,11 +34,11 @@ class PlayerSource : public AbstractExtSysMonSource
public:
const char *MPD_STATUS_REQUEST = "currentsong\nstatus\n";
explicit PlayerSource(QObject *parent, const QStringList args);
explicit PlayerSource(QObject *parent, const QStringList &args);
virtual ~PlayerSource();
QVariant data(QString source);
QVariant data(const QString &source);
QString getAutoMpris() const;
QVariantMap initialData(QString source) const;
QVariantMap initialData(const QString &source) const;
void run();
QStringList sources() const;
// additional method to build dynamic tags
@ -56,7 +56,7 @@ private slots:
private:
inline QVariantHash defaultInfo() const;
QVariantHash getPlayerMpdInfo();
QVariantHash getPlayerMprisInfo(const QString mpris) const;
QVariantHash getPlayerMprisInfo(const QString &mpris) const;
QTcpSocket m_mpdSocket;
// configuration and values
QString m_mpdAddress;

8
sources/extsysmonsources/processessource.cpp
View File

@ -23,7 +23,7 @@
#include "awdebug.h"
ProcessesSource::ProcessesSource(QObject *parent, const QStringList args)
ProcessesSource::ProcessesSource(QObject *parent, const QStringList &args)
: AbstractExtSysMonSource(parent, args)
{
Q_ASSERT(args.count() == 0);
@ -37,7 +37,7 @@ ProcessesSource::~ProcessesSource()
}
QVariant ProcessesSource::data(QString source)
QVariant ProcessesSource::data(const QString &source)
{
qCDebug(LOG_ESS) << "Source" << source;
@ -48,7 +48,7 @@ QVariant ProcessesSource::data(QString source)
}
QVariantMap ProcessesSource::initialData(QString source) const
QVariantMap ProcessesSource::initialData(const QString &source) const
{
qCDebug(LOG_ESS) << "Source" << source;
@ -85,7 +85,7 @@ void ProcessesSource::run()
QStringList directories = allDirectories.filter(QRegExp(QString("(\\d+)")));
QStringList running;
for (auto dir : directories) {
for (auto &dir : directories) {
QFile statusFile(QString("/proc/%1/status").arg(dir));
if (!statusFile.open(QIODevice::ReadOnly | QIODevice::Text))
continue;

6
sources/extsysmonsources/processessource.h
View File

@ -28,10 +28,10 @@ class ProcessesSource : public AbstractExtSysMonSource
Q_OBJECT
public:
explicit ProcessesSource(QObject *parent, const QStringList args);
explicit ProcessesSource(QObject *parent, const QStringList &args);
virtual ~ProcessesSource();
QVariant data(QString source);
QVariantMap initialData(QString source) const;
QVariant data(const QString &source);
QVariantMap initialData(const QString &source) const;
void run();
QStringList sources() const;

17
sources/extsysmonsources/quotessource.cpp
View File

@ -22,7 +22,7 @@
#include "extquotes.h"
QuotesSource::QuotesSource(QObject *parent, const QStringList args)
QuotesSource::QuotesSource(QObject *parent, const QStringList &args)
: AbstractExtSysMonSource(parent, args)
{
Q_ASSERT(args.count() == 0);
@ -42,23 +42,24 @@ QuotesSource::~QuotesSource()
}
QVariant QuotesSource::data(QString source)
QVariant QuotesSource::data(const QString &source)
{
qCDebug(LOG_ESS) << "Source" << source;
int ind = index(source);
source.remove(QString("quotes/"));
if (!m_values.contains(source)) {
auto service = source;
service.remove(QString("quotes/"));
if (!m_values.contains(service)) {
QVariantHash data = m_extQuotes->itemByTagNumber(ind)->run();
for (auto key : data.keys())
for (auto &key : data.keys())
m_values[key] = data[key];
}
QVariant value = m_values.take(source);
QVariant value = m_values.take(service);
return value;
}
QVariantMap QuotesSource::initialData(QString source) const
QVariantMap QuotesSource::initialData(const QString &source) const
{
qCDebug(LOG_ESS) << "Source" << source;
@ -151,7 +152,7 @@ QStringList QuotesSource::sources() const
QStringList QuotesSource::getSources()
{
QStringList sources;
for (auto item : m_extQuotes->activeItems()) {
for (auto &item : m_extQuotes->activeItems()) {
sources.append(QString("quotes/%1").arg(item->tag(QString("ask"))));
sources.append(QString("quotes/%1").arg(item->tag(QString("askchg"))));
sources.append(

6
sources/extsysmonsources/quotessource.h
View File

@ -31,10 +31,10 @@ class QuotesSource : public AbstractExtSysMonSource
Q_OBJECT
public:
explicit QuotesSource(QObject *parent, const QStringList args);
explicit QuotesSource(QObject *parent, const QStringList &args);
virtual ~QuotesSource();
QVariant data(QString source);
QVariantMap initialData(QString source) const;
QVariant data(const QString &source);
QVariantMap initialData(const QString &source) const;
void run(){};
QStringList sources() const;

17
sources/extsysmonsources/requestsource.cpp
View File

@ -22,7 +22,7 @@
#include "extnetworkrequest.h"
RequestSource::RequestSource(QObject *parent, const QStringList args)
RequestSource::RequestSource(QObject *parent, const QStringList &args)
: AbstractExtSysMonSource(parent, args)
{
Q_ASSERT(args.count() == 0);
@ -43,23 +43,24 @@ RequestSource::~RequestSource()
}
QVariant RequestSource::data(QString source)
QVariant RequestSource::data(const QString &source)
{
qCDebug(LOG_ESS) << "Source" << source;
int ind = index(source);
source.remove(QString("network/"));
if (!m_values.contains(source)) {
auto service = source;
service.remove("network/");
if (!m_values.contains(service)) {
QVariantHash data = m_extNetRequest->itemByTagNumber(ind)->run();
for (auto key : data.keys())
for (auto &key : data.keys())
m_values[key] = data[key];
}
QVariant value = m_values.take(source);
QVariant value = m_values.take(service);
return value;
}
QVariantMap RequestSource::initialData(QString source) const
QVariantMap RequestSource::initialData(const QString &source) const
{
qCDebug(LOG_ESS) << "Source" << source;
@ -88,7 +89,7 @@ QStringList RequestSource::sources() const
QStringList RequestSource::getSources()
{
QStringList sources;
for (auto item : m_extNetRequest->activeItems())
for (auto &item : m_extNetRequest->activeItems())
sources.append(
QString("network/%1").arg(item->tag(QString("response"))));

6
sources/extsysmonsources/requestsource.h
View File

@ -31,10 +31,10 @@ class RequestSource : public AbstractExtSysMonSource
Q_OBJECT
public:
explicit RequestSource(QObject *parent, const QStringList args);
explicit RequestSource(QObject *parent, const QStringList &args);
virtual ~RequestSource();
QVariant data(QString source);
QVariantMap initialData(QString source) const;
QVariant data(const QString &source);
QVariantMap initialData(const QString &source) const;
void run(){};
QStringList sources() const;

8
sources/extsysmonsources/upgradesource.cpp
View File

@ -22,7 +22,7 @@
#include "extupgrade.h"
UpgradeSource::UpgradeSource(QObject *parent, const QStringList args)
UpgradeSource::UpgradeSource(QObject *parent, const QStringList &args)
: AbstractExtSysMonSource(parent, args)
{
Q_ASSERT(args.count() == 0);
@ -43,7 +43,7 @@ UpgradeSource::~UpgradeSource()
}
QVariant UpgradeSource::data(QString source)
QVariant UpgradeSource::data(const QString &source)
{
qCDebug(LOG_ESS) << "Source" << source;
@ -52,7 +52,7 @@ QVariant UpgradeSource::data(QString source)
}
QVariantMap UpgradeSource::initialData(QString source) const
QVariantMap UpgradeSource::initialData(const QString &source) const
{
qCDebug(LOG_ESS) << "Source" << source;
@ -78,7 +78,7 @@ QStringList UpgradeSource::sources() const
QStringList UpgradeSource::getSources()
{
QStringList sources;
for (auto item : m_extUpgrade->activeItems())
for (auto &item : m_extUpgrade->activeItems())
sources.append(
QString("upgrade/%1").arg(item->tag(QString("pkgcount"))));

6
sources/extsysmonsources/upgradesource.h
View File

@ -31,10 +31,10 @@ class UpgradeSource : public AbstractExtSysMonSource
Q_OBJECT
public:
explicit UpgradeSource(QObject *parent, const QStringList args);
explicit UpgradeSource(QObject *parent, const QStringList &args);
virtual ~UpgradeSource();
QVariant data(QString source);
QVariantMap initialData(QString source) const;
QVariant data(const QString &source);
QVariantMap initialData(const QString &source) const;
void run(){};
QStringList sources() const;

17
sources/extsysmonsources/weathersource.cpp
View File

@ -22,7 +22,7 @@
#include "extweather.h"
WeatherSource::WeatherSource(QObject *parent, const QStringList args)
WeatherSource::WeatherSource(QObject *parent, const QStringList &args)
: AbstractExtSysMonSource(parent, args)
{
Q_ASSERT(args.count() == 0);
@ -43,23 +43,24 @@ WeatherSource::~WeatherSource()
}
QVariant WeatherSource::data(QString source)
QVariant WeatherSource::data(const QString &source)
{
qCDebug(LOG_ESS) << "Source" << source;
int ind = index(source);
source.remove(QString("weather/"));
if (!m_values.contains(source)) {
auto service = source;
service.remove("weather/");
if (!m_values.contains(service)) {
QVariantHash data = m_extWeather->itemByTagNumber(ind)->run();
for (auto key : data.keys())
for (auto &key : data.keys())
m_values[key] = data[key];
}
QVariant value = m_values.take(source);
QVariant value = m_values.take(service);
return value;
}
QVariantMap WeatherSource::initialData(QString source) const
QVariantMap WeatherSource::initialData(const QString &source) const
{
qCDebug(LOG_ESS) << "Source" << source;
@ -128,7 +129,7 @@ QStringList WeatherSource::sources() const
QStringList WeatherSource::getSources()
{
QStringList sources;
for (auto item : m_extWeather->activeItems()) {
for (auto &item : m_extWeather->activeItems()) {
sources.append(
QString("weather/%1").arg(item->tag(QString("weatherId"))));
sources.append(

6
sources/extsysmonsources/weathersource.h
View File

@ -31,10 +31,10 @@ class WeatherSource : public AbstractExtSysMonSource
Q_OBJECT
public:
explicit WeatherSource(QObject *parent, const QStringList args);
explicit WeatherSource(QObject *parent, const QStringList &args);
virtual ~WeatherSource();
QVariant data(QString source);
QVariantMap initialData(QString source) const;
QVariant data(const QString &source);
QVariantMap initialData(const QString &source) const;
void run(){};
QStringList sources() const;