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

LibGUI: Move GUI::Model::Role to GUI::ModelRole

Browse source 
This is preparation for using ModelRole in the ModelIndex API.
This commit is contained in:
Andreas Kling 2020-08-16 16:00:07 +02:00
parent f6d7204689
commit a1e381a0f8
66 changed files with 201 additions and 167 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Applications/IRCClient/IRCChannelMemberListModel.cpp
View file

@ -57,11 +57,11 @@ String IRCChannelMemberListModel::column_name(int column) const
ASSERT_NOT_REACHED();
}
GUI::Variant IRCChannelMemberListModel::data(const GUI::ModelIndex& index, Role role) const
GUI::Variant IRCChannelMemberListModel::data(const GUI::ModelIndex& index, GUI::ModelRole role) const
{
if (role == Role::TextAlignment)
if (role == GUI::ModelRole::TextAlignment)
return Gfx::TextAlignment::CenterLeft;
if (role == Role::Display) {
if (role == GUI::ModelRole::Display) {
switch (index.column()) {
case Column::Name:
return m_channel.member_at(index.row());
@ -77,5 +77,5 @@ void IRCChannelMemberListModel::update()
String IRCChannelMemberListModel::nick_at(const GUI::ModelIndex& index) const
{
return data(index, IRCChannelMemberListModel::Role::Display).to_string();
return data(index, GUI::ModelRole::Display).to_string();
}

2
Applications/IRCClient/IRCChannelMemberListModel.h
View file

@ -42,7 +42,7 @@ public:
virtual int row_count(const GUI::ModelIndex&) const override;
virtual int column_count(const GUI::ModelIndex&) const override;
virtual String column_name(int column) const override;
virtual GUI::Variant data(const GUI::ModelIndex&, Role = Role::Display) const override;
virtual GUI::Variant data(const GUI::ModelIndex&, GUI::ModelRole) const override;
virtual void update() override;
virtual String nick_at(const GUI::ModelIndex& index) const;

8
Applications/IRCClient/IRCWindowListModel.cpp
View file

@ -56,11 +56,11 @@ String IRCWindowListModel::column_name(int column) const
ASSERT_NOT_REACHED();
}
GUI::Variant IRCWindowListModel::data(const GUI::ModelIndex& index, Role role) const
GUI::Variant IRCWindowListModel::data(const GUI::ModelIndex& index, GUI::ModelRole role) const
{
if (role == Role::TextAlignment)
if (role == GUI::ModelRole::TextAlignment)
return Gfx::TextAlignment::CenterLeft;
if (role == Role::Display) {
if (role == GUI::ModelRole::Display) {
switch (index.column()) {
case Column::Name: {
auto& window = m_client.window_at(index.row());
@ -70,7 +70,7 @@ GUI::Variant IRCWindowListModel::data(const GUI::ModelIndex& index, Role role) c
}
}
}
if (role == Role::ForegroundColor) {
if (role == GUI::ModelRole::ForegroundColor) {
switch (index.column()) {
case Column::Name: {
auto& window = m_client.window_at(index.row());

2
Applications/IRCClient/IRCWindowListModel.h
View file

@ -44,7 +44,7 @@ public:
virtual int row_count(const GUI::ModelIndex&) const override;
virtual int column_count(const GUI::ModelIndex&) const override;
virtual String column_name(int column) const override;
virtual GUI::Variant data(const GUI::ModelIndex&, Role = Role::Display) const override;
virtual GUI::Variant data(const GUI::ModelIndex&, GUI::ModelRole) const override;
virtual void update() override;
private: