summaryrefslogtreecommitdiff
path: root/Userland/Libraries/LibDesktop/AppFile.cpp
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/Libraries/LibDesktop/AppFile.cpp
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/Libraries/LibDesktop/AppFile.cpp')
-rw-r--r--Userland/Libraries/LibDesktop/AppFile.cpp30
1 files changed, 15 insertions, 15 deletions
diff --git a/Userland/Libraries/LibDesktop/AppFile.cpp b/Userland/Libraries/LibDesktop/AppFile.cpp
index 64910f410b..c28eb7ae89 100644
--- a/Userland/Libraries/LibDesktop/AppFile.cpp
+++ b/Userland/Libraries/LibDesktop/AppFile.cpp
@@ -17,7 +17,7 @@ namespace Desktop {
NonnullRefPtr<AppFile> AppFile::get_for_app(StringView app_name)
{
- auto path = String::formatted("{}/{}.af", APP_FILES_DIRECTORY, app_name);
+ auto path = DeprecatedString::formatted("{}/{}.af", APP_FILES_DIRECTORY, app_name);
return open(path);
}
@@ -35,7 +35,7 @@ void AppFile::for_each(Function<void(NonnullRefPtr<AppFile>)> callback, StringVi
auto name = di.next_path();
if (!name.ends_with(".af"sv))
continue;
- auto path = String::formatted("{}/{}", directory, name);
+ auto path = DeprecatedString::formatted("{}/{}", directory, name);
auto af = AppFile::open(path);
if (!af->is_valid())
continue;
@@ -58,36 +58,36 @@ bool AppFile::validate() const
return true;
}
-String AppFile::name() const
+DeprecatedString AppFile::name() const
{
auto name = m_config->read_entry("App", "Name").trim_whitespace();
VERIFY(!name.is_empty());
return name;
}
-String AppFile::executable() const
+DeprecatedString AppFile::executable() const
{
auto executable = m_config->read_entry("App", "Executable").trim_whitespace();
VERIFY(!executable.is_empty());
return executable;
}
-String AppFile::description() const
+DeprecatedString AppFile::description() const
{
return m_config->read_entry("App", "Description").trim_whitespace();
}
-String AppFile::category() const
+DeprecatedString AppFile::category() const
{
return m_config->read_entry("App", "Category").trim_whitespace();
}
-String AppFile::working_directory() const
+DeprecatedString AppFile::working_directory() const
{
return m_config->read_entry("App", "WorkingDirectory").trim_whitespace();
}
-String AppFile::icon_path() const
+DeprecatedString AppFile::icon_path() const
{
return m_config->read_entry("App", "IconPath").trim_whitespace();
}
@@ -112,9 +112,9 @@ bool AppFile::requires_root() const
return m_config->read_bool_entry("App", "RequiresRoot", false);
}
-Vector<String> AppFile::launcher_mime_types() const
+Vector<DeprecatedString> AppFile::launcher_mime_types() const
{
- Vector<String> mime_types;
+ Vector<DeprecatedString> mime_types;
for (auto& entry : m_config->read_entry("Launcher", "MimeTypes").split(',')) {
entry = entry.trim_whitespace();
if (!entry.is_empty())
@@ -123,9 +123,9 @@ Vector<String> AppFile::launcher_mime_types() const
return mime_types;
}
-Vector<String> AppFile::launcher_file_types() const
+Vector<DeprecatedString> AppFile::launcher_file_types() const
{
- Vector<String> file_types;
+ Vector<DeprecatedString> file_types;
for (auto& entry : m_config->read_entry("Launcher", "FileTypes").split(',')) {
entry = entry.trim_whitespace();
if (!entry.is_empty())
@@ -134,9 +134,9 @@ Vector<String> AppFile::launcher_file_types() const
return file_types;
}
-Vector<String> AppFile::launcher_protocols() const
+Vector<DeprecatedString> AppFile::launcher_protocols() const
{
- Vector<String> protocols;
+ Vector<DeprecatedString> protocols;
for (auto& entry : m_config->read_entry("Launcher", "Protocols").split(',')) {
entry = entry.trim_whitespace();
if (!entry.is_empty())
@@ -150,7 +150,7 @@ bool AppFile::spawn() const
if (!is_valid())
return false;
- auto pid = Core::Process::spawn(executable(), Span<String const> {}, working_directory());
+ auto pid = Core::Process::spawn(executable(), Span<DeprecatedString const> {}, working_directory());
if (pid.is_error())
return false;