From 985737564e6d2d558500d7b3626213c7c6bbe7e3 Mon Sep 17 00:00:00 2001 From: Evgenii Alekseev Date: Tue, 30 Apr 2024 17:08:52 +0300 Subject: [PATCH] nodiscard attribute for formatter methods --- .../plugin/formatters/awpluginformatter.h | 11 +++++++---- .../plugin/formatters/awpluginformatterac.h | 3 ++- .../plugin/formatters/awpluginformattercustom.h | 3 ++- .../plugin/formatters/awpluginformatterdouble.h | 3 ++- .../plugin/formatters/awpluginformatterfloat.h | 3 ++- .../plugin/formatters/awpluginformatterfloatprecise.h | 3 ++- .../plugin/formatters/awpluginformatterinteger.h | 3 ++- .../plugin/formatters/awpluginformatterintegershort.h | 3 ++- .../plugin/formatters/awpluginformatterintegerwide.h | 3 ++- .../plugin/formatters/awpluginformatterlist.h | 3 ++- .../plugin/formatters/awpluginformattermemory.h | 3 ++- .../plugin/formatters/awpluginformattermemorygb.h | 3 ++- .../plugin/formatters/awpluginformattermemorymb.h | 3 ++- .../plugin/formatters/awpluginformatternet.h | 7 ++++--- .../plugin/formatters/awpluginformatternetunits.h | 7 ++++--- .../plugin/formatters/awpluginformatternoformat.h | 3 ++- .../plugin/formatters/awpluginformattertemperature.h | 5 +++-- .../plugin/formatters/awpluginformattertime.h | 3 ++- .../plugin/formatters/awpluginformattertimecustom.h | 5 +++-- .../plugin/formatters/awpluginformattertimeiso.h | 3 ++- .../plugin/formatters/awpluginformattertimelong.h | 3 ++- .../plugin/formatters/awpluginformattertimeshort.h | 3 ++- .../plugin/formatters/awpluginformatteruptime.h | 5 +++-- .../awesome-widget/plugin/matchers/awpluginmatcher.h | 4 ++-- 24 files changed, 60 insertions(+), 35 deletions(-) diff --git a/sources/awesome-widget/plugin/formatters/awpluginformatter.h b/sources/awesome-widget/plugin/formatters/awpluginformatter.h index 02f7a3b..12b27a1 100644 --- a/sources/awesome-widget/plugin/formatters/awpluginformatter.h +++ b/sources/awesome-widget/plugin/formatters/awpluginformatter.h @@ -29,7 +29,8 @@ class AWPluginFormaterInterface { public: virtual ~AWPluginFormaterInterface() = default; - virtual QString format(const QVariant &_value, const QString &_key, const AWPluginFormatSettings &_settings) const + [[nodiscard]] virtual QString format(const QVariant &_value, const QString &_key, + const AWPluginFormatSettings &_settings) const = 0; virtual void load(){}; }; @@ -46,19 +47,21 @@ public: AWPluginFormatter(AWPluginFormatter &) = delete; void operator=(const AWPluginFormatter &) = delete; - static Formatter *instance() + [[nodiscard]] static Formatter *instance() { static auto instance = loadInstance(); return instance.get(); }; - static QLocale locale(const AWPluginFormatSettings &_settings) + + [[nodiscard]] static QLocale locale(const AWPluginFormatSettings &_settings) { return _settings.translate ? QLocale::system() : QLocale::c(); }; protected: AWPluginFormatter() = default; - static std::unique_ptr loadInstance() + + [[nodiscard]] static std::unique_ptr loadInstance() { auto instance = std::make_unique(); instance->load(); diff --git a/sources/awesome-widget/plugin/formatters/awpluginformatterac.h b/sources/awesome-widget/plugin/formatters/awpluginformatterac.h index 221a4df..bff2c5f 100644 --- a/sources/awesome-widget/plugin/formatters/awpluginformatterac.h +++ b/sources/awesome-widget/plugin/formatters/awpluginformatterac.h @@ -24,5 +24,6 @@ class AWPluginFormatterAC : public AWPluginFormatter { public: - QString format(const QVariant &_value, const QString &, const AWPluginFormatSettings &_settings) const override; + [[nodiscard]] QString format(const QVariant &_value, const QString &, + const AWPluginFormatSettings &_settings) const override; }; diff --git a/sources/awesome-widget/plugin/formatters/awpluginformattercustom.h b/sources/awesome-widget/plugin/formatters/awpluginformattercustom.h index c815fa1..5793343 100644 --- a/sources/awesome-widget/plugin/formatters/awpluginformattercustom.h +++ b/sources/awesome-widget/plugin/formatters/awpluginformattercustom.h @@ -24,5 +24,6 @@ class AWPluginFormatterCustom : public AWPluginFormatter { public: - QString format(const QVariant &_value, const QString &, const AWPluginFormatSettings &) const override; + [[nodiscard]] QString format(const QVariant &_value, const QString &, + const AWPluginFormatSettings &) const override; }; diff --git a/sources/awesome-widget/plugin/formatters/awpluginformatterfloatprecise.h b/sources/awesome-widget/plugin/formatters/awpluginformatterfloatprecise.h index 666cff0..4f24626 100644 --- a/sources/awesome-widget/plugin/formatters/awpluginformatterfloatprecise.h +++ b/sources/awesome-widget/plugin/formatters/awpluginformatterfloatprecise.h @@ -24,5 +24,6 @@ class AWPluginFormatterFloatPrecise : public AWPluginFormatter { public: - QString format(const QVariant &_value, const QString &, const AWPluginFormatSettings &) const override; + [[nodiscard]] QString format(const QVariant &_value, const QString &, + const AWPluginFormatSettings &) const override; }; diff --git a/sources/awesome-widget/plugin/formatters/awpluginformattermemory.h b/sources/awesome-widget/plugin/formatters/awpluginformattermemory.h index fcc4041..1fb2ba4 100644 --- a/sources/awesome-widget/plugin/formatters/awpluginformattermemory.h +++ b/sources/awesome-widget/plugin/formatters/awpluginformattermemory.h @@ -24,5 +24,6 @@ class AWPluginFormatterMemory : public AWPluginFormatter { public: - QString format(const QVariant &_value, const QString &, const AWPluginFormatSettings &) const override; + [[nodiscard]] QString format(const QVariant &_value, const QString &, + const AWPluginFormatSettings &) const override; private: - static QString formatKB(const double &_value); - static QString formatMB(const double &_value); + [[nodiscard]] static QString formatKB(const double &_value); + [[nodiscard]] static QString formatMB(const double &_value); }; diff --git a/sources/awesome-widget/plugin/formatters/awpluginformatternetunits.h b/sources/awesome-widget/plugin/formatters/awpluginformatternetunits.h index 568e0c2..ba17855 100644 --- a/sources/awesome-widget/plugin/formatters/awpluginformatternetunits.h +++ b/sources/awesome-widget/plugin/formatters/awpluginformatternetunits.h @@ -24,9 +24,10 @@ class AWPluginFormatterNetUnits : public AWPluginFormatter { public: - QString format(const QVariant &_value, const QString &, const AWPluginFormatSettings &) const override; + [[nodiscard]] QString format(const QVariant &_value, const QString &, + const AWPluginFormatSettings &) const override; }; diff --git a/sources/awesome-widget/plugin/formatters/awpluginformattertimecustom.h b/sources/awesome-widget/plugin/formatters/awpluginformattertimecustom.h index ccd3621..bbc35f6 100644 --- a/sources/awesome-widget/plugin/formatters/awpluginformattertimecustom.h +++ b/sources/awesome-widget/plugin/formatters/awpluginformattertimecustom.h @@ -26,10 +26,11 @@ class AWPluginFormatterTimeCustom : public AWPluginFormatter(); return instance.get(); }; - static QString device(const QString &_source) { return _source.split('/')[1]; }; + [[nodiscard]] static QString device(const QString &_source) { return _source.split('/')[1]; }; protected: AWPluginMatcher() = default;