RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-21 14:55:07 +00:00
Code Issues Activity Actions

GModel: Add GModelIndex argument to row_count() and column_count().

Browse source 
This is in preparation for supporting hierarchical models.
This commit is contained in:
Andreas Kling 2019-03-29 03:27:03 +01:00
parent 34118aaaca
commit add38b3981
13 changed files with 28 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Applications/FileManager/DirectoryModel.cpp
View file

@ -79,12 +79,12 @@ DirectoryModel::~DirectoryModel()
{ {
} }
int DirectoryModel::row_count() const int DirectoryModel::row_count(const GModelIndex&) const
{ {
return m_directories.size() + m_files.size(); return m_directories.size() + m_files.size();
} }
int DirectoryModel::column_count() const int DirectoryModel::column_count(const GModelIndex&) const
{ {
return Column::__Count; return Column::__Count;
} }

4
Applications/FileManager/DirectoryModel.h
View file

@ -21,8 +21,8 @@ public:
__Count, __Count,
}; };
virtual int row_count() const override; virtual int row_count(const GModelIndex& = GModelIndex()) const override;
virtual int column_count() const override; virtual int column_count(const GModelIndex& = GModelIndex()) const override;
virtual String column_name(int column) const override; virtual String column_name(int column) const override;
virtual ColumnMetadata column_metadata(int column) const override; virtual ColumnMetadata column_metadata(int column) const override;
virtual GVariant data(const GModelIndex&, Role = Role::Display) const override; virtual GVariant data(const GModelIndex&, Role = Role::Display) const override;

4
Applications/IRCClient/IRCChannelMemberListModel.cpp
View file

@ -13,12 +13,12 @@ IRCChannelMemberListModel::~IRCChannelMemberListModel()
{ {
} }
int IRCChannelMemberListModel::row_count() const int IRCChannelMemberListModel::row_count(const GModelIndex&) const
{ {
return m_channel.member_count(); return m_channel.member_count();
} }
int IRCChannelMemberListModel::column_count() const int IRCChannelMemberListModel::column_count(const GModelIndex&) const
{ {
return 1; return 1;
} }

4
Applications/IRCClient/IRCChannelMemberListModel.h
View file

@ -11,8 +11,8 @@ public:
static Retained<IRCChannelMemberListModel> create(IRCChannel& channel) { return adopt(*new IRCChannelMemberListModel(channel)); } static Retained<IRCChannelMemberListModel> create(IRCChannel& channel) { return adopt(*new IRCChannelMemberListModel(channel)); }
virtual ~IRCChannelMemberListModel() override; virtual ~IRCChannelMemberListModel() override;
virtual int row_count() const override; virtual int row_count(const GModelIndex&) const override;
virtual int column_count() const override; virtual int column_count(const GModelIndex&) const override;
virtual String column_name(int column) const override; virtual String column_name(int column) const override;
virtual ColumnMetadata column_metadata(int column) const override; virtual ColumnMetadata column_metadata(int column) const override;
virtual GVariant data(const GModelIndex&, Role = Role::Display) const override; virtual GVariant data(const GModelIndex&, Role = Role::Display) const override;

4
Applications/IRCClient/IRCLogBufferModel.cpp
View file

@ -13,12 +13,12 @@ IRCLogBufferModel::~IRCLogBufferModel()
{ {
} }
int IRCLogBufferModel::row_count() const int IRCLogBufferModel::row_count(const GModelIndex&) const
{ {
return m_log_buffer->count(); return m_log_buffer->count();
} }
int IRCLogBufferModel::column_count() const int IRCLogBufferModel::column_count(const GModelIndex&) const
{ {
return Column::__Count; return Column::__Count;
} }

4
Applications/IRCClient/IRCLogBufferModel.h
View file

@ -16,8 +16,8 @@ public:
static Retained<IRCLogBufferModel> create(Retained<IRCLogBuffer>&& log_buffer) { return adopt(*new IRCLogBufferModel(move(log_buffer))); } static Retained<IRCLogBufferModel> create(Retained<IRCLogBuffer>&& log_buffer) { return adopt(*new IRCLogBufferModel(move(log_buffer))); }
virtual ~IRCLogBufferModel() override; virtual ~IRCLogBufferModel() override;
virtual int row_count() const override; virtual int row_count(const GModelIndex&) const override;
virtual int column_count() const override; virtual int column_count(const GModelIndex&) const override;
virtual String column_name(int column) const override; virtual String column_name(int column) const override;
virtual ColumnMetadata column_metadata(int column) const override; virtual ColumnMetadata column_metadata(int column) const override;
virtual GVariant data(const GModelIndex&, Role = Role::Display) const override; virtual GVariant data(const GModelIndex&, Role = Role::Display) const override;

4
Applications/IRCClient/IRCWindowListModel.cpp
View file

@ -15,12 +15,12 @@ IRCWindowListModel::~IRCWindowListModel()
{ {
} }
int IRCWindowListModel::row_count() const int IRCWindowListModel::row_count(const GModelIndex&) const
{ {
return m_client.window_count(); return m_client.window_count();
} }
int IRCWindowListModel::column_count() const int IRCWindowListModel::column_count(const GModelIndex&) const
{ {
return 1; return 1;
} }

4
Applications/IRCClient/IRCWindowListModel.h
View file

@ -15,8 +15,8 @@ public:
static Retained<IRCWindowListModel> create(IRCClient& client) { return adopt(*new IRCWindowListModel(client)); } static Retained<IRCWindowListModel> create(IRCClient& client) { return adopt(*new IRCWindowListModel(client)); }
virtual ~IRCWindowListModel() override; virtual ~IRCWindowListModel() override;
virtual int row_count() const override; virtual int row_count(const GModelIndex&) const override;
virtual int column_count() const override; virtual int column_count(const GModelIndex&) const override;
virtual String column_name(int column) const override; virtual String column_name(int column) const override;
virtual ColumnMetadata column_metadata(int column) const override; virtual ColumnMetadata column_metadata(int column) const override;
virtual GVariant data(const GModelIndex&, Role = Role::Display) const override; virtual GVariant data(const GModelIndex&, Role = Role::Display) const override;

4
Applications/ProcessManager/ProcessModel.cpp
View file

@ -21,12 +21,12 @@ ProcessModel::~ProcessModel()
{ {
} }
int ProcessModel::row_count() const int ProcessModel::row_count(const GModelIndex&) const
{ {
return m_processes.size(); return m_processes.size();
} }
int ProcessModel::column_count() const int ProcessModel::column_count(const GModelIndex&) const
{ {
return Column::__Count; return Column::__Count;
} }

4
Applications/ProcessManager/ProcessModel.h
View file

@ -24,8 +24,8 @@ public:
static Retained<ProcessModel> create() { return adopt(*new ProcessModel); } static Retained<ProcessModel> create() { return adopt(*new ProcessModel); }
virtual ~ProcessModel() override; virtual ~ProcessModel() override;
virtual int row_count() const override; virtual int row_count(const GModelIndex&) const override;
virtual int column_count() const override; virtual int column_count(const GModelIndex&) const override;
virtual String column_name(int column) const override; virtual String column_name(int column) const override;
virtual ColumnMetadata column_metadata(int column) const override; virtual ColumnMetadata column_metadata(int column) const override;
virtual GVariant data(const GModelIndex&, Role = Role::Display) const override; virtual GVariant data(const GModelIndex&, Role = Role::Display) const override;

4
LibGUI/GModel.h
View file

@ -46,8 +46,8 @@ public:
virtual ~GModel(); virtual ~GModel();
virtual int row_count() const = 0; virtual int row_count(const GModelIndex& = GModelIndex()) const = 0;
virtual int column_count() const = 0; virtual int column_count(const GModelIndex& = GModelIndex()) const = 0;
virtual String row_name(int) const { return { }; } virtual String row_name(int) const { return { }; }
virtual String column_name(int) const { return { }; } virtual String column_name(int) const { return { }; }
virtual ColumnMetadata column_metadata(int) const { return { }; } virtual ColumnMetadata column_metadata(int) const { return { }; }

8
LibGUI/GSortingProxyModel.cpp
View file

@ -16,14 +16,14 @@ GSortingProxyModel::~GSortingProxyModel()
{ {
} }
int GSortingProxyModel::row_count() const int GSortingProxyModel::row_count(const GModelIndex& index) const
{ {
return target().row_count(); return target().row_count(index);
} }
int GSortingProxyModel::column_count() const int GSortingProxyModel::column_count(const GModelIndex& index) const
{ {
return target().column_count(); return target().column_count(index);
} }
GModelIndex GSortingProxyModel::map_to_target(const GModelIndex& index) const GModelIndex GSortingProxyModel::map_to_target(const GModelIndex& index) const

4
LibGUI/GSortingProxyModel.h
View file

@ -7,8 +7,8 @@ public:
static Retained<GSortingProxyModel> create(Retained<GModel>&& model) { return adopt(*new GSortingProxyModel(move(model))); } static Retained<GSortingProxyModel> create(Retained<GModel>&& model) { return adopt(*new GSortingProxyModel(move(model))); }
virtual ~GSortingProxyModel() override; virtual ~GSortingProxyModel() override;
virtual int row_count() const override; virtual int row_count(const GModelIndex& = GModelIndex()) const override;
virtual int column_count() const override; virtual int column_count(const GModelIndex& = GModelIndex()) const override;
virtual String row_name(int) const override; virtual String row_name(int) const override;
virtual String column_name(int) const override; virtual String column_name(int) const override;
virtual ColumnMetadata column_metadata(int) const override; virtual ColumnMetadata column_metadata(int) const override;