summaryrefslogtreecommitdiff
path: root/Userland/Applets/Keymap
diff options
context:
space:
mode:
authorLinus Groh <mail@linusgroh.de>2022-12-04 18:02:33 +0000
committerAndreas Kling <kling@serenityos.org>2022-12-06 08:54:33 +0100
commit6e19ab2bbce0b113b628e6f8e9b5c0640053933e (patch)
tree372d21b2f5dcff112f5d0089559c6af5798680d4 /Userland/Applets/Keymap
parentf74251606d74b504a1379ebb893fdb5529054ea5 (diff)
downloadserenity-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/Applets/Keymap')
-rw-r--r--Userland/Applets/Keymap/KeymapStatusWidget.cpp2
-rw-r--r--Userland/Applets/Keymap/KeymapStatusWidget.h4
-rw-r--r--Userland/Applets/Keymap/KeymapStatusWindow.cpp2
-rw-r--r--Userland/Applets/Keymap/KeymapStatusWindow.h2
4 files changed, 5 insertions, 5 deletions
diff --git a/Userland/Applets/Keymap/KeymapStatusWidget.cpp b/Userland/Applets/Keymap/KeymapStatusWidget.cpp
index ecc4269bde..bc3b1802d9 100644
--- a/Userland/Applets/Keymap/KeymapStatusWidget.cpp
+++ b/Userland/Applets/Keymap/KeymapStatusWidget.cpp
@@ -59,7 +59,7 @@ ErrorOr<void> KeymapStatusWidget::refresh_menu()
return {};
}
-void KeymapStatusWidget::set_current_keymap(String const& keymap, ClearBackground clear_background)
+void KeymapStatusWidget::set_current_keymap(DeprecatedString const& keymap, ClearBackground clear_background)
{
if (clear_background == ClearBackground::Yes) {
GUI::Painter painter(*this);
diff --git a/Userland/Applets/Keymap/KeymapStatusWidget.h b/Userland/Applets/Keymap/KeymapStatusWidget.h
index 3e3e0fa54e..880a6510d2 100644
--- a/Userland/Applets/Keymap/KeymapStatusWidget.h
+++ b/Userland/Applets/Keymap/KeymapStatusWidget.h
@@ -22,11 +22,11 @@ class KeymapStatusWidget : public GUI::Label {
virtual void mousedown_event(GUI::MouseEvent& event) override;
- void set_current_keymap(String const& keymap, ClearBackground clear_background = ClearBackground::Yes);
+ void set_current_keymap(DeprecatedString const& keymap, ClearBackground clear_background = ClearBackground::Yes);
private:
RefPtr<GUI::Menu> m_context_menu;
- String m_current_keymap;
+ DeprecatedString m_current_keymap;
ErrorOr<void> refresh_menu();
diff --git a/Userland/Applets/Keymap/KeymapStatusWindow.cpp b/Userland/Applets/Keymap/KeymapStatusWindow.cpp
index 69248141a1..7a0fc2b29f 100644
--- a/Userland/Applets/Keymap/KeymapStatusWindow.cpp
+++ b/Userland/Applets/Keymap/KeymapStatusWindow.cpp
@@ -30,7 +30,7 @@ void KeymapStatusWindow::wm_event(GUI::WMEvent& event)
}
}
-void KeymapStatusWindow::set_keymap_text(String const& keymap)
+void KeymapStatusWindow::set_keymap_text(DeprecatedString const& keymap)
{
m_status_widget->set_current_keymap(keymap);
}
diff --git a/Userland/Applets/Keymap/KeymapStatusWindow.h b/Userland/Applets/Keymap/KeymapStatusWindow.h
index a4f4d3a162..0ba3c106dc 100644
--- a/Userland/Applets/Keymap/KeymapStatusWindow.h
+++ b/Userland/Applets/Keymap/KeymapStatusWindow.h
@@ -23,5 +23,5 @@ private:
RefPtr<KeymapStatusWidget> m_status_widget;
- void set_keymap_text(String const& keymap);
+ void set_keymap_text(DeprecatedString const& keymap);
};