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

clang-tidy warning fixes

Browse Source
This commit is contained in:
Evgenii Alekseev
2020-11-03 04:23:01 +03:00
parent e81d765098
commit 91abbdcd96
99 changed files with 392 additions and 436 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sources/awesomewidgets/abstractextitem.cpp
View File

@ -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;
}();

36
sources/awesomewidgets/abstractextitem.h
View File

@ -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:

4
sources/awesomewidgets/abstractextitemaggregator.cpp
View File

@ -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()) {

14
sources/awesomewidgets/abstractextitemaggregator.h
View File

@ -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<AbstractExtItem *> items() const = 0;
QString type() const;
[[nodiscard]] QVariant configArgs() const;
[[nodiscard]] QStringList directories() const;
[[nodiscard]] virtual QList<AbstractExtItem *> items() const = 0;
[[nodiscard]] QString type() const;
// set methods
void setConfigArgs(const QVariant &_configArgs);

7
sources/awesomewidgets/abstractquotesprovider.h
View File

@ -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<AbstractExtItem *>(parent())->tag(_type);
};
virtual QUrl url() const = 0;
[[nodiscard]] virtual QUrl url() const = 0;
};

6
sources/awesomewidgets/abstractweatherprovider.h
View File

@ -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<AbstractExtItem *>(parent())->tag(_type);
};

10
sources/awesomewidgets/awabstractformatter.h
View File

@ -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;

4
sources/awesomewidgets/awdatetimeformatter.cpp
View File

@ -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();
}

10
sources/awesomewidgets/awdatetimeformatter.h
View File

@ -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;

4
sources/awesomewidgets/awfloatformatter.cpp
View File

@ -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();
}

28
sources/awesomewidgets/awfloatformatter.h
View File

@ -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;

6
sources/awesomewidgets/awjsonformatter.cpp
View File

@ -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;

10
sources/awesomewidgets/awjsonformatter.h
View File

@ -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;

4
sources/awesomewidgets/awlistformatter.cpp
View File

@ -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();
}

12
sources/awesomewidgets/awlistformatter.h
View File

@ -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;

4
sources/awesomewidgets/awnoformatter.cpp
View File

@ -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();
}

4
sources/awesomewidgets/awnoformatter.h
View File

@ -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;

4
sources/awesomewidgets/awscriptformatter.cpp
View File

@ -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();
}

16
sources/awesomewidgets/awscriptformatter.h
View File

@ -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;

4
sources/awesomewidgets/awstringformatter.cpp
View File

@ -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();
}

14
sources/awesomewidgets/awstringformatter.h
View File

@ -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;

4
sources/awesomewidgets/extitemaggregator.h
View File

@ -41,7 +41,7 @@ public:
qCDebug(LOG_LIB) << "Type" << _type;
initItems();
ExtItemAggregator::initItems();
};
~ExtItemAggregator() override
@ -117,7 +117,7 @@ public:
return found;
};
QList<AbstractExtItem *> items() const override { return m_items; };
[[nodiscard]] QList<AbstractExtItem *> items() const override { return m_items; };
private:
QList<AbstractExtItem *> m_items;

4
sources/awesomewidgets/extnetworkrequest.cpp
View File

@ -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")] = "";

6
sources/awesomewidgets/extnetworkrequest.h
View File

@ -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);

4
sources/awesomewidgets/extquotes.cpp
View File

@ -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;

6
sources/awesomewidgets/extquotes.h
View File

@ -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);

35
sources/awesomewidgets/extscript.cpp
View File

@ -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<int>(_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<int>(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<Redirect>(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"));

21
sources/awesomewidgets/extscript.h
View File

@ -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;

25
sources/awesomewidgets/extscript.ui
View File

@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>420</width>
<height>506</height>
<height>463</height>
</rect>
</property>
<property name="windowTitle">
@ -104,29 +104,6 @@
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="layout_prefix">
<item>
<widget class="QLabel" name="label_prefix">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Prefix</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="lineEdit_prefix"/>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="layout_active">
<item>

4
sources/awesomewidgets/extupgrade.cpp
View File

@ -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;

12
sources/awesomewidgets/extupgrade.h
View File

@ -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;

4
sources/awesomewidgets/extweather.cpp
View File

@ -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")] = "";

24
sources/awesomewidgets/extweather.h
View File

@ -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;

4
sources/awesomewidgets/graphicalitem.cpp
View File

@ -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)));

52
sources/awesomewidgets/graphicalitem.h
View File

@ -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;

12
sources/awesomewidgets/graphicalitemhelper.cpp
View File

@ -92,7 +92,7 @@ void GraphicalItemHelper::paintBars(const float _value)
auto normY = static_cast<float>(m_height - 1);
// paint graph
for (int i = 0; i < m_values.count(); i++) {
float x = i * normX;
float x = static_cast<float>(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<float>(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<float>(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);
}

18
sources/awesomewidgets/graphicalitemhelper.h
View File

@ -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;

8
sources/awesomewidgets/owmweatherprovider.h
View File

@ -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;
};

4
sources/awesomewidgets/qcronscheduler.h
View File

@ -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<int> toList();
} QCronField;
@ -56,7 +56,7 @@ private slots:
private:
QCronRunSchedule m_schedule;
QTimer *m_timer = nullptr;
static QList<int> parseField(const QString &_value, const int _min, const int _max);
static QList<int> parseField(const QString &_value, int _min, int _max);
};

3
sources/awesomewidgets/scripts/get-external-ip.desktop
View File

@ -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=

5
sources/awesomewidgets/stooqquotesprovider.h
View File

@ -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;

5
sources/awesomewidgets/yahooquotesprovider.h
View File

@ -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;

11
sources/awesomewidgets/yahooweatherprovider.h
View File

@ -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;
};