mirror of
https://github.com/RGBCube/serenity
synced 2025-07-27 21:47:45 +00:00
Userland: Port Model::column_name()
to String
This commit is contained in:
parent
741f07dedf
commit
945f05ed76
70 changed files with 218 additions and 222 deletions
|
@ -92,7 +92,7 @@ public:
|
|||
return Column::__Count;
|
||||
}
|
||||
|
||||
virtual DeprecatedString column_name(int) const override { return {}; }
|
||||
virtual String column_name(int) const override { return {}; }
|
||||
|
||||
virtual ModelIndex index(int row, int column = 0, ModelIndex const& = ModelIndex()) const override
|
||||
{
|
||||
|
|
|
@ -761,27 +761,27 @@ int FileSystemModel::column_count(ModelIndex const&) const
|
|||
return Column::__Count;
|
||||
}
|
||||
|
||||
DeprecatedString FileSystemModel::column_name(int column) const
|
||||
String FileSystemModel::column_name(int column) const
|
||||
{
|
||||
switch (column) {
|
||||
case Column::Icon:
|
||||
return "";
|
||||
return {};
|
||||
case Column::Name:
|
||||
return "Name";
|
||||
return "Name"_short_string;
|
||||
case Column::Size:
|
||||
return "Size";
|
||||
return "Size"_short_string;
|
||||
case Column::User:
|
||||
return "User";
|
||||
return "User"_short_string;
|
||||
case Column::Group:
|
||||
return "Group";
|
||||
return "Group"_short_string;
|
||||
case Column::Permissions:
|
||||
return "Mode";
|
||||
return "Mode"_short_string;
|
||||
case Column::ModificationTime:
|
||||
return "Modified";
|
||||
return "Modified"_string.release_value_but_fixme_should_propagate_errors();
|
||||
case Column::Inode:
|
||||
return "Inode";
|
||||
return "Inode"_short_string;
|
||||
case Column::SymlinkTarget:
|
||||
return "Symlink target";
|
||||
return "Symlink target"_string.release_value_but_fixme_should_propagate_errors();
|
||||
}
|
||||
VERIFY_NOT_REACHED();
|
||||
}
|
||||
|
|
|
@ -127,7 +127,7 @@ public:
|
|||
virtual int tree_column() const override { return Column::Name; }
|
||||
virtual int row_count(ModelIndex const& = ModelIndex()) const override;
|
||||
virtual int column_count(ModelIndex const& = ModelIndex()) const override;
|
||||
virtual DeprecatedString column_name(int column) const override;
|
||||
virtual String column_name(int column) const override;
|
||||
virtual Variant data(ModelIndex const&, ModelRole = ModelRole::Display) const override;
|
||||
virtual ModelIndex parent_index(ModelIndex const&) const override;
|
||||
virtual ModelIndex index(int row, int column = 0, ModelIndex const& parent = ModelIndex()) const override;
|
||||
|
|
|
@ -33,7 +33,7 @@ int FilteringProxyModel::column_count(ModelIndex const& index) const
|
|||
return m_model->column_count(m_matching_indices[index.row()]);
|
||||
}
|
||||
|
||||
DeprecatedString FilteringProxyModel::column_name(int column) const
|
||||
String FilteringProxyModel::column_name(int column) const
|
||||
{
|
||||
return m_model->column_name(column);
|
||||
}
|
||||
|
|
|
@ -29,7 +29,7 @@ public:
|
|||
|
||||
virtual int row_count(ModelIndex const& = ModelIndex()) const override;
|
||||
virtual int column_count(ModelIndex const& = ModelIndex()) const override;
|
||||
virtual DeprecatedString column_name(int) const override;
|
||||
virtual String column_name(int) const override;
|
||||
virtual Variant data(ModelIndex const&, ModelRole = ModelRole::Display) const override;
|
||||
virtual void invalidate() override;
|
||||
virtual ModelIndex index(int row, int column = 0, ModelIndex const& parent = ModelIndex()) const override;
|
||||
|
|
|
@ -358,7 +358,7 @@ Menu& HeaderView::ensure_context_menu()
|
|||
int section_count = this->section_count();
|
||||
for (int section = 0; section < section_count; ++section) {
|
||||
auto& column_data = this->section_data(section);
|
||||
auto name = model()->column_name(section);
|
||||
auto name = model()->column_name(section).to_deprecated_string();
|
||||
column_data.visibility_action = Action::create_checkable(name, [this, section](auto& action) {
|
||||
set_section_visible(section, action.is_checked());
|
||||
});
|
||||
|
|
|
@ -71,11 +71,11 @@ public:
|
|||
return 1;
|
||||
}
|
||||
|
||||
virtual DeprecatedString column_name(int index) const override
|
||||
virtual String column_name(int index) const override
|
||||
{
|
||||
if constexpr (IsTwoDimensional)
|
||||
return m_column_names[index];
|
||||
return "Data";
|
||||
return "Data"_short_string;
|
||||
}
|
||||
|
||||
virtual Variant data(ModelIndex const& index, ModelRole role) const override
|
||||
|
|
|
@ -49,7 +49,7 @@ public:
|
|||
|
||||
virtual int row_count(ModelIndex const& = ModelIndex()) const override { return m_array.size(); }
|
||||
virtual int column_count(ModelIndex const& = ModelIndex()) const override { return m_fields.size(); }
|
||||
virtual DeprecatedString column_name(int column) const override { return m_fields[column].column_name; }
|
||||
virtual String column_name(int column) const override { return String::from_deprecated_string(m_fields[column].column_name).release_value_but_fixme_should_propagate_errors(); }
|
||||
virtual Variant data(ModelIndex const&, ModelRole = ModelRole::Display) const override;
|
||||
virtual void invalidate() override;
|
||||
virtual void update();
|
||||
|
|
|
@ -9,11 +9,11 @@
|
|||
#pragma once
|
||||
|
||||
#include <AK/Badge.h>
|
||||
#include <AK/DeprecatedString.h>
|
||||
#include <AK/Function.h>
|
||||
#include <AK/HashMap.h>
|
||||
#include <AK/HashTable.h>
|
||||
#include <AK/RefCounted.h>
|
||||
#include <AK/String.h>
|
||||
#include <AK/WeakPtr.h>
|
||||
#include <LibCore/MimeData.h>
|
||||
#include <LibGUI/Forward.h>
|
||||
|
@ -66,7 +66,7 @@ public:
|
|||
|
||||
virtual int row_count(ModelIndex const& = ModelIndex()) const = 0;
|
||||
virtual int column_count(ModelIndex const& = ModelIndex()) const = 0;
|
||||
virtual DeprecatedString column_name(int) const { return {}; }
|
||||
virtual String column_name(int) const { return {}; }
|
||||
virtual Variant data(ModelIndex const&, ModelRole = ModelRole::Display) const = 0;
|
||||
virtual TriState data_matches(ModelIndex const&, Variant const&) const { return TriState::Unknown; }
|
||||
virtual void invalidate();
|
||||
|
|
|
@ -45,17 +45,17 @@ int RunningProcessesModel::column_count(const GUI::ModelIndex&) const
|
|||
return Column::__Count;
|
||||
}
|
||||
|
||||
DeprecatedString RunningProcessesModel::column_name(int column_index) const
|
||||
String RunningProcessesModel::column_name(int column_index) const
|
||||
{
|
||||
switch (column_index) {
|
||||
case Column::Icon:
|
||||
return {};
|
||||
case Column::PID:
|
||||
return "PID";
|
||||
return "PID"_short_string;
|
||||
case Column::UID:
|
||||
return "UID";
|
||||
return "UID"_short_string;
|
||||
case Column::Name:
|
||||
return "Name";
|
||||
return "Name"_short_string;
|
||||
}
|
||||
VERIFY_NOT_REACHED();
|
||||
}
|
||||
|
|
|
@ -27,7 +27,7 @@ public:
|
|||
|
||||
virtual int row_count(const GUI::ModelIndex&) const override;
|
||||
virtual int column_count(const GUI::ModelIndex&) const override;
|
||||
virtual DeprecatedString column_name(int column_index) const override;
|
||||
virtual String column_name(int column_index) const override;
|
||||
virtual GUI::Variant data(const GUI::ModelIndex&, GUI::ModelRole) const override;
|
||||
|
||||
void update();
|
||||
|
|
|
@ -106,7 +106,7 @@ ModelIndex SortingProxyModel::map_to_proxy(ModelIndex const& source_index) const
|
|||
return create_index(proxy_row, proxy_column, &mapping);
|
||||
}
|
||||
|
||||
DeprecatedString SortingProxyModel::column_name(int column) const
|
||||
String SortingProxyModel::column_name(int column) const
|
||||
{
|
||||
return source().column_name(column);
|
||||
}
|
||||
|
|
|
@ -24,7 +24,7 @@ public:
|
|||
virtual int tree_column() const override { return m_source->tree_column(); }
|
||||
virtual int row_count(ModelIndex const& = ModelIndex()) const override;
|
||||
virtual int column_count(ModelIndex const& = ModelIndex()) const override;
|
||||
virtual DeprecatedString column_name(int) const override;
|
||||
virtual String column_name(int) const override;
|
||||
virtual Variant data(ModelIndex const&, ModelRole = ModelRole::Display) const override;
|
||||
virtual void invalidate() override;
|
||||
virtual StringView drag_data_type() const override;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue