feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Utils: Fix some Aspect::on*Changed names

Browse Source 
Change-Id: Ic23cc6f5fe9cee6b7d54ea73fc2a35f6b3843269
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
This commit is contained in:
hjk
2024-07-19 15:58:44 +02:00
parent f2505ee90a
commit 68d00db242
2 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/libs/utils/aspects.cpp
View File

@@ -746,27 +746,27 @@ void BaseAspect::addOnChanged(QObject *guard, const Callback &callback)
connect(this, &BaseAspect::changed, guard, callback); connect(this, &BaseAspect::changed, guard, callback);
} }
void BaseAspect::addVolatileValueChanged(QObject *guard, const Callback &callback) void BaseAspect::addOnVolatileValueChanged(QObject *guard, const Callback &callback)
{ {
connect(this, &BaseAspect::volatileValueChanged, guard, callback); connect(this, &BaseAspect::volatileValueChanged, guard, callback);
} }
void BaseAspect::addCheckedChanged(QObject *guard, const Callback &callback) void BaseAspect::addOnCheckedChanged(QObject *guard, const Callback &callback)
{ {
connect(this, &BaseAspect::checkedChanged, guard, callback); connect(this, &BaseAspect::checkedChanged, guard, callback);
} }
void BaseAspect::addEnabledChanged(QObject *guard, const Callback &callback) void BaseAspect::addOnEnabledChanged(QObject *guard, const Callback &callback)
{ {
connect(this, &BaseAspect::enabledChanged, guard, callback); connect(this, &BaseAspect::enabledChanged, guard, callback);
} }
void BaseAspect::addLabelTextChanged(QObject *guard, const Callback &callback) void BaseAspect::addOnLabelTextChanged(QObject *guard, const Callback &callback)
{ {
connect(this, &BaseAspect::labelTextChanged, guard, callback); connect(this, &BaseAspect::labelTextChanged, guard, callback);
} }
void BaseAspect::addLabelPixmapChanged(QObject *guard, const Callback &callback) void BaseAspect::addOnLabelPixmapChanged(QObject *guard, const Callback &callback)
{ {
connect(this, &BaseAspect::labelPixmapChanged, guard, callback); connect(this, &BaseAspect::labelPixmapChanged, guard, callback);
} }
@@ -899,16 +899,14 @@ public:
? BoolAspect::LabelPlacement::InExtraLabel ? BoolAspect::LabelPlacement::InExtraLabel
: BoolAspect::LabelPlacement::AtCheckBox); : BoolAspect::LabelPlacement::AtCheckBox);
m_checked->setSettingsKey(checkerKey); m_checked->setSettingsKey(checkerKey);
m_checked->addOnChanged(aspect, [aspect] {
QObject::connect(m_checked.get(), &BoolAspect::changed, aspect, [aspect] {
// FIXME: Check. // FIXME: Check.
aspect->internalToBuffer(); aspect->internalToBuffer();
aspect->bufferToGui(); aspect->bufferToGui();
emit aspect->changed(); emit aspect->changed();
aspect->checkedChanged(); aspect->checkedChanged();
}); });
m_checked->addOnVolatileValueChanged(aspect, [aspect] {
QObject::connect(m_checked.get(), &BoolAspect::volatileValueChanged, aspect, [aspect] {
// FIXME: Check. // FIXME: Check.
aspect->internalToBuffer(); aspect->internalToBuffer();
aspect->bufferToGui(); aspect->bufferToGui();

10
src/libs/utils/aspects.h
View File

@@ -209,11 +209,11 @@ public:
using Callback = std::function<void()>; using Callback = std::function<void()>;
void addOnChanged(QObject *guard, const Callback &callback); void addOnChanged(QObject *guard, const Callback &callback);
void addVolatileValueChanged(QObject *guard, const Callback &callback); void addOnVolatileValueChanged(QObject *guard, const Callback &callback);
void addCheckedChanged(QObject *guard, const Callback &callback); void addOnCheckedChanged(QObject *guard, const Callback &callback);
void addEnabledChanged(QObject *guard, const Callback &callback); void addOnEnabledChanged(QObject *guard, const Callback &callback);
void addLabelTextChanged(QObject *guard, const Callback &callback); void addOnLabelTextChanged(QObject *guard, const Callback &callback);
void addLabelPixmapChanged(QObject *guard, const Callback &callback); void addOnLabelPixmapChanged(QObject *guard, const Callback &callback);
signals: signals:
void changed(); void changed();