mirror of
https://github.com/RGBCube/serenity
synced 2025-07-27 06: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
|
@ -6,7 +6,7 @@
|
|||
|
||||
#pragma once
|
||||
|
||||
#include <AK/DeprecatedString.h>
|
||||
#include <AK/ByteString.h>
|
||||
#include <AK/Optional.h>
|
||||
#include <AK/RefPtr.h>
|
||||
#include <AK/StringView.h>
|
||||
|
@ -15,35 +15,35 @@
|
|||
// Extended M3U fields (de facto standard)
|
||||
struct M3UExtendedInfo {
|
||||
Optional<u32> track_length_in_seconds;
|
||||
Optional<DeprecatedString> track_display_title;
|
||||
Optional<DeprecatedString> group_name;
|
||||
Optional<DeprecatedString> album_title;
|
||||
Optional<DeprecatedString> album_artist;
|
||||
Optional<DeprecatedString> album_genre;
|
||||
Optional<ByteString> track_display_title;
|
||||
Optional<ByteString> group_name;
|
||||
Optional<ByteString> album_title;
|
||||
Optional<ByteString> album_artist;
|
||||
Optional<ByteString> album_genre;
|
||||
Optional<u64> file_size_in_bytes;
|
||||
Optional<ReadonlyBytes> embedded_mp3;
|
||||
Optional<DeprecatedString> cover_path;
|
||||
Optional<ByteString> cover_path;
|
||||
};
|
||||
|
||||
struct M3UEntry {
|
||||
DeprecatedString path;
|
||||
ByteString path;
|
||||
Optional<M3UExtendedInfo> extended_info;
|
||||
};
|
||||
|
||||
class M3UParser {
|
||||
public:
|
||||
static NonnullOwnPtr<M3UParser> from_file(StringView path);
|
||||
static NonnullOwnPtr<M3UParser> from_memory(DeprecatedString const& m3u_contents, bool utf8);
|
||||
static NonnullOwnPtr<M3UParser> from_memory(ByteString const& m3u_contents, bool utf8);
|
||||
|
||||
NonnullOwnPtr<Vector<M3UEntry>> parse(bool include_extended_info);
|
||||
|
||||
Optional<DeprecatedString>& get_playlist_title_metadata() { return m_parsed_playlist_title; }
|
||||
Optional<ByteString>& get_playlist_title_metadata() { return m_parsed_playlist_title; }
|
||||
|
||||
M3UParser();
|
||||
|
||||
private:
|
||||
DeprecatedString m_m3u_raw_data;
|
||||
DeprecatedString m_playlist_path;
|
||||
ByteString m_m3u_raw_data;
|
||||
ByteString m_playlist_path;
|
||||
bool m_use_utf8;
|
||||
Optional<DeprecatedString> m_parsed_playlist_title;
|
||||
Optional<ByteString> m_parsed_playlist_title;
|
||||
};
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue