From 2d97a4b9d7c6d84cb8b22302cd22f805a4ab76b0 Mon Sep 17 00:00:00 2001 From: Thorbjørn Lindeijer Date: Mon, 29 Jan 2024 21:53:25 +0100 Subject: Apply readability-delete-null-pointer fixits These checks are unnecessary as deleting a null pointer has no effect. --- src/gui/equipmentwindow.cpp | 6 ++---- src/gui/setup_players.cpp | 7 +++---- 2 files changed, 5 insertions(+), 8 deletions(-) (limited to 'src/gui') diff --git a/src/gui/equipmentwindow.cpp b/src/gui/equipmentwindow.cpp index d646b78c..4d1d5291 100644 --- a/src/gui/equipmentwindow.cpp +++ b/src/gui/equipmentwindow.cpp @@ -83,8 +83,7 @@ EquipmentWindow::EquipmentWindow(Equipment *equipment): void EquipmentWindow::loadEquipBoxes() { - if (mEquipBox) - delete[] mEquipBox; + delete[] mEquipBox; // Load equipment boxes. mBoxesNumber = mEquipment->getSlotNumber(); @@ -110,8 +109,7 @@ void EquipmentWindow::loadEquipBoxes() EquipmentWindow::~EquipmentWindow() { delete mItemPopup; - if (mEquipBox) - delete[] mEquipBox; + delete[] mEquipBox; } void EquipmentWindow::draw(gcn::Graphics *graphics) diff --git a/src/gui/setup_players.cpp b/src/gui/setup_players.cpp index fe72a29c..529e69a5 100644 --- a/src/gui/setup_players.cpp +++ b/src/gui/setup_players.cpp @@ -127,8 +127,8 @@ public: signalBeforeUpdate(); freeWidgets(); - if (mPlayers) - delete mPlayers; + + delete mPlayers; mPlayers = player_relations.getPlayers(); // set up widgets @@ -162,8 +162,7 @@ public: virtual void freeWidgets() { - if (mPlayers) - delete mPlayers; + delete mPlayers; mPlayers = nullptr; delete_all(mWidgets); -- cgit v1.2.3-70-g09d2