move retvals

This commit is contained in:
2022-09-30 15:05:32 +02:00
parent acab5f6bce
commit 1eceef4645
11 changed files with 44 additions and 48 deletions
+3 -5
View File
@@ -21,11 +21,11 @@ ControllerBase::~ControllerBase() { QueueFactory::instance()->deleteMessageQueue
ReturnValue_t ControllerBase::initialize() {
ReturnValue_t result = modeHelper.initialize();
if(result != returnvalue::OK) {
if (result != returnvalue::OK) {
return result;
}
result = healthHelper.initialize();
if(result != returnvalue::OK) {
if (result != returnvalue::OK) {
return result;
}
return SystemObject::initialize();
@@ -106,9 +106,7 @@ const HasHealthIF* ControllerBase::getOptHealthIF() const { return this; }
const HasModesIF& ControllerBase::getModeIF() const { return *this; }
ModeTreeChildIF& ControllerBase::getModeTreeChildIF() {
return *this;
}
ModeTreeChildIF& ControllerBase::getModeTreeChildIF() { return *this; }
ReturnValue_t ControllerBase::connectModeTreeParent(HasModeTreeChildrenIF& parent) {
return modetree::connectModeTreeParent(parent, *this, healthHelper, modeHelper);
+1 -1
View File
@@ -31,7 +31,7 @@ class ControllerBase : public HasModesIF,
~ControllerBase() override;
ReturnValue_t connectModeTreeParent(HasModeTreeChildrenIF &parent) override;
ModeTreeChildIF& getModeTreeChildIF() override;
ModeTreeChildIF &getModeTreeChildIF() override;
/** SystemObject override */
ReturnValue_t initialize() override;