RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 22:27:44 +00:00
Code Issues Activity Actions

HexEditor: Replace DeprecatedString in ValueInspectorModel

Browse source
This commit is contained in:
kamp 2023-08-16 19:47:06 +03:00 • committed by Andrew Kaster
parent 4b87714700
commit 7a2ad83c07
2 changed files with 60 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

48
Userland/Applications/HexEditor/ValueInspectorModel.h
View file

@ -6,7 +6,6 @@
#pragma once
#include <AK/DeprecatedString.h>
#include <AK/Hex.h>
#include <AK/NonnullRefPtr.h>
#include <AK/Utf16View.h>
@ -45,12 +44,13 @@ public:
: m_is_little_endian(is_little_endian)
{
for (int i = 0; i < ValueType::__Count; i++)
set_parsed_value(static_cast<ValueType>(i), "");
set_parsed_value(static_cast<ValueType>(i), ""_string);
}
void set_parsed_value(ValueType type, DeprecatedString value)
void set_parsed_value(ValueType type, ErrorOr<String> value)
{
m_values[type] = value;
if (!value.is_error())
m_values[type] = value.release_value();
}
virtual int row_count(GUI::ModelIndex const& = GUI::ModelIndex()) const override
@ -74,43 +74,43 @@ public:
VERIFY_NOT_REACHED();
}
DeprecatedString inspector_value_type_to_deprecated_string(ValueType type) const
String inspector_value_type_to_string(ValueType type) const
{
switch (type) {
case SignedByte:
return "Signed Byte";
return "Signed Byte"_string;
case UnsignedByte:
return "Unsigned Byte";
return "Unsigned Byte"_string;
case SignedShort:
return "Signed Short";
return "Signed Short"_string;
case UnsignedShort:
return "Unsigned Short";
return "Unsigned Short"_string;
case SignedInt:
return "Signed Int";
return "Signed Int"_string;
case UnsignedInt:
return "Unsigned Int";
return "Unsigned Int"_string;
case SignedLong:
return "Signed Long";
return "Signed Long"_string;
case UnsignedLong:
return "Unsigned Long";
return "Unsigned Long"_string;
case Float:
return "Float";
return "Float"_string;
case Double:
return "Double";
return "Double"_string;
case ASCII:
return "ASCII";
return "ASCII"_string;
case UTF8:
return "UTF-8";
return "UTF-8"_string;
case UTF16:
return "UTF-16";
return "UTF-16"_string;
case ASCIIString:
return "ASCII String";
return "ASCII String"_string;
case UTF8String:
return "UTF-8 String";
return "UTF-8 String"_string;
case UTF16String:
return "UTF-16 String";
return "UTF-16 String"_string;
default:
return "";
return ""_string;
}
}
@ -121,7 +121,7 @@ public:
if (role == GUI::ModelRole::Display) {
switch (index.column()) {
case Column::Type:
return inspector_value_type_to_deprecated_string(static_cast<ValueType>(index.row()));
return inspector_value_type_to_string(static_cast<ValueType>(index.row())).to_deprecated_string();
case Column::Value:
return m_values.at(index.row());
}
@ -165,5 +165,5 @@ public:
private:
bool m_is_little_endian = false;
Array<DeprecatedString, ValueType::__Count> m_values = {};
Array<String, ValueType::__Count> m_values = {};
};