diff options
| author | Linus Groh <mail@linusgroh.de> | 2022-12-04 18:02:33 +0000 |
|---|---|---|
| committer | Andreas Kling <kling@serenityos.org> | 2022-12-06 08:54:33 +0100 |
| commit | 6e19ab2bbce0b113b628e6f8e9b5c0640053933e (patch) | |
| tree | 372d21b2f5dcff112f5d0089559c6af5798680d4 /Userland/Libraries/LibGPU | |
| parent | f74251606d74b504a1379ebb893fdb5529054ea5 (diff) | |
| download | serenity-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/LibGPU')
| -rw-r--r-- | Userland/Libraries/LibGPU/DeviceInfo.h | 6 | ||||
| -rw-r--r-- | Userland/Libraries/LibGPU/Driver.cpp | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/Userland/Libraries/LibGPU/DeviceInfo.h b/Userland/Libraries/LibGPU/DeviceInfo.h index d9c12ca334..b9f11c472d 100644 --- a/Userland/Libraries/LibGPU/DeviceInfo.h +++ b/Userland/Libraries/LibGPU/DeviceInfo.h @@ -6,13 +6,13 @@ #pragma once -#include <AK/String.h> +#include <AK/DeprecatedString.h> namespace GPU { struct DeviceInfo final { - String vendor_name; - String device_name; + DeprecatedString vendor_name; + DeprecatedString device_name; unsigned num_texture_units; unsigned num_lights; unsigned max_clip_planes; diff --git a/Userland/Libraries/LibGPU/Driver.cpp b/Userland/Libraries/LibGPU/Driver.cpp index e2d2d973a0..85e0b56cf6 100644 --- a/Userland/Libraries/LibGPU/Driver.cpp +++ b/Userland/Libraries/LibGPU/Driver.cpp @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-2-Clause */ +#include <AK/DeprecatedString.h> #include <AK/HashMap.h> -#include <AK/String.h> #include <AK/WeakPtr.h> #include <LibGPU/Driver.h> #include <dlfcn.h> @@ -13,7 +13,7 @@ namespace GPU { // FIXME: Think of a better way to configure these paths. Maybe use ConfigServer? -static HashMap<String, String> const s_driver_path_map +static HashMap<DeprecatedString, DeprecatedString> const s_driver_path_map { #if defined(AK_OS_SERENITY) { "softgpu", "libsoftgpu.so.serenity" }, @@ -24,7 +24,7 @@ static HashMap<String, String> const s_driver_path_map #endif }; -static HashMap<String, WeakPtr<Driver>> s_loaded_drivers; +static HashMap<DeprecatedString, WeakPtr<Driver>> s_loaded_drivers; ErrorOr<NonnullRefPtr<Driver>> Driver::try_create(StringView driver_name) { |