From f71bd4e359f4bbfcfa85ef5611709f819f31d3fe Mon Sep 17 00:00:00 2001 From: Uwe Rathmann Date: Tue, 12 Jan 2021 16:25:33 +0100 Subject: [PATCH] pointless nullptr checks removed --- src/controls/QskHintAnimator.cpp | 4 +--- src/controls/QskSetup.cpp | 7 ++----- src/controls/QskSkin.cpp | 8 +++----- 3 files changed, 6 insertions(+), 13 deletions(-) diff --git a/src/controls/QskHintAnimator.cpp b/src/controls/QskHintAnimator.cpp index c7a99908..ee5a1e18 100644 --- a/src/controls/QskHintAnimator.cpp +++ b/src/controls/QskHintAnimator.cpp @@ -217,9 +217,7 @@ QskHintAnimatorTable::QskHintAnimatorTable() QskHintAnimatorTable::~QskHintAnimatorTable() { qskAnimatorGuard->unregisterTable( this ); - - if ( m_data ) - delete m_data; + delete m_data; } void QskHintAnimatorTable::start( QskControl* control, diff --git a/src/controls/QskSetup.cpp b/src/controls/QskSetup.cpp index 68bbb8dd..f7ec5d5d 100644 --- a/src/controls/QskSetup.cpp +++ b/src/controls/QskSetup.cpp @@ -144,11 +144,8 @@ void QskSetup::setup() void QskSetup::cleanup() { - if ( s_instance ) - { - delete s_instance; - s_instance = nullptr; - } + delete s_instance; + s_instance = nullptr; } void QskSetup::setControlFlags( QskSetup::Flags flags ) diff --git a/src/controls/QskSkin.cpp b/src/controls/QskSkin.cpp index 89e4e6e8..422d4ad5 100644 --- a/src/controls/QskSkin.cpp +++ b/src/controls/QskSkin.cpp @@ -196,11 +196,9 @@ void QskSkin::declareSkinlet( const QMetaObject* metaObject, if ( entry.metaObject != skinletMetaObject ) { entry.metaObject = skinletMetaObject; - if ( entry.skinlet != nullptr ) - { - delete entry.skinlet; - entry.skinlet = nullptr; - } + + delete entry.skinlet; + entry.skinlet = nullptr; } } else