RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-28 14:17:34 +00:00
Code Issues Activity Actions

Userland: Use nondeprecated set_tooltip for static and formatted strings

Browse source
This commit is contained in:
Karol Kosek 2023-08-23 20:14:42 +02:00 • committed by Andreas Kling
parent 46a97844c7
commit ed3e729d4e
18 changed files with 45 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Userland/Libraries/LibGUI/EmojiInputDialog.cpp
View file

@ -144,7 +144,7 @@ auto EmojiInputDialog::supported_emoji() -> Vector<Emoji>
};
if (!emoji->name.is_empty())
button->set_tooltip_deprecated(emoji->name);
button->set_tooltip(MUST(String::from_utf8(emoji->name)));
emojis.empend(move(button), emoji.release_value(), move(text));
}

8
Userland/Libraries/LibGUI/Toolbar.cpp
View file

@ -49,7 +49,7 @@ private:
if (action.group() && action.group()->is_exclusive())
set_exclusive(true);
set_action(action);
set_tooltip_deprecated(tooltip(action));
set_tooltip(tooltip(action));
set_focus_policy(FocusPolicy::NoFocus);
if (action.icon())
set_icon(action.icon());
@ -63,12 +63,12 @@ private:
auto const* action = this->action();
VERIFY(action);
set_tooltip_deprecated(tooltip(*action));
set_tooltip(tooltip(*action));
if (!action->icon())
Button::set_text(move(text));
}
DeprecatedString tooltip(Action const& action) const
String tooltip(Action const& action) const
{
StringBuilder builder;
builder.append(action.tooltip());
@ -77,7 +77,7 @@ private:
builder.append(action.shortcut().to_deprecated_string());
builder.append(')');
}
return builder.to_deprecated_string();
return MUST(builder.to_string());
}
virtual void enter_event(Core::Event& event) override

10
Userland/Libraries/LibVT/TerminalWidget.cpp
View file

@ -878,18 +878,18 @@ void TerminalWidget::mousemove_event(GUI::MouseEvent& event)
auto file_name = LexicalPath::basename(path);
if (path == handlers[0]) {
set_tooltip_deprecated(DeprecatedString::formatted("Execute {}", app_name));
set_tooltip(MUST(String::formatted("Execute {}", app_name)));
} else {
set_tooltip_deprecated(DeprecatedString::formatted("Open {} with {}", file_name, app_name));
set_tooltip(MUST(String::formatted("Open {} with {}", file_name, app_name)));
}
} else {
set_tooltip_deprecated(DeprecatedString::formatted("Open {} with {}", attribute.href, app_name));
set_tooltip(MUST(String::formatted("Open {} with {}", attribute.href, app_name)));
}
}
} else {
m_hovered_href_id = {};
m_hovered_href = {};
set_tooltip_deprecated({});
set_tooltip({});
}
show_or_hide_tooltip();
if (!m_hovered_href.is_empty())
@ -957,7 +957,7 @@ void TerminalWidget::leave_event(Core::Event&)
bool should_update = !m_hovered_href.is_empty();
m_hovered_href = {};
m_hovered_href_id = {};
set_tooltip_deprecated(m_hovered_href);
set_tooltip({});
set_override_cursor(Gfx::StandardCursor::IBeam);
if (should_update)
update();