From 03d7eaaca99d83df1b73389b0e8e363fd5c2fb7f Mon Sep 17 00:00:00 2001 From: kpluas21 <56205531+kpluas21@users.noreply.github.com> Date: Sat, 6 Aug 2022 15:56:23 -0400 Subject: [PATCH 1/3] Update partsbinpalettewidget.cpp Removed some unnecessary null pointer checks. --- src/partsbinpalette/partsbinpalettewidget.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/partsbinpalette/partsbinpalettewidget.cpp b/src/partsbinpalette/partsbinpalettewidget.cpp index 9f37ec77c..06a77ca35 100644 --- a/src/partsbinpalette/partsbinpalettewidget.cpp +++ b/src/partsbinpalette/partsbinpalettewidget.cpp @@ -144,8 +144,8 @@ PartsBinPaletteWidget::~PartsBinPaletteWidget() { m_model = NULL; } - if (m_icon) delete m_icon; - if (m_monoIcon) delete m_monoIcon; + delete m_icon; + delete m_monoIcon; } void PartsBinPaletteWidget::cleanup() { From 967895c0d8cb78635684e83730b95001b465054d Mon Sep 17 00:00:00 2001 From: kpluas21 <56205531+kpluas21@users.noreply.github.com> Date: Sat, 6 Aug 2022 16:10:17 -0400 Subject: [PATCH 2/3] Update itemdrag.cpp Removed an unnecessary null pointer check --- src/itemdrag.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/itemdrag.cpp b/src/itemdrag.cpp index 5b859203f..048415c3d 100644 --- a/src/itemdrag.cpp +++ b/src/itemdrag.cpp @@ -37,10 +37,8 @@ void ItemDrag::__dragIsDone() { } void ItemDrag::cleanup() { - if (Singleton) { - delete Singleton; - Singleton = NULL; - } + delete Singleton; + Singleton = NULL; } QHash & ItemDrag::cache() { From 34035093dfd58c697d3c48940e1090bff9f043c2 Mon Sep 17 00:00:00 2001 From: kpluas21 <56205531+kpluas21@users.noreply.github.com> Date: Sat, 6 Aug 2022 16:22:20 -0400 Subject: [PATCH 3/3] update svgicowidget.cpp removed an unnecessary null pointer check. --- src/partsbinpalette/svgiconwidget.cpp | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/partsbinpalette/svgiconwidget.cpp b/src/partsbinpalette/svgiconwidget.cpp index ec7938947..39ea2cd07 100644 --- a/src/partsbinpalette/svgiconwidget.cpp +++ b/src/partsbinpalette/svgiconwidget.cpp @@ -119,14 +119,11 @@ void SvgIconWidget::initNames() { } void SvgIconWidget::cleanup() { - if (PluralImage) { - delete PluralImage; - PluralImage = nullptr; - } - if (SingularImage) { - delete SingularImage; - SingularImage = nullptr; - } + delete PluralImage; + delete SingularImage; + + PluralImage = nullptr; + SingularImage = nullptr; } ItemBase *SvgIconWidget::itemBase() const noexcept {