mirror of
https://github.com/RGBCube/serenity
synced 2025-07-28 07:37:35 +00:00
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 :^)
This commit is contained in:
Linus Groh
Andreas Kling
parent
f74251606d
commit
6e19ab2bbc
2006 changed files with 11635 additions and 11636 deletions
|
|
@ -60,7 +60,7 @@ void URLResult::activate() const
|
|||
Desktop::Launcher::open(URL::create_with_url_or_path(title()));
|
||||
}
|
||||
|
||||
void AppProvider::query(String const& query, Function<void(NonnullRefPtrVector<Result>)> on_complete)
|
||||
void AppProvider::query(DeprecatedString const& query, Function<void(NonnullRefPtrVector<Result>)> on_complete)
|
||||
{
|
||||
if (query.starts_with('=') || query.starts_with('$'))
|
||||
return;
|
||||
|
|
@ -79,7 +79,7 @@ void AppProvider::query(String const& query, Function<void(NonnullRefPtrVector<R
|
|||
on_complete(move(results));
|
||||
}
|
||||
|
||||
void CalculatorProvider::query(String const& query, Function<void(NonnullRefPtrVector<Result>)> on_complete)
|
||||
void CalculatorProvider::query(DeprecatedString const& query, Function<void(NonnullRefPtrVector<Result>)> on_complete)
|
||||
{
|
||||
if (!query.starts_with('='))
|
||||
return;
|
||||
|
|
@ -97,7 +97,7 @@ void CalculatorProvider::query(String const& query, Function<void(NonnullRefPtrV
|
|||
return;
|
||||
|
||||
auto result = completion.release_value();
|
||||
String calculation;
|
||||
DeprecatedString calculation;
|
||||
if (!result.is_number()) {
|
||||
calculation = "0";
|
||||
} else {
|
||||
|
|
@ -119,7 +119,7 @@ FileProvider::FileProvider()
|
|||
build_filesystem_cache();
|
||||
}
|
||||
|
||||
void FileProvider::query(String const& query, Function<void(NonnullRefPtrVector<Result>)> on_complete)
|
||||
void FileProvider::query(DeprecatedString const& query, Function<void(NonnullRefPtrVector<Result>)> on_complete)
|
||||
{
|
||||
build_filesystem_cache();
|
||||
|
||||
|
|
@ -159,7 +159,7 @@ void FileProvider::build_filesystem_cache()
|
|||
|
||||
(void)Threading::BackgroundAction<int>::construct(
|
||||
[this, strong_ref = NonnullRefPtr(*this)](auto&) {
|
||||
String slash = "/";
|
||||
DeprecatedString slash = "/";
|
||||
auto timer = Core::ElapsedTimer::start_new();
|
||||
while (!m_work_queue.is_empty()) {
|
||||
auto base_directory = m_work_queue.dequeue();
|
||||
|
|
@ -197,7 +197,7 @@ void FileProvider::build_filesystem_cache()
|
|||
});
|
||||
}
|
||||
|
||||
void TerminalProvider::query(String const& query, Function<void(NonnullRefPtrVector<Result>)> on_complete)
|
||||
void TerminalProvider::query(DeprecatedString const& query, Function<void(NonnullRefPtrVector<Result>)> on_complete)
|
||||
{
|
||||
if (!query.starts_with('$'))
|
||||
return;
|
||||
|
|
@ -209,7 +209,7 @@ void TerminalProvider::query(String const& query, Function<void(NonnullRefPtrVec
|
|||
on_complete(move(results));
|
||||
}
|
||||
|
||||
void URLProvider::query(String const& query, Function<void(NonnullRefPtrVector<Result>)> on_complete)
|
||||
void URLProvider::query(DeprecatedString const& query, Function<void(NonnullRefPtrVector<Result>)> on_complete)
|
||||
{
|
||||
if (query.is_empty() || query.starts_with('=') || query.starts_with('$'))
|
||||
return;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,10 +6,10 @@
|
|||
*/
|
||||
|
||||
#include "Providers.h"
|
||||
#include <AK/DeprecatedString.h>
|
||||
#include <AK/Error.h>
|
||||
#include <AK/LexicalPath.h>
|
||||
#include <AK/QuickSort.h>
|
||||
#include <AK/String.h>
|
||||
#include <AK/Try.h>
|
||||
#include <LibCore/LockFile.h>
|
||||
#include <LibCore/System.h>
|
||||
|
|
@ -38,7 +38,7 @@ struct AppState {
|
|||
size_t visible_result_count { 0 };
|
||||
|
||||
Threading::Mutex lock;
|
||||
String last_query;
|
||||
DeprecatedString last_query;
|
||||
};
|
||||
|
||||
class ResultRow final : public GUI::Button {
|
||||
|
|
@ -87,7 +87,7 @@ public:
|
|||
|
||||
Function<void(NonnullRefPtrVector<Result>)> on_new_results;
|
||||
|
||||
void search(String const& query)
|
||||
void search(DeprecatedString const& query)
|
||||
{
|
||||
for (auto& provider : m_providers) {
|
||||
provider.query(query, [=, this](auto results) {
|
||||
|
|
@ -97,7 +97,7 @@ public:
|
|||
}
|
||||
|
||||
private:
|
||||
void did_receive_results(String const& query, NonnullRefPtrVector<Result> const& results)
|
||||
void did_receive_results(DeprecatedString const& query, NonnullRefPtrVector<Result> const& results)
|
||||
{
|
||||
{
|
||||
Threading::MutexLocker db_locker(m_mutex);
|
||||
|
|
@ -135,7 +135,7 @@ private:
|
|||
NonnullRefPtrVector<Provider> m_providers;
|
||||
|
||||
Threading::Mutex m_mutex;
|
||||
HashMap<String, NonnullRefPtrVector<Result>> m_result_cache;
|
||||
HashMap<DeprecatedString, NonnullRefPtrVector<Result>> m_result_cache;
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue