Skip to content
Snippets Groups Projects
Commit 130c9496 authored by Raphael Grimm's avatar Raphael Grimm
Browse files

Replace typedef with using

parent 1c7dc8e1
No related branches found
No related tags found
No related merge requests found
Showing
with 32 additions and 32 deletions
...@@ -583,7 +583,7 @@ namespace armarx ...@@ -583,7 +583,7 @@ namespace armarx
}; };
typedef IceInternal::Handle<DebugDrawerComponent> DebugDrawerComponentPtr; using DebugDrawerComponentPtr = IceInternal::Handle<DebugDrawerComponent>;
} }
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
namespace armarx namespace armarx
{ {
class DebugDrawerHelper; class DebugDrawerHelper;
typedef boost::shared_ptr<DebugDrawerHelper> DebugDrawerHelperPtr; using DebugDrawerHelperPtr = boost::shared_ptr<DebugDrawerHelper>;
class DebugDrawerHelper class DebugDrawerHelper
{ {
......
...@@ -89,8 +89,8 @@ protected: ...@@ -89,8 +89,8 @@ protected:
// ***************************************************************** // *****************************************************************
// types // types
// ***************************************************************** // *****************************************************************
typedef vector<CSGEdge*> TEdgeList; using TEdgeList = vector<CSGEdge*>;
typedef vector<CSGNode*> TNodeList; using TNodeList = vector<CSGNode*>;
// ***************************************************************** // *****************************************************************
// definition of class CSphericalGraph // definition of class CSphericalGraph
......
...@@ -61,7 +61,7 @@ struct TPathElement ...@@ -61,7 +61,7 @@ struct TPathElement
float fBestSimilarity; float fBestSimilarity;
}; };
typedef vector<TPathElement> TPath; using TPath = vector<TPathElement>;
struct THypothesis struct THypothesis
{ {
......
...@@ -54,7 +54,7 @@ using namespace Ice; ...@@ -54,7 +54,7 @@ using namespace Ice;
namespace armarx namespace armarx
{ {
typedef std::map<std::string, SharedRobotNodeInterfacePrx> NodeCache; using NodeCache = std::map<std::string, SharedRobotNodeInterfacePrx>;
/////////////////////////////// ///////////////////////////////
// SharedObjectBase // SharedObjectBase
......
...@@ -35,9 +35,9 @@ ...@@ -35,9 +35,9 @@
namespace VirtualRobot namespace VirtualRobot
{ {
class Robot; class Robot;
typedef boost::shared_ptr<Robot> RobotPtr; using RobotPtr = boost::shared_ptr<Robot>;
class RobotNode; class RobotNode;
typedef boost::shared_ptr<RobotNode> RobotNodePtr; using RobotNodePtr = boost::shared_ptr<RobotNode>;
} }
namespace armarx namespace armarx
...@@ -157,6 +157,6 @@ namespace armarx ...@@ -157,6 +157,6 @@ namespace armarx
}; };
typedef IceInternal::Handle<SharedRobotServant> SharedRobotServantPtr; using SharedRobotServantPtr = IceInternal::Handle<SharedRobotServant>;
} }
...@@ -68,7 +68,7 @@ public: ...@@ -68,7 +68,7 @@ public:
TestArmarXManagerPtr _manager; TestArmarXManagerPtr _manager;
IceTestHelperPtr _iceTestHelper; IceTestHelperPtr _iceTestHelper;
}; };
typedef boost::shared_ptr<RobotStateComponentTestEnvironment> RobotStateComponentTestEnvironmentPtr; using RobotStateComponentTestEnvironmentPtr = boost::shared_ptr<RobotStateComponentTestEnvironment>;
BOOST_AUTO_TEST_CASE(RobotStateComponentHistoryTest) BOOST_AUTO_TEST_CASE(RobotStateComponentHistoryTest)
//void func() //void func()
......
...@@ -37,9 +37,9 @@ ...@@ -37,9 +37,9 @@
namespace VirtualRobot namespace VirtualRobot
{ {
class Robot; class Robot;
typedef boost::shared_ptr<Robot> RobotPtr; using RobotPtr = boost::shared_ptr<Robot>;
class EndEffector; class EndEffector;
typedef boost::shared_ptr<EndEffector> EndEffectorPtr; using EndEffectorPtr = boost::shared_ptr<EndEffector>;
} }
namespace armarx namespace armarx
{ {
......
...@@ -68,7 +68,7 @@ namespace armarx ...@@ -68,7 +68,7 @@ namespace armarx
float torque; float torque;
float temperature; float temperature;
}; };
typedef std::map<std::string, KinematicUnitSimulationJointState> KinematicUnitSimulationJointStates; using KinematicUnitSimulationJointStates = std::map<std::string, KinematicUnitSimulationJointState>;
/** /**
* \class JointInfo. * \class JointInfo.
...@@ -103,7 +103,7 @@ namespace armarx ...@@ -103,7 +103,7 @@ namespace armarx
float limitLo; float limitLo;
float limitHi; float limitHi;
}; };
typedef std::map<std::string, KinematicUnitSimulationJointInfo> KinematicUnitSimulationJointInfos; using KinematicUnitSimulationJointInfos = std::map<std::string, KinematicUnitSimulationJointInfo>;
/** /**
* \class KinematicUnitSimulationPropertyDefinitions * \class KinematicUnitSimulationPropertyDefinitions
......
...@@ -56,8 +56,8 @@ namespace VirtualRobot ...@@ -56,8 +56,8 @@ namespace VirtualRobot
{ {
class Robot; class Robot;
class RobotNode; class RobotNode;
typedef boost::shared_ptr<RobotNode> RobotNodePtr; using RobotNodePtr = boost::shared_ptr<RobotNode>;
typedef boost::shared_ptr<Robot> RobotPtr; using RobotPtr = boost::shared_ptr<Robot>;
} }
namespace armarx namespace armarx
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
namespace armarx namespace armarx
{ {
typedef std::shared_ptr<class RobotPool> RobotPoolPtr; using RobotPoolPtr = std::shared_ptr<class RobotPool>;
namespace RobotUnitModule namespace RobotUnitModule
{ {
......
...@@ -58,6 +58,6 @@ namespace Eigen ...@@ -58,6 +58,6 @@ namespace Eigen
template<typename _Scalar, int _Options> template<typename _Scalar, int _Options>
class Quaternion; class Quaternion;
typedef Quaternion<float, 0> Quaternionf; using Quaternionf = Quaternion<float, 0>;
typedef Quaternion<double, 0> Quaterniond; using Quaterniond = Quaternion<double, 0>;
} }
...@@ -183,10 +183,10 @@ namespace armarx ...@@ -183,10 +183,10 @@ namespace armarx
std::string tcpName; std::string tcpName;
}; };
typedef std::map<std::string, TCPVelocityData> TCPVelocityDataMap; using TCPVelocityDataMap = std::map<std::string, TCPVelocityData>;
TCPVelocityDataMap tcpVelocitiesMap, localTcpVelocitiesMap; TCPVelocityDataMap tcpVelocitiesMap, localTcpVelocitiesMap;
typedef std::map<std::string, VirtualRobot::DifferentialIKPtr> DIKMap; using DIKMap = std::map<std::string, VirtualRobot::DifferentialIKPtr>;
DIKMap dIKMap, localDIKMap; DIKMap dIKMap, localDIKMap;
...@@ -275,7 +275,7 @@ namespace armarx ...@@ -275,7 +275,7 @@ namespace armarx
std::map<VirtualRobot:: SceneObjectPtr, Eigen::VectorXf> tcpWeights; std::map<VirtualRobot:: SceneObjectPtr, Eigen::VectorXf> tcpWeights;
Eigen::VectorXf tcpWeightVec; Eigen::VectorXf tcpWeightVec;
}; };
typedef boost::shared_ptr<EDifferentialIK> EDifferentialIKPtr; using EDifferentialIKPtr = boost::shared_ptr<EDifferentialIK>;
} }
...@@ -80,7 +80,7 @@ namespace armarx ...@@ -80,7 +80,7 @@ namespace armarx
void printInfo(); void printInfo();
void checkSensorCount(); void checkSensorCount();
}; };
typedef boost::shared_ptr<DaqWrapper> DaqWrapperPtr; using DaqWrapperPtr = boost::shared_ptr<DaqWrapper>;
public: public:
OptoForceUnit(); OptoForceUnit();
......
...@@ -40,7 +40,7 @@ namespace armarx ...@@ -40,7 +40,7 @@ namespace armarx
{ {
class WeissHapticSensor; class WeissHapticSensor;
typedef boost::shared_ptr<WeissHapticSensor> WeissHapticSensorPtr; using WeissHapticSensorPtr = boost::shared_ptr<WeissHapticSensor>;
class WeissHapticSensor : public Logging class WeissHapticSensor : public Logging
{ {
......
...@@ -151,6 +151,6 @@ namespace armarx ...@@ -151,6 +151,6 @@ namespace armarx
void reportJointAngles(const::armarx::NameValueMap& actualJointAngles, const Ice::Current&) override; void reportJointAngles(const::armarx::NameValueMap& actualJointAngles, const Ice::Current&) override;
void reportJointPressures(const::armarx::NameValueMap& actualJointPressures, 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>;
} }
...@@ -131,6 +131,6 @@ namespace armarx ...@@ -131,6 +131,6 @@ namespace armarx
std::map<MatrixDatafieldDisplayWidget*, std::string> deviceNameReverseMap; std::map<MatrixDatafieldDisplayWidget*, std::string> deviceNameReverseMap;
}; };
//typedef boost::shared_ptr<HapticUnitWidget> HapticUnitGuiPluginPtr; //using HapticUnitGuiPluginPtr = boost::shared_ptr<HapticUnitWidget>;
} }
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
namespace armarx namespace armarx
{ {
typedef boost::shared_ptr<VirtualRobot::CoinVisualization> CoinVisualizationPtr; using CoinVisualizationPtr = boost::shared_ptr<VirtualRobot::CoinVisualization>;
class KinematicUnitConfigDialog; class KinematicUnitConfigDialog;
...@@ -327,8 +327,8 @@ namespace armarx ...@@ -327,8 +327,8 @@ namespace armarx
int updateTimerId = 0; int updateTimerId = 0;
IceReportSkipper skipper = {20.0f}; IceReportSkipper skipper = {20.0f};
}; };
typedef ::std::vector< ::Ice::Float> FloatVector; using FloatVector = ::std::vector< ::Ice::Float>;
typedef boost::shared_ptr<KinematicUnitWidgetController> KinematicUnitGuiPluginPtr; using KinematicUnitGuiPluginPtr = boost::shared_ptr<KinematicUnitWidgetController>;
} }
......
...@@ -228,6 +228,6 @@ namespace armarx ...@@ -228,6 +228,6 @@ namespace armarx
QPointer<QWidget> getWidget() override; QPointer<QWidget> getWidget() override;
}; };
typedef boost::shared_ptr<PlatformUnitWidget> PlatformUnitGuiPluginPtr; using PlatformUnitGuiPluginPtr = boost::shared_ptr<PlatformUnitWidget>;
} }
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
namespace armarx namespace armarx
{ {
typedef boost::shared_ptr<VirtualRobot::CoinVisualization> CoinVisualizationPtr; using CoinVisualizationPtr = boost::shared_ptr<VirtualRobot::CoinVisualization>;
class RobotViewerConfigDialog; class RobotViewerConfigDialog;
...@@ -190,6 +190,6 @@ namespace armarx ...@@ -190,6 +190,6 @@ namespace armarx
void reportGlobalRobotRootPose(const FramedPoseBasePtr& pose, Ice::Long timestamp, bool poseChanged, const Ice::Current&) override; 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; 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>;
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment