mirror of
https://github.com/RGBCube/serenity
synced 2025-07-27 15:57:35 +00:00
LibGUI+Userland: Port StatusBar::text() and set_text functions to String
This commit is contained in:
parent
2064f544c6
commit
2029750519
27 changed files with 88 additions and 88 deletions
|
@ -25,7 +25,7 @@ Statusbar::Statusbar(int count)
|
|||
m_corner = add<ResizeCorner>();
|
||||
set_segment_count(count);
|
||||
|
||||
REGISTER_DEPRECATED_STRING_PROPERTY("text", text, set_text);
|
||||
REGISTER_STRING_PROPERTY("text", text, set_text);
|
||||
REGISTER_INT_PROPERTY("segment_count", segment_count, set_segment_count);
|
||||
}
|
||||
|
||||
|
@ -100,19 +100,19 @@ void Statusbar::update_segment(size_t index)
|
|||
}
|
||||
}
|
||||
|
||||
DeprecatedString Statusbar::text(size_t index) const
|
||||
String Statusbar::text(size_t index) const
|
||||
{
|
||||
return m_segments[index]->text().to_deprecated_string();
|
||||
return m_segments[index]->text();
|
||||
}
|
||||
|
||||
void Statusbar::set_text(DeprecatedString text)
|
||||
void Statusbar::set_text(String text)
|
||||
{
|
||||
set_text(0, move(text));
|
||||
}
|
||||
|
||||
void Statusbar::set_text(size_t index, DeprecatedString text)
|
||||
void Statusbar::set_text(size_t index, String text)
|
||||
{
|
||||
m_segments[index]->m_restored_text = String::from_deprecated_string(text).release_value_but_fixme_should_propagate_errors();
|
||||
m_segments[index]->m_restored_text = move(text);
|
||||
update_segment(index);
|
||||
}
|
||||
|
||||
|
|
|
@ -19,9 +19,9 @@ class Statusbar : public Widget {
|
|||
public:
|
||||
virtual ~Statusbar() override = default;
|
||||
|
||||
DeprecatedString text(size_t index = 0) const;
|
||||
void set_text(DeprecatedString);
|
||||
void set_text(size_t index, DeprecatedString);
|
||||
String text(size_t index = 0) const;
|
||||
void set_text(String);
|
||||
void set_text(size_t index, String);
|
||||
void set_override_text(DeprecatedString);
|
||||
|
||||
class Segment final : public Button {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue