clang-tidy warning fixes

This commit is contained in:
2020-11-03 04:23:01 +03:00
parent e81d765098
commit 91abbdcd96
99 changed files with 392 additions and 436 deletions

View File

@ -32,9 +32,9 @@ public:
: QObject(_parent){};
~AbstractExtSysMonSource() override = default;
virtual QVariant data(const QString &_source) = 0;
virtual QVariantMap initialData(const QString &_source) const = 0;
[[nodiscard]] virtual QVariantMap initialData(const QString &_source) const = 0;
virtual void run() = 0;
virtual QStringList sources() const = 0;
[[nodiscard]] virtual QStringList sources() const = 0;
// used by extensions
static int index(const QString &_source)
{

View File

@ -241,7 +241,8 @@ void BatterySource::calculateRates()
// check time interval
auto now = QDateTime::currentDateTimeUtc();
auto interval = (now.toMSecsSinceEpoch() - m_timestamp.toMSecsSinceEpoch()) / 1000.0f;
auto interval = m_timestamp.secsTo(now);
qCDebug(LOG_AW) << interval;
m_timestamp.swap(now);
for (int i = 0; i < m_batteriesCount; i++) {

View File

@ -35,9 +35,9 @@ public:
~BatterySource() override;
QStringList getSources();
QVariant data(const QString &_source) override;
QVariantMap initialData(const QString &_source) const override;
[[nodiscard]] QVariantMap initialData(const QString &_source) const override;
void run() override;
QStringList sources() const override;
[[nodiscard]] QStringList sources() const override;
private:
static double approximate(const QList<int> &_trend);

View File

@ -34,9 +34,9 @@ public:
explicit CustomSource(QObject *_parent, const QStringList &_args);
~CustomSource() override;
QVariant data(const QString &_source) override;
QVariantMap initialData(const QString &_source) const override;
[[nodiscard]] QVariantMap initialData(const QString &_source) const override;
void run() override{};
QStringList sources() const override;
[[nodiscard]] QStringList sources() const override;
private:
QStringList getSources();

View File

@ -31,9 +31,9 @@ public:
explicit DesktopSource(QObject *_parent, const QStringList &_args);
~DesktopSource() override;
QVariant data(const QString &_source) override;
QVariantMap initialData(const QString &_source) const override;
[[nodiscard]] QVariantMap initialData(const QString &_source) const override;
void run() override{};
QStringList sources() const override;
[[nodiscard]] QStringList sources() const override;
};

View File

@ -34,9 +34,9 @@ public:
~GPULoadSource() override;
static QString autoGpu();
QVariant data(const QString &_source) override;
QVariantMap initialData(const QString &_source) const override;
[[nodiscard]] QVariantMap initialData(const QString &_source) const override;
void run() override;
QStringList sources() const override;
[[nodiscard]] QStringList sources() const override;
private slots:
void updateValue();

View File

@ -84,7 +84,8 @@ void GPUTemperatureSource::run()
return;
// build cmd
QString cmd = m_device == "nvidia" ? "nvidia-smi" : "aticonfig";
auto args = m_device == "nvidia" ? QStringList({"-q", "-x"}) : QStringList({"--od-gettemperature"});
auto args
= m_device == "nvidia" ? QStringList({"-q", "-x"}) : QStringList({"--od-gettemperature"});
qCInfo(LOG_ESS) << "cmd" << cmd;
m_process->start(cmd, args);

View File

@ -33,9 +33,9 @@ public:
explicit GPUTemperatureSource(QObject *_parent, const QStringList &_args);
~GPUTemperatureSource() override;
QVariant data(const QString &_source) override;
QVariantMap initialData(const QString &_source) const override;
[[nodiscard]] QVariantMap initialData(const QString &_source) const override;
void run() override;
QStringList sources() const override;
[[nodiscard]] QStringList sources() const override;
private slots:
void updateValue();

View File

@ -32,7 +32,7 @@ HDDTemperatureSource::HDDTemperatureSource(QObject *_parent, const QStringList &
qCDebug(LOG_ESS) << __PRETTY_FUNCTION__;
m_devices = _args.at(0).split(',', Qt::SkipEmptyParts);
m_cmd = _args.at(1).split(' '); // lets hope no one put cmd with spaces here lol
m_cmd = _args.at(1).split(' '); // lets hope no one put cmd with spaces here lol
m_smartctl = m_cmd.contains("smartctl");
qCInfo(LOG_ESS) << "Parse as smartctl" << m_smartctl;

View File

@ -34,9 +34,9 @@ public:
~HDDTemperatureSource() override;
static QStringList allHdd();
QVariant data(const QString &_source) override;
QVariantMap initialData(const QString &_source) const override;
[[nodiscard]] QVariantMap initialData(const QString &_source) const override;
void run() override{};
QStringList sources() const override;
[[nodiscard]] QStringList sources() const override;
private slots:
void updateValue(const QString &_device);

View File

@ -31,9 +31,9 @@ public:
explicit LoadSource(QObject *_parent, const QStringList &_args);
~LoadSource() override;
QVariant data(const QString &_source) override;
QVariantMap initialData(const QString &_source) const override;
[[nodiscard]] QVariantMap initialData(const QString &_source) const override;
void run() override{};
QStringList sources() const override;
[[nodiscard]] QStringList sources() const override;
};

View File

@ -33,9 +33,9 @@ public:
explicit NetworkSource(QObject *_parent, const QStringList &_args);
~NetworkSource() override;
QVariant data(const QString &_source) override;
QVariantMap initialData(const QString &_source) const override;
[[nodiscard]] QVariantMap initialData(const QString &_source) const override;
void run() override;
QStringList sources() const override;
[[nodiscard]] QStringList sources() const override;
private slots:
void updateSsid();

View File

@ -311,7 +311,7 @@ QVariantHash PlayerSource::getPlayerMpdInfo()
}
QVariantHash PlayerSource::getPlayerMprisInfo(const QString &_mpris) const
QVariantHash PlayerSource::getPlayerMprisInfo(const QString &_mpris)
{
qCDebug(LOG_ESS) << "MPRIS" << _mpris;
@ -338,7 +338,7 @@ QVariantHash PlayerSource::getPlayerMprisInfo(const QString &_mpris) const
qCWarning(LOG_ESS) << "Error message" << response.errorMessage();
} else {
// another portion of dirty magic
QVariantHash map = qdbus_cast<QVariantHash>(
auto map = qdbus_cast<QVariantHash>(
response.arguments().first().value<QDBusVariant>().variant().value<QDBusArgument>());
info["player/album"] = map.value("xesam:album", "unknown");
// artist is array

View File

@ -38,24 +38,24 @@ public:
~PlayerSource() override;
QVariant data(const QString &_source) override;
static QString getAutoMpris();
QVariantMap initialData(const QString &_source) const override;
[[nodiscard]] QVariantMap initialData(const QString &_source) const override;
void run() override;
QStringList sources() const override;
[[nodiscard]] QStringList sources() const override;
// additional method to build dynamic tags
static QString buildString(const QString &_current, const QString &_value, const int _s);
static QString stripString(const QString &_value, const int _s);
static QString buildString(const QString &_current, const QString &_value, int _s);
static QString stripString(const QString &_value, int _s);
// additional test method
bool isMpdSocketConnected() const;
[[nodiscard]] bool isMpdSocketConnected() const;
private slots:
void mpdSocketConnected();
void mpdSocketReadyRead();
void mpdSocketWritten(const qint64 _bytes);
void mpdSocketWritten(qint64 _bytes);
private:
static inline QVariantHash defaultInfo();
QVariantHash getPlayerMpdInfo();
QVariantHash getPlayerMprisInfo(const QString &_mpris) const;
[[nodiscard]] static QVariantHash getPlayerMprisInfo(const QString &_mpris);
QTcpSocket m_mpdSocket;
// configuration and values
QString m_mpdAddress;

View File

@ -31,9 +31,9 @@ public:
explicit ProcessesSource(QObject *_parent, const QStringList &_args);
~ProcessesSource() override;
QVariant data(const QString &_source) override;
QVariantMap initialData(const QString &_source) const override;
[[nodiscard]] QVariantMap initialData(const QString &_source) const override;
void run() override;
QStringList sources() const override;
[[nodiscard]] QStringList sources() const override;
private:
// configuration and values

View File

@ -34,9 +34,9 @@ public:
explicit QuotesSource(QObject *_parent, const QStringList &_args);
~QuotesSource() override;
QVariant data(const QString &_source) override;
QVariantMap initialData(const QString &_source) const override;
[[nodiscard]] QVariantMap initialData(const QString &_source) const override;
void run() override{};
QStringList sources() const override;
[[nodiscard]] QStringList sources() const override;
private:
QStringList getSources();

View File

@ -34,9 +34,9 @@ public:
explicit RequestSource(QObject *_parent, const QStringList &_args);
~RequestSource() override;
QVariant data(const QString &_source) override;
QVariantMap initialData(const QString &_source) const override;
[[nodiscard]] QVariantMap initialData(const QString &_source) const override;
void run() override{};
QStringList sources() const override;
[[nodiscard]] QStringList sources() const override;
private:
QStringList getSources();

View File

@ -31,9 +31,9 @@ public:
explicit SystemInfoSource(QObject *_parent, const QStringList &_args);
~SystemInfoSource() override;
QVariant data(const QString &_source) override;
QVariantMap initialData(const QString &_source) const override;
[[nodiscard]] QVariantMap initialData(const QString &_source) const override;
void run() override;
QStringList sources() const override;
[[nodiscard]] QStringList sources() const override;
private:
// configuration and values

View File

@ -34,9 +34,9 @@ public:
explicit UpgradeSource(QObject *_parent, const QStringList &_args);
~UpgradeSource() override;
QVariant data(const QString &_source) override;
QVariantMap initialData(const QString &_source) const override;
[[nodiscard]] QVariantMap initialData(const QString &_source) const override;
void run() override{};
QStringList sources() const override;
[[nodiscard]] QStringList sources() const override;
private:
QStringList getSources();

View File

@ -34,9 +34,9 @@ public:
explicit WeatherSource(QObject *_parent, const QStringList &_args);
~WeatherSource() override;
QVariant data(const QString &_source) override;
QVariantMap initialData(const QString &_source) const override;
[[nodiscard]] QVariantMap initialData(const QString &_source) const override;
void run() override{};
QStringList sources() const override;
[[nodiscard]] QStringList sources() const override;
private:
QStringList getSources();