diff --git a/source/RobotAPI/components/DebugDrawer/DebugDrawerComponent.h b/source/RobotAPI/components/DebugDrawer/DebugDrawerComponent.h
index d3ac754fc05faa9b149bad4045ef30f487f5b7f5..77a8c0e31493a8c1bbd7182dba4b1309934a6f18 100644
--- a/source/RobotAPI/components/DebugDrawer/DebugDrawerComponent.h
+++ b/source/RobotAPI/components/DebugDrawer/DebugDrawerComponent.h
@@ -583,7 +583,7 @@ namespace armarx
};
- typedef IceInternal::Handle<DebugDrawerComponent> DebugDrawerComponentPtr;
+ using DebugDrawerComponentPtr = IceInternal::Handle<DebugDrawerComponent>;
}
diff --git a/source/RobotAPI/components/DebugDrawer/DebugDrawerHelper.h b/source/RobotAPI/components/DebugDrawer/DebugDrawerHelper.h
index 5d95dd9c8e604b830bb7be33abab9ba96ff9d910..8248e3cd2eeb8608accf137c30e1566c6e264ed9 100644
--- a/source/RobotAPI/components/DebugDrawer/DebugDrawerHelper.h
+++ b/source/RobotAPI/components/DebugDrawer/DebugDrawerHelper.h
@@ -34,7 +34,7 @@
namespace armarx
{
class DebugDrawerHelper;
- typedef boost::shared_ptr<DebugDrawerHelper> DebugDrawerHelperPtr;
+ using DebugDrawerHelperPtr = boost::shared_ptr<DebugDrawerHelper>;
class DebugDrawerHelper
{
diff --git a/source/RobotAPI/components/EarlyVisionGraph/SphericalGraph.h b/source/RobotAPI/components/EarlyVisionGraph/SphericalGraph.h
index 53362a758d822f56834f27300dd92336f2c556f1..c96c9455b4f9e23301ee7432f27cb866920ea74e 100644
--- a/source/RobotAPI/components/EarlyVisionGraph/SphericalGraph.h
+++ b/source/RobotAPI/components/EarlyVisionGraph/SphericalGraph.h
@@ -89,8 +89,8 @@ protected:
// *****************************************************************
// types
// *****************************************************************
-typedef vector<CSGEdge*> TEdgeList;
-typedef vector<CSGNode*> TNodeList;
+using TEdgeList = vector<CSGEdge*>;
+using TNodeList = vector<CSGNode*>;
// *****************************************************************
// definition of class CSphericalGraph
diff --git a/source/RobotAPI/components/EarlyVisionGraph/Structs.h b/source/RobotAPI/components/EarlyVisionGraph/Structs.h
index 4b399341466e43ba74b14e449b52eca80412bb57..3e01ff8dbe20e46e5647ae802e189720544ad94b 100644
--- a/source/RobotAPI/components/EarlyVisionGraph/Structs.h
+++ b/source/RobotAPI/components/EarlyVisionGraph/Structs.h
@@ -61,7 +61,7 @@ struct TPathElement
float fBestSimilarity;
};
-typedef vector<TPathElement> TPath;
+using TPath = vector<TPathElement>;
struct THypothesis
{
diff --git a/source/RobotAPI/components/RobotState/SharedRobotServants.cpp b/source/RobotAPI/components/RobotState/SharedRobotServants.cpp
index ec0574032b5accb9e00e1df6957f9b6d43005d50..b412e5296931d1716757443929f7f28e1b8f8c7e 100644
--- a/source/RobotAPI/components/RobotState/SharedRobotServants.cpp
+++ b/source/RobotAPI/components/RobotState/SharedRobotServants.cpp
@@ -54,7 +54,7 @@ using namespace Ice;
namespace armarx
{
- typedef std::map<std::string, SharedRobotNodeInterfacePrx> NodeCache;
+ using NodeCache = std::map<std::string, SharedRobotNodeInterfacePrx>;
///////////////////////////////
// SharedObjectBase
diff --git a/source/RobotAPI/components/RobotState/SharedRobotServants.h b/source/RobotAPI/components/RobotState/SharedRobotServants.h
index b01b94f561cac8f14fc77fee19971df7cfe0b5de..9d4d60cf2e36fe6caa9b091cf58ad80c0a4b6cb5 100644
--- a/source/RobotAPI/components/RobotState/SharedRobotServants.h
+++ b/source/RobotAPI/components/RobotState/SharedRobotServants.h
@@ -35,9 +35,9 @@
namespace VirtualRobot
{
class Robot;
- typedef boost::shared_ptr<Robot> RobotPtr;
+ using RobotPtr = boost::shared_ptr<Robot>;
class RobotNode;
- typedef boost::shared_ptr<RobotNode> RobotNodePtr;
+ using RobotNodePtr = boost::shared_ptr<RobotNode>;
}
namespace armarx
@@ -157,6 +157,6 @@ namespace armarx
};
- typedef IceInternal::Handle<SharedRobotServant> SharedRobotServantPtr;
+ using SharedRobotServantPtr = IceInternal::Handle<SharedRobotServant>;
}
diff --git a/source/RobotAPI/components/RobotState/test/RobotStateTest.cpp b/source/RobotAPI/components/RobotState/test/RobotStateTest.cpp
index e414de12d0f92563644555fd0038812da476cc4e..ce77bf90cc1463d5c034325f905594492c94ae90 100644
--- a/source/RobotAPI/components/RobotState/test/RobotStateTest.cpp
+++ b/source/RobotAPI/components/RobotState/test/RobotStateTest.cpp
@@ -68,7 +68,7 @@ public:
TestArmarXManagerPtr _manager;
IceTestHelperPtr _iceTestHelper;
};
-typedef boost::shared_ptr<RobotStateComponentTestEnvironment> RobotStateComponentTestEnvironmentPtr;
+using RobotStateComponentTestEnvironmentPtr = boost::shared_ptr<RobotStateComponentTestEnvironment>;
BOOST_AUTO_TEST_CASE(RobotStateComponentHistoryTest)
//void func()
diff --git a/source/RobotAPI/components/units/HandUnit.h b/source/RobotAPI/components/units/HandUnit.h
index 9a6d2bcecf8cc5e3498f8e8ae52a4788bba79fa1..12d79c41b602ce701c2a473090edd8b0cb2479cb 100644
--- a/source/RobotAPI/components/units/HandUnit.h
+++ b/source/RobotAPI/components/units/HandUnit.h
@@ -37,9 +37,9 @@
namespace VirtualRobot
{
class Robot;
- typedef boost::shared_ptr<Robot> RobotPtr;
+ using RobotPtr = boost::shared_ptr<Robot>;
class EndEffector;
- typedef boost::shared_ptr<EndEffector> EndEffectorPtr;
+ using EndEffectorPtr = boost::shared_ptr<EndEffector>;
}
namespace armarx
{
diff --git a/source/RobotAPI/components/units/KinematicUnitSimulation.h b/source/RobotAPI/components/units/KinematicUnitSimulation.h
index 27c7158eac15241741c7e06817f8753084b7ea01..7a04769c70c74fcfe8f679e7d9b272b84dcf70d7 100644
--- a/source/RobotAPI/components/units/KinematicUnitSimulation.h
+++ b/source/RobotAPI/components/units/KinematicUnitSimulation.h
@@ -68,7 +68,7 @@ namespace armarx
float torque;
float temperature;
};
- typedef std::map<std::string, KinematicUnitSimulationJointState> KinematicUnitSimulationJointStates;
+ using KinematicUnitSimulationJointStates = std::map<std::string, KinematicUnitSimulationJointState>;
/**
* \class JointInfo.
@@ -103,7 +103,7 @@ namespace armarx
float limitLo;
float limitHi;
};
- typedef std::map<std::string, KinematicUnitSimulationJointInfo> KinematicUnitSimulationJointInfos;
+ using KinematicUnitSimulationJointInfos = std::map<std::string, KinematicUnitSimulationJointInfo>;
/**
* \class KinematicUnitSimulationPropertyDefinitions
diff --git a/source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointController.h b/source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointController.h
index dc15970ec2362c2b714f460793ad860adc62c69e..60c9df8452eac3b5b02230dfdead90804fefa5f6 100644
--- a/source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointController.h
+++ b/source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointController.h
@@ -56,8 +56,8 @@ namespace VirtualRobot
{
class Robot;
class RobotNode;
- typedef boost::shared_ptr<RobotNode> RobotNodePtr;
- typedef boost::shared_ptr<Robot> RobotPtr;
+ using RobotNodePtr = boost::shared_ptr<RobotNode>;
+ using RobotPtr = boost::shared_ptr<Robot>;
}
namespace armarx
diff --git a/source/RobotAPI/components/units/RobotUnit/RobotUnitModules/RobotUnitModuleRobotData.h b/source/RobotAPI/components/units/RobotUnit/RobotUnitModules/RobotUnitModuleRobotData.h
index a9313f9ccb587cf7c2c6294cea86960059f9eae7..1497eea387f161d00cc2a9bf8584af77cfadc9cc 100644
--- a/source/RobotAPI/components/units/RobotUnit/RobotUnitModules/RobotUnitModuleRobotData.h
+++ b/source/RobotAPI/components/units/RobotUnit/RobotUnitModules/RobotUnitModuleRobotData.h
@@ -32,7 +32,7 @@
namespace armarx
{
- typedef std::shared_ptr<class RobotPool> RobotPoolPtr;
+ using RobotPoolPtr = std::shared_ptr<class RobotPool>;
namespace RobotUnitModule
{
diff --git a/source/RobotAPI/components/units/RobotUnit/util/EigenForwardDeclarations.h b/source/RobotAPI/components/units/RobotUnit/util/EigenForwardDeclarations.h
index 2ebf88ed457db4146fca7ce9353c72f690f38f70..490f247702f1daa761c9b61c9f8959ae9e5dbadd 100644
--- a/source/RobotAPI/components/units/RobotUnit/util/EigenForwardDeclarations.h
+++ b/source/RobotAPI/components/units/RobotUnit/util/EigenForwardDeclarations.h
@@ -58,6 +58,6 @@ namespace Eigen
template<typename _Scalar, int _Options>
class Quaternion;
- typedef Quaternion<float, 0> Quaternionf;
- typedef Quaternion<double, 0> Quaterniond;
+ using Quaternionf = Quaternion<float, 0>;
+ using Quaterniond = Quaternion<double, 0>;
}
diff --git a/source/RobotAPI/components/units/TCPControlUnit.h b/source/RobotAPI/components/units/TCPControlUnit.h
index 263b92b64799dcd0ea825e491feb14f026fc58ad..ea2482acedb199503014992e36c7352f1080a379 100644
--- a/source/RobotAPI/components/units/TCPControlUnit.h
+++ b/source/RobotAPI/components/units/TCPControlUnit.h
@@ -183,10 +183,10 @@ namespace armarx
std::string tcpName;
};
- typedef std::map<std::string, TCPVelocityData> TCPVelocityDataMap;
+ using TCPVelocityDataMap = std::map<std::string, TCPVelocityData>;
TCPVelocityDataMap tcpVelocitiesMap, localTcpVelocitiesMap;
- typedef std::map<std::string, VirtualRobot::DifferentialIKPtr> DIKMap;
+ using DIKMap = std::map<std::string, VirtualRobot::DifferentialIKPtr>;
DIKMap dIKMap, localDIKMap;
@@ -275,7 +275,7 @@ namespace armarx
std::map<VirtualRobot:: SceneObjectPtr, Eigen::VectorXf> tcpWeights;
Eigen::VectorXf tcpWeightVec;
};
- typedef boost::shared_ptr<EDifferentialIK> EDifferentialIKPtr;
+ using EDifferentialIKPtr = boost::shared_ptr<EDifferentialIK>;
}
diff --git a/source/RobotAPI/drivers/OptoForceUnit/OptoForceUnit.h b/source/RobotAPI/drivers/OptoForceUnit/OptoForceUnit.h
index baef34563484821af081b2ea82b12d6072d7f29b..ee5c0fcaee8668170acc8840376de7b25aaf71eb 100644
--- a/source/RobotAPI/drivers/OptoForceUnit/OptoForceUnit.h
+++ b/source/RobotAPI/drivers/OptoForceUnit/OptoForceUnit.h
@@ -80,7 +80,7 @@ namespace armarx
void printInfo();
void checkSensorCount();
};
- typedef boost::shared_ptr<DaqWrapper> DaqWrapperPtr;
+ using DaqWrapperPtr = boost::shared_ptr<DaqWrapper>;
public:
OptoForceUnit();
diff --git a/source/RobotAPI/drivers/WeissHapticSensor/WeissHapticSensor.h b/source/RobotAPI/drivers/WeissHapticSensor/WeissHapticSensor.h
index 7f1ee4d4d4afedcc9cf52a9e4dc9ae85143c08fe..3a8e795fe8b4f703dcfa14abf1551c7fb1cb2cfe 100644
--- a/source/RobotAPI/drivers/WeissHapticSensor/WeissHapticSensor.h
+++ b/source/RobotAPI/drivers/WeissHapticSensor/WeissHapticSensor.h
@@ -40,7 +40,7 @@ namespace armarx
{
class WeissHapticSensor;
- typedef boost::shared_ptr<WeissHapticSensor> WeissHapticSensorPtr;
+ using WeissHapticSensorPtr = boost::shared_ptr<WeissHapticSensor>;
class WeissHapticSensor : public Logging
{
diff --git a/source/RobotAPI/gui-plugins/HandUnitPlugin/HandUnitGuiPlugin.h b/source/RobotAPI/gui-plugins/HandUnitPlugin/HandUnitGuiPlugin.h
index dce60f10516c9bbd91baa11173d360d7a0167056..96c7a96b7f38bd966e57b531ea8fb06097c8aea3 100644
--- a/source/RobotAPI/gui-plugins/HandUnitPlugin/HandUnitGuiPlugin.h
+++ b/source/RobotAPI/gui-plugins/HandUnitPlugin/HandUnitGuiPlugin.h
@@ -151,6 +151,6 @@ namespace armarx
void reportJointAngles(const::armarx::NameValueMap& actualJointAngles, const Ice::Current&) override;
void reportJointPressures(const::armarx::NameValueMap& actualJointPressures, const Ice::Current&) override;
};
- typedef boost::shared_ptr<HandUnitWidget> HandUnitGuiPluginPtr;
+ using HandUnitGuiPluginPtr = boost::shared_ptr<HandUnitWidget>;
}
diff --git a/source/RobotAPI/gui-plugins/HapticUnitPlugin/HapticUnitGuiPlugin.h b/source/RobotAPI/gui-plugins/HapticUnitPlugin/HapticUnitGuiPlugin.h
index 993bb2aa484c557063c43904556e3fd93afcd2c3..bca8d2f834f769281dcedccc228774d0811b9333 100644
--- a/source/RobotAPI/gui-plugins/HapticUnitPlugin/HapticUnitGuiPlugin.h
+++ b/source/RobotAPI/gui-plugins/HapticUnitPlugin/HapticUnitGuiPlugin.h
@@ -131,6 +131,6 @@ namespace armarx
std::map<MatrixDatafieldDisplayWidget*, std::string> deviceNameReverseMap;
};
- //typedef boost::shared_ptr<HapticUnitWidget> HapticUnitGuiPluginPtr;
+ //using HapticUnitGuiPluginPtr = boost::shared_ptr<HapticUnitWidget>;
}
diff --git a/source/RobotAPI/gui-plugins/KinematicUnitPlugin/KinematicUnitGuiPlugin.h b/source/RobotAPI/gui-plugins/KinematicUnitPlugin/KinematicUnitGuiPlugin.h
index 61162d6b488307af70eccc6be25ac69545be8f7c..d627b3cfd4b51b51a17fcded8f5c7614a3c6f5f9 100644
--- a/source/RobotAPI/gui-plugins/KinematicUnitPlugin/KinematicUnitGuiPlugin.h
+++ b/source/RobotAPI/gui-plugins/KinematicUnitPlugin/KinematicUnitGuiPlugin.h
@@ -59,7 +59,7 @@
namespace armarx
{
- typedef boost::shared_ptr<VirtualRobot::CoinVisualization> CoinVisualizationPtr;
+ using CoinVisualizationPtr = boost::shared_ptr<VirtualRobot::CoinVisualization>;
class KinematicUnitConfigDialog;
@@ -327,8 +327,8 @@ namespace armarx
int updateTimerId = 0;
IceReportSkipper skipper = {20.0f};
};
- typedef ::std::vector< ::Ice::Float> FloatVector;
- typedef boost::shared_ptr<KinematicUnitWidgetController> KinematicUnitGuiPluginPtr;
+ using FloatVector = ::std::vector< ::Ice::Float>;
+ using KinematicUnitGuiPluginPtr = boost::shared_ptr<KinematicUnitWidgetController>;
}
diff --git a/source/RobotAPI/gui-plugins/PlatformUnitPlugin/PlatformUnitGuiPlugin.h b/source/RobotAPI/gui-plugins/PlatformUnitPlugin/PlatformUnitGuiPlugin.h
index 18cde3712947371be73aa4677f6c0b9093852997..af61c2946460d7630f334ff30d85f83cf1848ede 100644
--- a/source/RobotAPI/gui-plugins/PlatformUnitPlugin/PlatformUnitGuiPlugin.h
+++ b/source/RobotAPI/gui-plugins/PlatformUnitPlugin/PlatformUnitGuiPlugin.h
@@ -228,6 +228,6 @@ namespace armarx
QPointer<QWidget> getWidget() override;
};
- typedef boost::shared_ptr<PlatformUnitWidget> PlatformUnitGuiPluginPtr;
+ using PlatformUnitGuiPluginPtr = boost::shared_ptr<PlatformUnitWidget>;
}
diff --git a/source/RobotAPI/gui-plugins/RobotViewerPlugin/RobotViewerGuiPlugin.h b/source/RobotAPI/gui-plugins/RobotViewerPlugin/RobotViewerGuiPlugin.h
index 61e90b516cf6d42a6ee2bf8bf557f0bdc01f6393..81e1bf92e6c805445bda11c1e3feaeb31d408252 100644
--- a/source/RobotAPI/gui-plugins/RobotViewerPlugin/RobotViewerGuiPlugin.h
+++ b/source/RobotAPI/gui-plugins/RobotViewerPlugin/RobotViewerGuiPlugin.h
@@ -50,7 +50,7 @@
namespace armarx
{
- typedef boost::shared_ptr<VirtualRobot::CoinVisualization> CoinVisualizationPtr;
+ using CoinVisualizationPtr = boost::shared_ptr<VirtualRobot::CoinVisualization>;
class RobotViewerConfigDialog;
@@ -190,6 +190,6 @@ namespace armarx
void reportGlobalRobotRootPose(const FramedPoseBasePtr& pose, Ice::Long timestamp, bool poseChanged, const Ice::Current&) override;
void reportJointValues(const NameValueMap& jointAngles, Ice::Long timestamp, bool aValueChanged, const Ice::Current&) override;
};
- typedef boost::shared_ptr<RobotViewerWidgetController> RobotViewerGuiPluginPtr;
+ using RobotViewerGuiPluginPtr = boost::shared_ptr<RobotViewerWidgetController>;
}
diff --git a/source/RobotAPI/libraries/ArmarXEtherCAT/AbstractData.h b/source/RobotAPI/libraries/ArmarXEtherCAT/AbstractData.h
index 904ee3ab9dd47320394df73ce63b7d9b88d0fa4d..f4a0e8c3162f72ec60777e220ec1e233cf6cbd37 100644
--- a/source/RobotAPI/libraries/ArmarXEtherCAT/AbstractData.h
+++ b/source/RobotAPI/libraries/ArmarXEtherCAT/AbstractData.h
@@ -127,7 +127,7 @@ namespace armarx
};
class AbstractData;
- typedef std::shared_ptr<AbstractData> AbstractDataPtr;
+ using AbstractDataPtr = std::shared_ptr<AbstractData>;
class AbstractData
diff --git a/source/RobotAPI/libraries/ArmarXEtherCAT/AbstractFunctionalDevice.h b/source/RobotAPI/libraries/ArmarXEtherCAT/AbstractFunctionalDevice.h
index 1c1c3b18fab8bf7d37f02252fd8e2693f2e32263..ab2ad3915589358848b643d624dae4270eb035a8 100644
--- a/source/RobotAPI/libraries/ArmarXEtherCAT/AbstractFunctionalDevice.h
+++ b/source/RobotAPI/libraries/ArmarXEtherCAT/AbstractFunctionalDevice.h
@@ -9,7 +9,7 @@
namespace armarx
{
class AbstractFunctionalDevice;
- typedef std::shared_ptr<AbstractFunctionalDevice> AbstractFunctionalDevicePtr;
+ using AbstractFunctionalDevicePtr = std::shared_ptr<AbstractFunctionalDevice>;
class AbstractFunctionalDevice : public std::enable_shared_from_this<AbstractFunctionalDevice>
{
diff --git a/source/RobotAPI/libraries/ArmarXEtherCAT/AbstractSlave.h b/source/RobotAPI/libraries/ArmarXEtherCAT/AbstractSlave.h
index 05a72f741c84caccee068b418fced5d905304042..82c21709b90071a112ee8b86c43a0f4fb1ff31b1 100644
--- a/source/RobotAPI/libraries/ArmarXEtherCAT/AbstractSlave.h
+++ b/source/RobotAPI/libraries/ArmarXEtherCAT/AbstractSlave.h
@@ -13,14 +13,14 @@ namespace armarx
#define DEFAULT_VENDOR_ID 0
class AbstractSlave;
- typedef std::shared_ptr<AbstractSlave> AbstractSlavePtr;
+ using AbstractSlavePtr = std::shared_ptr<AbstractSlave>;
class AbstractSlave : public armarx::Logging
{
public:
AbstractSlave(const armarx::SlaveIdentifier slaveIdentifier, uint16_t slaveNumber);
- virtual ~AbstractSlave(){}
+ virtual ~AbstractSlave() {}
/**
* This is called after EtherCAT Bus is PreOp Mode. This is where the PDO Mapping can be configured for the slave.
*/
diff --git a/source/RobotAPI/libraries/ArmarXEtherCAT/ArmarXEtherCATFwd.h b/source/RobotAPI/libraries/ArmarXEtherCAT/ArmarXEtherCATFwd.h
index 661d5a6589ed9e818f66e942dcf9e5c1cf0d9908..f321e2de7af4a47a60a31e9b7a3cd0f19b2687e2 100644
--- a/source/RobotAPI/libraries/ArmarXEtherCAT/ArmarXEtherCATFwd.h
+++ b/source/RobotAPI/libraries/ArmarXEtherCAT/ArmarXEtherCATFwd.h
@@ -36,5 +36,5 @@ namespace armarx
class AbstractSlave;
- typedef std::shared_ptr<AbstractSlave> AbstractSlavePtr;
+ using AbstractSlavePtr = std::shared_ptr<AbstractSlave>;
}
diff --git a/source/RobotAPI/libraries/ArmarXEtherCAT/EtherCAT.h b/source/RobotAPI/libraries/ArmarXEtherCAT/EtherCAT.h
index 6de9ba2c36b9c3df391865896be4e17d30193bef..e0a231dce019a0e72b4f99482a6ce94416e339bc 100644
--- a/source/RobotAPI/libraries/ArmarXEtherCAT/EtherCAT.h
+++ b/source/RobotAPI/libraries/ArmarXEtherCAT/EtherCAT.h
@@ -37,8 +37,8 @@
namespace armarx
{
- typedef std::shared_ptr<class ControlDevice> ControlDevicePtr;
- typedef std::shared_ptr<class SensorDevice> SensorDevicePtr;
+ using ControlDevicePtr = std::shared_ptr<class ControlDevice>;
+ using SensorDevicePtr = std::shared_ptr<class SensorDevice>;
class RobotUnit;
diff --git a/source/RobotAPI/libraries/ArmarXEtherCAT/SlaveIdentifier.h b/source/RobotAPI/libraries/ArmarXEtherCAT/SlaveIdentifier.h
index fbbc70f7721de0b6557f01c118c0da747d384d7e..eae2f090deca32efb12c9dc33b45c94d145c8c64 100644
--- a/source/RobotAPI/libraries/ArmarXEtherCAT/SlaveIdentifier.h
+++ b/source/RobotAPI/libraries/ArmarXEtherCAT/SlaveIdentifier.h
@@ -30,7 +30,7 @@
namespace armarx
{
class SlaveIdentifier;
- typedef std::shared_ptr<SlaveIdentifier> SlaveIdentifierPtr;
+ using SlaveIdentifierPtr = std::shared_ptr<SlaveIdentifier>;
class SlaveIdentifier
{
diff --git a/source/RobotAPI/libraries/DMPController/TaskSpaceDMPController.h b/source/RobotAPI/libraries/DMPController/TaskSpaceDMPController.h
index 96a17a18d61112000c44305488964218bf53b18e..5fec1f3f7a3e98d39420b4b729e2c28849b15c67 100644
--- a/source/RobotAPI/libraries/DMPController/TaskSpaceDMPController.h
+++ b/source/RobotAPI/libraries/DMPController/TaskSpaceDMPController.h
@@ -189,7 +189,7 @@ namespace armarx
Eigen::Quaterniond oldDMPAngularVelocity;
};
- typedef boost::shared_ptr<TaskSpaceDMPController> TaskSpaceDMPControllerPtr;
+ using TaskSpaceDMPControllerPtr = boost::shared_ptr<TaskSpaceDMPController>;
}
diff --git a/source/RobotAPI/libraries/RobotAPINJointControllers/DMPController/NJointBimanualCCDMPController.h b/source/RobotAPI/libraries/RobotAPINJointControllers/DMPController/NJointBimanualCCDMPController.h
index e717b5638edd597349783d48a982451f005df5bc..4f4f8bf0f5d4fadaf22434a56934759e95791fb2 100644
--- a/source/RobotAPI/libraries/RobotAPINJointControllers/DMPController/NJointBimanualCCDMPController.h
+++ b/source/RobotAPI/libraries/RobotAPINJointControllers/DMPController/NJointBimanualCCDMPController.h
@@ -26,8 +26,8 @@ namespace armarx
TYPEDEF_PTRS_HANDLE(NJointBimanualCCDMPController);
TYPEDEF_PTRS_HANDLE(NJointBimanualCCDMPControllerControlData);
- typedef std::pair<double, DVec > ViaPoint;
- typedef std::vector<ViaPoint > ViaPointsSet;
+ using ViaPoint = std::pair<double, DVec >;
+ using ViaPointsSet = std::vector<ViaPoint >;
class NJointBimanualCCDMPControllerControlData
{
public:
diff --git a/source/RobotAPI/libraries/RobotAPINJointControllers/DMPController/NJointBimanualDMPForceController.h b/source/RobotAPI/libraries/RobotAPINJointControllers/DMPController/NJointBimanualDMPForceController.h
index 7b1e430c6f2de6615f4dce83e07027c19455a98a..63269b3c1c947303b76d111aee904023018b50a1 100644
--- a/source/RobotAPI/libraries/RobotAPINJointControllers/DMPController/NJointBimanualDMPForceController.h
+++ b/source/RobotAPI/libraries/RobotAPINJointControllers/DMPController/NJointBimanualDMPForceController.h
@@ -25,8 +25,8 @@ namespace armarx
TYPEDEF_PTRS_HANDLE(NJointBimanualCCDMPController);
TYPEDEF_PTRS_HANDLE(NJointBimanualCCDMPControllerControlData);
- typedef std::pair<double, DVec > ViaPoint;
- typedef std::vector<ViaPoint > ViaPointsSet;
+ using ViaPoint = std::pair<double, DVec >;
+ using ViaPointsSet = std::vector<ViaPoint >;
class NJointBimanualCCDMPControllerControlData
{
public:
diff --git a/source/RobotAPI/libraries/RobotAPINJointControllers/DMPController/NJointBimanualForceMPController.h b/source/RobotAPI/libraries/RobotAPINJointControllers/DMPController/NJointBimanualForceMPController.h
index 6ee8ebdaf8d9740f7b6981beea10353cce8e78a9..db73f4f8c74b281f2e10dd0e6676101185e5deeb 100644
--- a/source/RobotAPI/libraries/RobotAPINJointControllers/DMPController/NJointBimanualForceMPController.h
+++ b/source/RobotAPI/libraries/RobotAPINJointControllers/DMPController/NJointBimanualForceMPController.h
@@ -21,8 +21,8 @@ namespace armarx
TYPEDEF_PTRS_HANDLE(NJointBimanualForceMPController);
TYPEDEF_PTRS_HANDLE(NJointBimanualForceMPControllerControlData);
- typedef std::pair<double, DVec > ViaPoint;
- typedef std::vector<ViaPoint > ViaPointsSet;
+ using ViaPoint = std::pair<double, DVec >;
+ using ViaPointsSet = std::vector<ViaPoint >;
class NJointBimanualForceMPControllerControlData
{
public:
diff --git a/source/RobotAPI/libraries/RobotAPINJointControllers/DMPController/NJointCCDMPController.h b/source/RobotAPI/libraries/RobotAPINJointControllers/DMPController/NJointCCDMPController.h
index 6ae87d985c7c3c57d5bb72aa83c171b970b9646d..cd0c4b0dbcd57285433dceda0a16f3e2f87b2021 100644
--- a/source/RobotAPI/libraries/RobotAPINJointControllers/DMPController/NJointCCDMPController.h
+++ b/source/RobotAPI/libraries/RobotAPINJointControllers/DMPController/NJointCCDMPController.h
@@ -22,8 +22,8 @@ namespace armarx
TYPEDEF_PTRS_HANDLE(NJointCCDMPController);
TYPEDEF_PTRS_HANDLE(NJointCCDMPControllerControlData);
- typedef std::pair<double, DVec > ViaPoint;
- typedef std::vector<ViaPoint > ViaPointsSet;
+ using ViaPoint = std::pair<double, DVec >;
+ using ViaPointsSet = std::vector<ViaPoint >;
class NJointCCDMPControllerControlData
{
public:
diff --git a/source/RobotAPI/libraries/RobotAPINJointControllers/DMPController/NJointTSDMPController.h b/source/RobotAPI/libraries/RobotAPINJointControllers/DMPController/NJointTSDMPController.h
index 3170d5d37427265148385c04569110617ecdd5ba..68a4f41d1bb1c5bbbb34c28d803ba85f26afd1cc 100644
--- a/source/RobotAPI/libraries/RobotAPINJointControllers/DMPController/NJointTSDMPController.h
+++ b/source/RobotAPI/libraries/RobotAPINJointControllers/DMPController/NJointTSDMPController.h
@@ -21,8 +21,8 @@ namespace armarx
TYPEDEF_PTRS_HANDLE(NJointTSDMPController);
TYPEDEF_PTRS_HANDLE(NJointTSDMPControllerControlData);
- typedef std::pair<double, DVec > ViaPoint;
- typedef std::vector<ViaPoint > ViaPointsSet;
+ using ViaPoint = std::pair<double, DVec >;
+ using ViaPointsSet = std::vector<ViaPoint >;
class NJointTSDMPControllerControlData
{
public:
diff --git a/source/RobotAPI/libraries/RobotStatechartHelpers/ForceTorqueHelper.h b/source/RobotAPI/libraries/RobotStatechartHelpers/ForceTorqueHelper.h
index a6ce157fcd0c3363e4245fa3afc76da476220b43..21308cc384d06a5125820f61b9a3e041d1dc0c1a 100644
--- a/source/RobotAPI/libraries/RobotStatechartHelpers/ForceTorqueHelper.h
+++ b/source/RobotAPI/libraries/RobotStatechartHelpers/ForceTorqueHelper.h
@@ -31,10 +31,10 @@
namespace armarx
{
class DatafieldRef;
- typedef IceInternal::Handle<DatafieldRef> DatafieldRefPtr;
+ using DatafieldRefPtr = IceInternal::Handle<DatafieldRef>;
class ForceTorqueHelper;
- typedef boost::shared_ptr<ForceTorqueHelper> ForceTorqueHelperPtr;
+ using ForceTorqueHelperPtr = boost::shared_ptr<ForceTorqueHelper>;
class ForceTorqueHelper
{
diff --git a/source/RobotAPI/libraries/RobotStatechartHelpers/KinematicUnitHelper.h b/source/RobotAPI/libraries/RobotStatechartHelpers/KinematicUnitHelper.h
index bc28651565e0289cf65fb0ffcfcb9cf354f806ec..17725f15c8cbbf11ffc34c21485e95973e1f65cb 100644
--- a/source/RobotAPI/libraries/RobotStatechartHelpers/KinematicUnitHelper.h
+++ b/source/RobotAPI/libraries/RobotStatechartHelpers/KinematicUnitHelper.h
@@ -30,7 +30,7 @@
namespace armarx
{
class KinematicUnitHelper;
- typedef boost::shared_ptr<KinematicUnitHelper> KinematicUnitHelperPtr;
+ using KinematicUnitHelperPtr = boost::shared_ptr<KinematicUnitHelper>;
class KinematicUnitHelper
{
diff --git a/source/RobotAPI/libraries/RobotStatechartHelpers/PositionControllerHelper.h b/source/RobotAPI/libraries/RobotStatechartHelpers/PositionControllerHelper.h
index b90b2a615f0dafabae4a7a42fb4024a8f1e84d0d..7018c45b5e26dcb0bee1f5e4ce1413d95b3a3faf 100644
--- a/source/RobotAPI/libraries/RobotStatechartHelpers/PositionControllerHelper.h
+++ b/source/RobotAPI/libraries/RobotStatechartHelpers/PositionControllerHelper.h
@@ -36,7 +36,7 @@
namespace Eigen
{
- typedef Matrix<float, 6, 1> Vector6f;
+ using Vector6f = Matrix<float, 6, 1>;
}
@@ -44,7 +44,7 @@ namespace armarx
{
class PositionControllerHelper;
- typedef boost::shared_ptr<PositionControllerHelper> PositionControllerHelperPtr;
+ using PositionControllerHelperPtr = boost::shared_ptr<PositionControllerHelper>;
class PositionControllerHelper
{
diff --git a/source/RobotAPI/libraries/RobotStatechartHelpers/RobotNameHelper.h b/source/RobotAPI/libraries/RobotStatechartHelpers/RobotNameHelper.h
index 0f633f431863e9c6064d559f72776487de08734d..c4e34fd0f60852c242db1d6d1424396065ca5cb7 100644
--- a/source/RobotAPI/libraries/RobotStatechartHelpers/RobotNameHelper.h
+++ b/source/RobotAPI/libraries/RobotStatechartHelpers/RobotNameHelper.h
@@ -33,7 +33,7 @@
namespace armarx
{
- typedef std::shared_ptr<class RobotNameHelper> RobotNameHelperPtr;
+ using RobotNameHelperPtr = std::shared_ptr<class RobotNameHelper>;
class RobotNameHelper : public std::enable_shared_from_this<RobotNameHelper>
{
diff --git a/source/RobotAPI/libraries/RobotStatechartHelpers/VelocityControllerHelper.h b/source/RobotAPI/libraries/RobotStatechartHelpers/VelocityControllerHelper.h
index b2f2ce30e0341a1a17ce6c4c1484af9743300b74..6d2175a03afba33f0187ec375bc55dae02347633 100644
--- a/source/RobotAPI/libraries/RobotStatechartHelpers/VelocityControllerHelper.h
+++ b/source/RobotAPI/libraries/RobotStatechartHelpers/VelocityControllerHelper.h
@@ -33,7 +33,7 @@
namespace armarx
{
class VelocityControllerHelper;
- typedef boost::shared_ptr<VelocityControllerHelper> VelocityControllerHelperPtr;
+ using VelocityControllerHelperPtr = boost::shared_ptr<VelocityControllerHelper>;
class VelocityControllerHelper
{
diff --git a/source/RobotAPI/libraries/SimpleJsonLogger/SimpleJsonLogger.h b/source/RobotAPI/libraries/SimpleJsonLogger/SimpleJsonLogger.h
index 34b2d03e6484d0b04a6ef0897171093d45f73bbb..8db4a810335dad8d1dcc69bdca6cdab62aca4bac 100644
--- a/source/RobotAPI/libraries/SimpleJsonLogger/SimpleJsonLogger.h
+++ b/source/RobotAPI/libraries/SimpleJsonLogger/SimpleJsonLogger.h
@@ -39,7 +39,7 @@
namespace armarx
{
class SimpleJsonLogger;
- typedef boost::shared_ptr<SimpleJsonLogger> SimpleJsonLoggerPtr;
+ using SimpleJsonLoggerPtr = boost::shared_ptr<SimpleJsonLogger>;
class SimpleJsonLogger
{
diff --git a/source/RobotAPI/libraries/SimpleJsonLogger/SimpleJsonLoggerEntry.h b/source/RobotAPI/libraries/SimpleJsonLogger/SimpleJsonLoggerEntry.h
index 9565419e5d15017c8a2bf1e937ec1615a740186f..465b73601a313f816c6e6c654fcd4b05433aa3b1 100644
--- a/source/RobotAPI/libraries/SimpleJsonLogger/SimpleJsonLoggerEntry.h
+++ b/source/RobotAPI/libraries/SimpleJsonLogger/SimpleJsonLoggerEntry.h
@@ -32,7 +32,7 @@
namespace armarx
{
class SimpleJsonLoggerEntry;
- typedef boost::shared_ptr<SimpleJsonLoggerEntry> SimpleJsonLoggerEntryPtr;
+ using SimpleJsonLoggerEntryPtr = boost::shared_ptr<SimpleJsonLoggerEntry>;
class SimpleJsonLoggerEntry
{
diff --git a/source/RobotAPI/libraries/core/CartesianFeedForwardPositionController.h b/source/RobotAPI/libraries/core/CartesianFeedForwardPositionController.h
index 18b8b8fb667d371e5ed3f33a2d64cd48f36245df..6a0f393d5f60eacf3a606bef02c5e4c4e634bdc6 100644
--- a/source/RobotAPI/libraries/core/CartesianFeedForwardPositionController.h
+++ b/source/RobotAPI/libraries/core/CartesianFeedForwardPositionController.h
@@ -34,7 +34,7 @@
namespace armarx
{
class CartesianFeedForwardPositionController;
- typedef boost::shared_ptr<CartesianFeedForwardPositionController> CartesianFeedForwardPositionControllerPtr;
+ using CartesianFeedForwardPositionControllerPtr = boost::shared_ptr<CartesianFeedForwardPositionController>;
class CartesianFeedForwardPositionController
{
diff --git a/source/RobotAPI/libraries/core/CartesianPositionController.h b/source/RobotAPI/libraries/core/CartesianPositionController.h
index 2c4b46c5c2363938a47555ca9407a0f495e0353a..7337d12fbf6468437795cc0d1a2767654fe136c8 100644
--- a/source/RobotAPI/libraries/core/CartesianPositionController.h
+++ b/source/RobotAPI/libraries/core/CartesianPositionController.h
@@ -33,7 +33,7 @@
namespace armarx
{
class CartesianPositionController;
- typedef boost::shared_ptr<CartesianPositionController> CartesianPositionControllerPtr;
+ using CartesianPositionControllerPtr = boost::shared_ptr<CartesianPositionController>;
// This is a P-controller. In: Target pose, out Cartesian velocity.
class CartesianPositionController
diff --git a/source/RobotAPI/libraries/core/CartesianVelocityController.h b/source/RobotAPI/libraries/core/CartesianVelocityController.h
index 3826e0471d9eada001b8cb13b07cdde7bde8b25c..be4053b28fbc269a25d6b6d938f8334dabf7fb10 100644
--- a/source/RobotAPI/libraries/core/CartesianVelocityController.h
+++ b/source/RobotAPI/libraries/core/CartesianVelocityController.h
@@ -34,7 +34,7 @@
namespace armarx
{
class CartesianVelocityController;
- typedef boost::shared_ptr<CartesianVelocityController> CartesianVelocityControllerPtr;
+ using CartesianVelocityControllerPtr = boost::shared_ptr<CartesianVelocityController>;
class CartesianVelocityController
{
diff --git a/source/RobotAPI/libraries/core/CartesianVelocityControllerWithRamp.h b/source/RobotAPI/libraries/core/CartesianVelocityControllerWithRamp.h
index a32b443a67476363b1456cfa583cc99eb7deb549..3e724985687352ed73233e0fe20f555a4bf42275 100644
--- a/source/RobotAPI/libraries/core/CartesianVelocityControllerWithRamp.h
+++ b/source/RobotAPI/libraries/core/CartesianVelocityControllerWithRamp.h
@@ -39,7 +39,7 @@
namespace armarx
{
class CartesianVelocityControllerWithRamp;
- typedef boost::shared_ptr<CartesianVelocityControllerWithRamp> CartesianVelocityControllerWithRampPtr;
+ using CartesianVelocityControllerWithRampPtr = boost::shared_ptr<CartesianVelocityControllerWithRamp>;
class CartesianVelocityControllerWithRamp
{
diff --git a/source/RobotAPI/libraries/core/CartesianVelocityRamp.h b/source/RobotAPI/libraries/core/CartesianVelocityRamp.h
index 51abe44bc22a8647062397e9ee2fb123129ae7c4..d3d0b9ba0b81823eb17a0851f798286e9e9acfab 100644
--- a/source/RobotAPI/libraries/core/CartesianVelocityRamp.h
+++ b/source/RobotAPI/libraries/core/CartesianVelocityRamp.h
@@ -31,7 +31,7 @@
namespace armarx
{
class CartesianVelocityRamp;
- typedef boost::shared_ptr<CartesianVelocityRamp> CartesianVelocityRampPtr;
+ using CartesianVelocityRampPtr = boost::shared_ptr<CartesianVelocityRamp>;
class CartesianVelocityRamp
{
diff --git a/source/RobotAPI/libraries/core/FramedOrientedPoint.h b/source/RobotAPI/libraries/core/FramedOrientedPoint.h
index dede436bd570ea98c466e738d9980cbe74c3d411..387ab6f4ce53f697362cc880da5e299dda3dcf47 100644
--- a/source/RobotAPI/libraries/core/FramedOrientedPoint.h
+++ b/source/RobotAPI/libraries/core/FramedOrientedPoint.h
@@ -40,7 +40,7 @@ namespace armarx
}
class FramedOrientedPoint;
- typedef IceInternal::Handle<FramedOrientedPoint> FramedOrientedPointPtr;
+ using FramedOrientedPointPtr = IceInternal::Handle<FramedOrientedPoint>;
class FramedOrientedPoint :
virtual public FramedOrientedPointBase,
diff --git a/source/RobotAPI/libraries/core/FramedPose.h b/source/RobotAPI/libraries/core/FramedPose.h
index 46236272331cd1782739994314f404c278d9de52..e847e63497dfa5b2929649c77e1a6da2af5a1436 100644
--- a/source/RobotAPI/libraries/core/FramedPose.h
+++ b/source/RobotAPI/libraries/core/FramedPose.h
@@ -41,7 +41,7 @@
namespace VirtualRobot
{
class Robot;
- typedef boost::shared_ptr<Robot> RobotPtr;
+ using RobotPtr = boost::shared_ptr<Robot>;
class LinkedCoordinate;
}
@@ -78,7 +78,7 @@ namespace armarx
* @see Vector3, FramedPosition
*/
class FramedDirection;
- typedef IceInternal::Handle<FramedDirection> FramedDirectionPtr;
+ using FramedDirectionPtr = IceInternal::Handle<FramedDirection>;
class FramedDirection :
virtual public FramedDirectionBase,
@@ -139,7 +139,7 @@ namespace armarx
};
class FramedPosition;
- typedef IceInternal::Handle<FramedPosition> FramedPositionPtr;
+ using FramedPositionPtr = IceInternal::Handle<FramedPosition>;
/**
* @class FramedPosition
@@ -220,7 +220,7 @@ namespace armarx
};
class FramedOrientation;
- typedef IceInternal::Handle<FramedOrientation> FramedOrientationPtr;
+ using FramedOrientationPtr = IceInternal::Handle<FramedOrientation>;
/**
* @class FramedOrientation
@@ -287,7 +287,7 @@ namespace armarx
class FramedPose;
- typedef IceInternal::Handle<FramedPose> FramedPosePtr;
+ using FramedPosePtr = IceInternal::Handle<FramedPose>;
/**
* @class FramedPose
@@ -360,7 +360,7 @@ namespace armarx
};
- typedef IceInternal::Handle<FramedPose> FramedPosePtr;
+ using FramedPosePtr = IceInternal::Handle<FramedPose>;
}
diff --git a/source/RobotAPI/libraries/core/JointVelocityRamp.h b/source/RobotAPI/libraries/core/JointVelocityRamp.h
index c31b4a4c2a5448653c7a7f7bbe2dd095f9573b2a..31faf65caee2b216f1cb4e63e5dfb692b47a2824 100644
--- a/source/RobotAPI/libraries/core/JointVelocityRamp.h
+++ b/source/RobotAPI/libraries/core/JointVelocityRamp.h
@@ -29,7 +29,7 @@
namespace armarx
{
class JointVelocityRamp;
- typedef boost::shared_ptr<JointVelocityRamp> JointVelocityRampPtr;
+ using JointVelocityRampPtr = boost::shared_ptr<JointVelocityRamp>;
class JointVelocityRamp
{
diff --git a/source/RobotAPI/libraries/core/LinkedPose.h b/source/RobotAPI/libraries/core/LinkedPose.h
index ff2bede9e9a16e2dcfcf68b2c7f2f64b07516d50..d6cb56ea4cbdac46b288629fb350da4cfb3e7e22 100644
--- a/source/RobotAPI/libraries/core/LinkedPose.h
+++ b/source/RobotAPI/libraries/core/LinkedPose.h
@@ -54,7 +54,7 @@ namespace armarx
class LinkedPose;
- typedef IceInternal::Handle<LinkedPose> LinkedPosePtr;
+ using LinkedPosePtr = IceInternal::Handle<LinkedPose>;
/**
* @class LinkedPose
@@ -172,6 +172,6 @@ namespace armarx
};
- typedef IceInternal::Handle<LinkedDirection> LinkedDirectionPtr;
+ using LinkedDirectionPtr = IceInternal::Handle<LinkedDirection>;
}
diff --git a/source/RobotAPI/libraries/core/MultiDimPIDController.h b/source/RobotAPI/libraries/core/MultiDimPIDController.h
index 4186cb9b15f0134e0d876194924dfe97fb7a735c..2e745298557343a8876cba66d73b3f60a09aaad4 100644
--- a/source/RobotAPI/libraries/core/MultiDimPIDController.h
+++ b/source/RobotAPI/libraries/core/MultiDimPIDController.h
@@ -36,7 +36,7 @@ namespace armarx
public Logging
{
public:
- typedef Eigen::Matrix<float, dimensions, 1> PIDVectorX;
+ using PIDVectorX = Eigen::Matrix<float, dimensions, 1>;
MultiDimPIDControllerTemplate(float Kp,
float Ki,
@@ -240,6 +240,6 @@ namespace armarx
}
}
};
- typedef MultiDimPIDControllerTemplate<> MultiDimPIDController;
- typedef boost::shared_ptr<MultiDimPIDControllerTemplate<>> MultiDimPIDControllerPtr;
+ using MultiDimPIDController = MultiDimPIDControllerTemplate<>;
+ using MultiDimPIDControllerPtr = boost::shared_ptr<MultiDimPIDControllerTemplate<>>;
}
diff --git a/source/RobotAPI/libraries/core/OrientedPoint.h b/source/RobotAPI/libraries/core/OrientedPoint.h
index 62594ffd43fbe8d602b458ba1c79b717f04531c5..6d1ed992b1de2adfbe4050c9d6a294a1b16de451 100644
--- a/source/RobotAPI/libraries/core/OrientedPoint.h
+++ b/source/RobotAPI/libraries/core/OrientedPoint.h
@@ -80,6 +80,6 @@ namespace armarx
void deserialize(const armarx::ObjectSerializerBasePtr& serializer, const ::Ice::Current& = ::Ice::Current()) override;
};
- typedef IceInternal::Handle<OrientedPoint> OrientedPointPtr;
+ using OrientedPointPtr = IceInternal::Handle<OrientedPoint>;
}
diff --git a/source/RobotAPI/libraries/core/PIDController.h b/source/RobotAPI/libraries/core/PIDController.h
index f0409a76531fac273ca193bc3b844ab3b2926985..e61111d96ce662c46ef815e24e064f6406b85e9b 100644
--- a/source/RobotAPI/libraries/core/PIDController.h
+++ b/source/RobotAPI/libraries/core/PIDController.h
@@ -69,7 +69,7 @@ namespace armarx
ScopedRecursiveLockPtr getLock() const;
mutable RecursiveMutex mutex;
};
- typedef boost::shared_ptr<PIDController> PIDControllerPtr;
+ using PIDControllerPtr = boost::shared_ptr<PIDController>;
}
diff --git a/source/RobotAPI/libraries/core/Pose.h b/source/RobotAPI/libraries/core/Pose.h
index 6911f787073c25528b707b632444c638a55e766e..848eaa099195dc63a0546e697d088a29dc3d4f7e 100644
--- a/source/RobotAPI/libraries/core/Pose.h
+++ b/source/RobotAPI/libraries/core/Pose.h
@@ -96,7 +96,7 @@ namespace armarx
};
- typedef IceInternal::Handle<Vector2> Vector2Ptr;
+ using Vector2Ptr = IceInternal::Handle<Vector2>;
/**
* @class Vector3
@@ -148,7 +148,7 @@ namespace armarx
void deserialize(const armarx::ObjectSerializerBasePtr& serializer, const ::Ice::Current& = ::Ice::Current()) override;
};
- typedef IceInternal::Handle<Vector3> Vector3Ptr;
+ using Vector3Ptr = IceInternal::Handle<Vector3>;
/**
@@ -208,7 +208,7 @@ namespace armarx
void init(const Eigen::Quaternionf&);
};
- typedef IceInternal::Handle<Quaternion> QuaternionPtr;
+ using QuaternionPtr = IceInternal::Handle<Quaternion>;
/**
@@ -269,7 +269,7 @@ namespace armarx
};
- typedef IceInternal::Handle<Pose> PosePtr;
+ using PosePtr = IceInternal::Handle<Pose>;
}
diff --git a/source/RobotAPI/libraries/core/RobotPool.h b/source/RobotAPI/libraries/core/RobotPool.h
index fb519103760805ae25be70fb9beb039cb8491440..6aa0ccb24c917a6e76c2d2a0e1d06f9cc8ae16be 100644
--- a/source/RobotAPI/libraries/core/RobotPool.h
+++ b/source/RobotAPI/libraries/core/RobotPool.h
@@ -55,7 +55,7 @@ namespace armarx
VirtualRobot::RobotPtr baseRobot;
mutable Mutex mutex;
};
- typedef std::shared_ptr<RobotPool> RobotPoolPtr;
+ using RobotPoolPtr = std::shared_ptr<RobotPool>;
}
diff --git a/source/RobotAPI/libraries/core/Trajectory.h b/source/RobotAPI/libraries/core/Trajectory.h
index 15de38e073b2924f2178df40c98d9160dfc03f9b..4bc802bdf578df373dcf1942fd672731a4621862 100644
--- a/source/RobotAPI/libraries/core/Trajectory.h
+++ b/source/RobotAPI/libraries/core/Trajectory.h
@@ -53,10 +53,10 @@ namespace armarx
}
- typedef boost::shared_ptr<Ice::DoubleSeq> DoubleSeqPtr;
+ using DoubleSeqPtr = boost::shared_ptr<Ice::DoubleSeq>;
class Trajectory;
- typedef IceInternal::Handle<Trajectory> TrajectoryPtr;
+ using TrajectoryPtr = IceInternal::Handle<Trajectory>;
/**
* @class Trajectory
@@ -87,7 +87,7 @@ namespace armarx
public:
- typedef std::map<double, std::vector< DoubleSeqPtr > > TrajMap;
+ using TrajMap = std::map<double, std::vector< DoubleSeqPtr > >;
struct TrajData
{
@@ -192,8 +192,8 @@ namespace armarx
boost::multi_index::ordered_unique<boost::multi_index::tag<TagOrdered>, boost::multi_index::member<TrajData, double, &TrajData::timestamp> > // this index represents timestamp incremental order
>
> TrajDataContainer;
- typedef typename boost::multi_index::index<TrajDataContainer, TagTimestamp>::type timestamp_view;
- typedef typename boost::multi_index::index<TrajDataContainer, TagOrdered>::type ordered_view;
+ using timestamp_view = typename boost::multi_index::index<TrajDataContainer, TagTimestamp>::type;
+ using ordered_view = typename boost::multi_index::index<TrajDataContainer, TagOrdered>::type;
diff --git a/source/RobotAPI/libraries/core/TrajectoryController.h b/source/RobotAPI/libraries/core/TrajectoryController.h
index 2b4c44983357322de378f71ee753711a349b02f6..161495b726a119669dbd6cbba38a1538e6979cf3 100644
--- a/source/RobotAPI/libraries/core/TrajectoryController.h
+++ b/source/RobotAPI/libraries/core/TrajectoryController.h
@@ -58,7 +58,7 @@ namespace armarx
Eigen::VectorXf currentError;
};
- typedef std::shared_ptr<TrajectoryController> TrajectoryControllerPtr;
+ using TrajectoryControllerPtr = std::shared_ptr<TrajectoryController>;
} // namespace armarx
diff --git a/source/RobotAPI/libraries/core/math/LinearizeAngularTrajectory.h b/source/RobotAPI/libraries/core/math/LinearizeAngularTrajectory.h
index c8479ee65d3bc665d696e9550ee66ddda1d8fa2c..79a8101a3eda595f3dc366aeec3a8ac5258efa7b 100644
--- a/source/RobotAPI/libraries/core/math/LinearizeAngularTrajectory.h
+++ b/source/RobotAPI/libraries/core/math/LinearizeAngularTrajectory.h
@@ -31,7 +31,7 @@ namespace armarx
namespace math
{
class LinearizeAngularTrajectory;
- typedef boost::shared_ptr<LinearizeAngularTrajectory> LinearizedAngularTrajectoryPtr;
+ using LinearizedAngularTrajectoryPtr = boost::shared_ptr<LinearizeAngularTrajectory>;
class LinearizeAngularTrajectory
{
diff --git a/source/RobotAPI/libraries/core/math/SlidingWindowVectorMedian.h b/source/RobotAPI/libraries/core/math/SlidingWindowVectorMedian.h
index d306c3c6487240ca069d0b5aa136d4434a8d9cae..54ed9123a3a1fab6bba1823b724b67d91eef6569 100644
--- a/source/RobotAPI/libraries/core/math/SlidingWindowVectorMedian.h
+++ b/source/RobotAPI/libraries/core/math/SlidingWindowVectorMedian.h
@@ -35,7 +35,7 @@ namespace armarx
namespace math
{
class SlidingWindowVectorMedian;
- typedef boost::shared_ptr<SlidingWindowVectorMedian> SlidingWindowVectorMedianPtr;
+ using SlidingWindowVectorMedianPtr = boost::shared_ptr<SlidingWindowVectorMedian>;
class SlidingWindowVectorMedian
{
diff --git a/source/RobotAPI/libraries/core/math/TimeSeriesUtils.h b/source/RobotAPI/libraries/core/math/TimeSeriesUtils.h
index 8490879424a4945f50593bda5737ffe0018edac5..af54ec9750fc3a5bfcb75967a6f571fb1ab36cd3 100644
--- a/source/RobotAPI/libraries/core/math/TimeSeriesUtils.h
+++ b/source/RobotAPI/libraries/core/math/TimeSeriesUtils.h
@@ -30,7 +30,7 @@ namespace armarx
namespace math
{
class TimeSeriesUtils;
- typedef boost::shared_ptr<TimeSeriesUtils> TimeSeriesUtilsPtr;
+ using TimeSeriesUtilsPtr = boost::shared_ptr<TimeSeriesUtils>;
class TimeSeriesUtils
diff --git a/source/RobotAPI/libraries/core/remoterobot/RemoteRobot.h b/source/RobotAPI/libraries/core/remoterobot/RemoteRobot.h
index 41e3136b0cd351b72b79cfaa88c3d0dd9b3a0c53..03f07a1f4cc4118d3083df4d62d9ae527d9972ba 100644
--- a/source/RobotAPI/libraries/core/remoterobot/RemoteRobot.h
+++ b/source/RobotAPI/libraries/core/remoterobot/RemoteRobot.h
@@ -272,7 +272,7 @@ namespace armarx
static VirtualRobot::RobotNodePtr createRemoteRobotNode(SharedRobotNodeInterfacePrx, VirtualRobot::RobotPtr);
};
- typedef boost::shared_ptr<RemoteRobot> RemoteRobotPtr;
+ using RemoteRobotPtr = boost::shared_ptr<RemoteRobot>;
}
#endif
diff --git a/source/RobotAPI/libraries/core/remoterobot/RobotStateObserver.h b/source/RobotAPI/libraries/core/remoterobot/RobotStateObserver.h
index e101bb3572537970e63bef0709bd035a47868723..e8c1146821c153ab5767805431e2a8c8a9d53163 100644
--- a/source/RobotAPI/libraries/core/remoterobot/RobotStateObserver.h
+++ b/source/RobotAPI/libraries/core/remoterobot/RobotStateObserver.h
@@ -36,9 +36,9 @@
namespace VirtualRobot
{
class Robot;
- typedef boost::shared_ptr<Robot> RobotPtr;
+ using RobotPtr = boost::shared_ptr<Robot>;
class RobotNode;
- typedef boost::shared_ptr<RobotNode> RobotNodePtr;
+ using RobotNodePtr = boost::shared_ptr<RobotNode>;
}
namespace armarx
@@ -58,7 +58,7 @@ namespace armarx
}
};
- typedef ::std::map< ::std::string, ::armarx::FramedPoseBasePtr> FramedPoseBaseMap;
+ using FramedPoseBaseMap = ::std::map< ::std::string, ::armarx::FramedPoseBasePtr>;
/**
* ArmarX RobotStateObserver.
@@ -108,6 +108,6 @@ namespace armarx
DatafieldRefBasePtr getPoseDatafield(const std::string& nodeName, const Ice::Current&) const override;
};
- typedef IceInternal::Handle<RobotStateObserver> RobotStateObserverPtr;
+ using RobotStateObserverPtr = IceInternal::Handle<RobotStateObserver>;
}