From 64d0374c2203735e54f27403ee0c2a8ff75384ba Mon Sep 17 00:00:00 2001 From: Gregor Parzefall Date: Fri, 29 Sep 2023 18:25:57 +0200 Subject: [PATCH] nullptr --- source/Irrlicht/CGUIComboBox.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/source/Irrlicht/CGUIComboBox.cpp b/source/Irrlicht/CGUIComboBox.cpp index ebd846f90..0955f47a9 100644 --- a/source/Irrlicht/CGUIComboBox.cpp +++ b/source/Irrlicht/CGUIComboBox.cpp @@ -22,9 +22,9 @@ namespace gui CGUIComboBox::CGUIComboBox(IGUIEnvironment* environment, IGUIElement* parent, s32 id, core::rect rectangle) : IGUIComboBox(environment, parent, id, rectangle), - ListButton(0), SelectedText(0), ListBox(0), LastFocus(0), + ListButton(nullptr), SelectedText(nullptr), ListBox(nullptr), LastFocus(nullptr), Selected(-1), HAlign(EGUIA_UPPERLEFT), VAlign(EGUIA_CENTER), MaxSelectionRows(5), HasFocus(false), - ActiveFont(0) + ActiveFont(nullptr) { #ifdef _DEBUG setDebugName("CGUIComboBox"); @@ -217,7 +217,7 @@ bool CGUIComboBox::OnEvent(const SEvent& event) openCloseMenu(); } - ListButton->setPressed(ListBox == 0); + ListButton->setPressed(ListBox == nullptr); return true; } @@ -370,7 +370,7 @@ void CGUIComboBox::sendSelectionChangedEvent() event.EventType = EET_GUI_EVENT; event.GUIEvent.Caller = this; - event.GUIEvent.Element = 0; + event.GUIEvent.Element = nullptr; event.GUIEvent.EventType = EGET_COMBO_BOX_CHANGED; Parent->OnEvent(event); } @@ -456,7 +456,7 @@ void CGUIComboBox::openCloseMenu() // close list box Environment->setFocus(this); ListBox->remove(); - ListBox = 0; + ListBox = nullptr; } else { @@ -464,7 +464,7 @@ void CGUIComboBox::openCloseMenu() SEvent event; event.EventType = EET_GUI_EVENT; event.GUIEvent.Caller = this; - event.GUIEvent.Element = 0; + event.GUIEvent.Element = nullptr; event.GUIEvent.EventType = EGET_LISTBOX_OPENED; // Allow to prevent the listbox from opening.