oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-09-30 19:22:14 +00:00
Code Wiki Activity

Remove irr namespace (#16309)

Browse source
This commit is contained in:
Lars Müller 2025-07-09 10:35:52 +02:00 • committed by GitHub
parent 7e22c72492
commit 61551cfc3a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
381 changed files with 680 additions and 1632 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/gui/guiFormSpecMenu.cpp
View file

@ -1505,7 +1505,7 @@ void GUIFormSpecMenu::parsePwdField(parserData* data, const std::string &element
e->setOverrideColor(style.getColor(StyleSpec::TEXTCOLOR, video::SColor(0xFFFFFFFF)));
e->setOverrideFont(style.getFont());
irr::SEvent evt;
SEvent evt;
evt.EventType = EET_KEY_INPUT_EVENT;
evt.KeyInput.Key = KEY_END;
evt.KeyInput.Char = 0;
@ -1560,7 +1560,7 @@ void GUIFormSpecMenu::createTextField(parserData *data, FieldSpec &spec,
e->setWordWrap(true);
e->setTextAlignment(gui::EGUIA_UPPERLEFT, gui::EGUIA_UPPERLEFT);
} else {
irr::SEvent evt;
SEvent evt;
evt.EventType = EET_KEY_INPUT_EVENT;
evt.KeyInput.Key = KEY_END;
evt.KeyInput.Char = 0;
@ -2137,8 +2137,8 @@ void GUIFormSpecMenu::parseTabHeader(parserData* data, const std::string &elemen
gui::IGUITabControl *e = Environment->addTabControl(rect,
data->current_parent, show_background, show_border, spec.fid);
e->setAlignment(irr::gui::EGUIA_UPPERLEFT, irr::gui::EGUIA_UPPERLEFT,
irr::gui::EGUIA_UPPERLEFT, irr::gui::EGUIA_LOWERRIGHT);
e->setAlignment(gui::EGUIA_UPPERLEFT, gui::EGUIA_UPPERLEFT,
gui::EGUIA_UPPERLEFT, gui::EGUIA_LOWERRIGHT);
e->setTabHeight(geom.Y);
auto style = getDefaultStyleForElement("tabheader", name);
@ -3400,7 +3400,7 @@ void GUIFormSpecMenu::getAndroidUIInput()
return;
auto element_type = element->getType();
if (dialog_type == porting::TEXT_INPUT && element_type == irr::gui::EGUIET_EDIT_BOX) {
if (dialog_type == porting::TEXT_INPUT && element_type == gui::EGUIET_EDIT_BOX) {
gui::IGUIEditBox *editbox = (gui::IGUIEditBox *)element;
std::string text = porting::getInputDialogMessage();
editbox->setText(utf8_to_wide(text).c_str());
@ -3419,7 +3419,7 @@ void GUIFormSpecMenu::getAndroidUIInput()
editbox->getParent()->OnEvent(enter);
}
} else if (dialog_type == porting::SELECTION_INPUT &&
element_type == irr::gui::EGUIET_COMBO_BOX) {
element_type == gui::EGUIET_COMBO_BOX) {
auto dropdown = (gui::IGUIComboBox *) element;
int selected = porting::getInputDialogSelection();
dropdown->setAndSendSelected(selected);
@ -3631,7 +3631,7 @@ void GUIFormSpecMenu::drawMenu()
void GUIFormSpecMenu::showTooltip(const std::wstring &text,
const irr::video::SColor &color, const irr::video::SColor &bgcolor)
const video::SColor &color, const video::SColor &bgcolor)
{
EnrichedString ntext(text);
ntext.setDefaultColor(color);
@ -4024,7 +4024,7 @@ bool GUIFormSpecMenu::preprocessEvent(const SEvent& event)
}
}
if (event.EventType == irr::EET_JOYSTICK_INPUT_EVENT) {
if (event.EventType == EET_JOYSTICK_INPUT_EVENT) {
if (event.JoystickEvent.Joystick != m_joystick->getJoystickId())
return false;