mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-03-23 15:25:35 +08:00
refs #601 Slot inhibitor no longer needed, this reverts commit:bc2e0faa.
This commit is contained in:
@@ -78,7 +78,6 @@ namespace BlackMisc
|
||||
{
|
||||
MetaType::registerMetadata();
|
||||
qDBusRegisterMetaType<value_type>();
|
||||
qDBusRegisterMetaType<decltype(m_inhibitions)::value_type>();
|
||||
}
|
||||
|
||||
////////////////////////////////
|
||||
@@ -493,7 +492,7 @@ namespace BlackMisc
|
||||
|
||||
QList<NotifySlot> notifySlots;
|
||||
|
||||
forEachIntersection(m_elements, values, [changedBy, this, ¬ifySlots, &values](const QString & key, const ElementPtr & element, CValueCachePacket::const_iterator it)
|
||||
forEachIntersection(m_elements, values, [changedBy, this, ¬ifySlots, &values](const QString &, const ElementPtr & element, CValueCachePacket::const_iterator it)
|
||||
{
|
||||
if (changedBy == this) // round trip
|
||||
{
|
||||
@@ -508,7 +507,7 @@ namespace BlackMisc
|
||||
element->m_value.uniqueWrite() = it.value();
|
||||
element->m_timestamp = it.timestamp();
|
||||
element->m_saved = values.isSaved();
|
||||
if (element->m_notifySlot && ! notifySlots.contains(element->m_notifySlot) && ! values.isInhibited(parent(), key))
|
||||
if (element->m_notifySlot && ! notifySlots.contains(element->m_notifySlot))
|
||||
{
|
||||
notifySlots.push_back(element->m_notifySlot);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user