mirror of
https://github.com/RGBCube/serenity
synced 2025-07-27 12:47:35 +00:00
Everywhere: Rename {Deprecated => Byte}String
This commit un-deprecates DeprecatedString, and repurposes it as a byte string. As the null state has already been removed, there are no other particularly hairy blockers in repurposing this type as a byte string (what it _really_ is). This commit is auto-generated: $ xs=$(ack -l \bDeprecatedString\b\|deprecated_string AK Userland \ Meta Ports Ladybird Tests Kernel) $ perl -pie 's/\bDeprecatedString\b/ByteString/g; s/deprecated_string/byte_string/g' $xs $ clang-format --style=file -i \ $(git diff --name-only | grep \.cpp\|\.h) $ gn format $(git ls-files '*.gn' '*.gni')
This commit is contained in:
parent
38d62563b3
commit
5e1499d104
1615 changed files with 10257 additions and 10257 deletions
|
@ -8,7 +8,7 @@
|
|||
#pragma once
|
||||
|
||||
#include "Slide.h"
|
||||
#include <AK/DeprecatedString.h>
|
||||
#include <AK/ByteString.h>
|
||||
#include <AK/HashMap.h>
|
||||
#include <AK/NonnullOwnPtr.h>
|
||||
#include <AK/Vector.h>
|
||||
|
@ -38,21 +38,21 @@ public:
|
|||
void previous_frame();
|
||||
void go_to_first_slide();
|
||||
|
||||
ErrorOr<DeprecatedString> render();
|
||||
ErrorOr<ByteString> render();
|
||||
|
||||
private:
|
||||
static HashMap<DeprecatedString, DeprecatedString> parse_metadata(JsonObject const& metadata_object);
|
||||
static HashMap<ByteString, ByteString> parse_metadata(JsonObject const& metadata_object);
|
||||
static ErrorOr<Gfx::IntSize> parse_presentation_size(JsonObject const& metadata_object);
|
||||
|
||||
Presentation(Gfx::IntSize normative_size, HashMap<DeprecatedString, DeprecatedString> metadata);
|
||||
static NonnullOwnPtr<Presentation> construct(Gfx::IntSize normative_size, HashMap<DeprecatedString, DeprecatedString> metadata);
|
||||
Presentation(Gfx::IntSize normative_size, HashMap<ByteString, ByteString> metadata);
|
||||
static NonnullOwnPtr<Presentation> construct(Gfx::IntSize normative_size, HashMap<ByteString, ByteString> metadata);
|
||||
|
||||
void append_slide(Slide slide);
|
||||
|
||||
Vector<Slide> m_slides {};
|
||||
// This is not a pixel size, but an abstract size used by the slide objects for relative positioning.
|
||||
Gfx::IntSize m_normative_size;
|
||||
HashMap<DeprecatedString, DeprecatedString> m_metadata;
|
||||
HashMap<ByteString, ByteString> m_metadata;
|
||||
|
||||
Checked<unsigned> m_current_slide { 0 };
|
||||
Checked<unsigned> m_current_frame_in_slide { 0 };
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue