minetest/minetest
1
0
Fork 0
mirror of https://github.com/minetest/minetest.git synced 2025-07-10 11:50:21 +02:00
Code Issues Releases Wiki Activity

Replace Optional with std::optional

Browse Source
This commit is contained in:
Desour
2023-06-11 22:55:36 +02:00
committed by sfan5
parent 34ad551efc
commit e700182f44
15 changed files with 39 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/guiFormSpecMenu.cpp
View File

@ -3053,7 +3053,7 @@ void GUIFormSpecMenu::regenerateGui(v2u32 screensize)
}
} else {
// Don't keep old focus value
m_focused_element = nullopt;
m_focused_element = std::nullopt;
}
removeAll();

16
src/gui/guiFormSpecMenu.h
View File

@ -19,6 +19,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#pragma once
#include <optional>
#include <utility>
#include <stack>
#include <unordered_set>
@ -33,7 +34,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "guiTable.h"
#include "network/networkprotocol.h"
#include "client/joystick_controller.h"
#include "util/Optional.h"
#include "util/string.h"
#include "util/enriched_string.h"
#include "StyleSpec.h"
@ -374,13 +374,13 @@ protected:
video::SColor m_default_tooltip_color;
private:
IFormSource *m_form_src;
TextDest *m_text_dst;
std::string m_last_formname;
u16 m_formspec_version = 1;
Optional<std::string> m_focused_element = nullopt;
JoystickController *m_joystick;
bool m_show_debug = false;
IFormSource *m_form_src;
TextDest *m_text_dst;
std::string m_last_formname;
u16 m_formspec_version = 1;
std::optional<std::string> m_focused_element = std::nullopt;
JoystickController *m_joystick;
bool m_show_debug = false;
struct parserData {
bool explicit_size;