From 91abbdcd968c037754df866d95ef86c7b6759c81 Mon Sep 17 00:00:00 2001 From: Evgeniy Alekseev Date: Tue, 3 Nov 2020 04:23:01 +0300 Subject: [PATCH] clang-tidy warning fixes --- .../plugin/awabstractpairconfig.cpp | 6 ++- .../plugin/awabstractpairconfig.h | 6 +-- .../plugin/awabstractpairhelper.cpp | 2 +- .../plugin/awabstractpairhelper.h | 12 ++--- .../plugin/awabstractselector.h | 2 +- sources/awesome-widget/plugin/awactions.h | 2 +- .../awesome-widget/plugin/awbugreporter.cpp | 2 +- sources/awesome-widget/plugin/awbugreporter.h | 2 +- .../awesome-widget/plugin/awconfighelper.cpp | 2 +- .../awesome-widget/plugin/awconfighelper.h | 12 ++--- .../plugin/awcustomkeyshelper.h | 6 +-- .../plugin/awdataaggregator.cpp | 2 +- .../awesome-widget/plugin/awdataaggregator.h | 8 +-- .../plugin/awdataengineaggregator.cpp | 14 ++--- .../plugin/awdataengineaggregator.h | 2 +- .../plugin/awdataenginemapper.h | 4 +- .../awesome-widget/plugin/awdbusadaptor.cpp | 2 +- sources/awesome-widget/plugin/awdbusadaptor.h | 14 ++--- .../plugin/awformatterhelper.cpp | 5 +- .../awesome-widget/plugin/awformatterhelper.h | 10 ++-- .../awesome-widget/plugin/awkeyoperations.h | 18 +++---- sources/awesome-widget/plugin/awkeys.cpp | 4 +- sources/awesome-widget/plugin/awkeys.h | 17 +++--- .../awesome-widget/plugin/awkeysaggregator.h | 9 ++-- .../plugin/awpatternfunctions.h | 2 +- .../plugin/awtelemetryhandler.h | 10 ++-- .../awesome-widget/plugin/awupdatehelper.h | 6 +-- sources/awesomewidgets/abstractextitem.cpp | 3 +- sources/awesomewidgets/abstractextitem.h | 36 ++++++------- .../abstractextitemaggregator.cpp | 4 +- .../abstractextitemaggregator.h | 14 ++--- .../awesomewidgets/abstractquotesprovider.h | 7 +-- .../awesomewidgets/abstractweatherprovider.h | 6 +-- sources/awesomewidgets/awabstractformatter.h | 10 ++-- .../awesomewidgets/awdatetimeformatter.cpp | 4 +- sources/awesomewidgets/awdatetimeformatter.h | 10 ++-- sources/awesomewidgets/awfloatformatter.cpp | 4 +- sources/awesomewidgets/awfloatformatter.h | 28 +++++----- sources/awesomewidgets/awjsonformatter.cpp | 6 +-- sources/awesomewidgets/awjsonformatter.h | 10 ++-- sources/awesomewidgets/awlistformatter.cpp | 4 +- sources/awesomewidgets/awlistformatter.h | 12 ++--- sources/awesomewidgets/awnoformatter.cpp | 4 +- sources/awesomewidgets/awnoformatter.h | 4 +- sources/awesomewidgets/awscriptformatter.cpp | 4 +- sources/awesomewidgets/awscriptformatter.h | 16 +++--- sources/awesomewidgets/awstringformatter.cpp | 4 +- sources/awesomewidgets/awstringformatter.h | 14 ++--- sources/awesomewidgets/extitemaggregator.h | 4 +- sources/awesomewidgets/extnetworkrequest.cpp | 4 +- sources/awesomewidgets/extnetworkrequest.h | 6 +-- sources/awesomewidgets/extquotes.cpp | 4 +- sources/awesomewidgets/extquotes.h | 6 +-- sources/awesomewidgets/extscript.cpp | 35 ++----------- sources/awesomewidgets/extscript.h | 21 ++++---- sources/awesomewidgets/extscript.ui | 25 +-------- sources/awesomewidgets/extupgrade.cpp | 4 +- sources/awesomewidgets/extupgrade.h | 12 ++--- sources/awesomewidgets/extweather.cpp | 4 +- sources/awesomewidgets/extweather.h | 24 ++++----- sources/awesomewidgets/graphicalitem.cpp | 4 +- sources/awesomewidgets/graphicalitem.h | 52 +++++++++---------- .../awesomewidgets/graphicalitemhelper.cpp | 12 +++-- sources/awesomewidgets/graphicalitemhelper.h | 18 +++---- sources/awesomewidgets/owmweatherprovider.h | 8 +-- sources/awesomewidgets/qcronscheduler.h | 4 +- .../scripts/get-external-ip.desktop | 3 +- sources/awesomewidgets/stooqquotesprovider.h | 5 +- sources/awesomewidgets/yahooquotesprovider.h | 5 +- sources/awesomewidgets/yahooweatherprovider.h | 11 ++-- sources/desktop-panel/plugin/dpadds.cpp | 39 +++++++------- sources/desktop-panel/plugin/dpadds.h | 12 ++--- sources/extsysmon/extsysmon.cpp | 3 +- sources/extsysmon/extsysmon.h | 5 +- sources/extsysmon/extsysmonaggregator.h | 8 +-- .../abstractextsysmonsource.h | 4 +- sources/extsysmonsources/batterysource.cpp | 3 +- sources/extsysmonsources/batterysource.h | 4 +- sources/extsysmonsources/customsource.h | 4 +- sources/extsysmonsources/desktopsource.h | 4 +- sources/extsysmonsources/gpuloadsource.h | 4 +- sources/extsysmonsources/gputempsource.cpp | 3 +- sources/extsysmonsources/gputempsource.h | 4 +- sources/extsysmonsources/hddtempsource.cpp | 2 +- sources/extsysmonsources/hddtempsource.h | 4 +- sources/extsysmonsources/loadsource.h | 4 +- sources/extsysmonsources/networksource.h | 4 +- sources/extsysmonsources/playersource.cpp | 4 +- sources/extsysmonsources/playersource.h | 14 ++--- sources/extsysmonsources/processessource.h | 4 +- sources/extsysmonsources/quotessource.h | 4 +- sources/extsysmonsources/requestsource.h | 4 +- sources/extsysmonsources/systeminfosource.h | 4 +- sources/extsysmonsources/upgradesource.h | 4 +- sources/extsysmonsources/weathersource.h | 4 +- sources/test/awtestlibrary.cpp | 6 +-- sources/test/testbatterysource.cpp | 4 +- sources/test/testextscript.cpp | 7 +-- sources/test/testfloatformatter.cpp | 2 +- 99 files changed, 392 insertions(+), 436 deletions(-) diff --git a/sources/awesome-widget/plugin/awabstractpairconfig.cpp b/sources/awesome-widget/plugin/awabstractpairconfig.cpp index f18fb98..95ea6b9 100644 --- a/sources/awesome-widget/plugin/awabstractpairconfig.cpp +++ b/sources/awesome-widget/plugin/awabstractpairconfig.cpp @@ -141,15 +141,17 @@ void AWAbstractPairConfig::execDialog() } // save configuration if required + auto status = true; switch (ret) { case 0: break; case 1: default: - m_helper->writeItems(data); - m_helper->removeUnusedKeys(data.keys()); + status &= m_helper->writeItems(data); + status &= m_helper->removeUnusedKeys(data.keys()); break; } + qCDebug(LOG_AW) << "Configuration save status" << status; } diff --git a/sources/awesome-widget/plugin/awabstractpairconfig.h b/sources/awesome-widget/plugin/awabstractpairconfig.h index 579b865..2f36b37 100644 --- a/sources/awesome-widget/plugin/awabstractpairconfig.h +++ b/sources/awesome-widget/plugin/awabstractpairconfig.h @@ -35,7 +35,7 @@ class AWAbstractPairConfig : public QDialog Q_OBJECT public: - explicit AWAbstractPairConfig(QWidget *_parent = nullptr, const bool _hasEdit = false, + explicit AWAbstractPairConfig(QWidget *_parent = nullptr, bool _hasEdit = false, QStringList _keys = QStringList()); ~AWAbstractPairConfig() override; template void initHelper() @@ -46,7 +46,7 @@ public: } void showDialog(); // properties - void setEditable(const bool _first, const bool _second); + void setEditable(bool _first, bool _second); private slots: void edit(); @@ -66,7 +66,7 @@ private: const QPair &_current); void clearSelectors(); void execDialog(); - QPair initKeys() const; + [[nodiscard]] QPair initKeys() const; void updateDialog(); }; diff --git a/sources/awesome-widget/plugin/awabstractpairhelper.cpp b/sources/awesome-widget/plugin/awabstractpairhelper.cpp index e8d8426..55a4e91 100644 --- a/sources/awesome-widget/plugin/awabstractpairhelper.cpp +++ b/sources/awesome-widget/plugin/awabstractpairhelper.cpp @@ -30,7 +30,7 @@ AWAbstractPairHelper::AWAbstractPairHelper(QString _filePath, QString _section) { qCDebug(LOG_AW) << __PRETTY_FUNCTION__; - initItems(); + AWAbstractPairHelper::initItems(); } diff --git a/sources/awesome-widget/plugin/awabstractpairhelper.h b/sources/awesome-widget/plugin/awabstractpairhelper.h index bc05669..b5817c4 100644 --- a/sources/awesome-widget/plugin/awabstractpairhelper.h +++ b/sources/awesome-widget/plugin/awabstractpairhelper.h @@ -27,14 +27,14 @@ class AWAbstractPairHelper public: explicit AWAbstractPairHelper(QString _filePath = "", QString _section = ""); virtual ~AWAbstractPairHelper(); - QStringList keys() const; - QHash pairs() const; - QStringList values() const; - QSet valuesSet() const; + [[nodiscard]] QStringList keys() const; + [[nodiscard]] QHash pairs() const; + [[nodiscard]] QStringList values() const; + [[nodiscard]] QSet valuesSet() const; // read-write methods virtual void initItems(); - virtual bool writeItems(const QHash &_configuration) const; - virtual bool removeUnusedKeys(const QStringList &_keys) const; + [[nodiscard]] virtual bool writeItems(const QHash &_configuration) const; + [[nodiscard]] virtual bool removeUnusedKeys(const QStringList &_keys) const; // configuration related virtual void editPairs() = 0; virtual QStringList leftKeys() = 0; diff --git a/sources/awesome-widget/plugin/awabstractselector.h b/sources/awesome-widget/plugin/awabstractselector.h index 2cac132..1faffc9 100644 --- a/sources/awesome-widget/plugin/awabstractselector.h +++ b/sources/awesome-widget/plugin/awabstractselector.h @@ -35,7 +35,7 @@ public: explicit AWAbstractSelector(QWidget *_parent = nullptr, const QPair &_editable = {false, false}); ~AWAbstractSelector() override; - QPair current() const; + [[nodiscard]] QPair current() const; void init(const QStringList &_keys, const QStringList &_values, const QPair &_current); diff --git a/sources/awesome-widget/plugin/awactions.h b/sources/awesome-widget/plugin/awactions.h index 73133e6..cd63371 100644 --- a/sources/awesome-widget/plugin/awactions.h +++ b/sources/awesome-widget/plugin/awactions.h @@ -32,7 +32,7 @@ class AWActions : public QObject public: explicit AWActions(QObject *_parent = nullptr); ~AWActions() override; - Q_INVOKABLE void checkUpdates(const bool _showAnyway = false); + Q_INVOKABLE void checkUpdates(bool _showAnyway = false); Q_INVOKABLE static QString getFileContent(const QString &_path); Q_INVOKABLE static bool isDebugEnabled(); Q_INVOKABLE static bool runCmd(const QString &_cmd, const QStringList &_args); diff --git a/sources/awesome-widget/plugin/awbugreporter.cpp b/sources/awesome-widget/plugin/awbugreporter.cpp index 337d603..13390ee 100644 --- a/sources/awesome-widget/plugin/awbugreporter.cpp +++ b/sources/awesome-widget/plugin/awbugreporter.cpp @@ -45,7 +45,7 @@ void AWBugReporter::doConnect() { // additional method for testing needs connect(this, SIGNAL(replyReceived(const int, const QString &)), this, - SLOT(showInformation(const int, const QString &))); + SLOT(showInformation(int, const QString &))); } diff --git a/sources/awesome-widget/plugin/awbugreporter.h b/sources/awesome-widget/plugin/awbugreporter.h index 57ada94..fa89fde 100644 --- a/sources/awesome-widget/plugin/awbugreporter.h +++ b/sources/awesome-widget/plugin/awbugreporter.h @@ -42,7 +42,7 @@ signals: private slots: void issueReplyRecieved(QNetworkReply *_reply); - void showInformation(const int _number, const QString &_url); + void showInformation(int _number, const QString &_url); void userReplyOnBugReport(QAbstractButton *_button); private: diff --git a/sources/awesome-widget/plugin/awconfighelper.cpp b/sources/awesome-widget/plugin/awconfighelper.cpp index 70d76b1..30a7289 100644 --- a/sources/awesome-widget/plugin/awconfighelper.cpp +++ b/sources/awesome-widget/plugin/awconfighelper.cpp @@ -42,7 +42,7 @@ AWConfigHelper::~AWConfigHelper() } -QString AWConfigHelper::configurationDirectory() const +QString AWConfigHelper::configurationDirectory() { // get readable directory QString localDir diff --git a/sources/awesome-widget/plugin/awconfighelper.h b/sources/awesome-widget/plugin/awconfighelper.h index 957431f..496334f 100644 --- a/sources/awesome-widget/plugin/awconfighelper.h +++ b/sources/awesome-widget/plugin/awconfighelper.h @@ -32,13 +32,13 @@ class AWConfigHelper : public QObject public: explicit AWConfigHelper(QObject *_parent = nullptr); ~AWConfigHelper() override; - Q_INVOKABLE QString configurationDirectory() const; + Q_INVOKABLE [[nodiscard]] static QString configurationDirectory(); Q_INVOKABLE static bool dropCache(); Q_INVOKABLE bool exportConfiguration(QObject *_nativeConfig, const QString &_fileName) const; - Q_INVOKABLE QVariantMap importConfiguration(const QString &_fileName, - const bool _importPlasmoid, - const bool _importExtensions, - const bool _importAdds) const; + Q_INVOKABLE [[nodiscard]] QVariantMap importConfiguration(const QString &_fileName, + bool _importPlasmoid, + bool _importExtensions, + bool _importAdds) const; // dataengine Q_INVOKABLE static QVariantMap readDataEngineConfiguration(); Q_INVOKABLE static bool writeDataEngineConfiguration(const QVariantMap &_configuration); @@ -47,7 +47,7 @@ private: // methods static void copyConfigs(const QString &_localDir); void copyExtensions(const QString &_item, const QString &_type, QSettings &_settings, - const bool _inverse) const; + bool _inverse) const; static void copySettings(QSettings &_from, QSettings &_to); static void readFile(QSettings &_settings, const QString &_key, const QString &_fileName); static void writeFile(QSettings &_settings, const QString &_key, const QString &_fileName); diff --git a/sources/awesome-widget/plugin/awcustomkeyshelper.h b/sources/awesome-widget/plugin/awcustomkeyshelper.h index 7a3b179..87dff8a 100644 --- a/sources/awesome-widget/plugin/awcustomkeyshelper.h +++ b/sources/awesome-widget/plugin/awcustomkeyshelper.h @@ -32,9 +32,9 @@ public: explicit AWCustomKeysHelper(QObject *_parent = nullptr); ~AWCustomKeysHelper() override; // get - QString source(const QString &_key) const; - QStringList sources() const; - QStringList refinedSources() const; + [[nodiscard]] QString source(const QString &_key) const; + [[nodiscard]] QStringList sources() const; + [[nodiscard]] QStringList refinedSources() const; // configuration related void editPairs() override{}; QStringList leftKeys() override; diff --git a/sources/awesome-widget/plugin/awdataaggregator.cpp b/sources/awesome-widget/plugin/awdataaggregator.cpp index feb000c..145d665 100644 --- a/sources/awesome-widget/plugin/awdataaggregator.cpp +++ b/sources/awesome-widget/plugin/awdataaggregator.cpp @@ -119,7 +119,7 @@ QPixmap AWDataAggregator::tooltipImage() // create frame float normX = 100.0f / static_cast(m_values[key].count()); float normY = 100.0f / (1.5f * m_boundaries[key]); - float shift = requiredKeys.indexOf(key) * 100.0f; + float shift = static_cast(requiredKeys.indexOf(key)) * 100.0f; if (down) shift -= 100.0; // apply pen color diff --git a/sources/awesome-widget/plugin/awdataaggregator.h b/sources/awesome-widget/plugin/awdataaggregator.h index e5c75a1..fb0824f 100644 --- a/sources/awesome-widget/plugin/awdataaggregator.h +++ b/sources/awesome-widget/plugin/awdataaggregator.h @@ -49,17 +49,17 @@ private: // ui QGraphicsScene *m_toolTipScene = nullptr; QGraphicsView *m_toolTipView = nullptr; - void checkValue(const QString &_source, const float _value, const float _extremum) const; + void checkValue(const QString &_source, float _value, float _extremum) const; void checkValue(const QString &_source, const QString &_current, const QString &_received) const; void initScene(); - static QString notificationText(const QString &_source, const float _value); + static QString notificationText(const QString &_source, float _value); static QString notificationText(const QString &_source, const QString &_value); // main method void setData(const QVariantHash &_values); - void setData(const QString &_source, float _value, const float _extremum = -1.0f); + void setData(const QString &_source, float _value, float _extremum = -1.0f); // different signature for battery device - void setData(const bool _dontInvert, const QString &_source, float _value); + void setData(bool _dontInvert, const QString &_source, float _value); // variables int m_counts = 0; QVariantHash m_configuration; diff --git a/sources/awesome-widget/plugin/awdataengineaggregator.cpp b/sources/awesome-widget/plugin/awdataengineaggregator.cpp index e0e048c..1f69dd3 100644 --- a/sources/awesome-widget/plugin/awdataengineaggregator.cpp +++ b/sources/awesome-widget/plugin/awdataengineaggregator.cpp @@ -36,7 +36,7 @@ AWDataEngineAggregator::AWDataEngineAggregator(QObject *_parent) // additional method required by systemmonitor structure m_newSourceConnection = connect(m_dataEngines["systemmonitor"], &Plasma::DataEngine::sourceAdded, - [this](const QString source) { + [this](const QString &source) { emit(deviceAdded(source)); m_dataEngines["systemmonitor"]->connectSource(source, parent(), 1000); }); @@ -56,9 +56,9 @@ AWDataEngineAggregator::~AWDataEngineAggregator() void AWDataEngineAggregator::disconnectSources() { - for (auto dataengine : m_dataEngines.values()) - for (auto &source : dataengine->sources()) - dataengine->disconnectSource(source, parent()); + for (auto dataEngine : m_dataEngines.values()) + for (auto &source : dataEngine->sources()) + dataEngine->disconnectSource(source, parent()); disconnect(m_newSourceConnection); } @@ -75,7 +75,7 @@ void AWDataEngineAggregator::reconnectSources(const int _interval) m_newSourceConnection = connect( m_dataEngines["systemmonitor"], &Plasma::DataEngine::sourceAdded, - [this, _interval](const QString source) { + [this, _interval](const QString &source) { emit(deviceAdded(source)); m_dataEngines["systemmonitor"]->connectSource(source, parent(), (uint)_interval); }); @@ -92,8 +92,8 @@ void AWDataEngineAggregator::dropSource(const QString &_source) // HACK there is no possibility to check to which dataengine source // connected we will try to disconnect it from all engines - for (auto dataengine : m_dataEngines.values()) - dataengine->disconnectSource(_source, parent()); + for (auto dataEngine : m_dataEngines.values()) + dataEngine->disconnectSource(_source, parent()); } diff --git a/sources/awesome-widget/plugin/awdataengineaggregator.h b/sources/awesome-widget/plugin/awdataengineaggregator.h index dae35a6..580b9b8 100644 --- a/sources/awesome-widget/plugin/awdataengineaggregator.h +++ b/sources/awesome-widget/plugin/awdataengineaggregator.h @@ -33,7 +33,7 @@ public: explicit AWDataEngineAggregator(QObject *_parent = nullptr); ~AWDataEngineAggregator() override; void disconnectSources(); - void reconnectSources(const int _interval); + void reconnectSources(int _interval); signals: void deviceAdded(const QString &_source); diff --git a/sources/awesome-widget/plugin/awdataenginemapper.h b/sources/awesome-widget/plugin/awdataenginemapper.h index 2d5adde..0d55f03 100644 --- a/sources/awesome-widget/plugin/awdataenginemapper.h +++ b/sources/awesome-widget/plugin/awdataenginemapper.h @@ -35,8 +35,8 @@ public: explicit AWDataEngineMapper(QObject *_parent = nullptr, AWFormatterHelper *_custom = nullptr); ~AWDataEngineMapper() override; // get methods - AWKeysAggregator::FormatterType formatter(const QString &_key) const; - QStringList keysFromSource(const QString &_source) const; + [[nodiscard]] AWKeysAggregator::FormatterType formatter(const QString &_key) const; + [[nodiscard]] QStringList keysFromSource(const QString &_source) const; // set methods QStringList registerSource(const QString &_source, const QString &_units, const QStringList &_keys); diff --git a/sources/awesome-widget/plugin/awdbusadaptor.cpp b/sources/awesome-widget/plugin/awdbusadaptor.cpp index 10a7906..1cb38a0 100644 --- a/sources/awesome-widget/plugin/awdbusadaptor.cpp +++ b/sources/awesome-widget/plugin/awdbusadaptor.cpp @@ -49,7 +49,7 @@ QStringList AWDBusAdaptor::ActiveServices() const QStringList arguments = listServices.arguments().first().toStringList(); return std::accumulate(arguments.cbegin(), arguments.cend(), QStringList(), - [](QStringList &source, QString service) { + [](QStringList &source, const QString &service) { if (service.startsWith(AWDBUS_SERVICE)) source.append(service); return source; diff --git a/sources/awesome-widget/plugin/awdbusadaptor.h b/sources/awesome-widget/plugin/awdbusadaptor.h index 31309ec..2f55f48 100644 --- a/sources/awesome-widget/plugin/awdbusadaptor.h +++ b/sources/awesome-widget/plugin/awdbusadaptor.h @@ -37,14 +37,14 @@ public: public slots: // get methods - QStringList ActiveServices() const; - QString Info(const QString &key) const; - QStringList Keys(const QString ®exp) const; - QString Value(const QString &key) const; - qlonglong WhoAmI() const; + [[nodiscard]] QStringList ActiveServices() const; + [[nodiscard]] QString Info(const QString &key) const; + [[nodiscard]] QStringList Keys(const QString ®exp) const; + [[nodiscard]] QString Value(const QString &key) const; + [[nodiscard]] qlonglong WhoAmI() const; // set methods - void SetLogLevel(const QString &what, const int level); - void SetLogLevel(const QString &what, const QString &level, const bool enabled); + void SetLogLevel(const QString &what, int level); + void SetLogLevel(const QString &what, const QString &level, bool enabled); private: AWKeys *m_plugin = nullptr; diff --git a/sources/awesome-widget/plugin/awformatterhelper.cpp b/sources/awesome-widget/plugin/awformatterhelper.cpp index 0eadc67..ef5d0b1 100644 --- a/sources/awesome-widget/plugin/awformatterhelper.cpp +++ b/sources/awesome-widget/plugin/awformatterhelper.cpp @@ -39,7 +39,7 @@ AWFormatterHelper::AWFormatterHelper(QWidget *_parent) { qCDebug(LOG_AW) << __PRETTY_FUNCTION__; - initItems(); + AWFormatterHelper::initItems(); } @@ -55,7 +55,6 @@ AWFormatterHelper::~AWFormatterHelper() void AWFormatterHelper::initItems() { initFormatters(); - AWAbstractPairHelper::initItems(); // assign internal storage m_formatters.clear(); @@ -199,7 +198,7 @@ void AWFormatterHelper::initFormatters() QPair -AWFormatterHelper::readMetadata(const QString &_filePath) const +AWFormatterHelper::readMetadata(const QString &_filePath) { qCDebug(LOG_AW) << "Read initial parameters from" << _filePath; diff --git a/sources/awesome-widget/plugin/awformatterhelper.h b/sources/awesome-widget/plugin/awformatterhelper.h index 3152d61..66864bf 100644 --- a/sources/awesome-widget/plugin/awformatterhelper.h +++ b/sources/awesome-widget/plugin/awformatterhelper.h @@ -34,9 +34,9 @@ public: // read-write methods void initItems() override; // methods - QString convert(const QVariant &_value, const QString &_name) const; - QStringList definedFormatters() const; - QList items() const override; + [[nodiscard]] QString convert(const QVariant &_value, const QString &_name) const; + [[nodiscard]] QStringList definedFormatters() const; + [[nodiscard]] QList items() const override; // configuration related void editPairs() override; QStringList leftKeys() override; @@ -49,8 +49,8 @@ private: // methods static AWAbstractFormatter::FormatterClass defineFormatterClass(const QString &_stringType); void initFormatters(); - QPair - readMetadata(const QString &_filePath) const; + [[nodiscard]] static QPair + readMetadata(const QString &_filePath); // parent methods void doCreateItem() override; // properties diff --git a/sources/awesome-widget/plugin/awkeyoperations.h b/sources/awesome-widget/plugin/awkeyoperations.h index 57c0a7e..ee01197 100644 --- a/sources/awesome-widget/plugin/awkeyoperations.h +++ b/sources/awesome-widget/plugin/awkeyoperations.h @@ -40,18 +40,18 @@ class AWKeyOperations : public QObject public: explicit AWKeyOperations(QObject *_parent = nullptr); ~AWKeyOperations() override; - QStringList devices(const QString &_type) const; - QHash devices() const; + [[nodiscard]] QStringList devices(const QString &_type) const; + [[nodiscard]] QHash devices() const; void updateCache(); // keys - QStringList dictKeys() const; - GraphicalItem *giByKey(const QString &_key) const; - QStringList requiredUserKeys() const; - QStringList userKeys() const; - QString userKeySource(const QString &_key) const; + [[nodiscard]] QStringList dictKeys() const; + [[nodiscard]] GraphicalItem *giByKey(const QString &_key) const; + [[nodiscard]] QStringList requiredUserKeys() const; + [[nodiscard]] QStringList userKeys() const; + [[nodiscard]] QString userKeySource(const QString &_key) const; // values - QString infoByKey(const QString &_key) const; - QString pattern() const; + [[nodiscard]] QString infoByKey(const QString &_key) const; + [[nodiscard]] QString pattern() const; void setPattern(const QString &_currentPattern); // configuration void editItem(const QString &_type); diff --git a/sources/awesome-widget/plugin/awkeys.cpp b/sources/awesome-widget/plugin/awkeys.cpp index 9ff94a9..9d4e57c 100644 --- a/sources/awesome-widget/plugin/awkeys.cpp +++ b/sources/awesome-widget/plugin/awkeys.cpp @@ -76,7 +76,7 @@ AWKeys::~AWKeys() m_timer->stop(); // delete dbus session - qlonglong id = reinterpret_cast(this); + auto id = reinterpret_cast(this); QDBusConnection::sessionBus().unregisterObject(QString("/%1").arg(id)); } @@ -305,7 +305,7 @@ void AWKeys::calculateValues() void AWKeys::createDBusInterface() { // get this object id - qlonglong id = reinterpret_cast(this); + auto id = reinterpret_cast(this); // create session QDBusConnection instanceBus = QDBusConnection::sessionBus(); diff --git a/sources/awesome-widget/plugin/awkeys.h b/sources/awesome-widget/plugin/awkeys.h index 8f0ebce..756eb86 100644 --- a/sources/awesome-widget/plugin/awkeys.h +++ b/sources/awesome-widget/plugin/awkeys.h @@ -40,19 +40,20 @@ public: explicit AWKeys(QObject *_parent = nullptr); ~AWKeys() override; Q_INVOKABLE void initDataAggregator(const QVariantMap &_tooltipParams); - Q_INVOKABLE void initKeys(const QString &_currentPattern, const int _interval, const int _limit, - const bool _optimize); + Q_INVOKABLE void initKeys(const QString &_currentPattern, int _interval, int _limit, + bool _optimize); Q_INVOKABLE void setAggregatorProperty(const QString &_key, const QVariant &_value); - Q_INVOKABLE void setWrapNewLines(const bool _wrap); + Q_INVOKABLE void setWrapNewLines(bool _wrap); // additional method to force load keys from Qml UI. Used in some // configuration pages Q_INVOKABLE void updateCache(); // keys - Q_INVOKABLE QStringList dictKeys(const bool _sorted = false, const QString &_regexp = "") const; - Q_INVOKABLE QVariantList getHddDevices() const; + Q_INVOKABLE [[nodiscard]] QStringList dictKeys(bool _sorted = false, + const QString &_regexp = "") const; + Q_INVOKABLE [[nodiscard]] QVariantList getHddDevices() const; // values - Q_INVOKABLE QString infoByKey(const QString &_key) const; - Q_INVOKABLE QString valueByKey(const QString &_key) const; + Q_INVOKABLE [[nodiscard]] QString infoByKey(const QString &_key) const; + Q_INVOKABLE [[nodiscard]] QString valueByKey(const QString &_key) const; // configuration Q_INVOKABLE void editItem(const QString &_type); @@ -74,7 +75,7 @@ private: // methods void calculateValues(); void createDBusInterface(); - QString parsePattern(QString _pattern) const; + [[nodiscard]] QString parsePattern(QString _pattern) const; void setDataBySource(const QString &_sourceName, const QVariantMap &_data); // objects AWDataAggregator *m_dataAggregator = nullptr; diff --git a/sources/awesome-widget/plugin/awkeysaggregator.h b/sources/awesome-widget/plugin/awkeysaggregator.h index c2bd1c1..4c1def7 100644 --- a/sources/awesome-widget/plugin/awkeysaggregator.h +++ b/sources/awesome-widget/plugin/awkeysaggregator.h @@ -69,8 +69,9 @@ public: ~AWKeysAggregator() override; void initFormatters(); // get methods - QString formatter(const QVariant &_data, const QString &_key, bool replaceSpace) const; - QStringList keysFromSource(const QString &_source) const; + [[nodiscard]] QString formatter(const QVariant &_data, const QString &_key, + bool replaceSpace) const; + [[nodiscard]] QStringList keysFromSource(const QString &_source) const; // set methods void setAcOffline(const QString &_inactive); void setAcOnline(const QString &_active); @@ -78,14 +79,14 @@ public: void setCustomUptime(const QString &_customUptime); void setDevices(const QHash &_devices); void setTempUnits(const QString &_units); - void setTranslate(const bool _translate); + void setTranslate(bool _translate); public slots: QStringList registerSource(const QString &_source, const QString &_units, const QStringList &_keys); private: - float temperature(const float temp) const; + [[nodiscard]] float temperature(float temp) const; AWFormatterHelper *m_customFormatters = nullptr; AWDataEngineMapper *m_mapper = nullptr; QStringList m_timeKeys; diff --git a/sources/awesome-widget/plugin/awpatternfunctions.h b/sources/awesome-widget/plugin/awpatternfunctions.h index c57ffd0..5e89406 100644 --- a/sources/awesome-widget/plugin/awpatternfunctions.h +++ b/sources/awesome-widget/plugin/awpatternfunctions.h @@ -44,7 +44,7 @@ QString insertKeyNames(QString _code, const QStringList &_keys); QString insertKeys(QString _code, const QStringList &_keys); QString insertMacros(QString _code); // find methods -QStringList findKeys(const QString &_code, const QStringList &_keys, const bool _isBars); +QStringList findKeys(const QString &_code, const QStringList &_keys, bool _isBars); QStringList findLambdas(const QString &_code); } // namespace AWPatternFunctions diff --git a/sources/awesome-widget/plugin/awtelemetryhandler.h b/sources/awesome-widget/plugin/awtelemetryhandler.h index 42eb3f1..2dfa2ad 100644 --- a/sources/awesome-widget/plugin/awtelemetryhandler.h +++ b/sources/awesome-widget/plugin/awtelemetryhandler.h @@ -33,10 +33,10 @@ public: explicit AWTelemetryHandler(QObject *_parent = nullptr, const QString &_clientId = ""); ~AWTelemetryHandler() override; - Q_INVOKABLE QStringList get(const QString &_group) const; - Q_INVOKABLE QString getLast(const QString &_group) const; - Q_INVOKABLE void init(const int _count, const bool _enableRemote, const QString &_clientId); - Q_INVOKABLE bool put(const QString &_group, const QString &_value) const; + Q_INVOKABLE [[nodiscard]] QStringList get(const QString &_group) const; + Q_INVOKABLE [[nodiscard]] QString getLast(const QString &_group) const; + Q_INVOKABLE void init(int _count, bool _enableRemote, const QString &_clientId); + Q_INVOKABLE [[nodiscard]] bool put(const QString &_group, const QString &_value) const; Q_INVOKABLE void uploadTelemetry(const QString &_group, const QString &_value); signals: @@ -46,7 +46,7 @@ private slots: void telemetryReplyRecieved(QNetworkReply *_reply); private: - static QString getKey(const int _count); + static QString getKey(int _count); QString m_clientId; QString m_localFile; int m_storeCount = 0; diff --git a/sources/awesome-widget/plugin/awupdatehelper.h b/sources/awesome-widget/plugin/awupdatehelper.h index ae650fd..0d6a7bc 100644 --- a/sources/awesome-widget/plugin/awupdatehelper.h +++ b/sources/awesome-widget/plugin/awupdatehelper.h @@ -33,18 +33,18 @@ class AWUpdateHelper : public QObject public: explicit AWUpdateHelper(QObject *_parent = nullptr); ~AWUpdateHelper() override; - void checkUpdates(const bool _showAnyway = false); + void checkUpdates(bool _showAnyway = false); bool checkVersion(); private slots: static void showInfo(const QVersionNumber &_version); void showUpdates(const QVersionNumber &_version); void userReplyOnUpdates(QAbstractButton *_button); - void versionReplyRecieved(QNetworkReply *_reply, const bool _showAnyway); + void versionReplyRecieved(QNetworkReply *_reply, bool _showAnyway); private: static QMessageBox *genMessageBox(const QString &_title, const QString &_body, - const QMessageBox::StandardButtons _buttons); + QMessageBox::StandardButtons _buttons); QVersionNumber m_foundVersion; QString m_genericConfig; }; diff --git a/sources/awesomewidgets/abstractextitem.cpp b/sources/awesomewidgets/abstractextitem.cpp index 98e80a9..ab6ad2f 100644 --- a/sources/awesomewidgets/abstractextitem.cpp +++ b/sources/awesomewidgets/abstractextitem.cpp @@ -240,8 +240,7 @@ void AbstractExtItem::setNumber(int _number) if (generateNumber) { _number = []() { qCWarning(LOG_LIB) << "Number is empty, generate new one"; - // we suppose that currentTIme().msec() is always valid time - int n = QRandomGenerator::global()->generate() % 1000; + auto n = QRandomGenerator::global()->generate() % 1000; qCInfo(LOG_LIB) << "Generated number is" << n; return n; }(); diff --git a/sources/awesomewidgets/abstractextitem.h b/sources/awesomewidgets/abstractextitem.h index 8e0300b..91fe620 100644 --- a/sources/awesomewidgets/abstractextitem.h +++ b/sources/awesomewidgets/abstractextitem.h @@ -42,29 +42,29 @@ class AbstractExtItem : public QDialog public: explicit AbstractExtItem(QWidget *_parent = nullptr, const QString &_filePath = ""); ~AbstractExtItem() override; - virtual void bumpApi(const int _newVer); - virtual AbstractExtItem *copy(const QString &_fileName, const int _number) = 0; + virtual void bumpApi(int _newVer); + virtual AbstractExtItem *copy(const QString &_fileName, int _number) = 0; virtual void copyDefaults(AbstractExtItem *_other) const; virtual void startTimer(); - QString writtableConfig() const; + [[nodiscard]] QString writtableConfig() const; // get methods - int apiVersion() const; - QString comment() const; - QString cron() const; - QString fileName() const; - int interval() const; - bool isActive() const; - QString name() const; - int number() const; - QString socket() const; - QString tag(const QString &_type) const; - virtual QString uniq() const = 0; + [[nodiscard]] int apiVersion() const; + [[nodiscard]] QString comment() const; + [[nodiscard]] QString cron() const; + [[nodiscard]] QString fileName() const; + [[nodiscard]] int interval() const; + [[nodiscard]] bool isActive() const; + [[nodiscard]] QString name() const; + [[nodiscard]] int number() const; + [[nodiscard]] QString socket() const; + [[nodiscard]] QString tag(const QString &_type) const; + [[nodiscard]] virtual QString uniq() const = 0; // set methods - void setApiVersion(const int _apiVersion); - void setActive(const bool _state); + void setApiVersion(int _apiVersion); + void setActive(bool _state); void setComment(const QString &_comment); void setCron(const QString &_cron); - void setInterval(const int _interval); + void setInterval(int _interval); void setName(const QString &_name); void setNumber(int _number); void setSocket(const QString &_socket); @@ -79,7 +79,7 @@ public slots: virtual void readConfiguration(); virtual QVariantHash run() = 0; virtual int showConfiguration(const QVariant &_args) = 0; - virtual bool tryDelete() const; + [[nodiscard]] virtual bool tryDelete() const; virtual void writeConfiguration() const; private slots: diff --git a/sources/awesomewidgets/abstractextitemaggregator.cpp b/sources/awesomewidgets/abstractextitemaggregator.cpp index 8fb22a8..b15be31 100644 --- a/sources/awesomewidgets/abstractextitemaggregator.cpp +++ b/sources/awesomewidgets/abstractextitemaggregator.cpp @@ -129,7 +129,7 @@ QString AbstractExtItemAggregator::getName() } -AbstractExtItem *AbstractExtItemAggregator::itemFromWidget() +AbstractExtItem *AbstractExtItemAggregator::itemFromWidget() const { QListWidgetItem *widgetItem = ui->listWidget->currentItem(); if (!widgetItem) @@ -150,7 +150,7 @@ AbstractExtItem *AbstractExtItemAggregator::itemFromWidget() } -void AbstractExtItemAggregator::repaintList() +void AbstractExtItemAggregator::repaintList() const { ui->listWidget->clear(); for (auto &_item : items()) { diff --git a/sources/awesomewidgets/abstractextitemaggregator.h b/sources/awesomewidgets/abstractextitemaggregator.h index 418d386..08da486 100644 --- a/sources/awesomewidgets/abstractextitemaggregator.h +++ b/sources/awesomewidgets/abstractextitemaggregator.h @@ -68,14 +68,14 @@ public: void editItem(); QString getName(); virtual void initItems() = 0; - AbstractExtItem *itemFromWidget(); - void repaintList(); - int uniqNumber() const; + AbstractExtItem *itemFromWidget() const; + void repaintList() const; + [[nodiscard]] int uniqNumber() const; // get methods - QVariant configArgs() const; - QStringList directories() const; - virtual QList items() const = 0; - QString type() const; + [[nodiscard]] QVariant configArgs() const; + [[nodiscard]] QStringList directories() const; + [[nodiscard]] virtual QList items() const = 0; + [[nodiscard]] QString type() const; // set methods void setConfigArgs(const QVariant &_configArgs); diff --git a/sources/awesomewidgets/abstractquotesprovider.h b/sources/awesomewidgets/abstractquotesprovider.h index 53b94ff..26f7586 100644 --- a/sources/awesomewidgets/abstractquotesprovider.h +++ b/sources/awesomewidgets/abstractquotesprovider.h @@ -33,12 +33,13 @@ public: : QObject(_parent){}; ~AbstractQuotesProvider() override = default; virtual void initUrl(const QString &_asset) = 0; - virtual QVariantHash parse(const QByteArray &_source, const QVariantHash &_oldValues) const = 0; - QString tag(const QString &_type) const + [[nodiscard]] virtual QVariantHash parse(const QByteArray &_source, + const QVariantHash &_oldValues) const = 0; + [[nodiscard]] QString tag(const QString &_type) const { return dynamic_cast(parent())->tag(_type); }; - virtual QUrl url() const = 0; + [[nodiscard]] virtual QUrl url() const = 0; }; diff --git a/sources/awesomewidgets/abstractweatherprovider.h b/sources/awesomewidgets/abstractweatherprovider.h index 10895a0..ac9d96b 100644 --- a/sources/awesomewidgets/abstractweatherprovider.h +++ b/sources/awesomewidgets/abstractweatherprovider.h @@ -32,9 +32,9 @@ public: explicit AbstractWeatherProvider(QObject *_parent) : QObject(_parent){}; ~AbstractWeatherProvider() override = default; - virtual void initUrl(const QString &_city, const QString &_country, const int _ts) = 0; - virtual QVariantHash parse(const QVariantMap &_json) const = 0; - QString tag(const QString &_type) const + virtual void initUrl(const QString &_city, const QString &_country, int _ts) = 0; + [[nodiscard]] virtual QVariantHash parse(const QVariantMap &_json) const = 0; + [[nodiscard]] QString tag(const QString &_type) const { return dynamic_cast(parent())->tag(_type); }; diff --git a/sources/awesomewidgets/awabstractformatter.h b/sources/awesomewidgets/awabstractformatter.h index b254271..214acec 100644 --- a/sources/awesomewidgets/awabstractformatter.h +++ b/sources/awesomewidgets/awabstractformatter.h @@ -32,14 +32,14 @@ public: explicit AWAbstractFormatter(QWidget *_parent = nullptr, const QString &_filePath = ""); ~AWAbstractFormatter() override; - virtual QString convert(const QVariant &_value) const = 0; + [[nodiscard]] virtual QString convert(const QVariant &_value) const = 0; void copyDefaults(AbstractExtItem *_other) const override; - QString uniq() const override; + [[nodiscard]] QString uniq() const override; // properties - QString strType() const; - FormatterClass type() const; + [[nodiscard]] QString strType() const; + [[nodiscard]] FormatterClass type() const; void setStrType(const QString &_type); - void setType(const FormatterClass _type); + void setType(FormatterClass _type); public slots: void readConfiguration() override; diff --git a/sources/awesomewidgets/awdatetimeformatter.cpp b/sources/awesomewidgets/awdatetimeformatter.cpp index b2a18a4..03a34de 100644 --- a/sources/awesomewidgets/awdatetimeformatter.cpp +++ b/sources/awesomewidgets/awdatetimeformatter.cpp @@ -34,9 +34,9 @@ AWDateTimeFormatter::AWDateTimeFormatter(QWidget *_parent, const QString &_fileP qCDebug(LOG_LIB) << __PRETTY_FUNCTION__; if (!_filePath.isEmpty()) - readConfiguration(); + AWDateTimeFormatter::readConfiguration(); ui->setupUi(this); - translate(); + AWDateTimeFormatter::translate(); } diff --git a/sources/awesomewidgets/awdatetimeformatter.h b/sources/awesomewidgets/awdatetimeformatter.h index b2e1d78..ef6bca2 100644 --- a/sources/awesomewidgets/awdatetimeformatter.h +++ b/sources/awesomewidgets/awdatetimeformatter.h @@ -37,13 +37,13 @@ class AWDateTimeFormatter : public AWAbstractFormatter public: explicit AWDateTimeFormatter(QWidget *_parent = nullptr, const QString &_filePath = ""); ~AWDateTimeFormatter() override; - QString convert(const QVariant &_value) const override; - AWDateTimeFormatter *copy(const QString &_fileName, const int _number) override; + [[nodiscard]] QString convert(const QVariant &_value) const override; + AWDateTimeFormatter *copy(const QString &_fileName, int _number) override; // properties - QString format() const; - bool translateString() const; + [[nodiscard]] QString format() const; + [[nodiscard]] bool translateString() const; void setFormat(const QString &_format); - void setTranslateString(const bool _translate); + void setTranslateString(bool _translate); public slots: void readConfiguration() override; diff --git a/sources/awesomewidgets/awfloatformatter.cpp b/sources/awesomewidgets/awfloatformatter.cpp index 2c51b28..4089711 100644 --- a/sources/awesomewidgets/awfloatformatter.cpp +++ b/sources/awesomewidgets/awfloatformatter.cpp @@ -33,9 +33,9 @@ AWFloatFormatter::AWFloatFormatter(QWidget *_parent, const QString &_filePath) qCDebug(LOG_LIB) << __PRETTY_FUNCTION__; if (!_filePath.isEmpty()) - readConfiguration(); + AWFloatFormatter::readConfiguration(); ui->setupUi(this); - translate(); + AWFloatFormatter::translate(); } diff --git a/sources/awesomewidgets/awfloatformatter.h b/sources/awesomewidgets/awfloatformatter.h index bbedf22..021d3e7 100644 --- a/sources/awesomewidgets/awfloatformatter.h +++ b/sources/awesomewidgets/awfloatformatter.h @@ -40,23 +40,23 @@ class AWFloatFormatter : public AWAbstractFormatter public: explicit AWFloatFormatter(QWidget *_parent = nullptr, const QString &_filePath = ""); ~AWFloatFormatter() override; - QString convert(const QVariant &_value) const override; - AWFloatFormatter *copy(const QString &_fileName, const int _number) override; + [[nodiscard]] QString convert(const QVariant &_value) const override; + AWFloatFormatter *copy(const QString &_fileName, int _number) override; // properties - int count() const; - QChar fillChar() const; - bool forceWidth() const; - char format() const; - double multiplier() const; - int precision() const; - double summand() const; - void setCount(const int _count); + [[nodiscard]] int count() const; + [[nodiscard]] QChar fillChar() const; + [[nodiscard]] bool forceWidth() const; + [[nodiscard]] char format() const; + [[nodiscard]] double multiplier() const; + [[nodiscard]] int precision() const; + [[nodiscard]] double summand() const; + void setCount(int _count); void setFillChar(const QChar &_fillChar); - void setForceWidth(const bool _forceWidth); + void setForceWidth(bool _forceWidth); void setFormat(char _format); - void setMultiplier(const double _multiplier); - void setPrecision(const int _precision); - void setSummand(const double _summand); + void setMultiplier(double _multiplier); + void setPrecision(int _precision); + void setSummand(double _summand); public slots: void readConfiguration() override; diff --git a/sources/awesomewidgets/awjsonformatter.cpp b/sources/awesomewidgets/awjsonformatter.cpp index 7d0fc3a..bbdd7ce 100644 --- a/sources/awesomewidgets/awjsonformatter.cpp +++ b/sources/awesomewidgets/awjsonformatter.cpp @@ -34,9 +34,9 @@ AWJsonFormatter::AWJsonFormatter(QWidget *_parent, const QString &_filePath) qCDebug(LOG_LIB) << __PRETTY_FUNCTION__; if (!_filePath.isEmpty()) - readConfiguration(); + AWJsonFormatter::readConfiguration(); ui->setupUi(this); - translate(); + AWJsonFormatter::translate(); } @@ -144,7 +144,7 @@ void AWJsonFormatter::writeConfiguration() const } -QVariant AWJsonFormatter::getFromJson(const QVariant &_value, const QVariant &_element) const +QVariant AWJsonFormatter::getFromJson(const QVariant &_value, const QVariant &_element) { qCDebug(LOG_LIB) << "Looking for element" << _element << "in" << _value; diff --git a/sources/awesomewidgets/awjsonformatter.h b/sources/awesomewidgets/awjsonformatter.h index bb06f2b..b0dec25 100644 --- a/sources/awesomewidgets/awjsonformatter.h +++ b/sources/awesomewidgets/awjsonformatter.h @@ -34,10 +34,10 @@ class AWJsonFormatter : public AWAbstractFormatter public: explicit AWJsonFormatter(QWidget *_parent = nullptr, const QString &_filePath = ""); ~AWJsonFormatter() override; - QString convert(const QVariant &_value) const override; - AWJsonFormatter *copy(const QString &_fileName, const int _number) override; + [[nodiscard]] QString convert(const QVariant &_value) const override; + AWJsonFormatter *copy(const QString &_fileName, int _number) override; // properties - QString path() const; + [[nodiscard]] QString path() const; void setPath(const QString &_path); public slots: @@ -47,8 +47,8 @@ public slots: private: Ui::AWJsonFormatter *ui = nullptr; - QVariant getFromJson(const QVariant &_value, const QVariant &_element) const; - static QVariant getFromList(const QVariant &_value, const int _index); + static QVariant getFromJson(const QVariant &_value, const QVariant &_element); + static QVariant getFromList(const QVariant &_value, int _index); static QVariant getFromMap(const QVariant &_value, const QString &_key); void initPath(); void translate() override; diff --git a/sources/awesomewidgets/awlistformatter.cpp b/sources/awesomewidgets/awlistformatter.cpp index 85dbd96..de15406 100644 --- a/sources/awesomewidgets/awlistformatter.cpp +++ b/sources/awesomewidgets/awlistformatter.cpp @@ -33,9 +33,9 @@ AWListFormatter::AWListFormatter(QWidget *_parent, const QString &_filePath) qCDebug(LOG_LIB) << __PRETTY_FUNCTION__; if (!_filePath.isEmpty()) - readConfiguration(); + AWListFormatter::readConfiguration(); ui->setupUi(this); - translate(); + AWListFormatter::translate(); } diff --git a/sources/awesomewidgets/awlistformatter.h b/sources/awesomewidgets/awlistformatter.h index 888c414..665e54b 100644 --- a/sources/awesomewidgets/awlistformatter.h +++ b/sources/awesomewidgets/awlistformatter.h @@ -36,15 +36,15 @@ class AWListFormatter : public AWAbstractFormatter public: explicit AWListFormatter(QWidget *_parent = nullptr, const QString &_filePath = ""); ~AWListFormatter() override; - QString convert(const QVariant &_value) const override; - AWListFormatter *copy(const QString &_fileName, const int _number) override; + [[nodiscard]] QString convert(const QVariant &_value) const override; + AWListFormatter *copy(const QString &_fileName, int _number) override; // properties - QString filter() const; - bool isSorted() const; - QString separator() const; + [[nodiscard]] QString filter() const; + [[nodiscard]] bool isSorted() const; + [[nodiscard]] QString separator() const; void setFilter(const QString &_filter); void setSeparator(const QString &_separator); - void setSorted(const bool _sorted); + void setSorted(bool _sorted); public slots: void readConfiguration() override; diff --git a/sources/awesomewidgets/awnoformatter.cpp b/sources/awesomewidgets/awnoformatter.cpp index 695ffba..3253f1e 100644 --- a/sources/awesomewidgets/awnoformatter.cpp +++ b/sources/awesomewidgets/awnoformatter.cpp @@ -31,9 +31,9 @@ AWNoFormatter::AWNoFormatter(QWidget *_parent, const QString &_filePath) qCDebug(LOG_LIB) << __PRETTY_FUNCTION__; if (!_filePath.isEmpty()) - readConfiguration(); + AWNoFormatter::readConfiguration(); ui->setupUi(this); - translate(); + AWNoFormatter::translate(); } diff --git a/sources/awesomewidgets/awnoformatter.h b/sources/awesomewidgets/awnoformatter.h index 8e2113f..56f7b40 100644 --- a/sources/awesomewidgets/awnoformatter.h +++ b/sources/awesomewidgets/awnoformatter.h @@ -33,8 +33,8 @@ class AWNoFormatter : public AWAbstractFormatter public: explicit AWNoFormatter(QWidget *_parent = nullptr, const QString &_filePath = ""); ~AWNoFormatter() override; - QString convert(const QVariant &_value) const override; - AWNoFormatter *copy(const QString &_fileName, const int _number) override; + [[nodiscard]] QString convert(const QVariant &_value) const override; + AWNoFormatter *copy(const QString &_fileName, int _number) override; public slots: int showConfiguration(const QVariant &_args) override; diff --git a/sources/awesomewidgets/awscriptformatter.cpp b/sources/awesomewidgets/awscriptformatter.cpp index 9ba6315..7990983 100644 --- a/sources/awesomewidgets/awscriptformatter.cpp +++ b/sources/awesomewidgets/awscriptformatter.cpp @@ -34,9 +34,9 @@ AWScriptFormatter::AWScriptFormatter(QWidget *_parent, const QString &_filePath) qCDebug(LOG_LIB) << __PRETTY_FUNCTION__; if (!_filePath.isEmpty()) - readConfiguration(); + AWScriptFormatter::readConfiguration(); ui->setupUi(this); - translate(); + AWScriptFormatter::translate(); } diff --git a/sources/awesomewidgets/awscriptformatter.h b/sources/awesomewidgets/awscriptformatter.h index 71e5967..b3df69c 100644 --- a/sources/awesomewidgets/awscriptformatter.h +++ b/sources/awesomewidgets/awscriptformatter.h @@ -37,16 +37,16 @@ class AWScriptFormatter : public AWAbstractFormatter public: explicit AWScriptFormatter(QWidget *_parent = nullptr, const QString &_filePath = ""); ~AWScriptFormatter() override; - QString convert(const QVariant &_value) const override; - AWScriptFormatter *copy(const QString &_fileName, const int _number) override; + [[nodiscard]] QString convert(const QVariant &_value) const override; + AWScriptFormatter *copy(const QString &_fileName, int _number) override; // properties - bool appendCode() const; - QString code() const; - bool hasReturn() const; - QString program() const; - void setAppendCode(const bool _appendCode); + [[nodiscard]] bool appendCode() const; + [[nodiscard]] QString code() const; + [[nodiscard]] bool hasReturn() const; + [[nodiscard]] QString program() const; + void setAppendCode(bool _appendCode); void setCode(const QString &_code); - void setHasReturn(const bool _hasReturn); + void setHasReturn(bool _hasReturn); public slots: void readConfiguration() override; diff --git a/sources/awesomewidgets/awstringformatter.cpp b/sources/awesomewidgets/awstringformatter.cpp index 952238e..b606931 100644 --- a/sources/awesomewidgets/awstringformatter.cpp +++ b/sources/awesomewidgets/awstringformatter.cpp @@ -33,9 +33,9 @@ AWStringFormatter::AWStringFormatter(QWidget *_parent, const QString &_filePath) qCDebug(LOG_LIB) << __PRETTY_FUNCTION__; if (!_filePath.isEmpty()) - readConfiguration(); + AWStringFormatter::readConfiguration(); ui->setupUi(this); - translate(); + AWStringFormatter::translate(); } diff --git a/sources/awesomewidgets/awstringformatter.h b/sources/awesomewidgets/awstringformatter.h index 7af6516..c634f6e 100644 --- a/sources/awesomewidgets/awstringformatter.h +++ b/sources/awesomewidgets/awstringformatter.h @@ -36,15 +36,15 @@ class AWStringFormatter : public AWAbstractFormatter public: explicit AWStringFormatter(QWidget *_parent = nullptr, const QString &_filePath = ""); ~AWStringFormatter() override; - QString convert(const QVariant &_value) const override; - AWStringFormatter *copy(const QString &_fileName, const int _number) override; + [[nodiscard]] QString convert(const QVariant &_value) const override; + AWStringFormatter *copy(const QString &_fileName, int _number) override; // properties - int count() const; - QChar fillChar() const; - bool forceWidth() const; - void setCount(const int _count); + [[nodiscard]] int count() const; + [[nodiscard]] QChar fillChar() const; + [[nodiscard]] bool forceWidth() const; + void setCount(int _count); void setFillChar(const QChar &_fillChar); - void setForceWidth(const bool _forceWidth); + void setForceWidth(bool _forceWidth); public slots: void readConfiguration() override; diff --git a/sources/awesomewidgets/extitemaggregator.h b/sources/awesomewidgets/extitemaggregator.h index 6bd106d..0487152 100644 --- a/sources/awesomewidgets/extitemaggregator.h +++ b/sources/awesomewidgets/extitemaggregator.h @@ -41,7 +41,7 @@ public: qCDebug(LOG_LIB) << "Type" << _type; - initItems(); + ExtItemAggregator::initItems(); }; ~ExtItemAggregator() override @@ -117,7 +117,7 @@ public: return found; }; - QList items() const override { return m_items; }; + [[nodiscard]] QList items() const override { return m_items; }; private: QList m_items; diff --git a/sources/awesomewidgets/extnetworkrequest.cpp b/sources/awesomewidgets/extnetworkrequest.cpp index ac23f90..3acd2f4 100644 --- a/sources/awesomewidgets/extnetworkrequest.cpp +++ b/sources/awesomewidgets/extnetworkrequest.cpp @@ -36,9 +36,9 @@ ExtNetworkRequest::ExtNetworkRequest(QWidget *_parent, const QString &_filePath) qCDebug(LOG_LIB) << __PRETTY_FUNCTION__; if (!_filePath.isEmpty()) - readConfiguration(); + ExtNetworkRequest::readConfiguration(); ui->setupUi(this); - translate(); + ExtNetworkRequest::translate(); m_values[tag("response")] = ""; diff --git a/sources/awesomewidgets/extnetworkrequest.h b/sources/awesomewidgets/extnetworkrequest.h index b55e2a3..fb079a6 100644 --- a/sources/awesomewidgets/extnetworkrequest.h +++ b/sources/awesomewidgets/extnetworkrequest.h @@ -36,10 +36,10 @@ class ExtNetworkRequest : public AbstractExtItem public: explicit ExtNetworkRequest(QWidget *_parent = nullptr, const QString &_filePath = ""); ~ExtNetworkRequest() override; - ExtNetworkRequest *copy(const QString &_fileName, const int _number) override; + ExtNetworkRequest *copy(const QString &_fileName, int _number) override; // get methods - QString stringUrl() const; - QString uniq() const override; + [[nodiscard]] QString stringUrl() const; + [[nodiscard]] QString uniq() const override; // set methods void setStringUrl(const QString &_url); diff --git a/sources/awesomewidgets/extquotes.cpp b/sources/awesomewidgets/extquotes.cpp index 2c9e0d3..a7bfa06 100644 --- a/sources/awesomewidgets/extquotes.cpp +++ b/sources/awesomewidgets/extquotes.cpp @@ -36,9 +36,9 @@ ExtQuotes::ExtQuotes(QWidget *_parent, const QString &_filePath) qCDebug(LOG_LIB) << __PRETTY_FUNCTION__; if (!_filePath.isEmpty()) - readConfiguration(); + ExtQuotes::readConfiguration(); ui->setupUi(this); - translate(); + ExtQuotes::translate(); m_values[tag("price")] = 0.0; m_values[tag("pricechg")] = 0.0; diff --git a/sources/awesomewidgets/extquotes.h b/sources/awesomewidgets/extquotes.h index 439fac6..1acce39 100644 --- a/sources/awesomewidgets/extquotes.h +++ b/sources/awesomewidgets/extquotes.h @@ -37,10 +37,10 @@ class ExtQuotes : public AbstractExtItem public: explicit ExtQuotes(QWidget *_parent = nullptr, const QString &_filePath = ""); ~ExtQuotes() override; - ExtQuotes *copy(const QString &_fileName, const int _number) override; + ExtQuotes *copy(const QString &_fileName, int _number) override; // get methods - QString ticker() const; - QString uniq() const override; + [[nodiscard]] QString ticker() const; + [[nodiscard]] QString uniq() const override; // set methods void setTicker(const QString &_ticker); diff --git a/sources/awesomewidgets/extscript.cpp b/sources/awesomewidgets/extscript.cpp index ba9b909..3017dac 100644 --- a/sources/awesomewidgets/extscript.cpp +++ b/sources/awesomewidgets/extscript.cpp @@ -36,10 +36,10 @@ ExtScript::ExtScript(QWidget *_parent, const QString &_filePath) qCDebug(LOG_LIB) << __PRETTY_FUNCTION__; if (!_filePath.isEmpty()) - readConfiguration(); + ExtScript::readConfiguration(); readJsonFilters(); ui->setupUi(this); - translate(); + ExtScript::translate(); m_values[tag("custom")] = ""; @@ -71,7 +71,6 @@ ExtScript *ExtScript::copy(const QString &_fileName, const int _number) copyDefaults(item); item->setExecutable(executable()); item->setNumber(_number); - item->setPrefix(prefix()); item->setRedirect(redirect()); item->setFilters(filters()); @@ -102,12 +101,6 @@ QStringList ExtScript::filters() const } -QString ExtScript::prefix() const -{ - return m_prefix; -} - - ExtScript::Redirect ExtScript::redirect() const { return m_redirect; @@ -159,14 +152,6 @@ void ExtScript::setFilters(const QStringList &_filters) } -void ExtScript::setPrefix(const QString &_prefix) -{ - qCDebug(LOG_LIB) << "Prefix" << _prefix; - - m_prefix = _prefix; -} - - void ExtScript::setRedirect(const Redirect _redirect) { qCDebug(LOG_LIB) << "Redirect" << static_cast(_redirect); @@ -231,11 +216,9 @@ void ExtScript::readConfiguration() settings.beginGroup("Desktop Entry"); setExecutable(settings.value("Exec", executable()).toString()); - setPrefix(settings.value("X-AW-Prefix", prefix()).toString()); setStrRedirect(settings.value("X-AW-Redirect", strRedirect()).toString()); // api == 3 - setFilters( - settings.value("X-AW-Filters", filters()).toString().split(',', Qt::SkipEmptyParts)); + setFilters(settings.value("X-AW-Filters", filters()).toString().split(',', Qt::SkipEmptyParts)); settings.endGroup(); bumpApi(AW_EXTSCRIPT_API); @@ -283,7 +266,6 @@ int ExtScript::showConfiguration(const QVariant &_args) ui->lineEdit_comment->setText(comment()); ui->label_numberValue->setText(QString("%1").arg(number())); ui->lineEdit_command->setText(executable()); - ui->lineEdit_prefix->setText(prefix()); ui->checkBox_active->setCheckState(isActive() ? Qt::Checked : Qt::Unchecked); ui->comboBox_redirect->setCurrentIndex(static_cast(redirect())); ui->lineEdit_schedule->setText(cron()); @@ -305,7 +287,6 @@ int ExtScript::showConfiguration(const QVariant &_args) setNumber(ui->label_numberValue->text().toInt()); setApiVersion(AW_EXTSCRIPT_API); setExecutable(ui->lineEdit_command->text()); - setPrefix(ui->lineEdit_prefix->text()); setActive(ui->checkBox_active->checkState() == Qt::Checked); setRedirect(static_cast(ui->comboBox_redirect->currentIndex())); setCron(ui->lineEdit_schedule->text()); @@ -330,7 +311,6 @@ void ExtScript::writeConfiguration() const settings.beginGroup("Desktop Entry"); settings.setValue("Exec", executable()); - settings.setValue("X-AW-Prefix", prefix()); settings.setValue("X-AW-Redirect", strRedirect()); settings.setValue("X-AW-Filters", filters().join(',')); settings.endGroup(); @@ -341,12 +321,8 @@ void ExtScript::writeConfiguration() const void ExtScript::startProcess() { - QStringList cmdList; - if (!prefix().isEmpty()) - cmdList.append(prefix()); - cmdList.append(executable()); - qCInfo(LOG_LIB) << "Run cmd" << cmdList.join(' '); - m_process->start("sh", QStringList() << "-c" << cmdList); + qCInfo(LOG_LIB) << "Run cmd" << executable(); + m_process->start("sh", QStringList() << "-c" << executable()); } @@ -387,7 +363,6 @@ void ExtScript::translate() ui->label_comment->setText(i18n("Comment")); ui->label_number->setText(i18n("Tag")); ui->label_command->setText(i18n("Command")); - ui->label_prefix->setText(i18n("Prefix")); ui->checkBox_active->setText(i18n("Active")); ui->label_redirect->setText(i18n("Redirect")); ui->label_schedule->setText(i18n("Schedule")); diff --git a/sources/awesomewidgets/extscript.h b/sources/awesomewidgets/extscript.h index 0f83a10..784a545 100644 --- a/sources/awesomewidgets/extscript.h +++ b/sources/awesomewidgets/extscript.h @@ -33,7 +33,6 @@ class ExtScript : public AbstractExtItem Q_OBJECT Q_PROPERTY(QString executable READ executable WRITE setExecutable) Q_PROPERTY(QStringList filters READ filters WRITE setFilters) - Q_PROPERTY(QString prefix READ prefix WRITE setPrefix) Q_PROPERTY(Redirect redirect READ redirect WRITE setRedirect) public: @@ -41,25 +40,23 @@ public: explicit ExtScript(QWidget *_parent = nullptr, const QString &_filePath = ""); ~ExtScript() override; - ExtScript *copy(const QString &_fileName, const int _number) override; + ExtScript *copy(const QString &_fileName, int _number) override; static QString jsonFiltersFile(); // get methods - QString executable() const; - QStringList filters() const; - QString prefix() const; - Redirect redirect() const; - QString uniq() const override; + [[nodiscard]] QString executable() const; + [[nodiscard]] QStringList filters() const; + [[nodiscard]] Redirect redirect() const; + [[nodiscard]] QString uniq() const override; // derivatives - QString strRedirect() const; + [[nodiscard]] QString strRedirect() const; // set methods void setExecutable(const QString &_executable); void setFilters(const QStringList &_filters); - void setPrefix(const QString &_prefix); - void setRedirect(const Redirect _redirect); + void setRedirect(Redirect _redirect); void setStrRedirect(const QString &_redirect); // filters - QString applyFilters(QString _value) const; - void updateFilter(const QString &_filter, const bool _add); + [[nodiscard]] QString applyFilters(QString _value) const; + void updateFilter(const QString &_filter, bool _add); public slots: void readConfiguration() override; diff --git a/sources/awesomewidgets/extscript.ui b/sources/awesomewidgets/extscript.ui index 8f57e87..700f5db 100644 --- a/sources/awesomewidgets/extscript.ui +++ b/sources/awesomewidgets/extscript.ui @@ -7,7 +7,7 @@ 0 0 420 - 506 + 463 @@ -104,29 +104,6 @@ - - - - - - - 0 - 0 - - - - Prefix - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - diff --git a/sources/awesomewidgets/extupgrade.cpp b/sources/awesomewidgets/extupgrade.cpp index 6673ec2..0195779 100644 --- a/sources/awesomewidgets/extupgrade.cpp +++ b/sources/awesomewidgets/extupgrade.cpp @@ -34,9 +34,9 @@ ExtUpgrade::ExtUpgrade(QWidget *_parent, const QString &_filePath) qCDebug(LOG_LIB) << __PRETTY_FUNCTION__; if (!_filePath.isEmpty()) - readConfiguration(); + ExtUpgrade::readConfiguration(); ui->setupUi(this); - translate(); + ExtUpgrade::translate(); m_values[tag("pkgcount")] = 0; diff --git a/sources/awesomewidgets/extupgrade.h b/sources/awesomewidgets/extupgrade.h index aedc0dc..62b0edd 100644 --- a/sources/awesomewidgets/extupgrade.h +++ b/sources/awesomewidgets/extupgrade.h @@ -38,16 +38,16 @@ class ExtUpgrade : public AbstractExtItem public: explicit ExtUpgrade(QWidget *_parent = nullptr, const QString &_filePath = ""); ~ExtUpgrade() override; - ExtUpgrade *copy(const QString &_fileName, const int _number) override; + ExtUpgrade *copy(const QString &_fileName, int _number) override; // get methods - QString executable() const; - QString filter() const; - int null() const; - QString uniq() const override; + [[nodiscard]] QString executable() const; + [[nodiscard]] QString filter() const; + [[nodiscard]] int null() const; + [[nodiscard]] QString uniq() const override; // set methods void setExecutable(const QString &_executable); void setFilter(const QString &_filter); - void setNull(const int _null); + void setNull(int _null); public slots: void readConfiguration() override; diff --git a/sources/awesomewidgets/extweather.cpp b/sources/awesomewidgets/extweather.cpp index 99232c9..31cd0e4 100644 --- a/sources/awesomewidgets/extweather.cpp +++ b/sources/awesomewidgets/extweather.cpp @@ -39,10 +39,10 @@ ExtWeather::ExtWeather(QWidget *_parent, const QString &_filePath) qCDebug(LOG_LIB) << __PRETTY_FUNCTION__; if (!_filePath.isEmpty()) - readConfiguration(); + ExtWeather::readConfiguration(); readJsonMap(); ui->setupUi(this); - translate(); + ExtWeather::translate(); m_values[tag("weatherId")] = 0; m_values[tag("weather")] = ""; diff --git a/sources/awesomewidgets/extweather.h b/sources/awesomewidgets/extweather.h index b9ab53c..0ba6c7f 100644 --- a/sources/awesomewidgets/extweather.h +++ b/sources/awesomewidgets/extweather.h @@ -44,24 +44,24 @@ public: explicit ExtWeather(QWidget *_parent = nullptr, const QString &_filePath = ""); ~ExtWeather() override; - ExtWeather *copy(const QString &_fileName, const int _number) override; + ExtWeather *copy(const QString &_fileName, int _number) override; static QString jsonMapFile(); - QString weatherFromInt(const int _id) const; + [[nodiscard]] QString weatherFromInt(int _id) const; // get methods - QString city() const; - QString country() const; - bool image() const; - Provider provider() const; - QString strProvider() const; - int ts() const; - QString uniq() const override; + [[nodiscard]] QString city() const; + [[nodiscard]] QString country() const; + [[nodiscard]] bool image() const; + [[nodiscard]] Provider provider() const; + [[nodiscard]] QString strProvider() const; + [[nodiscard]] int ts() const; + [[nodiscard]] QString uniq() const override; // set methods void setCity(const QString &_city); void setCountry(const QString &_country); - void setImage(const bool _image); - void setProvider(const Provider _provider); + void setImage(bool _image); + void setProvider(Provider _provider); void setStrProvider(const QString &_provider); - void setTs(const int _ts); + void setTs(int _ts); public slots: void readConfiguration() override; diff --git a/sources/awesomewidgets/graphicalitem.cpp b/sources/awesomewidgets/graphicalitem.cpp index 4b9bd6f..fd0ac10 100644 --- a/sources/awesomewidgets/graphicalitem.cpp +++ b/sources/awesomewidgets/graphicalitem.cpp @@ -52,9 +52,9 @@ GraphicalItem::GraphicalItem(QWidget *_parent, const QString &_filePath) m_helper = new GraphicalItemHelper(this, m_scene); if (!_filePath.isEmpty()) - readConfiguration(); + GraphicalItem::readConfiguration(); ui->setupUi(this); - translate(); + GraphicalItem::translate(); connect(ui->checkBox_custom, SIGNAL(stateChanged(int)), this, SLOT(changeValue(int))); connect(ui->comboBox_type, SIGNAL(currentIndexChanged(int)), this, SLOT(changeCountState(int))); diff --git a/sources/awesomewidgets/graphicalitem.h b/sources/awesomewidgets/graphicalitem.h index 544a193..b7409b1 100644 --- a/sources/awesomewidgets/graphicalitem.h +++ b/sources/awesomewidgets/graphicalitem.h @@ -54,38 +54,38 @@ public: explicit GraphicalItem(QWidget *_parent = nullptr, const QString &_filePath = ""); ~GraphicalItem() override; - GraphicalItem *copy(const QString &_fileName, const int _number) override; + GraphicalItem *copy(const QString &_fileName, int _number) override; QString image(const QVariant &value); void initScene(); // get methods - QString bar() const; - QString activeColor() const; - int count() const; - QString inactiveColor() const; - bool isCustom() const; - int itemHeight() const; - int itemWidth() const; - float minValue() const; - float maxValue() const; - Type type() const; - QString strType() const; - Direction direction() const; - QString strDirection() const; - QStringList usedKeys() const; - QString uniq() const override; + [[nodiscard]] QString bar() const; + [[nodiscard]] QString activeColor() const; + [[nodiscard]] int count() const; + [[nodiscard]] QString inactiveColor() const; + [[nodiscard]] bool isCustom() const; + [[nodiscard]] int itemHeight() const; + [[nodiscard]] int itemWidth() const; + [[nodiscard]] float minValue() const; + [[nodiscard]] float maxValue() const; + [[nodiscard]] Type type() const; + [[nodiscard]] QString strType() const; + [[nodiscard]] Direction direction() const; + [[nodiscard]] QString strDirection() const; + [[nodiscard]] QStringList usedKeys() const; + [[nodiscard]] QString uniq() const override; // set methods void setBar(const QString &_bar); void setActiveColor(const QString &_color); - void setCount(const int _count); - void setCustom(const bool _custom); + void setCount(int _count); + void setCustom(bool _custom); void setInactiveColor(const QString &_color); - void setItemHeight(const int _height); - void setItemWidth(const int _width); - void setMinValue(const float _value); - void setMaxValue(const float _value); - void setType(const Type _type); + void setItemHeight(int _height); + void setItemWidth(int _width); + void setMinValue(float _value); + void setMaxValue(float _value); + void setType(Type _type); void setStrType(const QString &_type); - void setDirection(const Direction _direction); + void setDirection(Direction _direction); void setStrDirection(const QString &_direction); void setUsedKeys(const QStringList &_usedKeys); @@ -97,8 +97,8 @@ public slots: private slots: void changeColor(); - void changeCountState(const int _state); - void changeValue(const int _state); + void changeCountState(int _state); + void changeValue(int _state); private: GraphicalItemHelper *m_helper = nullptr; diff --git a/sources/awesomewidgets/graphicalitemhelper.cpp b/sources/awesomewidgets/graphicalitemhelper.cpp index 5a039d0..1df798f 100644 --- a/sources/awesomewidgets/graphicalitemhelper.cpp +++ b/sources/awesomewidgets/graphicalitemhelper.cpp @@ -92,7 +92,7 @@ void GraphicalItemHelper::paintBars(const float _value) auto normY = static_cast(m_height - 1); // paint graph for (int i = 0; i < m_values.count(); i++) { - float x = i * normX; + float x = static_cast(i) * normX; float y = 0.5f; float width = normX; float height = m_values.at(i) * normY + 0.5f; @@ -137,9 +137,10 @@ void GraphicalItemHelper::paintGraph(const float _value) // paint graph for (int i = 0; i < m_values.count() - 1; i++) { // some magic here - float x1 = i * normX; + auto value = static_cast(i); + float x1 = value * normX; float y1 = m_values.at(i) * normY + 0.5f; - float x2 = (i + 1) * normX; + float x2 = (value + 1) * normX; float y2 = m_values.at(i + 1) * normY + 0.5f; m_scene->addLine(x1, y1, x2, y2, m_activePen); } @@ -153,10 +154,11 @@ void GraphicalItemHelper::paintHorizontal(const float _percent) m_activePen.setWidth(m_height); m_inactivePen.setWidth(m_height); // inactive - m_scene->addLine(_percent * m_width + 0.5 * m_height, 0.5 * m_height, m_width + 0.5 * m_height, + auto width = static_cast(m_width); + m_scene->addLine(_percent * width + 0.5 * m_height, 0.5 * m_height, m_width + 0.5 * m_height, 0.5 * m_height, m_inactivePen); // active - m_scene->addLine(-0.5 * m_height, 0.5 * m_height, _percent * m_width - 0.5 * m_height, + m_scene->addLine(-0.5 * m_height, 0.5 * m_height, _percent * width - 0.5 * m_height, 0.5 * m_height, m_activePen); } diff --git a/sources/awesomewidgets/graphicalitemhelper.h b/sources/awesomewidgets/graphicalitemhelper.h index 8cbb1b4..a7dd2d5 100644 --- a/sources/awesomewidgets/graphicalitemhelper.h +++ b/sources/awesomewidgets/graphicalitemhelper.h @@ -33,21 +33,21 @@ public: explicit GraphicalItemHelper(QObject *_parent = nullptr, QGraphicsScene *_scene = nullptr); ~GraphicalItemHelper() override; // parameters - void setParameters(const QString &_active, const QString &_inactive, const int _width, - const int _height, const int _count); + void setParameters(const QString &_active, const QString &_inactive, int _width, int _height, + int _count); // paint methods - void paintBars(const float _value); - void paintCircle(const float _percent); - void paintGraph(const float _value); - void paintHorizontal(const float _percent); - void paintVertical(const float _percent); + void paintBars(float _value); + void paintCircle(float _percent); + void paintGraph(float _value); + void paintHorizontal(float _percent); + void paintVertical(float _percent); // additional conversion methods - static float getPercents(const float _value, const float _min, const float _max); + static float getPercents(float _value, float _min, float _max); static bool isColor(const QString &_input); static QColor stringToColor(const QString &_color); private: - void storeValue(const float _value); + void storeValue(float _value); QGraphicsScene *m_scene = nullptr; int m_count = 100; QPen m_activePen; diff --git a/sources/awesomewidgets/owmweatherprovider.h b/sources/awesomewidgets/owmweatherprovider.h index 3222e5c..44612cb 100644 --- a/sources/awesomewidgets/owmweatherprovider.h +++ b/sources/awesomewidgets/owmweatherprovider.h @@ -33,12 +33,12 @@ public: explicit OWMWeatherProvider(QObject *_parent); ~OWMWeatherProvider() override; - void initUrl(const QString &_city, const QString &_country, const int) override; - QVariantHash parse(const QVariantMap &_json) const override; - QUrl url() const override; + void initUrl(const QString &_city, const QString &_country, int) override; + [[nodiscard]] QVariantHash parse(const QVariantMap &_json) const override; + [[nodiscard]] QUrl url() const override; private: - QVariantHash parseSingleJson(const QVariantMap &_json) const; + [[nodiscard]] QVariantHash parseSingleJson(const QVariantMap &_json) const; int m_ts = 0; QUrl m_url; }; diff --git a/sources/awesomewidgets/qcronscheduler.h b/sources/awesomewidgets/qcronscheduler.h index b42c495..5088587 100644 --- a/sources/awesomewidgets/qcronscheduler.h +++ b/sources/awesomewidgets/qcronscheduler.h @@ -39,7 +39,7 @@ public: int minValue = -1; int maxValue = -1; int div = 1; - void fromRange(const QString &_range, const int _min, const int _max); + void fromRange(const QString &_range, int _min, int _max); QList toList(); } QCronField; @@ -56,7 +56,7 @@ private slots: private: QCronRunSchedule m_schedule; QTimer *m_timer = nullptr; - static QList parseField(const QString &_value, const int _min, const int _max); + static QList parseField(const QString &_value, int _min, int _max); }; diff --git a/sources/awesomewidgets/scripts/get-external-ip.desktop b/sources/awesomewidgets/scripts/get-external-ip.desktop index 3e48688..4b3ec25 100644 --- a/sources/awesomewidgets/scripts/get-external-ip.desktop +++ b/sources/awesomewidgets/scripts/get-external-ip.desktop @@ -3,11 +3,10 @@ Encoding=UTF-8 Name=aw-get-external-ip Comment=Custom command to get external IP Exec=curl ip4.telize.com -X-AW-Prefix= X-AW-Active=false X-AW-Redirect=nothing X-AW-Interval=1 -X-AW-ApiVersion=5 +X-AW-ApiVersion=6 X-AW-Number=0 X-AW-Filters= X-AW-Schedule= diff --git a/sources/awesomewidgets/stooqquotesprovider.h b/sources/awesomewidgets/stooqquotesprovider.h index ae232d7..e83ea69 100644 --- a/sources/awesomewidgets/stooqquotesprovider.h +++ b/sources/awesomewidgets/stooqquotesprovider.h @@ -31,8 +31,9 @@ public: explicit StooqQuotesProvider(QObject *_parent); ~StooqQuotesProvider() override; void initUrl(const QString &_asset) override; - QVariantHash parse(const QByteArray &_source, const QVariantHash &_oldValues) const override; - QUrl url() const override; + [[nodiscard]] QVariantHash parse(const QByteArray &_source, + const QVariantHash &_oldValues) const override; + [[nodiscard]] QUrl url() const override; private: QUrl m_url; diff --git a/sources/awesomewidgets/yahooquotesprovider.h b/sources/awesomewidgets/yahooquotesprovider.h index c63a007..58cc6e0 100644 --- a/sources/awesomewidgets/yahooquotesprovider.h +++ b/sources/awesomewidgets/yahooquotesprovider.h @@ -32,8 +32,9 @@ public: explicit YahooQuotesProvider(QObject *_parent); ~YahooQuotesProvider() override; void initUrl(const QString &_asset) override; - QVariantHash parse(const QByteArray &_source, const QVariantHash &_oldValues) const override; - QUrl url() const override; + [[nodiscard]] QVariantHash parse(const QByteArray &_source, + const QVariantHash &_oldValues) const override; + [[nodiscard]] QUrl url() const override; private: QUrl m_url; diff --git a/sources/awesomewidgets/yahooweatherprovider.h b/sources/awesomewidgets/yahooweatherprovider.h index 20e0eee..cd8c476 100644 --- a/sources/awesomewidgets/yahooweatherprovider.h +++ b/sources/awesomewidgets/yahooweatherprovider.h @@ -33,13 +33,14 @@ public: explicit YahooWeatherProvider(QObject *_parent); ~YahooWeatherProvider() override; - void initUrl(const QString &_city, const QString &_country, const int) override; - QVariantHash parse(const QVariantMap &_json) const override; - QUrl url() const override; + void initUrl(const QString &_city, const QString &_country, int) override; + [[nodiscard]] QVariantHash parse(const QVariantMap &_json) const override; + [[nodiscard]] QUrl url() const override; private: - QVariantHash parseCurrent(const QVariantMap &_json, const QVariantMap &_atmosphere) const; - QVariantHash parseForecast(const QVariantMap &_json) const; + [[nodiscard]] QVariantHash parseCurrent(const QVariantMap &_json, + const QVariantMap &_atmosphere) const; + [[nodiscard]] QVariantHash parseForecast(const QVariantMap &_json) const; int m_ts = 0; QUrl m_url; }; diff --git a/sources/desktop-panel/plugin/dpadds.cpp b/sources/desktop-panel/plugin/dpadds.cpp index 1b53277..434564a 100644 --- a/sources/desktop-panel/plugin/dpadds.cpp +++ b/sources/desktop-panel/plugin/dpadds.cpp @@ -118,34 +118,35 @@ QString DPAdds::toolTipImage(const int _desktop) const toolTipView->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff); // update - float margin = 5.0f * info.desktop.width() / 400.0f; - toolTipView->resize(static_cast(info.desktop.width() + 2.0f * margin), - static_cast(info.desktop.height() + 2.0f * margin)); + auto width = static_cast(info.desktop.width()); + auto height = static_cast(info.desktop.height()); + float margin = 5.0f * width / 400.0f; + toolTipView->resize(static_cast(width + 2.0f * margin), + static_cast(height + 2.0f * margin)); toolTipScene->clear(); toolTipScene->setBackgroundBrush(QBrush(Qt::NoBrush)); // borders - toolTipScene->addLine(0, 0, 0, info.desktop.height() + 2.0 * margin); - toolTipScene->addLine(0, info.desktop.height() + 2.0 * margin, - info.desktop.width() + 2.0 * margin, - info.desktop.height() + 2.0 * margin); - toolTipScene->addLine(info.desktop.width() + 2.0 * margin, info.desktop.height() + 2.0 * margin, - info.desktop.width() + 2.0 * margin, 0); - toolTipScene->addLine(info.desktop.width() + 2.0 * margin, 0, 0, 0); + toolTipScene->addLine(0, 0, 0, height + 2.0 * margin); + toolTipScene->addLine(0, height + 2.0 * margin, width + 2.0 * margin, height + 2.0 * margin); + toolTipScene->addLine(width + 2.0 * margin, height + 2.0 * margin, width + 2.0 * margin, 0); + toolTipScene->addLine(width + 2.0 * margin, 0, 0, 0); if (m_tooltipType == "contours") { QPen pen = QPen(); - pen.setWidthF(2.0 * info.desktop.width() / 400.0); + pen.setWidthF(2.0 * width / 400.0); pen.setColor(QColor(m_tooltipColor)); for (auto &data : info.windowsData) { QRect rect = data.rect; - toolTipScene->addLine(rect.left() + margin, rect.bottom() + margin, - rect.left() + margin, rect.top() + margin, pen); - toolTipScene->addLine(rect.left() + margin, rect.top() + margin, rect.right() + margin, - rect.top() + margin, pen); - toolTipScene->addLine(rect.right() + margin, rect.top() + margin, rect.right() + margin, - rect.bottom() + margin, pen); - toolTipScene->addLine(rect.right() + margin, rect.bottom() + margin, - rect.left() + margin, rect.bottom() + margin, pen); + auto left = static_cast(rect.left()); + auto right = static_cast(rect.right()); + auto top = static_cast(rect.top()); + auto bottom = static_cast(rect.bottom()); + toolTipScene->addLine(left + margin, bottom + margin, left + margin, top + margin, pen); + toolTipScene->addLine(left + margin, top + margin, right + margin, top + margin, pen); + toolTipScene->addLine(right + margin, top + margin, right + margin, bottom + margin, + pen); + toolTipScene->addLine(right + margin, bottom + margin, left + margin, bottom + margin, + pen); } } else if (m_tooltipType == "clean") { QScreen *screen = QGuiApplication::primaryScreen(); diff --git a/sources/desktop-panel/plugin/dpadds.h b/sources/desktop-panel/plugin/dpadds.h index 8604716..d3f6fa6 100644 --- a/sources/desktop-panel/plugin/dpadds.h +++ b/sources/desktop-panel/plugin/dpadds.h @@ -45,15 +45,15 @@ public: ~DPAdds() override; Q_INVOKABLE static bool isDebugEnabled(); Q_INVOKABLE static int currentDesktop(); - Q_INVOKABLE static QStringList dictKeys(const bool _sorted = true, const QString &_regexp = ""); + Q_INVOKABLE static QStringList dictKeys(bool _sorted = true, const QString &_regexp = ""); Q_INVOKABLE static int numberOfDesktops(); - Q_INVOKABLE QString toolTipImage(const int _desktop) const; - Q_INVOKABLE QString parsePattern(const QString &_pattern, const int _desktop) const; + Q_INVOKABLE [[nodiscard]] QString toolTipImage(int _desktop) const; + Q_INVOKABLE [[nodiscard]] QString parsePattern(const QString &_pattern, int _desktop) const; // values Q_INVOKABLE void setMark(const QString &_newMark); Q_INVOKABLE void setToolTipData(const QVariantMap &_tooltipData); Q_INVOKABLE static QString infoByKey(const QString &_key); - Q_INVOKABLE QString valueByKey(const QString &_key, int _desktop = -1) const; + Q_INVOKABLE [[nodiscard]] QString valueByKey(const QString &_key, int _desktop = -1) const; // configuration slots Q_INVOKABLE static QString getAboutText(const QString &_type); Q_INVOKABLE static QVariantMap getFont(const QVariantMap &_defaultFont); @@ -64,10 +64,10 @@ signals: public slots: Q_INVOKABLE static void sendNotification(const QString &_eventId, const QString &_message); - Q_INVOKABLE static void setCurrentDesktop(const int _desktop); + Q_INVOKABLE static void setCurrentDesktop(int _desktop); private: - static DesktopWindowsInfo getInfoByDesktop(const int _desktop); + static DesktopWindowsInfo getInfoByDesktop(int _desktop); // variables int m_tooltipWidth = 200; QString m_mark = "*"; diff --git a/sources/extsysmon/extsysmon.cpp b/sources/extsysmon/extsysmon.cpp index 17f56fc..88b6e39 100644 --- a/sources/extsysmon/extsysmon.cpp +++ b/sources/extsysmon/extsysmon.cpp @@ -108,8 +108,7 @@ void ExtendedSysMon::readConfiguration() } -QHash -ExtendedSysMon::updateConfiguration(QHash _rawConfig) const +QHash ExtendedSysMon::updateConfiguration(QHash _rawConfig) { qCDebug(LOG_ESM) << "Raw configuration" << _rawConfig; diff --git a/sources/extsysmon/extsysmon.h b/sources/extsysmon/extsysmon.h index c1aded3..6f6b109 100644 --- a/sources/extsysmon/extsysmon.h +++ b/sources/extsysmon/extsysmon.h @@ -32,7 +32,7 @@ public: ~ExtendedSysMon() override; protected: - QStringList sources() const override; + [[nodiscard]] QStringList sources() const override; bool sourceRequestEvent(const QString &_source) override; bool updateSourceEvent(const QString &_source) override; @@ -42,7 +42,8 @@ private: QHash m_configuration; // methods void readConfiguration(); - QHash updateConfiguration(QHash _rawConfig) const; + [[nodiscard]] static QHash + updateConfiguration(QHash _rawConfig); }; diff --git a/sources/extsysmon/extsysmonaggregator.h b/sources/extsysmon/extsysmonaggregator.h index 6543fe5..d47d216 100644 --- a/sources/extsysmon/extsysmonaggregator.h +++ b/sources/extsysmon/extsysmonaggregator.h @@ -30,10 +30,10 @@ class ExtSysMonAggregator : public QObject public: explicit ExtSysMonAggregator(QObject *_parent, const QHash &_config); ~ExtSysMonAggregator() override; - QVariant data(const QString &_source) const; - bool hasSource(const QString &_source) const; - QVariantMap initialData(const QString &_source) const; - QStringList sources() const; + [[nodiscard]] QVariant data(const QString &_source) const; + [[nodiscard]] bool hasSource(const QString &_source) const; + [[nodiscard]] QVariantMap initialData(const QString &_source) const; + [[nodiscard]] QStringList sources() const; private: void init(const QHash &_config); diff --git a/sources/extsysmonsources/abstractextsysmonsource.h b/sources/extsysmonsources/abstractextsysmonsource.h index 5b5dcc8..cfe1366 100644 --- a/sources/extsysmonsources/abstractextsysmonsource.h +++ b/sources/extsysmonsources/abstractextsysmonsource.h @@ -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) { diff --git a/sources/extsysmonsources/batterysource.cpp b/sources/extsysmonsources/batterysource.cpp index 7472db2..af25bda 100644 --- a/sources/extsysmonsources/batterysource.cpp +++ b/sources/extsysmonsources/batterysource.cpp @@ -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++) { diff --git a/sources/extsysmonsources/batterysource.h b/sources/extsysmonsources/batterysource.h index 5de7efd..23b3a34 100644 --- a/sources/extsysmonsources/batterysource.h +++ b/sources/extsysmonsources/batterysource.h @@ -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 &_trend); diff --git a/sources/extsysmonsources/customsource.h b/sources/extsysmonsources/customsource.h index 290bcd6..c7e921d 100644 --- a/sources/extsysmonsources/customsource.h +++ b/sources/extsysmonsources/customsource.h @@ -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(); diff --git a/sources/extsysmonsources/desktopsource.h b/sources/extsysmonsources/desktopsource.h index 8a2b235..1de29d1 100644 --- a/sources/extsysmonsources/desktopsource.h +++ b/sources/extsysmonsources/desktopsource.h @@ -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; }; diff --git a/sources/extsysmonsources/gpuloadsource.h b/sources/extsysmonsources/gpuloadsource.h index 8662cca..5787411 100644 --- a/sources/extsysmonsources/gpuloadsource.h +++ b/sources/extsysmonsources/gpuloadsource.h @@ -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(); diff --git a/sources/extsysmonsources/gputempsource.cpp b/sources/extsysmonsources/gputempsource.cpp index a7edad0..55fbadc 100644 --- a/sources/extsysmonsources/gputempsource.cpp +++ b/sources/extsysmonsources/gputempsource.cpp @@ -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); diff --git a/sources/extsysmonsources/gputempsource.h b/sources/extsysmonsources/gputempsource.h index cfd7edb..1d88ccf 100644 --- a/sources/extsysmonsources/gputempsource.h +++ b/sources/extsysmonsources/gputempsource.h @@ -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(); diff --git a/sources/extsysmonsources/hddtempsource.cpp b/sources/extsysmonsources/hddtempsource.cpp index d434db7..efaae08 100644 --- a/sources/extsysmonsources/hddtempsource.cpp +++ b/sources/extsysmonsources/hddtempsource.cpp @@ -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; diff --git a/sources/extsysmonsources/hddtempsource.h b/sources/extsysmonsources/hddtempsource.h index 469a67a..4034ab8 100644 --- a/sources/extsysmonsources/hddtempsource.h +++ b/sources/extsysmonsources/hddtempsource.h @@ -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); diff --git a/sources/extsysmonsources/loadsource.h b/sources/extsysmonsources/loadsource.h index e3f68f4..3566d32 100644 --- a/sources/extsysmonsources/loadsource.h +++ b/sources/extsysmonsources/loadsource.h @@ -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; }; diff --git a/sources/extsysmonsources/networksource.h b/sources/extsysmonsources/networksource.h index 7144543..8e115c6 100644 --- a/sources/extsysmonsources/networksource.h +++ b/sources/extsysmonsources/networksource.h @@ -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(); diff --git a/sources/extsysmonsources/playersource.cpp b/sources/extsysmonsources/playersource.cpp index 6700138..aaca22f 100644 --- a/sources/extsysmonsources/playersource.cpp +++ b/sources/extsysmonsources/playersource.cpp @@ -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( + auto map = qdbus_cast( response.arguments().first().value().variant().value()); info["player/album"] = map.value("xesam:album", "unknown"); // artist is array diff --git a/sources/extsysmonsources/playersource.h b/sources/extsysmonsources/playersource.h index ec42bce..e5a8449 100644 --- a/sources/extsysmonsources/playersource.h +++ b/sources/extsysmonsources/playersource.h @@ -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; diff --git a/sources/extsysmonsources/processessource.h b/sources/extsysmonsources/processessource.h index 2f44781..2f4cb6e 100644 --- a/sources/extsysmonsources/processessource.h +++ b/sources/extsysmonsources/processessource.h @@ -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 diff --git a/sources/extsysmonsources/quotessource.h b/sources/extsysmonsources/quotessource.h index 21470bc..04fbcba 100644 --- a/sources/extsysmonsources/quotessource.h +++ b/sources/extsysmonsources/quotessource.h @@ -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(); diff --git a/sources/extsysmonsources/requestsource.h b/sources/extsysmonsources/requestsource.h index 6661aa4..4ad16cb 100644 --- a/sources/extsysmonsources/requestsource.h +++ b/sources/extsysmonsources/requestsource.h @@ -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(); diff --git a/sources/extsysmonsources/systeminfosource.h b/sources/extsysmonsources/systeminfosource.h index 521b025..88b6c10 100644 --- a/sources/extsysmonsources/systeminfosource.h +++ b/sources/extsysmonsources/systeminfosource.h @@ -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 diff --git a/sources/extsysmonsources/upgradesource.h b/sources/extsysmonsources/upgradesource.h index 21db72c..79a6443 100644 --- a/sources/extsysmonsources/upgradesource.h +++ b/sources/extsysmonsources/upgradesource.h @@ -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(); diff --git a/sources/extsysmonsources/weathersource.h b/sources/extsysmonsources/weathersource.h index 3ed8cea..b75a1e5 100644 --- a/sources/extsysmonsources/weathersource.h +++ b/sources/extsysmonsources/weathersource.h @@ -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(); diff --git a/sources/test/awtestlibrary.cpp b/sources/test/awtestlibrary.cpp index f702381..2413c26 100644 --- a/sources/test/awtestlibrary.cpp +++ b/sources/test/awtestlibrary.cpp @@ -20,15 +20,13 @@ #include #include +#include #include #include -#include #include -void AWTestLibrary::init() -{ -} +void AWTestLibrary::init() {} bool AWTestLibrary::isKWinActive() diff --git a/sources/test/testbatterysource.cpp b/sources/test/testbatterysource.cpp index 893a00d..434cb6d 100644 --- a/sources/test/testbatterysource.cpp +++ b/sources/test/testbatterysource.cpp @@ -52,10 +52,12 @@ void TestBatterySource::test_battery() QSKIP("No battery found, test will be skipped"); QStringList batteries = source->sources(); - std::for_each(batteries.begin(), batteries.end(), [this](const QString bat) { + std::for_each(batteries.begin(), batteries.end(), [this](const QString &bat) { QVariant value = source->data(bat); if (bat == "battery/ac") QCOMPARE(value.type(), QVariant::Bool); + else if (bat.startsWith("battery/batrate") || bat.startsWith("battery/batleft")) + ; else QVERIFY((value.toFloat() >= battery.first) || (std::isnan(value.toFloat()))); }); diff --git a/sources/test/testextscript.cpp b/sources/test/testextscript.cpp index 1586a83..bd89f00 100644 --- a/sources/test/testextscript.cpp +++ b/sources/test/testextscript.cpp @@ -31,10 +31,9 @@ void TestExtScript::initTestCase() extScript = new ExtScript(nullptr); extScript->setInterval(1); - extScript->setExecutable(randomString); + extScript->setExecutable(QString("echo %1").arg(randomString)); extScript->setNumber(0); extScript->setRedirect(ExtScript::Redirect::stderr2stdout); - extScript->setPrefix("echo"); extScript->run(); } @@ -50,9 +49,8 @@ void TestExtScript::test_values() { QCOMPARE(extScript->interval(), 1); QCOMPARE(extScript->number(), 0); - QCOMPARE(extScript->executable(), randomString); + QCOMPARE(extScript->executable(), QString("echo %1").arg(randomString)); QCOMPARE(extScript->strRedirect(), QString("stderr2stdout")); - QCOMPARE(extScript->prefix(), QString("echo")); } @@ -97,7 +95,6 @@ void TestExtScript::test_copy() QCOMPARE(newExtScript->interval(), extScript->interval()); QCOMPARE(newExtScript->executable(), extScript->executable()); QCOMPARE(newExtScript->strRedirect(), extScript->strRedirect()); - QCOMPARE(newExtScript->prefix(), extScript->prefix()); QCOMPARE(newExtScript->filters(), extScript->filters()); QCOMPARE(newExtScript->number(), 1); diff --git a/sources/test/testfloatformatter.cpp b/sources/test/testfloatformatter.cpp index 24abf6d..fbec11a 100644 --- a/sources/test/testfloatformatter.cpp +++ b/sources/test/testfloatformatter.cpp @@ -18,8 +18,8 @@ #include "testfloatformatter.h" -#include #include +#include #include "awfloatformatter.h" #include "awtestlibrary.h"