Skip to content

Commit

Permalink
Removed trailing tabs and whitespaces from C++ source
Browse files Browse the repository at this point in the history
[ci skip]

I ran the same command from 9b7b175.

Excludes:
* lua/
* spirit_po/
* modules/
  • Loading branch information
Vultraz committed Feb 22, 2021
1 parent b2baa10 commit 56364cc
Show file tree
Hide file tree
Showing 55 changed files with 207 additions and 207 deletions.
4 changes: 2 additions & 2 deletions src/actions/create.hpp
Expand Up @@ -151,7 +151,7 @@ typedef std::tuple<bool /*event modified*/, int /*previous village owner side*/,
* @param cost the unit's cost.
* @param is_recall whether the unit was recalled.
* @param facing the desired facing for the unit, map_location::NDIRECTIONS to determine facing automatically.
* @param show
* @param show
* @param fire_event whether to fire events for the unit placement.
* @param full_movement whether the unit starts with full movement points.
* @param wml_triggered whether this was triggered via WML.
Expand Down Expand Up @@ -183,7 +183,7 @@ void recruit_unit(const unit_type & u_type, int side_num, const map_location & l
* @param loc the location it was recalled onto.
* @param from the location it was recalled from.
* @param facing the desired facing for the unit, map_location::NDIRECTIONS to determine facing automatically.
* @param show
* @param show
* @param use_undo if it's possible to undo the recall.
* @returns false if the recall could not be found in the team's recall list.
*/
Expand Down
4 changes: 2 additions & 2 deletions src/display.hpp
Expand Up @@ -736,7 +736,7 @@ class display : public video2::draw_layering
bool dont_show_all_; //const team *viewpoint_;
/**
* Position of the top-left corner of the viewport, in pixels.
*
*
* Dependent on zoom_.. For example, ypos_==72 only means we're one
* hex below the top of the map when zoom_ == 72 (the default value).
*/
Expand Down Expand Up @@ -984,7 +984,7 @@ class display : public video2::draw_layering
* @param x The x coordinate.
* @param y The y coordinate.
* @param surf The surface to use.
* @param clip
* @param clip
*/
void drawing_buffer_add(const drawing_layer layer,
const map_location& loc, int x, int y, const surface& surf,
Expand Down
2 changes: 1 addition & 1 deletion src/fake_unit_ptr.hpp
Expand Up @@ -78,7 +78,7 @@ class fake_unit_ptr {

private :
/** Internal unit pointer. */
internal_ptr unit_;
internal_ptr unit_;
/** Raw pointer to the manager. */
fake_unit_manager * my_manager_;

Expand Down
6 changes: 3 additions & 3 deletions src/formatter.hpp
Expand Up @@ -67,20 +67,20 @@ class formatter
{
return stream_.str();
}

// Support manipulators
formatter& operator<<(std::ostream&(*fn)(std::ostream&)) &
{
fn(stream_);
return *this;
}

formatter&& operator<<(std::ostream&(*fn)(std::ostream&)) &&
{
fn(stream_);
return std::move(*this);
}

formatter& operator<<(std::ios_base&(*fn)(std::ios_base&)) &
{
fn(stream_);
Expand Down
62 changes: 31 additions & 31 deletions src/gui/core/canvas_private.hpp
Expand Up @@ -19,13 +19,13 @@ namespace gui2 {

/**
* @ingroup GUICanvasWML
*
*
* Definition of a line.
* When drawing a line it doesn't get blended on the surface but replaces the pixels instead.
* A blitting flag might be added later if needed.
*
*
* Keys:
* Key |Type |Default |Description
* Key |Type |Default |Description
* -------------|----------------------------------------|---------|-----------
* x1 | @ref guivartype_f_unsigned "f_unsigned"|0 |The x coordinate of the startpoint.
* y1 | @ref guivartype_f_unsigned "f_unsigned"|0 |The y coordinate of the startpoint.
Expand All @@ -34,9 +34,9 @@ namespace gui2 {
* color | @ref guivartype_color "color" |"" |The color of the line.
* thickness | @ref guivartype_unsigned "unsigned" |0 |The thickness of the line; if 0 nothing is drawn.
* debug | @ref guivartype_string "string" |"" |Debug message to show upon creation this message is not stored.
*
*
* Variables:
* Key |Type |Description
* Key |Type |Description
* -------------------|----------------------------------------|-----------
* width | @ref guivartype_unsigned "unsigned" |The width of the canvas.
* height | @ref guivartype_unsigned "unsigned" |The height of the canvas.
Expand All @@ -45,11 +45,11 @@ namespace gui2 {
* text_maximum_height| @ref guivartype_unsigned "unsigned" |The maximum height available for the text on the widget.
* text_wrap_mode | @ref guivartype_int "int" |When the text doesn't fit in the available width there are several ways to fix that. This variable holds the best method. (NOTE this is a 'hidden' variable meant to copy state from a widget to its canvas so there's no reason to use this variable and thus its values are not listed and might change without further notice.)
* text_alignment | @ref guivartype_h_align "h_align" |The way the text is aligned inside the canvas.
*
*
* The size variables are copied to the window and will be determined at runtime.
* This is needed since the main window can be resized and the dialog needs to resize accordingly.
* The following variables are available:
* Key |Type |Description
* Key |Type |Description
* ---------------|------------------------------------|-----------
* screen_width | @ref guivartype_unsigned "unsigned"|The usable width of the Wesnoth main window.
* screen_height | @ref guivartype_unsigned "unsigned"|The usable height of the Wesnoth main window.
Expand All @@ -60,11 +60,11 @@ namespace gui2 {
* mouse_y | @ref guivartype_unsigned "unsigned"|The y coordinate of the mouse pointer.
* window_width | @ref guivartype_unsigned "unsigned"|The window width. This value has two meanings during the layout phase. This only applies if automatic placement is not enabled. - When set to 0 it should return the wanted maximum width. If no maximum is wanted it should be set to the '"(screen_width)"'. - When not equal to 0 its value is the best width for the window. When the size should remain unchanged it should be set to '"(window_width)"'.
* window_height | @ref guivartype_unsigned "unsigned"|The window height. This value has two meanings during the layout phase. This only applies if automatic placement is not enabled. - When set to 0 it should return the wanted maximum height. If no maximum is wanted it should be set to the '"(screen_height)"'. - When not equal to 0 its value is the best height for the window. When the size should remain unchanged it should be set to '"(window_height)"'.
*
*
* Note when drawing the valid coordinates are:
* * 0 -> width - 1
* * 0 -> height -1
*
*
* Drawing outside this area will result in unpredictable results including crashing. (That should be fixed, when encountered.)
*/
class line_shape : public canvas::shape {
Expand Down Expand Up @@ -102,13 +102,13 @@ class line_shape : public canvas::shape {

/**
* @ingroup GUICanvasWML
*
*
* Definition of a rectangle.
* When drawing a rectangle it doesn't get blended on the surface but replaces the pixels instead.
* A blitting flag might be added later if needed.
*
*
* Keys:
* Key |Type |Default|Description
* Key |Type |Default|Description
* -------------------|----------------------------------------|-------|-----------
* x | @ref guivartype_f_unsigned "f_unsigned"|0 |The x coordinate of the top left corner.
* y | @ref guivartype_f_unsigned "f_unsigned"|0 |The y coordinate of the top left corner.
Expand All @@ -118,7 +118,7 @@ class line_shape : public canvas::shape {
* border_color | @ref guivartype_color "color" |"" |The color of the border if empty it's not drawn.
* fill_color | @ref guivartype_color "color" |"" |The color of the interior if omitted it's not drawn.
* debug | @ref guivartype_string "string" |"" |Debug message to show upon creation this message is not stored.
*
*
* Variables: see line_shape
*/
class rectangle_shape : public canvas::shape {
Expand Down Expand Up @@ -165,11 +165,11 @@ class rectangle_shape : public canvas::shape {

/**
* @ingroup GUICanvasWML
*
*
* Definition of a rounded rectangle shape.
* When drawing a rounded rectangle it doesn't get blended on the surface but replaces the pixels instead.
* A blitting flag might be added later if needed.
* Key |Type |Default |Description
* Key |Type |Default |Description
* ----------------|----------------------------------------|---------|-----------
* x | @ref guivartype_f_unsigned "f_unsigned"|0 |The x coordinate of the top left corner.
* y | @ref guivartype_f_unsigned "f_unsigned"|0 |The y coordinate of the top left corner.
Expand Down Expand Up @@ -226,22 +226,22 @@ class round_rectangle_shape : public canvas::shape {

/**
* @ingroup GUICanvasWML
*
*
* Definition of a circle.
* When drawing a circle it doesn't get blended on the surface but replaces the pixels instead.
* A blitting flag might be added later if needed.
*
*
* Keys:
* Key |Type |Default|Description
* Key |Type |Default|Description
* -------------------|----------------------------------------|-------|-----------
* x | @ref guivartype_f_unsigned "f_unsigned"|0 |The x coordinate of the center.
* y | @ref guivartype_f_unsigned "f_unsigned"|0 |The y coordinate of the center.
* radius | @ref guivartype_f_unsigned "f_unsigned"|0 |The radius of the circle; if 0 nothing is drawn.
* color | @ref guivartype_color "color" |"" |The color of the circle.
* debug | @ref guivartype_string "string" |"" |Debug message to show upon creation this message is not stored.
*
*
* Variables: see line_shape
*
*
* Drawing outside the area will result in unpredictable results including crashing. (That should be fixed, when encountered.)
*/
class circle_shape : public canvas::shape {
Expand Down Expand Up @@ -272,9 +272,9 @@ class circle_shape : public canvas::shape {

/**
* @ingroup GUICanvasWML
*
*
* Keys:
* Key |Type |Default|Description
* Key |Type |Default|Description
* -------------------|------------------------------------------|-------|-----------
* x | @ref guivartype_f_unsigned "f_unsigned" |0 |The x coordinate of the top left corner.
* y | @ref guivartype_f_unsigned "f_unsigned" |0 |The y coordinate of the top left corner.
Expand All @@ -284,15 +284,15 @@ class circle_shape : public canvas::shape {
* vertical_mirror | @ref guivartype_f_bool "f_bool" |false |Mirror the image over the vertical axis.
* name | @ref guivartype_string "string" |"" |The name of the image.
* debug | @ref guivartype_string "string" |"" |Debug message to show upon creation this message is not stored.
*
*
* Variables:
* Key |Type |Description
* Key |Type |Description
* ---------------------|--------------------------------------|-----------
* image_width | @ref guivartype_unsigned "unsigned" |The width of the image, either the requested width or the natural width of the image. This value can be used to set the x (or y) value of the image. (This means x and y are evaluated after the width and height.)
* image_height | @ref guivartype_unsigned "unsigned" |The height of the image, either the requested height or the natural height of the image. This value can be used to set the y (or x) value of the image. (This means x and y are evaluated after the width and height.)
* image_original_width | @ref guivartype_unsigned "unsigned" |The width of the image as stored on disk, can be used to set x or w (also y and h can be set).
* image_original_height| @ref guivartype_unsigned "unsigned" |The height of the image as stored on disk, can be used to set y or h (also x and y can be set).
*
*
* Also the general variables are available, see line_shape
*/
class image_shape : public canvas::shape {
Expand Down Expand Up @@ -361,8 +361,8 @@ class image_shape : public canvas::shape {

/**
* @ingroup GUICanvasWML
*
* Key |Type |Default |Description
*
* Key |Type |Default |Description
* -------------------|------------------------------------------|---------|-----------
* x | @ref guivartype_f_unsigned "f_unsigned" |0 |The x coordinate of the top left corner.
* y | @ref guivartype_f_unsigned "f_unsigned" |0 |The y coordinate of the top left corner.
Expand All @@ -380,12 +380,12 @@ class image_shape : public canvas::shape {
* maximum_width | @ref guivartype_f_int "f_int" |-1 |The maximum width the text is allowed to be.
* maximum_height | @ref guivartype_f_int "f_int" |-1 |The maximum height the text is allowed to be.
* debug | @ref guivartype_string "string" |"" |Debug message to show upon creation this message is not stored.
*
*
* NOTE alignment could only be done with the formulas, but now with the text_alignment flag as well,
* older widgets might still use the formulas and not all widgets may expose the text alignment yet and when exposed not use it yet.
*
* older widgets might still use the formulas and not all widgets may expose the text alignment yet and when exposed not use it yet.
*
* Variables:
* Key |Type |Description
* Key |Type |Description
* -------------------|------------------------------------------|-----------
* text_width | @ref guivartype_unsigned "unsigned" |The width of the rendered text.
* text_height | @ref guivartype_unsigned "unsigned" |The height of the rendered text.
Expand Down
10 changes: 5 additions & 5 deletions src/gui/core/widget_definition.hpp
Expand Up @@ -41,22 +41,22 @@ struct state_definition

/**
* Base class of a resolution, contains the common keys for a resolution.
*
*
* Depending on the resolution a widget can look different. Resolutions are evaluated in order of appearance.
* The window_width and window_height are the upper limit this resolution is valid for.
* When one of the sizes gets above the limit, the next resolution is selected.
* There's one special case where both values are 0. This resolution always matches.
* (Resolution definitions behind that one will never be picked.)
* This resolution can be used as upper limit or if there's only one resolution.
*
*
* The default (and also minimum) size of a button is determined by two items, the wanted default size and the size needed for the text.
* The size of the text differs per used widget so needs to be determined per button.
*
*
* Container widgets like panels and windows have other rules for their sizes.
* Their sizes are based on the size of their children (and the border they need themselves).
* It's wise to set all sizes to 0 for these kind of widgets.
*
* Key |Type |Default |Description
*
* Key |Type |Default |Description
* -----------------|------------------------------------|---------|-------------
* window_width | @ref guivartype_unsigned "unsigned"|0 |Width of the application window.
* window_height | @ref guivartype_unsigned "unsigned"|0 |Height of the application window.
Expand Down
10 changes: 5 additions & 5 deletions src/gui/core/window_builder.hpp
Expand Up @@ -142,7 +142,7 @@ class builder_window
}

/**
* Key |Type |Default |Description
* Key |Type |Default |Description
* --------------------|----------------------------------------|---------|-------------
* window_width | @ref guivartype_unsigned "unsigned" |0 |Width of the application window.
* window_height | @ref guivartype_unsigned "unsigned" |0 |Height of the application window.
Expand All @@ -163,16 +163,16 @@ class builder_window
* tooltip | @ref guivartype_section "section" |mandatory|Information regarding the tooltip for this window.
* helptip | @ref guivartype_section "section" |mandatory|Information regarding the helptip for this window.
* grid | @ref guivartype_grid "grid" |mandatory|The grid with the widgets to show.
*
*
* A linked_group section has the following fields and needs to have at least one size fixed:
* Key |Type |Default |Description
* Key |Type |Default |Description
* --------------------|----------------------------------------|---------|-------------
* id | @ref guivartype_string "string" |mandatory|The unique id of the group (unique in this window).
* fixed_width | @ref guivartype_bool "bool" |false |Should widget in this group have the same width.
* fixed_height | @ref guivartype_bool "bool" |false |Should widget in this group have the same height.
*
*
* A tooltip and helptip section have the following field; more fields will probably be added later on:
* Key |Type |Default |Description
* Key |Type |Default |Description
* --------------------|----------------------------------------|---------|-------------
* id | @ref guivartype_string "string" |mandatory|The id of the tip to show.
*/
Expand Down
4 changes: 2 additions & 2 deletions src/gui/dialogs/addon/manager.hpp
Expand Up @@ -37,10 +37,10 @@ namespace dialogs

/**
* @ingroup GUIWindowDefinitionWML
*
*
* Shows the list of addons on the server available for installation.
* This dialog is under construction and only used with --new-widgets.
* Key |Type |Mandatory|Description
* Key |Type |Mandatory|Description
* ------------------|--------------|---------|-----------
* addons | @ref listbox |yes |A listbox that will contain the info about all addons on the server.
* name | control |no |The name of the addon.
Expand Down
6 changes: 3 additions & 3 deletions src/gui/dialogs/debug_clock.hpp
Expand Up @@ -31,11 +31,11 @@ namespace dialogs

/**
* @ingroup GUIWindowDefinitionWML
*
*
* Clock to test the draw events.
*
*
* This shows the dialog for keeping track of the drawing events related to the current time. (This window is used for debug purposes only.)
* Key |Type |Mandatory|Description
* Key |Type |Mandatory|Description
* ------------------|------------------|---------|-----------
* hour_percentage | progress_bar |no |This shows the hours as a percentage, where 24 hours is 100%.
* minute_percentage | progress_bar |no |This shows the minutes as a percentage, where 60 minutes is 100%.
Expand Down
4 changes: 2 additions & 2 deletions src/gui/dialogs/editor/custom_tod.hpp
Expand Up @@ -28,9 +28,9 @@ namespace dialogs

/**
* @ingroup GUIWindowDefinitionWML
*
*
* This shows the dialog to modify tod schedules.
* Key |Type |Mandatory|Description
* Key |Type |Mandatory|Description
* ------------------|--------------|---------|-----------
* current_tod_name | text_box |yes |The name of the time of day(ToD).
* current_tod_id | text_box |yes |The id of the time of day(ToD).
Expand Down
4 changes: 2 additions & 2 deletions src/gui/dialogs/editor/edit_side.hpp
Expand Up @@ -27,9 +27,9 @@ namespace dialogs

/**
* @ingroup GUIWindowDefinitionWML
*
*
* Dialog for editing gamemap sides.
* Key |Type |Mandatory|Description
* Key |Type |Mandatory|Description
* ------------------|---------------|---------|-----------
* title | @ref label |yes |Dialog title label.
* label | @ref text_box |yes |Input field for the id.
Expand Down

0 comments on commit 56364cc

Please sign in to comment.