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

AK+Everywhere: Rename String to DeprecatedString

Browse source 
We have a new, improved string type coming up in AK (OOM aware, no null
state), and while it's going to use UTF-8, the name UTF8String is a
mouthful - so let's free up the String name by renaming the existing
class.
Making the old one have an annoying name will hopefully also help with
quick adoption :^)
This commit is contained in:
Linus Groh 2022-12-04 18:02:33 +00:00 • committed by Andreas Kling
parent f74251606d
commit 6e19ab2bbc
2006 changed files with 11635 additions and 11636 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Userland/Applications/Piano/KnobsWidget.cpp
View file

@ -26,7 +26,7 @@ KnobsWidget::KnobsWidget(TrackManager& track_manager, MainWidget& main_widget)
m_octave_container = add<GUI::Widget>();
m_octave_container->set_layout<GUI::VerticalBoxLayout>();
m_octave_container->add<GUI::Label>("Octave");
m_octave_value = m_octave_container->add<GUI::Label>(String::number(m_track_manager.keyboard()->virtual_keyboard_octave()));
m_octave_value = m_octave_container->add<GUI::Label>(DeprecatedString::number(m_track_manager.keyboard()->virtual_keyboard_octave()));
// FIXME: Implement vertical flipping in GUI::Slider, not here.
m_octave_knob = m_octave_container->add<GUI::VerticalSlider>();
@ -39,7 +39,7 @@ KnobsWidget::KnobsWidget(TrackManager& track_manager, MainWidget& main_widget)
if (m_change_underlying)
m_main_widget.set_octave_and_ensure_note_change(new_octave);
VERIFY(new_octave == m_track_manager.keyboard()->virtual_keyboard_octave());
m_octave_value->set_text(String::number(new_octave));
m_octave_value->set_text(DeprecatedString::number(new_octave));
};
for (auto& parameter : m_track_manager.current_track()->track_mastering()->parameters())

4
Userland/Applications/Piano/PlayerWidget.cpp
View file

@ -36,7 +36,7 @@ PlayerWidget::PlayerWidget(TrackManager& manager, AudioPlayerLoop& loop)
m_track_dropdown = add<GUI::ComboBox>();
m_track_dropdown->set_max_width(75);
m_track_dropdown->set_model(*GUI::ItemListModel<String>::create(m_track_number_choices));
m_track_dropdown->set_model(*GUI::ItemListModel<DeprecatedString>::create(m_track_number_choices));
m_track_dropdown->set_only_allow_values_from_model(true);
m_track_dropdown->set_model_column(0);
m_track_dropdown->set_selected_index(0);
@ -100,7 +100,7 @@ void PlayerWidget::add_track()
{
m_track_manager.add_track();
auto latest_track_count = m_track_manager.track_count();
auto latest_track_string = String::number(latest_track_count);
auto latest_track_string = DeprecatedString::number(latest_track_count);
m_track_number_choices.append(latest_track_string);
m_track_dropdown->set_selected_index(latest_track_count - 1);
}

2
Userland/Applications/Piano/PlayerWidget.h
View file

@ -26,7 +26,7 @@ private:
TrackManager& m_track_manager;
AudioPlayerLoop& m_audio_loop;
Vector<String> m_track_number_choices;
Vector<DeprecatedString> m_track_number_choices;
RefPtr<Gfx::Bitmap> m_play_icon;
RefPtr<Gfx::Bitmap> m_pause_icon;

6
Userland/Applications/Piano/ProcessorParameterWidget/Dropdown.h
View file

@ -19,12 +19,12 @@ requires(IsEnum<EnumT>) class ProcessorParameterDropdown : public GUI::ComboBox
C_OBJECT(ProcessorParameterDropdown);
public:
ProcessorParameterDropdown(DSP::ProcessorEnumParameter<EnumT>& parameter, Vector<String> modes)
ProcessorParameterDropdown(DSP::ProcessorEnumParameter<EnumT>& parameter, Vector<DeprecatedString> modes)
: ComboBox()
, m_parameter(parameter)
, m_modes(move(modes))
{
auto model = GUI::ItemListModel<EnumT, Vector<String>>::create(m_modes);
auto model = GUI::ItemListModel<EnumT, Vector<DeprecatedString>>::create(m_modes);
set_model(model);
set_only_allow_values_from_model(true);
set_model_column(0);
@ -54,5 +54,5 @@ public:
private:
DSP::ProcessorEnumParameter<EnumT>& m_parameter;
Vector<String> m_modes;
Vector<DeprecatedString> m_modes;
};

4
Userland/Applications/Piano/ProcessorParameterWidget/ParameterWidget.cpp
View file

@ -19,14 +19,14 @@ ProcessorParameterWidget::ProcessorParameterWidget(DSP::ProcessorParameter& raw_
switch (raw_parameter.type()) {
case DSP::ParameterType::Range: {
auto& parameter = static_cast<DSP::ProcessorRangeParameter&>(raw_parameter);
m_value_label = add<GUI::Label>(String::number(static_cast<double>(parameter.value())));
m_value_label = add<GUI::Label>(DeprecatedString::number(static_cast<double>(parameter.value())));
m_parameter_modifier = add<ProcessorParameterSlider>(Orientation::Vertical, parameter, m_value_label);
break;
}
case DSP::ParameterType::Enum: {
// FIXME: We shouldn't do that, but the only user is the synth right now.
auto& parameter = static_cast<DSP::ProcessorEnumParameter<DSP::Synthesizers::Waveform>&>(raw_parameter);
auto enum_strings = Vector<String> { "Sine", "Triangle", "Square", "Saw", "Noise" };
auto enum_strings = Vector<DeprecatedString> { "Sine", "Triangle", "Square", "Saw", "Noise" };
m_parameter_modifier = add<ProcessorParameterDropdown<DSP::Synthesizers::Waveform>>(parameter, move(enum_strings));
break;
}

6
Userland/Applications/Piano/ProcessorParameterWidget/Slider.cpp
View file

@ -27,7 +27,7 @@ ProcessorParameterSlider::ProcessorParameterSlider(Orientation orientation, DSP:
set_step((min_log - max_log) / slider_steps);
}
set_tooltip(m_parameter.name());
m_value_label->set_text(String::formatted("{:.2f}", static_cast<double>(m_parameter)));
m_value_label->set_text(DeprecatedString::formatted("{:.2f}", static_cast<double>(m_parameter)));
on_change = [this](auto value) {
if (m_currently_setting_from_ui)
@ -42,11 +42,11 @@ ProcessorParameterSlider::ProcessorParameterSlider(Orientation orientation, DSP:
m_parameter.set_value(real_value);
if (m_value_label) {
double value = static_cast<double>(m_parameter);
String label_text = String::formatted("{:.2f}", value);
DeprecatedString label_text = DeprecatedString::formatted("{:.2f}", value);
// FIXME: This is a magic value; we know that with normal font sizes, the label will disappear starting from approximately this length.
// Can we do this dynamically?
if (label_text.length() > 7)
m_value_label->set_text(String::formatted("{:.0f}", value));
m_value_label->set_text(DeprecatedString::formatted("{:.0f}", value));
else
m_value_label->set_text(label_text);
}

2
Userland/Applications/Piano/RollWidget.cpp
View file

@ -161,7 +161,7 @@ void RollWidget::paint_event(GUI::PaintEvent& event)
painter.draw_text(note_name_rect, note_name, Gfx::TextAlignment::CenterLeft);
note_name_rect.translate_by(Gfx::FontDatabase::default_font().width(note_name) + 2, 0);
if (note % notes_per_octave == 0)
painter.draw_text(note_name_rect, String::formatted("{}", note / notes_per_octave + 1), Gfx::TextAlignment::CenterLeft);
painter.draw_text(note_name_rect, DeprecatedString::formatted("{}", note / notes_per_octave + 1), Gfx::TextAlignment::CenterLeft);
}
int x = m_roll_width * (static_cast<double>(m_track_manager.transport()->time()) / roll_length);

2
Userland/Applications/Piano/SamplerWidget.cpp
View file

@ -55,7 +55,7 @@ SamplerWidget::SamplerWidget(TrackManager& track_manager)
m_open_button->set_focus_policy(GUI::FocusPolicy::TabFocus);
m_open_button->set_icon(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/open.png"sv).release_value_but_fixme_should_propagate_errors());
m_open_button->on_click = [this](auto) {
Optional<String> open_path = GUI::FilePicker::get_open_filepath(window());
Optional<DeprecatedString> open_path = GUI::FilePicker::get_open_filepath(window());
if (!open_path.has_value())
return;
// TODO: We don't actually load the sample.

4
Userland/Applications/Piano/main.cpp
View file

@ -33,7 +33,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
TrackManager track_manager;
Audio::WavWriter wav_writer;
Optional<String> save_path;
Optional<DeprecatedString> save_path;
bool need_to_write_wav = false;
auto audio_loop = AudioPlayerLoop::construct(track_manager, need_to_write_wav, wav_writer);
@ -57,7 +57,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
return;
wav_writer.set_file(save_path.value());
if (wav_writer.has_error()) {
GUI::MessageBox::show(window, String::formatted("Failed to export WAV file: {}", wav_writer.error_string()), "Error"sv, GUI::MessageBox::Type::Error);
GUI::MessageBox::show(window, DeprecatedString::formatted("Failed to export WAV file: {}", wav_writer.error_string()), "Error"sv, GUI::MessageBox::Type::Error);
wav_writer.clear_error();
return;
}