RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 20:47:45 +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

36
Userland/Applications/Assistant/Providers.h
View file

@ -6,8 +6,8 @@
#pragma once
#include <AK/DeprecatedString.h>
#include <AK/Queue.h>
#include <AK/String.h>
#include <AK/URL.h>
#include <LibDesktop/AppFile.h>
#include <LibGUI/Desktop.h>
@ -26,8 +26,8 @@ public:
virtual Gfx::Bitmap const* bitmap() const = 0;
String const& title() const { return m_title; }
String const& tooltip() const { return m_tooltip; }
DeprecatedString const& title() const { return m_title; }
DeprecatedString const& tooltip() const { return m_tooltip; }
int score() const { return m_score; }
bool equals(Result const& other) const
{
@ -37,7 +37,7 @@ public:
}
protected:
Result(String title, String tooltip, int score = 0)
Result(DeprecatedString title, DeprecatedString tooltip, int score = 0)
: m_title(move(title))
, m_tooltip(move(tooltip))
, m_score(score)
@ -45,14 +45,14 @@ protected:
}
private:
String m_title;
String m_tooltip;
DeprecatedString m_title;
DeprecatedString m_tooltip;
int m_score { 0 };
};
class AppResult final : public Result {
public:
AppResult(RefPtr<Gfx::Bitmap> bitmap, String title, String tooltip, NonnullRefPtr<Desktop::AppFile> af, int score)
AppResult(RefPtr<Gfx::Bitmap> bitmap, DeprecatedString title, DeprecatedString tooltip, NonnullRefPtr<Desktop::AppFile> af, int score)
: Result(move(title), move(tooltip), score)
, m_app_file(move(af))
, m_bitmap(move(bitmap))
@ -70,7 +70,7 @@ private:
class CalculatorResult final : public Result {
public:
explicit CalculatorResult(String title)
explicit CalculatorResult(DeprecatedString title)
: Result(move(title), "Copy to Clipboard"sv, 100)
, m_bitmap(GUI::Icon::default_icon("app-calculator"sv).bitmap_for_size(16))
{
@ -86,7 +86,7 @@ private:
class FileResult final : public Result {
public:
explicit FileResult(String title, int score)
explicit FileResult(DeprecatedString title, int score)
: Result(move(title), "", score)
{
}
@ -98,7 +98,7 @@ public:
class TerminalResult final : public Result {
public:
explicit TerminalResult(String command)
explicit TerminalResult(DeprecatedString command)
: Result(move(command), "Run command in Terminal"sv, 100)
, m_bitmap(GUI::Icon::default_icon("app-terminal"sv).bitmap_for_size(16))
{
@ -132,41 +132,41 @@ class Provider : public RefCounted<Provider> {
public:
virtual ~Provider() = default;
virtual void query(String const&, Function<void(NonnullRefPtrVector<Result>)> on_complete) = 0;
virtual void query(DeprecatedString const&, Function<void(NonnullRefPtrVector<Result>)> on_complete) = 0;
};
class AppProvider final : public Provider {
public:
void query(String const& query, Function<void(NonnullRefPtrVector<Result>)> on_complete) override;
void query(DeprecatedString const& query, Function<void(NonnullRefPtrVector<Result>)> on_complete) override;
};
class CalculatorProvider final : public Provider {
public:
void query(String const& query, Function<void(NonnullRefPtrVector<Result>)> on_complete) override;
void query(DeprecatedString const& query, Function<void(NonnullRefPtrVector<Result>)> on_complete) override;
};
class FileProvider final : public Provider {
public:
FileProvider();
void query(String const& query, Function<void(NonnullRefPtrVector<Result>)> on_complete) override;
void query(DeprecatedString const& query, Function<void(NonnullRefPtrVector<Result>)> on_complete) override;
void build_filesystem_cache();
private:
RefPtr<Threading::BackgroundAction<NonnullRefPtrVector<Result>>> m_fuzzy_match_work;
bool m_building_cache { false };
Vector<String> m_full_path_cache;
Queue<String> m_work_queue;
Vector<DeprecatedString> m_full_path_cache;
Queue<DeprecatedString> m_work_queue;
};
class TerminalProvider final : public Provider {
public:
void query(String const& query, Function<void(NonnullRefPtrVector<Result>)> on_complete) override;
void query(DeprecatedString const& query, Function<void(NonnullRefPtrVector<Result>)> on_complete) override;
};
class URLProvider final : public Provider {
public:
void query(String const& query, Function<void(NonnullRefPtrVector<Result>)> on_complete) override;
void query(DeprecatedString const& query, Function<void(NonnullRefPtrVector<Result>)> on_complete) override;
};
}