3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix of [prusa3d/PrusaSlicer] Remove unnecessary null pointer checks (#5813)

Browse source 
Don't use
if (ptr)
	delete ptr;
call
delete ptr;
directly, it contains the test for null ptr.
This commit is contained in:
Vojtech Bubnik 2021-01-18 09:33:19 +01:00
parent d06aa60691
commit 9a2310ae98
3 changed files with 7 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/slic3r/GUI/ExtraRenderers.cpp
View file

@ -49,8 +49,7 @@ BitmapTextRenderer::~BitmapTextRenderer()
{ {
#ifdef SUPPORTS_MARKUP #ifdef SUPPORTS_MARKUP
#ifdef wxHAS_GENERIC_DATAVIEWCTRL #ifdef wxHAS_GENERIC_DATAVIEWCTRL
if (m_markupText) delete m_markupText;
delete m_markupText;
#endif //wxHAS_GENERIC_DATAVIEWCTRL #endif //wxHAS_GENERIC_DATAVIEWCTRL
#endif // SUPPORTS_MARKUP #endif // SUPPORTS_MARKUP
} }

7
src/slic3r/GUI/GUI_Preview.cpp
View file

@ -36,11 +36,8 @@ View3D::View3D(wxWindow* parent, Model* model, DynamicPrintConfig* config, Backg
View3D::~View3D() View3D::~View3D()
{ {
if (m_canvas != nullptr) delete m_canvas;
delete m_canvas; delete m_canvas_widget;
if (m_canvas_widget != nullptr)
delete m_canvas_widget;
} }
bool View3D::init(wxWindow* parent, Model* model, DynamicPrintConfig* config, BackgroundSlicingProcess* process) bool View3D::init(wxWindow* parent, Model* model, DynamicPrintConfig* config, BackgroundSlicingProcess* process)

15
src/slic3r/GUI/Plater.cpp
View file

@ -595,17 +595,10 @@ struct Sidebar::priv
Sidebar::priv::~priv() Sidebar::priv::~priv()
{ {
if (object_manipulation != nullptr) delete object_manipulation;
delete object_manipulation; delete object_settings;
delete frequently_changed_parameters;
if (object_settings != nullptr) delete object_layers;
delete object_settings;
if (frequently_changed_parameters != nullptr)
delete frequently_changed_parameters;
if (object_layers != nullptr)
delete object_layers;
} }
void Sidebar::priv::show_preset_comboboxes() void Sidebar::priv::show_preset_comboboxes()