refs #679 CValueCache local signal relay moved to the point of emission, to tolerate different orders of initialization of application.

This commit is contained in:
Mathew Sutcliffe
2016-06-30 02:06:16 +01:00
parent 8b73da6ed6
commit 242e041ceb
6 changed files with 18 additions and 46 deletions

View File

@@ -136,18 +136,8 @@ namespace BlackMisc
return cats;
}
CValueCache::CValueCache(CValueCache::DistributionMode mode, QObject *parent) :
QObject(parent)
{
if (mode == LocalOnly)
{
// loopback signal to own slot for local operation
connect(this, &CValueCache::valuesChangedByLocal, this, [ = ](const CValueCachePacket & values)
{
changeValuesFromRemote(values, CIdentifier());
});
}
}
CValueCache::CValueCache(QObject *parent) : QObject(parent)
{}
struct CValueCache::Element
{
@@ -242,8 +232,10 @@ namespace BlackMisc
if (values.valuesChanged()) { emit valuesChanged(values, sender()); }
emit valuesChangedByLocal(values);
Q_ASSERT_X(isSignalConnected(QMetaMethod::fromSignal(&CValueCache::valuesChangedByLocal)), Q_FUNC_INFO,
"signal must be connected for cache to function properly");
if (! isSignalConnected(QMetaMethod::fromSignal(&CValueCache::valuesChangedByLocal)))
{
changeValuesFromRemote(values, CIdentifier());
}
}
void CValueCache::changeValuesFromRemote(const CValueCachePacket &values, const CIdentifier &originator)