arcanis/awesome-widgets
1
0
Fork 0
mirror of https://github.com/arcan1s/awesome-widgets.git synced 2025-12-16 01:53:42 +00:00
Code Issues Projects Releases Wiki Activity

refactor: review delete and new operators

Browse Source
This commit is contained in:
Evgenii Alekseev
2024-04-17 17:43:33 +03:00
parent 397b523180
commit ed5cc627bf
25 changed files with 136 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sources/awesome-widget/plugin/awabstractpairconfig.cpp
View File

@ -58,6 +58,12 @@ AWAbstractPairConfig::~AWAbstractPairConfig()
}
void AWAbstractPairConfig::setHelper(std::unique_ptr<AWAbstractPairHelper> _helper)
{
m_helper = std::move(_helper);
}
void AWAbstractPairConfig::showDialog()
{
// update dialog
@ -133,7 +139,7 @@ void AWAbstractPairConfig::execDialog()
auto ret = exec();
QHash<QString, QString> data;
for (auto selector : m_selectors) {
QPair<QString, QString> select = selector->current();
auto select = selector->current();
if (select.first.isEmpty())
continue;
data[select.first] = select.second;

9
sources/awesome-widget/plugin/awabstractpairconfig.h
View File

@ -35,12 +35,7 @@ class AWAbstractPairConfig : public QDialog
public:
explicit AWAbstractPairConfig(QWidget *_parent = nullptr, bool _hasEdit = false, QStringList _keys = {});
~AWAbstractPairConfig() override;
template <class T> void initHelper()
{
delete m_helper;
m_helper = new T(this);
}
void setHelper(std::unique_ptr<AWAbstractPairHelper> _helper);
void showDialog();
// properties
void setEditable(bool _first, bool _second);
@ -52,7 +47,7 @@ private slots:
private:
QPushButton *m_editButton = nullptr;
Ui::AWAbstractPairConfig *ui = nullptr;
AWAbstractPairHelper *m_helper = nullptr;
std::unique_ptr<AWAbstractPairHelper> m_helper;
QList<AWAbstractSelector *> m_selectors;
// properties
QPair<bool, bool> m_editable = {false, false};

2
sources/awesome-widget/plugin/awcustomkeysconfig.cpp
View File

@ -27,5 +27,5 @@ AWCustomKeysConfig::AWCustomKeysConfig(QWidget *_parent, const QStringList &_key
qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
setEditable(true, false);
initHelper<AWCustomKeysHelper>();
setHelper(std::make_unique<AWCustomKeysHelper>());
}

3
sources/awesome-widget/plugin/awdataaggregator.cpp
View File

@ -50,7 +50,8 @@ AWDataAggregator::~AWDataAggregator()
{
qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
delete m_toolTipScene;
m_toolTipView->deleteLater();
m_toolTipScene->deleteLater();
}

2
sources/awesome-widget/plugin/awformatterconfig.cpp
View File

@ -27,5 +27,5 @@ AWFormatterConfig::AWFormatterConfig(QWidget *_parent, const QStringList &_keys)
qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
setEditable(false, false);
initHelper<AWFormatterHelper>();
setHelper(std::make_unique<AWFormatterHelper>());
}

6
sources/awesome-widget/plugin/awkeys.cpp
View File

@ -189,8 +189,10 @@ void AWKeys::dataUpdated(const QHash<QString, KSysGuard::SensorInfo> &_sensors,
if (!_sensors.contains(data.sensorProperty))
continue;
auto sensor = _sensors[data.sensorProperty];
std::ignore = QtConcurrent::run(m_threadPool, &AWKeys::setDataBySource, this, data.sensorProperty, sensor,
data.payload);
setDataBySource(data.sensorProperty, sensor, data.payload);
// std::ignore = QtConcurrent::run(m_threadPool, &AWKeys::setDataBySource, this, data.sensorProperty,
// sensor,
// data.payload);
}
}