From d5340a82abfd3e6eb2856eee7cdb408e79b1de10 Mon Sep 17 00:00:00 2001 From: wmayer Date: Sat, 25 Jun 2022 11:36:55 +0200 Subject: [PATCH] Gui/Mod: replace several reinterpret_cast with static_cast --- src/Gui/Application.cpp | 2 +- src/Gui/ApplicationPy.cpp | 2 +- src/Gui/Clipping.cpp | 2 +- src/Gui/CommandView.cpp | 6 +++--- src/Gui/LinkViewPyImp.cpp | 4 ++-- src/Gui/ManualAlignment.cpp | 4 ++-- src/Gui/NavigationStyle.cpp | 2 +- src/Gui/SoFCCSysDragger.cpp | 14 +++++++------- src/Gui/SoFCOffscreenRenderer.cpp | 2 +- src/Gui/View3DInventorViewer.cpp | 4 ++-- src/Gui/View3DPy.cpp | 10 +++++----- src/Gui/View3DViewerPy.cpp | 2 +- src/Gui/ViewProvider.cpp | 4 ++-- src/Gui/ViewProviderAnnotation.cpp | 2 +- src/Gui/ViewProviderBuilder.cpp | 2 +- src/Gui/ViewProviderDragger.cpp | 2 +- src/Gui/ViewProviderMeasureDistance.cpp | 4 ++-- src/Gui/ViewProviderPyImp.cpp | 6 +++--- src/Gui/ViewProviderPythonFeature.cpp | 4 ++-- src/Mod/Fem/Gui/Command.cpp | 2 +- src/Mod/Fem/Gui/TaskCreateNodeSet.cpp | 2 +- src/Mod/Fem/Gui/TaskPostBoxes.cpp | 8 ++++---- src/Mod/Fem/Gui/ViewProviderFemMesh.cpp | 2 +- src/Mod/Fem/Gui/ViewProviderFemPostFunction.cpp | 10 +++++----- src/Mod/Inspection/Gui/ViewProviderInspection.cpp | 2 +- src/Mod/MeshPart/Gui/CurveOnMesh.cpp | 2 +- src/Mod/Part/App/TopoShapeVertexPyImp.cpp | 5 ++--- src/Mod/Part/Gui/BoxSelection.cpp | 2 +- src/Mod/Part/Gui/DlgPrimitives.cpp | 8 ++++---- src/Mod/Part/Gui/TaskFaceColors.cpp | 4 ++-- src/Mod/Part/Gui/ViewProviderMirror.cpp | 2 +- src/Mod/Points/Gui/ViewProvider.cpp | 2 +- src/Mod/Robot/App/WaypointPyImp.cpp | 1 - 33 files changed, 64 insertions(+), 66 deletions(-) diff --git a/src/Gui/Application.cpp b/src/Gui/Application.cpp index 568471cfd6..57173b4c56 100644 --- a/src/Gui/Application.cpp +++ b/src/Gui/Application.cpp @@ -268,7 +268,7 @@ FreeCADGui_exportSubgraph(PyObject * /*self*/, PyObject *args) void* ptr = nullptr; try { Base::Interpreter().convertSWIGPointerObj("pivy.coin", "SoNode *", proxy, &ptr, 0); - SoNode* node = reinterpret_cast(ptr); + SoNode* node = static_cast(ptr); if (node) { std::string formatStr(format); std::string buffer; diff --git a/src/Gui/ApplicationPy.cpp b/src/Gui/ApplicationPy.cpp index 3044161ede..9ecd9c571b 100644 --- a/src/Gui/ApplicationPy.cpp +++ b/src/Gui/ApplicationPy.cpp @@ -1640,7 +1640,7 @@ PyObject* Application::sCoinRemoveAllChildren(PyObject * /*self*/, PyObject *arg PY_TRY { void* ptr = nullptr; Base::Interpreter().convertSWIGPointerObj("pivy.coin","_p_SoGroup", pynode, &ptr, 0); - coinRemoveAllChildren(reinterpret_cast(ptr)); + coinRemoveAllChildren(static_cast(ptr)); Py_Return; } PY_CATCH; diff --git a/src/Gui/Clipping.cpp b/src/Gui/Clipping.cpp index 7c6c18aed5..7e4f33bcd0 100644 --- a/src/Gui/Clipping.cpp +++ b/src/Gui/Clipping.cpp @@ -88,7 +88,7 @@ public: static void moveCallback(void * data, SoSensor * sensor) { Q_UNUSED(sensor); - Private* self = reinterpret_cast(data); + Private* self = static_cast(data); if (self->view) { Gui::View3DInventorViewer* view = self->view->getViewer(); SoClipPlane* clip = self->clipView; diff --git a/src/Gui/CommandView.cpp b/src/Gui/CommandView.cpp index b9b30aa9a6..5cf9010897 100644 --- a/src/Gui/CommandView.cpp +++ b/src/Gui/CommandView.cpp @@ -2568,8 +2568,8 @@ public: // Also supports aborting the selection mode by pressing (releasing) the Escape key. static void selectionCallback(void * ud, SoEventCallback * n) { - SelectionCallbackHandler* selectionHandler = reinterpret_cast(ud); - Gui::View3DInventorViewer* view = reinterpret_cast(n->getUserData()); + SelectionCallbackHandler* selectionHandler = static_cast(ud); + Gui::View3DInventorViewer* view = static_cast(n->getUserData()); const SoEvent* ev = n->getEvent(); if (ev->isOfType(SoKeyboardEvent::getClassTypeId())) { @@ -2873,7 +2873,7 @@ static std::vector getBoxSelection( static void doSelect(void* ud, SoEventCallback * cb) { bool selectElement = ud ? true : false; - Gui::View3DInventorViewer* viewer = reinterpret_cast(cb->getUserData()); + Gui::View3DInventorViewer* viewer = static_cast(cb->getUserData()); SoNode* root = viewer->getSceneGraph(); static_cast(root)->selectionRole.setValue(true); diff --git a/src/Gui/LinkViewPyImp.cpp b/src/Gui/LinkViewPyImp.cpp index 07468c4a2c..7fc4fa9d9d 100644 --- a/src/Gui/LinkViewPyImp.cpp +++ b/src/Gui/LinkViewPyImp.cpp @@ -277,7 +277,7 @@ PyObject* LinkViewPy::getElementPicked(PyObject* args) return nullptr; void *ptr = nullptr; Base::Interpreter().convertSWIGPointerObj("pivy.coin", "SoPickedPoint *", obj, &ptr, 0); - SoPickedPoint *pp = reinterpret_cast(ptr); + SoPickedPoint *pp = static_cast(ptr); if(!pp) throw Py::TypeError("type must be of coin.SoPickedPoint"); PY_TRY{ @@ -296,7 +296,7 @@ PyObject* LinkViewPy::getDetailPath(PyObject* args) return nullptr; void *ptr = nullptr; Base::Interpreter().convertSWIGPointerObj("pivy.coin", "SoPath *", path, &ptr, 0); - SoPath *pPath = reinterpret_cast(ptr); + SoPath *pPath = static_cast(ptr); if(!pPath) throw Py::TypeError("type must be of coin.SoPath"); PY_TRY{ diff --git a/src/Gui/ManualAlignment.cpp b/src/Gui/ManualAlignment.cpp index 85b7ed6000..2cf741abe7 100644 --- a/src/Gui/ManualAlignment.cpp +++ b/src/Gui/ManualAlignment.cpp @@ -575,7 +575,7 @@ public: static void syncCameraCB(void * data, SoSensor * s) { - ManualAlignment* self = reinterpret_cast(data); + ManualAlignment* self = static_cast(data); if (!self->myViewer) return; // already destroyed SoCamera* cam1 = self->myViewer->getViewer(0)->getSoRenderManager()->getCamera(); @@ -1215,7 +1215,7 @@ void ManualAlignment::probePickedCallback(void * ud, SoEventCallback * n) { Q_UNUSED(ud); - Gui::View3DInventorViewer* view = reinterpret_cast(n->getUserData()); + Gui::View3DInventorViewer* view = static_cast(n->getUserData()); const SoEvent* ev = n->getEvent(); if (ev->getTypeId() == SoMouseButtonEvent::getClassTypeId()) { // set as handled diff --git a/src/Gui/NavigationStyle.cpp b/src/Gui/NavigationStyle.cpp index ae6d62356e..fe616a4d30 100644 --- a/src/Gui/NavigationStyle.cpp +++ b/src/Gui/NavigationStyle.cpp @@ -477,7 +477,7 @@ void NavigationStyle::setCameraOrientation(const SbRotation& rot, SbBool moveToC void NavigationStyleP::viewAnimationCB(void * data, SoSensor * sensor) { Q_UNUSED(sensor); - NavigationStyle* that = reinterpret_cast(data); + NavigationStyle* that = static_cast(data); if (PRIVATE(that)->animationsteps > 0) { // here the camera rotates from the current rotation to a given // rotation (e.g. the standard views). To get this movement animated diff --git a/src/Gui/SoFCCSysDragger.cpp b/src/Gui/SoFCCSysDragger.cpp index 55ddf27c3f..1e89a52a5f 100644 --- a/src/Gui/SoFCCSysDragger.cpp +++ b/src/Gui/SoFCCSysDragger.cpp @@ -214,7 +214,7 @@ void TDragger::finishCB(void *, SoDragger *d) void TDragger::fieldSensorCB(void *f, SoSensor *) { - TDragger *sudoThis = reinterpret_cast(f); + TDragger *sudoThis = static_cast(f); SbMatrix matrix = sudoThis->getMotionMatrix(); sudoThis->workFieldsIntoTransform(matrix); @@ -486,7 +486,7 @@ void RDragger::finishCB(void *, SoDragger *d) void RDragger::fieldSensorCB(void *f, SoSensor *) { - RDragger *sudoThis = reinterpret_cast(f); + RDragger *sudoThis = static_cast(f); SbMatrix matrix = sudoThis->getMotionMatrix(); sudoThis->workFieldsIntoTransform(matrix); @@ -868,7 +868,7 @@ SbBool SoFCCSysDragger::setUpConnections(SbBool onoff, SbBool doitalways) void SoFCCSysDragger::translationSensorCB(void *f, SoSensor *) { - SoFCCSysDragger *sudoThis = reinterpret_cast(f); + SoFCCSysDragger *sudoThis = static_cast(f); SbMatrix matrix = sudoThis->getMotionMatrix(); sudoThis->workFieldsIntoTransform(matrix); @@ -877,7 +877,7 @@ void SoFCCSysDragger::translationSensorCB(void *f, SoSensor *) void SoFCCSysDragger::rotationSensorCB(void *f, SoSensor *) { - SoFCCSysDragger *sudoThis = reinterpret_cast(f); + SoFCCSysDragger *sudoThis = static_cast(f); SbMatrix matrix = sudoThis->getMotionMatrix(); sudoThis->workFieldsIntoTransform(matrix); @@ -935,7 +935,7 @@ void SoFCCSysDragger::setUpAutoScale(SoCamera *cameraIn) void SoFCCSysDragger::cameraCB(void *data, SoSensor *) { - SoFCCSysDragger *sudoThis = reinterpret_cast(data); + SoFCCSysDragger *sudoThis = static_cast(data); if (!sudoThis->idleSensor.isScheduled()) sudoThis->idleSensor.schedule(); } @@ -980,7 +980,7 @@ void SoFCCSysDragger::handleEvent(SoHandleEventAction * action) void SoFCCSysDragger::idleCB(void *data, SoSensor *) { - SoFCCSysDragger *sudoThis = reinterpret_cast(data); + SoFCCSysDragger *sudoThis = static_cast(data); SoField* field = sudoThis->cameraSensor.getAttachedField(); if (field) { @@ -1003,7 +1003,7 @@ void SoFCCSysDragger::idleCB(void *data, SoSensor *) void SoFCCSysDragger::finishDragCB(void *data, SoDragger *) { - SoFCCSysDragger *sudoThis = reinterpret_cast(data); + SoFCCSysDragger *sudoThis = static_cast(data); // note: when creating a second view of the document and then closing // the first viewer it deletes the camera. However, the attached field diff --git a/src/Gui/SoFCOffscreenRenderer.cpp b/src/Gui/SoFCOffscreenRenderer.cpp index b0e5615b82..35a897b6d7 100644 --- a/src/Gui/SoFCOffscreenRenderer.cpp +++ b/src/Gui/SoFCOffscreenRenderer.cpp @@ -881,7 +881,7 @@ Py::Object SoQtOffscreenRendererPy::render(const Py::Tuple& args) try { void* ptr = nullptr; Base::Interpreter().convertSWIGPointerObj("pivy.coin", "SoNode *", proxy, &ptr, 0); - SoNode* node = reinterpret_cast(ptr); + SoNode* node = static_cast(ptr); bool ok = false; if (node) { ok = renderer.render(node); diff --git a/src/Gui/View3DInventorViewer.cpp b/src/Gui/View3DInventorViewer.cpp index 2b6321eddd..23ca52cc57 100644 --- a/src/Gui/View3DInventorViewer.cpp +++ b/src/Gui/View3DInventorViewer.cpp @@ -1290,14 +1290,14 @@ void View3DInventorViewer::setGLWidgetCB(void* userdata, SoAction* action) // Coin error in SoNode::GLRenderS(): GL error: 'GL_STACK_UNDERFLOW', nodetype: // Separator (set envvar COIN_GLERROR_DEBUGGING=1 and re-run to get more information) if (action->isOfType(SoGLRenderAction::getClassTypeId())) { - QWidget* gl = reinterpret_cast(userdata); + QWidget* gl = static_cast(userdata); SoGLWidgetElement::set(action->getState(), qobject_cast(gl)); } } void View3DInventorViewer::handleEventCB(void* ud, SoEventCallback* n) { - View3DInventorViewer* that = reinterpret_cast(ud); + View3DInventorViewer* that = static_cast(ud); SoGLRenderAction* glra = that->getSoRenderManager()->getGLRenderAction(); SoAction* action = n->getAction(); SoGLRenderActionElement::set(action->getState(), glra); diff --git a/src/Gui/View3DPy.cpp b/src/Gui/View3DPy.cpp index ad8bf4ec94..58e39589d0 100644 --- a/src/Gui/View3DPy.cpp +++ b/src/Gui/View3DPy.cpp @@ -1324,7 +1324,7 @@ Py::Object View3DInventorPy::dumpNode(const Py::Tuple& args) catch (const Base::Exception& e) { throw Py::RuntimeError(e.what()); } - SoNode* node = reinterpret_cast(ptr); + SoNode* node = static_cast(ptr); return Py::String(SoFCDB::writeNodesToString(node)); } @@ -2342,7 +2342,7 @@ Py::Object View3DInventorPy::addEventCallbackPivy(const Py::Tuple& args) throw Py::RuntimeError(e.what()); } - SoType* eventId = reinterpret_cast(ptr); + SoType* eventId = static_cast(ptr); if (eventId->isBad() || !eventId->isDerivedFrom(SoEvent::getClassTypeId())) { std::string s; std::ostringstream s_out; @@ -2384,7 +2384,7 @@ Py::Object View3DInventorPy::removeEventCallbackPivy(const Py::Tuple& args) throw Py::RuntimeError(e.what()); } - SoType* eventId = reinterpret_cast(ptr); + SoType* eventId = static_cast(ptr); if (eventId->isBad() || !eventId->isDerivedFrom(SoEvent::getClassTypeId())) { std::string s; std::ostringstream s_out; @@ -2475,7 +2475,7 @@ Py::Object View3DInventorPy::addDraggerCallback(const Py::Tuple& args) catch (const Base::Exception&) { throw Py::TypeError("The first argument must be of type SoDragger"); } - SoDragger* drag = reinterpret_cast(ptr); + SoDragger* drag = static_cast(ptr); //Check if method is callable if (PyCallable_Check(method) == 0) { @@ -2528,7 +2528,7 @@ Py::Object View3DInventorPy::removeDraggerCallback(const Py::Tuple& args) throw Py::TypeError("The first argument must be of type SoDragger"); } - SoDragger* drag = reinterpret_cast(ptr); + SoDragger* drag = static_cast(ptr); try { if (strcmp(type, "addFinishCallback") == 0) { drag->removeFinishCallback(draggerCallback, method); diff --git a/src/Gui/View3DViewerPy.cpp b/src/Gui/View3DViewerPy.cpp index 9d769d57bd..27da7d1e2c 100644 --- a/src/Gui/View3DViewerPy.cpp +++ b/src/Gui/View3DViewerPy.cpp @@ -390,7 +390,7 @@ Py::Object View3DInventorViewerPy::setupEditingRoot(const Py::Tuple& args) if(pynode!=Py_None) { void* ptr = nullptr; Base::Interpreter().convertSWIGPointerObj("pivy.coin", "SoNode *", pynode, &ptr, 0); - node = reinterpret_cast(ptr); + node = static_cast(ptr); } _viewer->setupEditingRoot(node,mat); return Py::None(); diff --git a/src/Gui/ViewProvider.cpp b/src/Gui/ViewProvider.cpp index bb390865b9..495bb50b1c 100644 --- a/src/Gui/ViewProvider.cpp +++ b/src/Gui/ViewProvider.cpp @@ -197,8 +197,8 @@ void highlight(const HighlightMode& high) void ViewProvider::eventCallback(void * ud, SoEventCallback * node) { const SoEvent * ev = node->getEvent(); - Gui::View3DInventorViewer* viewer = reinterpret_cast(node->getUserData()); - ViewProvider *self = reinterpret_cast(ud); + Gui::View3DInventorViewer* viewer = static_cast(node->getUserData()); + ViewProvider *self = static_cast(ud); assert(self); try { diff --git a/src/Gui/ViewProviderAnnotation.cpp b/src/Gui/ViewProviderAnnotation.cpp index 2589523ab6..f1df4531e2 100644 --- a/src/Gui/ViewProviderAnnotation.cpp +++ b/src/Gui/ViewProviderAnnotation.cpp @@ -424,7 +424,7 @@ void ViewProviderAnnotationLabel::dragFinishCallback(void *, SoDragger *) void ViewProviderAnnotationLabel::dragMotionCallback(void *data, SoDragger *drag) { - ViewProviderAnnotationLabel* that = reinterpret_cast(data); + ViewProviderAnnotationLabel* that = static_cast(data); const SbMatrix& mat = drag->getMotionMatrix(); App::DocumentObject* obj = that->getObject(); if (obj && obj->getTypeId() == App::AnnotationLabel::getClassTypeId()) { diff --git a/src/Gui/ViewProviderBuilder.cpp b/src/Gui/ViewProviderBuilder.cpp index 2abfac4236..fa776352a4 100644 --- a/src/Gui/ViewProviderBuilder.cpp +++ b/src/Gui/ViewProviderBuilder.cpp @@ -54,7 +54,7 @@ ViewProvider* ViewProviderBuilder::create(const Base::Type& type) { std::map::iterator it = _prop_to_view.find(type); if (it != _prop_to_view.end()) - return reinterpret_cast(it->second.createInstance()); + return static_cast(it->second.createInstance()); return nullptr; } diff --git a/src/Gui/ViewProviderDragger.cpp b/src/Gui/ViewProviderDragger.cpp index 94bc043c56..91e50ded7f 100644 --- a/src/Gui/ViewProviderDragger.cpp +++ b/src/Gui/ViewProviderDragger.cpp @@ -226,7 +226,7 @@ void ViewProviderDragger::dragFinishCallback(void *data, SoDragger *d) { // This is called when a manipulator has done manipulating - ViewProviderDragger* sudoThis = reinterpret_cast(data); + ViewProviderDragger* sudoThis = static_cast(data); SoFCCSysDragger *dragger = static_cast(d); updatePlacementFromDragger(sudoThis, dragger); diff --git a/src/Gui/ViewProviderMeasureDistance.cpp b/src/Gui/ViewProviderMeasureDistance.cpp index bfec18944e..8a25195df4 100644 --- a/src/Gui/ViewProviderMeasureDistance.cpp +++ b/src/Gui/ViewProviderMeasureDistance.cpp @@ -315,8 +315,8 @@ ViewProviderPointMarker::~ViewProviderPointMarker() void ViewProviderMeasureDistance::measureDistanceCallback(void * ud, SoEventCallback * n) { - Gui::View3DInventorViewer* view = reinterpret_cast(n->getUserData()); - PointMarker *pm = reinterpret_cast(ud); + Gui::View3DInventorViewer* view = static_cast(n->getUserData()); + PointMarker *pm = static_cast(ud); const SoEvent* ev = n->getEvent(); if (ev->isOfType(SoKeyboardEvent::getClassTypeId())) { const SoKeyboardEvent * ke = static_cast(ev); diff --git a/src/Gui/ViewProviderPyImp.cpp b/src/Gui/ViewProviderPyImp.cpp index 09b7e57930..c2b510e1a0 100644 --- a/src/Gui/ViewProviderPyImp.cpp +++ b/src/Gui/ViewProviderPyImp.cpp @@ -317,7 +317,7 @@ PyObject* ViewProviderPy::addDisplayMode(PyObject * args) } PY_TRY { - SoNode* node = reinterpret_cast(ptr); + SoNode* node = static_cast(ptr); getViewProviderPtr()->addDisplayMaskMode(node,mode); Py_Return; } @@ -478,7 +478,7 @@ PyObject* ViewProviderPy::getElementPicked(PyObject* args) void *ptr = nullptr; Base::Interpreter().convertSWIGPointerObj("pivy.coin", "_p_SoPickedPoint", obj, &ptr, 0); - SoPickedPoint *pp = reinterpret_cast(ptr); + SoPickedPoint *pp = static_cast(ptr); if(!pp) throw Base::TypeError("type must be coin.SoPickedPoint"); @@ -499,7 +499,7 @@ PyObject* ViewProviderPy::getDetailPath(PyObject* args) void *ptr = nullptr; Base::Interpreter().convertSWIGPointerObj("pivy.coin", "_p_SoPath", path, &ptr, 0); - SoPath *pPath = reinterpret_cast(ptr); + SoPath *pPath = static_cast(ptr); if(!pPath) throw Base::TypeError("'path' must be a coin.SoPath"); SoDetail *det = nullptr; diff --git a/src/Gui/ViewProviderPythonFeature.cpp b/src/Gui/ViewProviderPythonFeature.cpp index 06c9910cfa..e7251ba741 100644 --- a/src/Gui/ViewProviderPythonFeature.cpp +++ b/src/Gui/ViewProviderPythonFeature.cpp @@ -497,7 +497,7 @@ bool ViewProviderPythonFeatureImp::getDetail(const char* name, SoDetail *&det) c Py::Object pydet(Base::pyCall(py_getDetail.ptr(),args.ptr())); void* ptr = nullptr; Base::Interpreter().convertSWIGPointerObj("pivy.coin", "SoDetail *", pydet.ptr(), &ptr, 0); - SoDetail* detail = reinterpret_cast(ptr); + SoDetail* detail = static_cast(ptr); det = detail ? detail->copy() : nullptr; return true; } @@ -538,7 +538,7 @@ ViewProviderPythonFeatureImp::ValueT ViewProviderPythonFeatureImp::getDetailPath return Accepted; void* ptr = nullptr; Base::Interpreter().convertSWIGPointerObj("pivy.coin", "SoDetail *", pyDet.ptr(), &ptr, 0); - SoDetail* detail = reinterpret_cast(ptr); + SoDetail* detail = static_cast(ptr); det = detail ? detail->copy() : nullptr; if(det) return Accepted; diff --git a/src/Mod/Fem/Gui/Command.cpp b/src/Mod/Fem/Gui/Command.cpp index 5d05de2909..7a1fa85c95 100644 --- a/src/Mod/Fem/Gui/Command.cpp +++ b/src/Mod/Fem/Gui/Command.cpp @@ -951,7 +951,7 @@ void DefineNodesCallback(void* ud, SoEventCallback* n) Gui::WaitCursor wc; // When this callback function is invoked we must in either case leave the edit mode - Gui::View3DInventorViewer* view = reinterpret_cast(n->getUserData()); + Gui::View3DInventorViewer* view = static_cast(n->getUserData()); view->setEditing(false); view->removeEventCallback(SoMouseButtonEvent::getClassTypeId(), DefineNodesCallback, ud); n->setHandled(); diff --git a/src/Mod/Fem/Gui/TaskCreateNodeSet.cpp b/src/Mod/Fem/Gui/TaskCreateNodeSet.cpp index 359fa5ce42..91e4fecb94 100644 --- a/src/Mod/Fem/Gui/TaskCreateNodeSet.cpp +++ b/src/Mod/Fem/Gui/TaskCreateNodeSet.cpp @@ -138,7 +138,7 @@ void TaskCreateNodeSet::DefineNodesCallback(void* ud, SoEventCallback* n) // When this callback function is invoked we must in either case leave the edit mode - Gui::View3DInventorViewer* view = reinterpret_cast(n->getUserData()); + Gui::View3DInventorViewer* view = static_cast(n->getUserData()); view->setEditing(false); view->removeEventCallback(SoMouseButtonEvent::getClassTypeId(), DefineNodesCallback, ud); n->setHandled(); diff --git a/src/Mod/Fem/Gui/TaskPostBoxes.cpp b/src/Mod/Fem/Gui/TaskPostBoxes.cpp index 94ae68aecb..42cf6987ff 100644 --- a/src/Mod/Fem/Gui/TaskPostBoxes.cpp +++ b/src/Mod/Fem/Gui/TaskPostBoxes.cpp @@ -822,8 +822,8 @@ void TaskPostDataAlongLine::resolutionChanged(int val) { void TaskPostDataAlongLine::pointCallback(void* ud, SoEventCallback* n) { const SoMouseButtonEvent* mbe = static_cast(n->getEvent()); - Gui::View3DInventorViewer* view = reinterpret_cast(n->getUserData()); - PointMarker* pm = reinterpret_cast(ud); + Gui::View3DInventorViewer* view = static_cast(n->getUserData()); + PointMarker* pm = static_cast(ud); // Mark all incoming mouse button events as handled, especially, to deactivate the selection node n->getAction()->setHandled(); @@ -1047,8 +1047,8 @@ void TaskPostDataAtPoint::centerChanged(double) { void TaskPostDataAtPoint::pointCallback(void* ud, SoEventCallback* n) { const SoMouseButtonEvent* mbe = static_cast(n->getEvent()); - Gui::View3DInventorViewer* view = reinterpret_cast(n->getUserData()); - DataMarker* pm = reinterpret_cast(ud); + Gui::View3DInventorViewer* view = static_cast(n->getUserData()); + DataMarker* pm = static_cast(ud); // Mark all incoming mouse button events as handled, especially, to deactivate the selection node n->getAction()->setHandled(); diff --git a/src/Mod/Fem/Gui/ViewProviderFemMesh.cpp b/src/Mod/Fem/Gui/ViewProviderFemMesh.cpp index 3716dba96e..438e1dd86f 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemMesh.cpp +++ b/src/Mod/Fem/Gui/ViewProviderFemMesh.cpp @@ -245,7 +245,7 @@ void ViewProviderFemMesh::attach(App::DocumentObject *pcObj) ViewProviderGeometryObject::attach(pcObj); // Move 'coords' before the switch - //pcRoot->insertChild(pcCoords,pcRoot->findChild(reinterpret_cast(pcModeSwitch))); + //pcRoot->insertChild(pcCoords,pcRoot->findChild(static_cast(pcModeSwitch))); // Annotation sets SoGroup* pcAnotRoot = new SoAnnotation(); diff --git a/src/Mod/Fem/Gui/ViewProviderFemPostFunction.cpp b/src/Mod/Fem/Gui/ViewProviderFemPostFunction.cpp index 6b2b853180..11fb93fdca 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemPostFunction.cpp +++ b/src/Mod/Fem/Gui/ViewProviderFemPostFunction.cpp @@ -297,9 +297,9 @@ void ViewProviderFemPostFunction::dragStartCallback(void* data, SoDragger*) { // This is called when a manipulator is about to manipulating Gui::Application::Instance->activeDocument()->openCommand(QT_TRANSLATE_NOOP("Command", "Edit Mirror")); - reinterpret_cast(data)->m_isDragging = true; + static_cast(data)->m_isDragging = true; - ViewProviderFemPostFunction* that = reinterpret_cast(data); + ViewProviderFemPostFunction* that = static_cast(data); that->m_autoRecompute = FemSettings().getPostAutoRecompute(); } @@ -308,16 +308,16 @@ void ViewProviderFemPostFunction::dragFinishCallback(void* data, SoDragger*) // This is called when a manipulator has done manipulating Gui::Application::Instance->activeDocument()->commitCommand(); - ViewProviderFemPostFunction* that = reinterpret_cast(data); + ViewProviderFemPostFunction* that = static_cast(data); if (that->m_autoRecompute) that->getObject()->getDocument()->recompute(); - reinterpret_cast(data)->m_isDragging = false; + static_cast(data)->m_isDragging = false; } void ViewProviderFemPostFunction::dragMotionCallback(void* data, SoDragger* drag) { - ViewProviderFemPostFunction* that = reinterpret_cast(data); + ViewProviderFemPostFunction* that = static_cast(data); that->draggerUpdate(drag); if (that->m_autoRecompute) diff --git a/src/Mod/Inspection/Gui/ViewProviderInspection.cpp b/src/Mod/Inspection/Gui/ViewProviderInspection.cpp index a7e93675d0..5581059b28 100644 --- a/src/Mod/Inspection/Gui/ViewProviderInspection.cpp +++ b/src/Mod/Inspection/Gui/ViewProviderInspection.cpp @@ -443,7 +443,7 @@ private: void ViewProviderInspection::inspectCallback(void * ud, SoEventCallback * n) { - Gui::View3DInventorViewer* view = reinterpret_cast(n->getUserData()); + Gui::View3DInventorViewer* view = static_cast(n->getUserData()); const SoEvent* ev = n->getEvent(); if (ev->getTypeId() == SoMouseButtonEvent::getClassTypeId()) { const SoMouseButtonEvent * mbe = static_cast(ev); diff --git a/src/Mod/MeshPart/Gui/CurveOnMesh.cpp b/src/Mod/MeshPart/Gui/CurveOnMesh.cpp index 2f7ec6b6a1..fd11115ee1 100644 --- a/src/Mod/MeshPart/Gui/CurveOnMesh.cpp +++ b/src/Mod/MeshPart/Gui/CurveOnMesh.cpp @@ -588,7 +588,7 @@ void CurveOnMeshHandler::closeWire() void CurveOnMeshHandler::Private::vertexCallback(void * ud, SoEventCallback * cb) { - Gui::View3DInventorViewer* view = reinterpret_cast(cb->getUserData()); + Gui::View3DInventorViewer* view = static_cast(cb->getUserData()); const SoEvent* ev = cb->getEvent(); if (ev->getTypeId() == SoMouseButtonEvent::getClassTypeId()) { // set as handled diff --git a/src/Mod/Part/App/TopoShapeVertexPyImp.cpp b/src/Mod/Part/App/TopoShapeVertexPyImp.cpp index 70f24a773b..b210bc4309 100644 --- a/src/Mod/Part/App/TopoShapeVertexPyImp.cpp +++ b/src/Mod/Part/App/TopoShapeVertexPyImp.cpp @@ -80,7 +80,6 @@ int TopoShapeVertexPy::PyInit(PyObject* args, PyObject* /*kwd*/) if (!success) { PyErr_Clear(); // set by PyArg_ParseTuple() if (PyArg_ParseTuple(args,"O!",&(Base::VectorPy::Type), &object)) { - // Note: must be static_cast, not reinterpret_cast Base::Vector3d* ptr = static_cast(object)->getVectorPtr(); x = ptr->x; y = ptr->y; @@ -121,7 +120,7 @@ int TopoShapeVertexPy::PyInit(PyObject* args, PyObject* /*kwd*/) TopoShape* ptr = static_cast(object)->getTopoShapePtr(); TopoDS_Shape shape = ptr->getShape(); if (!shape.IsNull() && shape.ShapeType() == TopAbs_VERTEX) { - TopoShapeVertexPy::PointerType vert = reinterpret_cast(_pcTwinPointer); + TopoShapeVertexPy::PointerType vert = getTopoShapePtr(); vert->setShape(ptr->getShape()); return 0; } @@ -132,7 +131,7 @@ int TopoShapeVertexPy::PyInit(PyObject* args, PyObject* /*kwd*/) return -1; } - TopoShapeVertexPy::PointerType ptr = reinterpret_cast(_pcTwinPointer); + TopoShapeVertexPy::PointerType ptr = getTopoShapePtr(); BRepBuilderAPI_MakeVertex aBuilder(gp_Pnt(x,y,z)); TopoDS_Shape s = aBuilder.Vertex(); ptr->setShape(s); diff --git a/src/Mod/Part/Gui/BoxSelection.cpp b/src/Mod/Part/Gui/BoxSelection.cpp index c6d103e49f..7ce3362dc3 100644 --- a/src/Mod/Part/Gui/BoxSelection.cpp +++ b/src/Mod/Part/Gui/BoxSelection.cpp @@ -107,7 +107,7 @@ bool BoxSelection::isAutoDelete() const void BoxSelection::selectionCallback(void * ud, SoEventCallback * cb) { - Gui::View3DInventorViewer* view = reinterpret_cast(cb->getUserData()); + Gui::View3DInventorViewer* view = static_cast(cb->getUserData()); view->removeEventCallback(SoMouseButtonEvent::getClassTypeId(), selectionCallback, ud); SoNode* root = view->getSceneGraph(); static_cast(root)->selectionRole.setValue(true); diff --git a/src/Mod/Part/Gui/DlgPrimitives.cpp b/src/Mod/Part/Gui/DlgPrimitives.cpp index 0fead13ba2..adfc5e2749 100644 --- a/src/Mod/Part/Gui/DlgPrimitives.cpp +++ b/src/Mod/Part/Gui/DlgPrimitives.cpp @@ -659,7 +659,7 @@ void DlgPrimitives::connectSignalMapper(QWidget *sender, const char *signal, QSi void DlgPrimitives::pickCallback(void * ud, SoEventCallback * n) { const SoMouseButtonEvent * mbe = static_cast(n->getEvent()); - Picker* pick = reinterpret_cast(ud); + Picker* pick = static_cast(ud); if (pick->exitCode >= 0) pick->loop.exit(pick->exitCode); @@ -1953,7 +1953,7 @@ void Location::on_viewPositionButton_clicked() void Location::pickCallback(void * ud, SoEventCallback * n) { const SoMouseButtonEvent * mbe = static_cast(n->getEvent()); - Gui::View3DInventorViewer* view = reinterpret_cast(n->getUserData()); + Gui::View3DInventorViewer* view = static_cast(n->getUserData()); // Mark all incoming mouse button events as handled, especially, to deactivate the selection node n->getAction()->setHandled(); @@ -1963,7 +1963,7 @@ void Location::pickCallback(void * ud, SoEventCallback * n) if (point) { SbVec3f pnt = point->getPoint(); SbVec3f nor = point->getNormal(); - Location* dlg = reinterpret_cast(ud); + Location* dlg = static_cast(ud); dlg->ui->XPositionQSB->setValue(pnt[0]); dlg->ui->YPositionQSB->setValue(pnt[1]); dlg->ui->ZPositionQSB->setValue(pnt[2]); @@ -1979,7 +1979,7 @@ void Location::pickCallback(void * ud, SoEventCallback * n) n->setHandled(); view->setEditing(false); view->setRedirectToSceneGraph(false); - Location* dlg = reinterpret_cast(ud); + Location* dlg = static_cast(ud); dlg->activeView = nullptr; view->removeEventCallback(SoMouseButtonEvent::getClassTypeId(), pickCallback,ud); SoNode* root = view->getSceneGraph(); diff --git a/src/Mod/Part/Gui/TaskFaceColors.cpp b/src/Mod/Part/Gui/TaskFaceColors.cpp index 4b1a21d81a..38df9f65ef 100644 --- a/src/Mod/Part/Gui/TaskFaceColors.cpp +++ b/src/Mod/Part/Gui/TaskFaceColors.cpp @@ -219,7 +219,7 @@ public: } static void selectionCallback(void* ud, SoEventCallback* cb) { - Gui::View3DInventorViewer* view = reinterpret_cast(cb->getUserData()); + Gui::View3DInventorViewer* view = static_cast(cb->getUserData()); view->removeEventCallback(SoMouseButtonEvent::getClassTypeId(), selectionCallback, ud); SoNode* root = view->getSceneGraph(); static_cast(root)->selectionRole.setValue(true); @@ -242,7 +242,7 @@ public: polygon.Add(Base::Vector2d((*it)[0], (*it)[1])); } - FaceColors* self = reinterpret_cast(ud); + FaceColors* self = static_cast(ud); self->d->view = nullptr; if (self->d->obj && self->d->obj->getTypeId().isDerivedFrom(Part::Feature::getClassTypeId())) { cb->setHandled(); diff --git a/src/Mod/Part/Gui/ViewProviderMirror.cpp b/src/Mod/Part/Gui/ViewProviderMirror.cpp index 314f5598d0..31368f4394 100644 --- a/src/Mod/Part/Gui/ViewProviderMirror.cpp +++ b/src/Mod/Part/Gui/ViewProviderMirror.cpp @@ -206,7 +206,7 @@ void ViewProviderMirror::dragFinishCallback(void *, SoDragger *) void ViewProviderMirror::dragMotionCallback(void *data, SoDragger *drag) { - ViewProviderMirror* that = reinterpret_cast(data); + ViewProviderMirror* that = static_cast(data); const SbMatrix& mat = drag->getMotionMatrix(); // the new axis of the plane SbRotation rot(mat); diff --git a/src/Mod/Points/Gui/ViewProvider.cpp b/src/Mod/Points/Gui/ViewProvider.cpp index 2c82f9e645..2f816e3f73 100644 --- a/src/Mod/Points/Gui/ViewProvider.cpp +++ b/src/Mod/Points/Gui/ViewProvider.cpp @@ -326,7 +326,7 @@ void ViewProviderPoints::unsetEdit(int ModNum) void ViewProviderPoints::clipPointsCallback(void *, SoEventCallback * n) { // When this callback function is invoked we must in either case leave the edit mode - Gui::View3DInventorViewer* view = reinterpret_cast(n->getUserData()); + Gui::View3DInventorViewer* view = static_cast(n->getUserData()); view->setEditing(false); view->removeEventCallback(SoMouseButtonEvent::getClassTypeId(), clipPointsCallback); n->setHandled(); diff --git a/src/Mod/Robot/App/WaypointPyImp.cpp b/src/Mod/Robot/App/WaypointPyImp.cpp index 5a6edebce6..9e342b1d3f 100644 --- a/src/Mod/Robot/App/WaypointPyImp.cpp +++ b/src/Mod/Robot/App/WaypointPyImp.cpp @@ -43,7 +43,6 @@ using namespace Base; std::string WaypointPy::representation(void) const { double A,B,C; - //PlacementPy::PointerType ptr = reinterpret_cast(_pcTwinPointer); std::stringstream str; getWaypointPtr()->EndPos.getRotation().getYawPitchRoll(A,B,C); str.precision(5);