diff options
| author | Linus Groh <mail@linusgroh.de> | 2022-12-04 18:02:33 +0000 |
|---|---|---|
| committer | Andreas Kling <kling@serenityos.org> | 2022-12-06 08:54:33 +0100 |
| commit | 6e19ab2bbce0b113b628e6f8e9b5c0640053933e (patch) | |
| tree | 372d21b2f5dcff112f5d0089559c6af5798680d4 /Userland/Applications/Calendar | |
| parent | f74251606d74b504a1379ebb893fdb5529054ea5 (diff) | |
| download | serenity-6e19ab2bbce0b113b628e6f8e9b5c0640053933e.zip | |
AK+Everywhere: Rename String to DeprecatedString
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 :^)
Diffstat (limited to 'Userland/Applications/Calendar')
| -rw-r--r-- | Userland/Applications/Calendar/AddEventDialog.cpp | 4 | ||||
| -rw-r--r-- | Userland/Applications/Calendar/AddEventDialog.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Userland/Applications/Calendar/AddEventDialog.cpp b/Userland/Applications/Calendar/AddEventDialog.cpp index 29f35fd44a..4951885d2c 100644 --- a/Userland/Applications/Calendar/AddEventDialog.cpp +++ b/Userland/Applications/Calendar/AddEventDialog.cpp @@ -123,7 +123,7 @@ int AddEventDialog::MeridiemListModel::row_count(const GUI::ModelIndex&) const return 2; } -String AddEventDialog::MonthListModel::column_name(int column) const +DeprecatedString AddEventDialog::MonthListModel::column_name(int column) const { switch (column) { case Column::Month: @@ -133,7 +133,7 @@ String AddEventDialog::MonthListModel::column_name(int column) const } } -String AddEventDialog::MeridiemListModel::column_name(int column) const +DeprecatedString AddEventDialog::MeridiemListModel::column_name(int column) const { switch (column) { case Column::Meridiem: diff --git a/Userland/Applications/Calendar/AddEventDialog.h b/Userland/Applications/Calendar/AddEventDialog.h index 4f0aa162e8..fab9abbef0 100644 --- a/Userland/Applications/Calendar/AddEventDialog.h +++ b/Userland/Applications/Calendar/AddEventDialog.h @@ -38,7 +38,7 @@ private: virtual int row_count(const GUI::ModelIndex& = GUI::ModelIndex()) const override; virtual int column_count(const GUI::ModelIndex& = GUI::ModelIndex()) const override { return Column::__Count; } - virtual String column_name(int) const override; + virtual DeprecatedString column_name(int) const override; virtual GUI::Variant data(const GUI::ModelIndex&, GUI::ModelRole) const override; private: @@ -57,7 +57,7 @@ private: virtual int row_count(const GUI::ModelIndex& = GUI::ModelIndex()) const override; virtual int column_count(const GUI::ModelIndex& = GUI::ModelIndex()) const override { return Column::__Count; } - virtual String column_name(int) const override; + virtual DeprecatedString column_name(int) const override; virtual GUI::Variant data(const GUI::ModelIndex&, GUI::ModelRole) const override; private: |