diff --git a/source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointController.h b/source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointController.h
index 4b18374a0a8c206378b87693d8da3d15d3f4d173..6e3f56c374220da7504acda1e82e123fb5f34bc2 100644
--- a/source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointController.h
+++ b/source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointController.h
@@ -192,22 +192,22 @@ namespace armarx
~NJointController() override = default;
//ice interface (must not be called in the rt thread)
- bool isControllerActive(const Ice::Current& = GlobalIceCurrent) const final;
- bool isControllerRequested(const Ice::Current& = GlobalIceCurrent) const final;
- bool isDeletable(const Ice::Current& = GlobalIceCurrent) const final;
- bool hasControllerError(const Ice::Current& = GlobalIceCurrent) const final;
+ bool isControllerActive(const Ice::Current& = GlobalIceCurrent) const final override;
+ bool isControllerRequested(const Ice::Current& = GlobalIceCurrent) const final override;
+ bool isDeletable(const Ice::Current& = GlobalIceCurrent) const final override;
+ bool hasControllerError(const Ice::Current& = GlobalIceCurrent) const final override;
std::string getClassName(const Ice::Current& = GlobalIceCurrent) const override = 0;
- std::string getInstanceName(const Ice::Current& = GlobalIceCurrent) const final;
+ std::string getInstanceName(const Ice::Current& = GlobalIceCurrent) const final override;
- NJointControllerDescription getControllerDescription(const Ice::Current& = GlobalIceCurrent) const final;
- NJointControllerStatus getControllerStatus(const Ice::Current& = GlobalIceCurrent) const final;
- NJointControllerDescriptionWithStatus getControllerDescriptionWithStatus(const Ice::Current& = GlobalIceCurrent) const final;
- RobotUnitInterfacePrx getRobotUnit(const Ice::Current& = GlobalIceCurrent) const final;
+ NJointControllerDescription getControllerDescription(const Ice::Current& = GlobalIceCurrent) const final override;
+ NJointControllerStatus getControllerStatus(const Ice::Current& = GlobalIceCurrent) const final override;
+ NJointControllerDescriptionWithStatus getControllerDescriptionWithStatus(const Ice::Current& = GlobalIceCurrent) const final override;
+ RobotUnitInterfacePrx getRobotUnit(const Ice::Current& = GlobalIceCurrent) const final override;
- void activateController(const Ice::Current& = GlobalIceCurrent) const final;
- void deactivateController(const Ice::Current& = GlobalIceCurrent) const final;
- void deleteController(const Ice::Current& = GlobalIceCurrent) const final;
+ void activateController(const Ice::Current& = GlobalIceCurrent) const final override;
+ void deactivateController(const Ice::Current& = GlobalIceCurrent) const final override;
+ void deleteController(const Ice::Current& = GlobalIceCurrent) const final override;
WidgetDescription::StringWidgetDictionary getFunctionDescriptions(const Ice::Current& = GlobalIceCurrent) const override;
void callDescribedFunction(const std::string&, const StringVariantBaseMap&, const Ice::Current& = GlobalIceCurrent) override;
@@ -234,7 +234,7 @@ namespace armarx
std::size_t rtGetId() const;
//used control devices
- StringStringDictionary getControlDeviceUsedControlModeMap(const Ice::Current& = GlobalIceCurrent) const final;
+ StringStringDictionary getControlDeviceUsedControlModeMap(const Ice::Current& = GlobalIceCurrent) const final override;
const std::vector<char>& getControlDeviceUsedBitmap() const;
const std::vector<std::size_t>& rtGetControlDeviceUsedIndices() const;
const std::vector<std::size_t>& getControlDeviceUsedIndices() const;
diff --git a/source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointController.hpp b/source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointController.hpp
index be19c8750b90950c838f9aa76d890fe36f3adf41..f1579a7483a6ba25dfb6875832ea0614c2492565 100644
--- a/source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointController.hpp
+++ b/source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointController.hpp
@@ -57,7 +57,7 @@ namespace armarx
{
NJointControllerPtr create(NJointControllerDescriptionProviderInterfacePtr prov,
const NJointControllerConfigPtr& config,
- const boost::shared_ptr<VirtualRobot::Robot>& rob) const final
+ const boost::shared_ptr<VirtualRobot::Robot>& rob) const final override
{
ARMARX_CHECK_EXPRESSION_W_HINT(prov, "DataProvider is NULL!");
using ConfigPtrT = typename NJointControllerT::ConfigPtrT;
@@ -68,7 +68,7 @@ namespace armarx
}
WidgetDescription::WidgetPtr GenerateConfigDescription(const boost::shared_ptr<VirtualRobot::Robot>&,
const std::map<std::string, ConstControlDevicePtr>&,
- const std::map<std::string, ConstSensorDevicePtr>&) const final
+ const std::map<std::string, ConstSensorDevicePtr>&) const final override
{
ARMARX_CHECK_EXPRESSION(!"This function should never be called");
}
@@ -103,7 +103,7 @@ namespace armarx
{
NJointControllerPtr create(NJointControllerDescriptionProviderInterfacePtr prov,
const NJointControllerConfigPtr& config,
- const boost::shared_ptr<VirtualRobot::Robot>& rob) const final
+ const boost::shared_ptr<VirtualRobot::Robot>& rob) const final override
{
ARMARX_CHECK_EXPRESSION_W_HINT(prov, "DataProvider is NULL!");
using ConfigPtrT = typename NJointControllerT::ConfigPtrT;
@@ -116,7 +116,7 @@ namespace armarx
const boost::shared_ptr<VirtualRobot::Robot>& robot,
const std::map<std::string, ConstControlDevicePtr>& controlDevices,
const std::map<std::string, ConstSensorDevicePtr>& sensorDevices
- ) const final
+ ) const final override
{
try
{
diff --git a/source/RobotAPI/components/units/RobotUnit/RobotUnit.cpp b/source/RobotAPI/components/units/RobotUnit/RobotUnit.cpp
index 91775cbbf3c0aa446a2e834e0f83c77ca5b1f05f..eeefedbd8712184151a969ad58720a1a597b8cfd 100644
--- a/source/RobotAPI/components/units/RobotUnit/RobotUnit.cpp
+++ b/source/RobotAPI/components/units/RobotUnit/RobotUnit.cpp
@@ -84,28 +84,28 @@ namespace armarx
emergencyStopTopicName {emergencyStopTopicName}
{}
- void setEmergencyStopState(EmergencyStopState state, const Ice::Current& = GlobalIceCurrent) final
+ void setEmergencyStopState(EmergencyStopState state, const Ice::Current& = GlobalIceCurrent) final override
{
robotUnit->setEmergencyStopState(state);
emergencyStopTopic->reportEmergencyStopState(state);
}
- EmergencyStopState getEmergencyStopState(const Ice::Current& = GlobalIceCurrent) const final
+ EmergencyStopState getEmergencyStopState(const Ice::Current& = GlobalIceCurrent) const final override
{
return robotUnit->getEmergencyStopState();
}
protected:
- void onInitComponent() final
+ void onInitComponent() final override
{
armarx::ManagedIceObject::offeringTopic(emergencyStopTopicName);
}
- void onConnectComponent() final
+ void onConnectComponent() final override
{
emergencyStopTopic = armarx::ManagedIceObject::getTopic<EmergencyStopListenerPrx>(emergencyStopTopicName);
setEmergencyStopState(EmergencyStopState::eEmergencyStopInactive);
}
- std::string getDefaultName() const final
+ std::string getDefaultName() const final override
{
return "EmergencyStopMaster";
}
diff --git a/source/RobotAPI/components/units/RobotUnit/RobotUnit.h b/source/RobotAPI/components/units/RobotUnit/RobotUnit.h
index 53ef66a1142819ee814dd0279603bea46f49c605..5d544450cd24f6580607ce1608ada78f118bdc97 100644
--- a/source/RobotAPI/components/units/RobotUnit/RobotUnit.h
+++ b/source/RobotAPI/components/units/RobotUnit/RobotUnit.h
@@ -633,10 +633,10 @@ namespace armarx
virtual void onDisconnectRobotUnit();
/// @brief called in RobotUnit::onExitComponent() before calling RobotUnit::finishRunning
virtual void onExitRobotUnit();
- void onInitComponent() final;
- void onConnectComponent() final;
- void onDisconnectComponent() final;
- void onExitComponent() final;
+ void onInitComponent() final override;
+ void onConnectComponent() final override;
+ void onDisconnectComponent() final override;
+ void onExitComponent() final override;
private:
// //////////////////////////////////////////////////////////////////////////////////////////////////////////////////// //
// TripleBuffer
diff --git a/source/RobotAPI/components/units/RobotUnit/util/ControlThreadOutputBuffer.h b/source/RobotAPI/components/units/RobotUnit/util/ControlThreadOutputBuffer.h
index 3fcc644bca09ebd50350ab084fe27a83208bbdea..e9171c345226f1e38e56af42fcaa660d0e099575 100644
--- a/source/RobotAPI/components/units/RobotUnit/util/ControlThreadOutputBuffer.h
+++ b/source/RobotAPI/components/units/RobotUnit/util/ControlThreadOutputBuffer.h
@@ -99,13 +99,13 @@ namespace armarx
{
static RtMessageLogEntryDummy Instance;
protected:
- std::string format() const final;
- std::size_t _sizeInBytes() const final;
- std::size_t _alignof() const final;
- RtMessageLogEntryBase* _placementCopyConstruct(void*) const final;
- std::size_t line() const final;
- std::string file() const final;
- std::string func() const final;
+ std::string format() const final override;
+ std::size_t _sizeInBytes() const final override;
+ std::size_t _alignof() const final override;
+ RtMessageLogEntryBase* _placementCopyConstruct(void*) const final override;
+ std::size_t line() const final override;
+ std::string file() const final override;
+ std::string func() const final override;
};
}
}
diff --git a/source/RobotAPI/gui-plugins/RobotUnitPlugin/QWidgets/RobotUnitWidgetBase.h b/source/RobotAPI/gui-plugins/RobotUnitPlugin/QWidgets/RobotUnitWidgetBase.h
index 507456ae512382b49331f1d495fff81b796aafdb..046141c3e3d2e4d74ecd7a70fa44b368a8c7527c 100644
--- a/source/RobotAPI/gui-plugins/RobotUnitPlugin/QWidgets/RobotUnitWidgetBase.h
+++ b/source/RobotAPI/gui-plugins/RobotUnitPlugin/QWidgets/RobotUnitWidgetBase.h
@@ -95,15 +95,15 @@ namespace armarx
}
protected:
- QTreeWidget& getTreeWidget() final
+ QTreeWidget& getTreeWidget() final override
{
return *(ui->treeWidget);
}
- QStackedWidget& getStackedWidget() final
+ QStackedWidget& getStackedWidget() final override
{
return *(ui->stackedWidget);
}
- QLabel& getResettigLabel() final
+ QLabel& getResettigLabel() final override
{
return *(ui->labelResetting);
}