uvos/UvosSmartHomeInterface
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added system item support, support for RGBControlers with multiple item backends, and item settings widgets

Browse Source
This commit is contained in:
Carl Klemm
2020-05-05 22:29:43 +02:00
parent a761eb4317
commit 5fb9ca7cc0
56 changed files with 635 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/actors/factoractor.cpp
View File

@ -42,11 +42,10 @@ QString MultiFactorActor::getName() const
}
}
void MultiFactorActor::setFactorActor(Actor* factorActor)
void MultiFactorActor::setFactorActor(std::shared_ptr<Actor> factorActor)
{
if(factorActor_) delete factorActor_;
factorActor_=factorActor;
connect(factorActor_, &Actor::sigValue, this, &MultiFactorActor::factorActorSlot);
connect(factorActor_.get(), &Actor::sigValue, this, &MultiFactorActor::factorActorSlot);
}
void MultiFactorActor::store(QJsonObject &json)
@ -73,7 +72,7 @@ void MultiFactorActor::load(const QJsonObject &json, bool preserve)
}
if(factorActor_)
{
connect(factorActor_, &Actor::sigValue, this, &MultiFactorActor::factorActorSlot);
connect(factorActor_.get(), &Actor::sigValue, this, &MultiFactorActor::factorActorSlot);
}
}