summaryrefslogtreecommitdiff
path: root/Userland/Applications/ClockSettings
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/Applications/ClockSettings
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/Applications/ClockSettings')
-rw-r--r--Userland/Applications/ClockSettings/ClockSettingsWidget.h2
-rw-r--r--Userland/Applications/ClockSettings/TimeZoneSettingsWidget.cpp2
-rw-r--r--Userland/Applications/ClockSettings/TimeZoneSettingsWidget.h6
3 files changed, 5 insertions, 5 deletions
diff --git a/Userland/Applications/ClockSettings/ClockSettingsWidget.h b/Userland/Applications/ClockSettings/ClockSettingsWidget.h
index 50db28840a..99fa5bb1a4 100644
--- a/Userland/Applications/ClockSettings/ClockSettingsWidget.h
+++ b/Userland/Applications/ClockSettings/ClockSettingsWidget.h
@@ -28,5 +28,5 @@ private:
RefPtr<Core::Timer> m_clock_preview_update_timer;
- String m_time_format;
+ DeprecatedString m_time_format;
};
diff --git a/Userland/Applications/ClockSettings/TimeZoneSettingsWidget.cpp b/Userland/Applications/ClockSettings/TimeZoneSettingsWidget.cpp
index 25722449e0..0750eb042c 100644
--- a/Userland/Applications/ClockSettings/TimeZoneSettingsWidget.cpp
+++ b/Userland/Applications/ClockSettings/TimeZoneSettingsWidget.cpp
@@ -131,7 +131,7 @@ void TimeZoneSettingsWidget::set_time_zone_location()
auto name = Locale::format_time_zone(locale, m_time_zone, Locale::CalendarPatternStyle::Long, now);
auto offset = Locale::format_time_zone(locale, m_time_zone, Locale::CalendarPatternStyle::LongOffset, now);
- m_time_zone_text = String::formatted("{}\n({})", name, offset);
+ m_time_zone_text = DeprecatedString::formatted("{}\n({})", name, offset);
}
// https://en.wikipedia.org/wiki/Mercator_projection#Derivation
diff --git a/Userland/Applications/ClockSettings/TimeZoneSettingsWidget.h b/Userland/Applications/ClockSettings/TimeZoneSettingsWidget.h
index 202c2c7ed6..4a8e0e8beb 100644
--- a/Userland/Applications/ClockSettings/TimeZoneSettingsWidget.h
+++ b/Userland/Applications/ClockSettings/TimeZoneSettingsWidget.h
@@ -6,9 +6,9 @@
#pragma once
+#include <AK/DeprecatedString.h>
#include <AK/Optional.h>
#include <AK/RefPtr.h>
-#include <AK/String.h>
#include <LibGUI/SettingsWindow.h>
#include <LibGUI/TextEditor.h>
#include <LibGUI/Window.h>
@@ -28,11 +28,11 @@ private:
Optional<Gfx::FloatPoint> compute_time_zone_location() const;
void set_time_zone();
- String m_time_zone;
+ DeprecatedString m_time_zone;
RefPtr<GUI::ComboBox> m_time_zone_combo_box;
RefPtr<GUI::ImageWidget> m_time_zone_map;
RefPtr<Gfx::Bitmap> m_time_zone_marker;
Optional<Gfx::FloatPoint> m_time_zone_location;
- String m_time_zone_text;
+ DeprecatedString m_time_zone_text;
};