RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-10-31 02:42:44 +00:00
Code Issues Activity Actions

LibGUI: Put all classes in the GUI namespace and remove the leading G

Browse source 
This took me a moment. Welcome to the new world of GUI::Widget! :^)
This commit is contained in:
Andreas Kling 2020-02-02 15:07:41 +01:00
parent 2d39da5405
commit c5bd9d4ed1
337 changed files with 5400 additions and 4816 deletions
Download patch file Download diff file Expand all files Collapse all files

24
DevTools/HackStudio/WidgetTreeModel.cpp
View file

@ -29,7 +29,7 @@
#include <LibGUI/GWidget.h>
#include <stdio.h>
WidgetTreeModel::WidgetTreeModel(GWidget& root)
WidgetTreeModel::WidgetTreeModel(GUI::Widget& root)
: m_root(root)
{
m_widget_icon.set_bitmap_for_size(16, GraphicsBitmap::load_from_file("/res/icons/16x16/inspector-object.png"));
@ -39,20 +39,20 @@ WidgetTreeModel::~WidgetTreeModel()
{
}
GModelIndex WidgetTreeModel::index(int row, int column, const GModelIndex& parent) const
GUI::ModelIndex WidgetTreeModel::index(int row, int column, const GUI::ModelIndex& parent) const
{
if (!parent.is_valid()) {
return create_index(row, column, m_root.ptr());
}
auto& parent_node = *static_cast<GWidget*>(parent.internal_data());
auto& parent_node = *static_cast<GUI::Widget*>(parent.internal_data());
return create_index(row, column, parent_node.child_widgets().at(row));
}
GModelIndex WidgetTreeModel::parent_index(const GModelIndex& index) const
GUI::ModelIndex WidgetTreeModel::parent_index(const GUI::ModelIndex& index) const
{
if (!index.is_valid())
return {};
auto& widget = *static_cast<GWidget*>(index.internal_data());
auto& widget = *static_cast<GUI::Widget*>(index.internal_data());
if (&widget == m_root.ptr())
return {};
@ -60,7 +60,7 @@ GModelIndex WidgetTreeModel::parent_index(const GModelIndex& index) const
return create_index(0, 0, m_root.ptr());
// Walk the grandparent's children to find the index of widget's parent in its parent.
// (This is needed to produce the row number of the GModelIndex corresponding to widget's parent.)
// (This is needed to produce the row number of the GUI::ModelIndex corresponding to widget's parent.)
int grandparent_child_index = 0;
for (auto& grandparent_child : widget.parent_widget()->parent_widget()->child_widgets()) {
if (grandparent_child == widget.parent_widget())
@ -72,22 +72,22 @@ GModelIndex WidgetTreeModel::parent_index(const GModelIndex& index) const
return {};
}
int WidgetTreeModel::row_count(const GModelIndex& index) const
int WidgetTreeModel::row_count(const GUI::ModelIndex& index) const
{
if (!index.is_valid())
return 1;
auto& widget = *static_cast<GWidget*>(index.internal_data());
auto& widget = *static_cast<GUI::Widget*>(index.internal_data());
return widget.child_widgets().size();
}
int WidgetTreeModel::column_count(const GModelIndex&) const
int WidgetTreeModel::column_count(const GUI::ModelIndex&) const
{
return 1;
}
GVariant WidgetTreeModel::data(const GModelIndex& index, Role role) const
GUI::Variant WidgetTreeModel::data(const GUI::ModelIndex& index, Role role) const
{
auto* widget = static_cast<GWidget*>(index.internal_data());
auto* widget = static_cast<GUI::Widget*>(index.internal_data());
if (role == Role::Icon) {
return m_widget_icon;
}
@ -102,7 +102,7 @@ void WidgetTreeModel::update()
did_update();
}
GModelIndex WidgetTreeModel::index_for_widget(GWidget& widget) const
GUI::ModelIndex WidgetTreeModel::index_for_widget(GUI::Widget& widget) const
{
int parent_child_index = 0;
for (auto& parent_child : widget.parent_widget()->child_widgets()) {