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

Raytracing: modernize C++11

Browse Source 
* use nullptr
This commit is contained in:
wmayer
2022-03-23 19:10:19 +01:00
parent 49cab1328e
commit 669b22252a
10 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Mod/Raytracing/App/AppRaytracing.cpp
View File

@@ -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();

2
src/Mod/Raytracing/App/LuxFeature.cpp
View File

@@ -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));
}

2
src/Mod/Raytracing/App/LuxProject.cpp
View File

@@ -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");
}

2
src/Mod/Raytracing/App/RayFeature.cpp
View File

@@ -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));
}

2
src/Mod/Raytracing/App/RayProject.cpp
View File

@@ -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");
}

2
src/Mod/Raytracing/App/RaySegment.cpp
View File

@@ -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()

4
src/Mod/Raytracing/Gui/AppRaytracingGui.cpp
View File

@@ -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");

4
src/Mod/Raytracing/Gui/AppRaytracingGuiPy.cpp
View File

@@ -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) {

10
src/Mod/Raytracing/Gui/Command.cpp
View File

@@ -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<Gui::SelectionObject> Sel = getSelection().getSelectionEx(0, renderType);
std::vector<Gui::SelectionObject> Sel = getSelection().getSelectionEx(nullptr, renderType);
if (renderType == Raytracing::RayProject::getClassTypeId()) {
Raytracing::RayProject* proj = static_cast<Raytracing::RayProject*>(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);

2
src/Mod/Raytracing/Gui/DlgSettingsRayImp.h
View File

@@ -40,7 +40,7 @@ class DlgSettingsRayImp : public Gui::Dialog::PreferencePage
Q_OBJECT
public:
DlgSettingsRayImp( QWidget* parent = 0 );
DlgSettingsRayImp( QWidget* parent = nullptr );
~DlgSettingsRayImp();
protected: