kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Robot: modernize C++11

Browse Source 
* use nullptr
This commit is contained in:
wmayer
2022-03-23 19:06:14 +01:00
parent 58d1cc4818
commit a057e5486d
30 changed files with 75 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Mod/Robot/Gui/ViewProviderRobotObject.cpp
View File

@@ -56,7 +56,7 @@ using namespace RobotGui;
PROPERTY_SOURCE(RobotGui::ViewProviderRobotObject, Gui::ViewProviderGeometryObject)
ViewProviderRobotObject::ViewProviderRobotObject()
: pcDragger(0),toolShape(0)
: pcDragger(nullptr),toolShape(nullptr)
{
ADD_PROPERTY(Manipulator,(0));
@@ -79,7 +79,7 @@ ViewProviderRobotObject::ViewProviderRobotObject()
pcTcpRoot->ref();
Axis1Node = Axis2Node = Axis3Node = Axis4Node = Axis5Node = Axis6Node = 0;
Axis1Node = Axis2Node = Axis3Node = Axis4Node = Axis5Node = Axis6Node = nullptr;
}
ViewProviderRobotObject::~ViewProviderRobotObject()
@@ -92,7 +92,7 @@ ViewProviderRobotObject::~ViewProviderRobotObject()
void ViewProviderRobotObject::setDragger()
{
assert(pcDragger==0);
assert(pcDragger==nullptr);
pcDragger = new SoJackDragger();
pcDragger->addMotionCallback(sDraggerMotionCallback,this);
pcTcpRoot->addChild(pcDragger);
@@ -112,7 +112,7 @@ void ViewProviderRobotObject::resetDragger()
{
assert(pcDragger);
Gui::coinRemoveAllChildren(pcTcpRoot);
pcDragger = 0;
pcDragger = nullptr;
}
void ViewProviderRobotObject::attach(App::DocumentObject *pcObj)
@@ -190,7 +190,7 @@ void ViewProviderRobotObject::updateData(const App::Property* prop)
pcRobotRoot->addChild(pcTcpRoot);
}
// search for the connection points +++++++++++++++++++++++++++++++++++++++++++++++++
Axis1Node = Axis2Node = Axis3Node = Axis4Node = Axis5Node = Axis6Node = 0;
Axis1Node = Axis2Node = Axis3Node = Axis4Node = Axis5Node = Axis6Node = nullptr;
SoSearchAction searchAction;
SoPath * path;
@@ -329,7 +329,7 @@ void ViewProviderRobotObject::updateData(const App::Property* prop)
toolShape = Gui::Application::Instance->getViewProvider(o);
toolShape->setTransformation((robObj->Tcp.getValue() * (robObj->ToolBase.getValue().inverse())).toMatrix());
}else
toolShape = 0;
toolShape = nullptr;
}
}