Skip to content

Commit

Permalink
GUI2: 'initialise' -> 'initialize'
Browse files Browse the repository at this point in the history
  • Loading branch information
Vultraz committed Apr 7, 2017
1 parent 9d2b0f6 commit 99de242
Show file tree
Hide file tree
Showing 26 changed files with 78 additions and 78 deletions.
4 changes: 2 additions & 2 deletions src/gui/core/placer.hpp
Expand Up @@ -35,7 +35,7 @@ struct point;
* Base class for the placement helper.
*
* The normal operation for the usage of the class is:
* * Call @ref initialise().
* * Call @ref initialize().
* * For every visible child item call @ref add_item() with the wanted size of
* the widget.
* Once this is done the required size for all children can be retrieved with
Expand Down Expand Up @@ -91,7 +91,7 @@ class placer_base
* reset, items are placed, removed or changed visibility causing the old
* placement to be invalid.
*/
virtual void initialise() = 0;
virtual void initialize() = 0;

/**
* Adds a item to be placed.
Expand Down
2 changes: 1 addition & 1 deletion src/gui/core/placer/horizontal_list.cpp
Expand Up @@ -37,7 +37,7 @@ placer_horizontal_list::placer_horizontal_list(const unsigned maximum_rows)
assert(maximum_rows_ > 0);
}

void placer_horizontal_list::initialise()
void placer_horizontal_list::initialize()
{
std::fill(rows_.begin(), rows_.end(), 0);
columns_.clear();
Expand Down
2 changes: 1 addition & 1 deletion src/gui/core/placer/horizontal_list.hpp
Expand Up @@ -46,7 +46,7 @@ class placer_horizontal_list : public placer_base

/***** ***** Inherited operations. ***** *****/

virtual void initialise();
virtual void initialize();

virtual void add_item(const point& size);

Expand Down
2 changes: 1 addition & 1 deletion src/gui/core/placer/vertical_list.cpp
Expand Up @@ -37,7 +37,7 @@ placer_vertical_list::placer_vertical_list(const unsigned maximum_columns)
assert(maximum_columns_ > 0);
}

void placer_vertical_list::initialise()
void placer_vertical_list::initialize()
{
rows_.clear();
rows_.emplace_back(0, 0);
Expand Down
2 changes: 1 addition & 1 deletion src/gui/core/placer/vertical_list.hpp
Expand Up @@ -45,7 +45,7 @@ class placer_vertical_list : public placer_base

/***** ***** Inherited operations. ***** *****/

virtual void initialise();
virtual void initialize();

virtual void add_item(const point& size);

Expand Down
6 changes: 3 additions & 3 deletions src/gui/widgets/container_base.cpp
Expand Up @@ -42,14 +42,14 @@ SDL_Rect container_base::get_client_rect() const
return get_rectangle();
}

void container_base::layout_initialise(const bool full_initialisation)
void container_base::layout_initialize(const bool full_initialization)
{
// Inherited.
styled_widget::layout_initialise(full_initialisation);
styled_widget::layout_initialize(full_initialization);

inject_linked_groups();

grid_.layout_initialise(full_initialisation);
grid_.layout_initialize(full_initialization);
}

void container_base::reduce_width(const unsigned maximum_width)
Expand Down
4 changes: 2 additions & 2 deletions src/gui/widgets/container_base.hpp
Expand Up @@ -48,8 +48,8 @@ class container_base : public styled_widget

/***** ***** ***** ***** layout functions ***** ***** ***** *****/

/** See @ref widget::layout_initialise. */
virtual void layout_initialise(const bool full_initialisation) override;
/** See @ref widget::layout_initialize. */
virtual void layout_initialize(const bool full_initialization) override;

/**
* Tries to reduce the width of a container.
Expand Down
4 changes: 2 additions & 2 deletions src/gui/widgets/generator.hpp
Expand Up @@ -259,8 +259,8 @@ class generator_base : public widget
* become pure virtuals.
*/

/** See @ref widget::layout_initialise. */
virtual void layout_initialise(const bool full_initialisation) override = 0;
/** See @ref widget::layout_initialize. */
virtual void layout_initialize(const bool full_initialization) override = 0;

/** See @ref widget::request_reduce_width. */
virtual void request_reduce_width(const unsigned maximum_width) override
Expand Down
6 changes: 3 additions & 3 deletions src/gui/widgets/generator_private.hpp
Expand Up @@ -791,15 +791,15 @@ class generator : public minimum_selection,
impl_create_items(index, list_builder, data, callback);
}

/** See @ref widget::layout_initialise. */
virtual void layout_initialise(const bool full_initialisation) override
/** See @ref widget::layout_initialize. */
virtual void layout_initialize(const bool full_initialization) override
{
for(auto item : items_)
{
if(item->child_grid.get_visible() != widget::visibility::invisible
&& item->shown) {

item->child_grid.layout_initialise(full_initialisation);
item->child_grid.layout_initialize(full_initialization);
}
}
}
Expand Down
12 changes: 6 additions & 6 deletions src/gui/widgets/grid.cpp
Expand Up @@ -193,16 +193,16 @@ void grid::set_active(const bool active)
}
}

void grid::layout_initialise(const bool full_initialisation)
void grid::layout_initialize(const bool full_initialization)
{
// Inherited.
widget::layout_initialise(full_initialisation);
widget::layout_initialize(full_initialization);

// Clear child caches.
for(auto & child : children_)
{

child.layout_initialise(full_initialisation);
child.layout_initialize(full_initialization);
}
}

Expand Down Expand Up @@ -408,7 +408,7 @@ void grid::request_placement(dispatcher&, const event::ui_event, bool& handled,
} else {
// Wrapping failed, we no longer fit.
// Reset the sizes of child widgets.
layout_initialise(true);
layout_initialize(true);
}
}

Expand Down Expand Up @@ -896,12 +896,12 @@ void grid::child::place(point origin, point size)
get_widget()->place(widget_orig, widget_size);
}

void grid::child::layout_initialise(const bool full_initialisation)
void grid::child::layout_initialize(const bool full_initialization)
{
assert(widget_);

if(widget_->get_visible() != widget::visibility::invisible) {
widget_->layout_initialise(full_initialisation);
widget_->layout_initialize(full_initialization);
}
}

Expand Down
8 changes: 4 additions & 4 deletions src/gui/widgets/grid.hpp
Expand Up @@ -187,8 +187,8 @@ class grid : public widget
virtual bool can_mouse_focus() const override { return false; }
/***** ***** ***** ***** layout functions ***** ***** ***** *****/

/** See @ref widget::layout_initialise. */
virtual void layout_initialise(const bool full_initialisation) override;
/** See @ref widget::layout_initialize. */
virtual void layout_initialize(const bool full_initialization) override;

/**
* Tries to reduce the width of a container.
Expand Down Expand Up @@ -334,8 +334,8 @@ class grid : public widget
*/
void place(point origin, point size);

/** Forwards @ref grid::layout_initialise to the cell. */
void layout_initialise(const bool full_initialisation);
/** Forwards @ref grid::layout_initialize to the cell. */
void layout_initialize(const bool full_initialization);

/** Returns the can_wrap for the cell. */
bool can_wrap() const
Expand Down
4 changes: 2 additions & 2 deletions src/gui/widgets/matrix.cpp
Expand Up @@ -108,9 +108,9 @@ void matrix::place(const point& origin, const point& size)
content_.place(origin, size);
}

void matrix::layout_initialise(const bool full_initialisation)
void matrix::layout_initialize(const bool full_initialization)
{
content_.layout_initialise(full_initialisation);
content_.layout_initialize(full_initialization);
}

void
Expand Down
4 changes: 2 additions & 2 deletions src/gui/widgets/matrix.hpp
Expand Up @@ -119,8 +119,8 @@ class matrix : public tbase
/** See @ref widget::place. */
virtual void place(const point& origin, const point& size) override;

/** See @ref widget::layout_initialise. */
virtual void layout_initialise(const bool full_initialisation) override;
/** See @ref widget::layout_initialize. */
virtual void layout_initialize(const bool full_initialization) override;

/** See @ref widget::impl_draw_children. */
virtual void impl_draw_children(surface& frame_buffer,
Expand Down
10 changes: 5 additions & 5 deletions src/gui/widgets/pane.cpp
Expand Up @@ -174,16 +174,16 @@ void pane::place(const point& origin, const point& size)
place_children();
}

void pane::layout_initialise(const bool full_initialisation)
void pane::layout_initialize(const bool full_initialization)
{
DBG_GUI_D << LOG_HEADER << '\n';

widget::layout_initialise(full_initialisation);
widget::layout_initialize(full_initialization);

for(auto & item : items_)
{
if(item.item_grid->get_visible() != widget::visibility::invisible) {
item.item_grid->layout_initialise(full_initialisation);
item.item_grid->layout_initialize(full_initialization);
}
}
}
Expand Down Expand Up @@ -329,7 +329,7 @@ void pane::place_or_set_origin_children()
void pane::prepare_placement() const
{
assert(placer_.get());
placer_->initialise();
placer_->initialize();

for(const auto & item : items_)
{
Expand Down Expand Up @@ -360,7 +360,7 @@ void pane::signal_handler_request_placement(dispatcher& dispatcher,
* addon_list. This code can use some more tuning,
* polishing and testing.
*/
item.item_grid->layout_initialise(false);
item.item_grid->layout_initialize(false);
get_window()->layout_linked_widgets();

/*
Expand Down
4 changes: 2 additions & 2 deletions src/gui/widgets/pane.hpp
Expand Up @@ -73,8 +73,8 @@ class pane : public widget
/** See @ref widget::place. */
virtual void place(const point& origin, const point& size) override;

/** See @ref widget::layout_initialise. */
virtual void layout_initialise(const bool full_initialisation) override;
/** See @ref widget::layout_initialize. */
virtual void layout_initialize(const bool full_initialization) override;

/** See @ref widget::impl_draw_children. */
virtual void impl_draw_children(surface& frame_buffer,
Expand Down
10 changes: 5 additions & 5 deletions src/gui/widgets/scrollbar_container.cpp
Expand Up @@ -117,12 +117,12 @@ scrollbar_container::scrollbar_container(const unsigned canvas_count)
event::dispatcher::back_post_child);
}

void scrollbar_container::layout_initialise(const bool full_initialisation)
void scrollbar_container::layout_initialize(const bool full_initialization)
{
// Inherited.
container_base::layout_initialise(full_initialisation);
container_base::layout_initialize(full_initialization);

if(full_initialisation) {
if(full_initialization) {

assert(vertical_scrollbar_grid_);
switch(vertical_scrollbar_mode_) {
Expand Down Expand Up @@ -160,7 +160,7 @@ void scrollbar_container::layout_initialise(const bool full_initialisation)
}

assert(content_grid_);
content_grid_->layout_initialise(full_initialisation);
content_grid_->layout_initialize(full_initialization);
}

void scrollbar_container::request_reduce_height(const unsigned maximum_height)
Expand Down Expand Up @@ -379,7 +379,7 @@ set_scrollbar_mode(grid* scrollbar_grid,
scrollbar_grid->get_visible() == widget::visibility::visible) {
scrollbar_grid->set_visible(widget::visibility::invisible);
// Give newly freed space to the items.
content_grid->layout_initialise(false);
content_grid->layout_initialize(false);
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/gui/widgets/scrollbar_container.hpp
Expand Up @@ -88,8 +88,8 @@ class scrollbar_container : public container_base

/***** ***** ***** ***** layout functions ***** ***** ***** *****/

/** See @ref widget::layout_initialise. */
virtual void layout_initialise(const bool full_initialisation) override;
/** See @ref widget::layout_initialize. */
virtual void layout_initialize(const bool full_initialization) override;

/** See @ref widget::request_reduce_height. */
virtual void request_reduce_height(const unsigned maximum_height) override;
Expand Down
6 changes: 3 additions & 3 deletions src/gui/widgets/styled_widget.cpp
Expand Up @@ -193,12 +193,12 @@ color_t styled_widget::get_link_color() const
return color_t::from_hex_string("ffff00");
}

void styled_widget::layout_initialise(const bool full_initialisation)
void styled_widget::layout_initialize(const bool full_initialization)
{
// Inherited.
widget::layout_initialise(full_initialisation);
widget::layout_initialize(full_initialization);

if(full_initialisation) {
if(full_initialization) {
shrunken_ = false;
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/gui/widgets/styled_widget.hpp
Expand Up @@ -166,12 +166,12 @@ class styled_widget : public widget
virtual color_t get_link_color() const;

/**
* See @ref widget::layout_initialise.
* See @ref widget::layout_initialize.
*
* @todo Also handle the tooltip state.
* Handle if shrunken_ && use_tooltip_on_label_overflow_.
*/
virtual void layout_initialise(const bool full_initialisation) override;
virtual void layout_initialize(const bool full_initialization) override;

/** See @ref widget::request_reduce_width. */
virtual void request_reduce_width(const unsigned maximum_width) override;
Expand Down
10 changes: 5 additions & 5 deletions src/gui/widgets/tree_view_node.cpp
Expand Up @@ -168,7 +168,7 @@ tree_view_node& tree_view_node::add_child(
// enough visual space.

// Throw away cached best size to force a recomputation.
get_tree_view().layout_initialise(false);
get_tree_view().layout_initialize(false);

const point tree_best_size = get_tree_view().get_best_size();

Expand Down Expand Up @@ -786,15 +786,15 @@ void tree_view_node::select_node()
label_->set_value_bool(true);
}

void tree_view_node::layout_initialise(const bool full_initialisation)
void tree_view_node::layout_initialize(const bool full_initialization)
{
// Inherited.
widget::layout_initialise(full_initialisation);
grid_.layout_initialise(full_initialisation);
widget::layout_initialize(full_initialization);
grid_.layout_initialize(full_initialization);

// Clear child caches.
for(auto & child : children_) {
child.layout_initialise(full_initialisation);
child.layout_initialize(full_initialization);
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/gui/widgets/tree_view_node.hpp
Expand Up @@ -243,7 +243,7 @@ class tree_view_node : public widget
tree_view_node* get_selectable_node_below();
void select_node();
grid& get_grid() { return grid_; }
void layout_initialise(const bool full_initialisation) override;
void layout_initialize(const bool full_initialization) override;

void clear_before_destruct();

Expand Down
6 changes: 3 additions & 3 deletions src/gui/widgets/viewport.cpp
Expand Up @@ -111,12 +111,12 @@ void viewport::place(const point& origin, const point& size)
widget_.place(point(), widget_.get_best_size());
}

void viewport::layout_initialise(const bool full_initialisation)
void viewport::layout_initialize(const bool full_initialization)
{
widget::layout_initialise(full_initialisation);
widget::layout_initialize(full_initialization);

if(widget_.get_visible() != widget::visibility::invisible) {
widget_.layout_initialise(full_initialisation);
widget_.layout_initialize(full_initialization);
}
}

Expand Down
4 changes: 2 additions & 2 deletions src/gui/widgets/viewport.hpp
Expand Up @@ -51,8 +51,8 @@ class viewport : public widget
/** See @ref widget::place. */
virtual void place(const point& origin, const point& size) override;

/** See @ref widget::layout_initialise. */
virtual void layout_initialise(const bool full_initialisation) override;
/** See @ref widget::layout_initialize. */
virtual void layout_initialize(const bool full_initialization) override;

/** See @ref widget::impl_draw_children. */
virtual void impl_draw_children(surface& frame_buffer,
Expand Down

0 comments on commit 99de242

Please sign in to comment.