From 669b22252a35187dbd16c5786b1d293cc522b434 Mon Sep 17 00:00:00 2001 From: wmayer Date: Wed, 23 Mar 2022 19:10:19 +0100 Subject: [PATCH] Raytracing: modernize C++11 * use nullptr --- src/Mod/Raytracing/App/AppRaytracing.cpp | 2 +- src/Mod/Raytracing/App/LuxFeature.cpp | 2 +- src/Mod/Raytracing/App/LuxProject.cpp | 2 +- src/Mod/Raytracing/App/RayFeature.cpp | 2 +- src/Mod/Raytracing/App/RayProject.cpp | 2 +- src/Mod/Raytracing/App/RaySegment.cpp | 2 +- src/Mod/Raytracing/Gui/AppRaytracingGui.cpp | 4 ++-- src/Mod/Raytracing/Gui/AppRaytracingGuiPy.cpp | 4 ++-- src/Mod/Raytracing/Gui/Command.cpp | 10 +++++----- src/Mod/Raytracing/Gui/DlgSettingsRayImp.h | 2 +- 10 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/Mod/Raytracing/App/AppRaytracing.cpp b/src/Mod/Raytracing/App/AppRaytracing.cpp index 8cc2ebba58..53a6f3dd8e 100644 --- a/src/Mod/Raytracing/App/AppRaytracing.cpp +++ b/src/Mod/Raytracing/App/AppRaytracing.cpp @@ -46,7 +46,7 @@ PyMOD_INIT_FUNC(Raytracing) } catch(const Base::Exception& e) { PyErr_SetString(PyExc_ImportError, e.what()); - PyMOD_Return(0); + PyMOD_Return(nullptr); } Raytracing::RaySegment ::init(); diff --git a/src/Mod/Raytracing/App/LuxFeature.cpp b/src/Mod/Raytracing/App/LuxFeature.cpp index 1793fa113a..ac9c587b94 100644 --- a/src/Mod/Raytracing/App/LuxFeature.cpp +++ b/src/Mod/Raytracing/App/LuxFeature.cpp @@ -48,7 +48,7 @@ PROPERTY_SOURCE(Raytracing::LuxFeature, Raytracing::RaySegment) LuxFeature::LuxFeature(void) { - ADD_PROPERTY(Source,(0)); + ADD_PROPERTY(Source,(nullptr)); ADD_PROPERTY(Color,(App::Color(0.5f,0.5f,0.5f))); ADD_PROPERTY(Transparency,(0)); } diff --git a/src/Mod/Raytracing/App/LuxProject.cpp b/src/Mod/Raytracing/App/LuxProject.cpp index fe025c19f0..36134d57ea 100644 --- a/src/Mod/Raytracing/App/LuxProject.cpp +++ b/src/Mod/Raytracing/App/LuxProject.cpp @@ -46,7 +46,7 @@ PROPERTY_SOURCE(Raytracing::LuxProject, App::DocumentObjectGroup) LuxProject::LuxProject(void) { - ADD_PROPERTY_TYPE(PageResult, (0), 0, App::Prop_Output, "Resulting Luxrender Scene file"); + ADD_PROPERTY_TYPE(PageResult, (nullptr), 0, App::Prop_Output, "Resulting Luxrender Scene file"); ADD_PROPERTY_TYPE(Template, (""), 0, App::Prop_None, "Template for the Luxrender project"); ADD_PROPERTY_TYPE(Camera, (""), 0, App::Prop_None, "Camera settings"); } diff --git a/src/Mod/Raytracing/App/RayFeature.cpp b/src/Mod/Raytracing/App/RayFeature.cpp index 2ad01f36b5..4303216f53 100644 --- a/src/Mod/Raytracing/App/RayFeature.cpp +++ b/src/Mod/Raytracing/App/RayFeature.cpp @@ -46,7 +46,7 @@ PROPERTY_SOURCE(Raytracing::RayFeature, Raytracing::RaySegment) RayFeature::RayFeature(void) { - ADD_PROPERTY(Source,(0)); + ADD_PROPERTY(Source,(nullptr)); ADD_PROPERTY(Color,(App::Color(0.5f,0.5f,0.5f))); ADD_PROPERTY(Transparency,(0)); } diff --git a/src/Mod/Raytracing/App/RayProject.cpp b/src/Mod/Raytracing/App/RayProject.cpp index 8932744052..7d26586277 100644 --- a/src/Mod/Raytracing/App/RayProject.cpp +++ b/src/Mod/Raytracing/App/RayProject.cpp @@ -46,7 +46,7 @@ PROPERTY_SOURCE(Raytracing::RayProject, App::DocumentObjectGroup) RayProject::RayProject(void) { - ADD_PROPERTY_TYPE(PageResult, (0), 0, App::Prop_Output, "Resulting povray Project file"); + ADD_PROPERTY_TYPE(PageResult, (nullptr), 0, App::Prop_Output, "Resulting povray Project file"); ADD_PROPERTY_TYPE(Template, (""), 0, App::Prop_None, "Template for the Povray project"); ADD_PROPERTY_TYPE(Camera, (""), 0, App::Prop_None, "Camera settings"); } diff --git a/src/Mod/Raytracing/App/RaySegment.cpp b/src/Mod/Raytracing/App/RaySegment.cpp index 5d6d05d395..aded8ef823 100644 --- a/src/Mod/Raytracing/App/RaySegment.cpp +++ b/src/Mod/Raytracing/App/RaySegment.cpp @@ -49,7 +49,7 @@ PROPERTY_SOURCE(Raytracing::RaySegment, App::DocumentObject) RaySegment::RaySegment(void) { App::PropertyType type = (App::PropertyType)(App::Prop_Output|App::Prop_Hidden); - ADD_PROPERTY_TYPE(Result ,(0),0,type,"Resulting SVG fragment of that view"); + ADD_PROPERTY_TYPE(Result ,(nullptr),0,type,"Resulting SVG fragment of that view"); } RaySegment::~RaySegment() diff --git a/src/Mod/Raytracing/Gui/AppRaytracingGui.cpp b/src/Mod/Raytracing/Gui/AppRaytracingGui.cpp index 058da3b834..969ad44c9c 100644 --- a/src/Mod/Raytracing/Gui/AppRaytracingGui.cpp +++ b/src/Mod/Raytracing/Gui/AppRaytracingGui.cpp @@ -56,7 +56,7 @@ PyMOD_INIT_FUNC(RaytracingGui) { if (!Gui::Application::Instance) { PyErr_SetString(PyExc_ImportError, "Cannot load Gui module in console application."); - PyMOD_Return(0); + PyMOD_Return(nullptr); } try { @@ -64,7 +64,7 @@ PyMOD_INIT_FUNC(RaytracingGui) } catch(const Base::Exception& e) { PyErr_SetString(PyExc_ImportError, e.what()); - PyMOD_Return(0); + PyMOD_Return(nullptr); } PyObject* mod = RaytracingGui::initModule(); Base::Console().Log("Loading GUI of Raytracing module... done\n"); diff --git a/src/Mod/Raytracing/Gui/AppRaytracingGuiPy.cpp b/src/Mod/Raytracing/Gui/AppRaytracingGuiPy.cpp index 6ef5ef0d0c..d797d5d4e0 100644 --- a/src/Mod/Raytracing/Gui/AppRaytracingGuiPy.cpp +++ b/src/Mod/Raytracing/Gui/AppRaytracingGuiPy.cpp @@ -116,7 +116,7 @@ private: throw Py::Exception(); try { std::string out; - const char* ppReturn=0; + const char* ppReturn=nullptr; Gui::Document* doc = Gui::Application::Instance->activeDocument(); if (doc) { @@ -187,7 +187,7 @@ private: throw Py::Exception(); try { std::string out; - const char* ppReturn=0; + const char* ppReturn=nullptr; Gui::Document* doc = Gui::Application::Instance->activeDocument(); if (doc) { diff --git a/src/Mod/Raytracing/Gui/Command.cpp b/src/Mod/Raytracing/Gui/Command.cpp index c46504b92a..bb29b00cdd 100644 --- a/src/Mod/Raytracing/Gui/Command.cpp +++ b/src/Mod/Raytracing/Gui/Command.cpp @@ -92,7 +92,7 @@ CmdRaytracingWriteCamera::CmdRaytracingWriteCamera() void CmdRaytracingWriteCamera::activated(int) { - const char* ppReturn=0; + const char* ppReturn=nullptr; getGuiApplication()->sendMsgToActiveView("GetCamera",&ppReturn); if (ppReturn) { std::string str(ppReturn); @@ -231,7 +231,7 @@ CmdRaytracingWriteView::CmdRaytracingWriteView() void CmdRaytracingWriteView::activated(int) { - const char* ppReturn=0; + const char* ppReturn=nullptr; Gui::Application::Instance->sendMsgToActiveView("GetCamera",&ppReturn); if (ppReturn) { std::string str(ppReturn); @@ -328,7 +328,7 @@ CmdRaytracingNewPovrayProject::CmdRaytracingNewPovrayProject() void CmdRaytracingNewPovrayProject::activated(int iMsg) { - const char* ppReturn=0; + const char* ppReturn=nullptr; Gui::Application::Instance->sendMsgToActiveView("GetCamera",&ppReturn); if (ppReturn) { std::string str(ppReturn); @@ -641,7 +641,7 @@ void CmdRaytracingRender::activated(int) } } - std::vector Sel = getSelection().getSelectionEx(0, renderType); + std::vector Sel = getSelection().getSelectionEx(nullptr, renderType); if (renderType == Raytracing::RayProject::getClassTypeId()) { Raytracing::RayProject* proj = static_cast(Sel[0].getObject()); @@ -774,7 +774,7 @@ CmdRaytracingNewLuxProject::CmdRaytracingNewLuxProject() void CmdRaytracingNewLuxProject::activated(int iMsg) { - const char* ppReturn=0; + const char* ppReturn=nullptr; Gui::Application::Instance->sendMsgToActiveView("GetCamera",&ppReturn); if (ppReturn) { std::string str(ppReturn); diff --git a/src/Mod/Raytracing/Gui/DlgSettingsRayImp.h b/src/Mod/Raytracing/Gui/DlgSettingsRayImp.h index 018f4703f6..fd0922fa20 100644 --- a/src/Mod/Raytracing/Gui/DlgSettingsRayImp.h +++ b/src/Mod/Raytracing/Gui/DlgSettingsRayImp.h @@ -40,7 +40,7 @@ class DlgSettingsRayImp : public Gui::Dialog::PreferencePage Q_OBJECT public: - DlgSettingsRayImp( QWidget* parent = 0 ); + DlgSettingsRayImp( QWidget* parent = nullptr ); ~DlgSettingsRayImp(); protected: