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

10
Userland/Applications/Presenter/Presentation.h
View file

@ -7,10 +7,10 @@
#pragma once
#include "Slide.h"
#include <AK/DeprecatedString.h>
#include <AK/Forward.h>
#include <AK/HashMap.h>
#include <AK/NonnullOwnPtr.h>
#include <AK/String.h>
#include <AK/Vector.h>
#include <LibGfx/Painter.h>
#include <LibGfx/Size.h>
@ -42,18 +42,18 @@ public:
void paint(Gfx::Painter& painter) const;
private:
static HashMap<String, String> parse_metadata(JsonObject const& metadata_object);
static HashMap<DeprecatedString, DeprecatedString> parse_metadata(JsonObject const& metadata_object);
static ErrorOr<Gfx::IntSize> parse_presentation_size(JsonObject const& metadata_object);
Presentation(Gfx::IntSize normative_size, HashMap<String, String> metadata);
static NonnullOwnPtr<Presentation> construct(Gfx::IntSize normative_size, HashMap<String, String> metadata);
Presentation(Gfx::IntSize normative_size, HashMap<DeprecatedString, DeprecatedString> metadata);
static NonnullOwnPtr<Presentation> construct(Gfx::IntSize normative_size, HashMap<DeprecatedString, DeprecatedString> 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<String, String> m_metadata;
HashMap<DeprecatedString, DeprecatedString> m_metadata;
Checked<unsigned> m_current_slide { 0 };
Checked<unsigned> m_current_frame_in_slide { 0 };