Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-12-08 06:09:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

Style: Fix statements ending with ';;'

Browse source 
(cherry picked from commit f44ee891be)
This commit is contained in:
Rémi Verschelde 2017-01-14 18:03:38 +01:00
parent 75bf6a9978
commit dbf0137576
98 changed files with 202 additions and 202 deletions
Download patch file Download diff file Expand all files Collapse all files

2
scene/gui/box_container.cpp
View file

@ -42,7 +42,7 @@ void BoxContainer::_resort() {
/** First pass, determine minimum size AND amount of stretchable elements */
Size2i new_size=get_size();;
Size2i new_size=get_size();
int sep=get_constant("separation");//,vertical?"VBoxContainer":"HBoxContainer");

2
scene/gui/control.cpp
View file

@ -1670,7 +1670,7 @@ Control *Control::find_next_valid_focus() const {
if (!next_child) {
next_child=const_cast<Control*>(this);;
next_child=const_cast<Control*>(this);
while(next_child) {
if (next_child->data.SI || next_child->data.RI)

4
scene/gui/item_list.cpp
View file

@ -300,7 +300,7 @@ void ItemList::move_item(int p_item,int p_to_pos) {
ERR_FAIL_INDEX(p_to_pos,items.size()+1);
Item it=items[p_item];
items.remove(p_item);;
items.remove(p_item);
if (p_to_pos>p_item) {
p_to_pos--;
@ -906,7 +906,7 @@ void ItemList::_notification(int p_what) {
Vector2 ofs;
int col=0;
int max_h=0;
separators.clear();;
separators.clear();
for(int i=0;i<items.size();i++) {
if (current_columns>1 && items[i].rect_cache.size.width+ofs.x > fit_size) {

2
scene/gui/label.cpp
View file

@ -196,7 +196,7 @@ void Label::_notification(int p_what) {
} break;
case ALIGN_CENTER: {
x_ofs=int(size.width-(taken+spaces*space_w))/2;;
x_ofs=int(size.width-(taken+spaces*space_w))/2;
} break;
case ALIGN_RIGHT: {

2
scene/gui/line_edit.cpp
View file

@ -1292,7 +1292,7 @@ void LineEdit::_bind_methods() {
ADD_PROPERTYNO( PropertyInfo( Variant::BOOL, "editable" ), _SCS("set_editable"),_SCS("is_editable") );
ADD_PROPERTYNZ( PropertyInfo( Variant::BOOL, "secret" ), _SCS("set_secret"),_SCS("is_secret") );
ADD_PROPERTY( PropertyInfo( Variant::INT,"focus_mode", PROPERTY_HINT_ENUM, "None,Click,All" ), _SCS("set_focus_mode"), _SCS("get_focus_mode") );
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "caret/caret_blink"), _SCS("cursor_set_blink_enabled"), _SCS("cursor_get_blink_enabled"));;
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "caret/caret_blink"), _SCS("cursor_set_blink_enabled"), _SCS("cursor_get_blink_enabled"));
ADD_PROPERTYNZ(PropertyInfo(Variant::REAL, "caret/caret_blink_speed",PROPERTY_HINT_RANGE,"0.1,10,0.1"), _SCS("cursor_set_blink_speed"),_SCS("cursor_get_blink_speed") );
}

2
scene/gui/rich_text_label.cpp
View file

@ -103,7 +103,7 @@ void RichTextLabel::_process_line(ItemFrame *p_frame,const Vector2& p_ofs,int &y
int line_ofs=0;
int margin=_find_margin(it,p_base_font);
Align align=_find_align(it);;
Align align=_find_align(it);
int line=0;
int spaces=0;

2
scene/gui/separator.h
View file

@ -45,7 +45,7 @@ protected:
void _notification(int p_what);
public:
virtual Size2 get_minimum_size() const;;
virtual Size2 get_minimum_size() const;
Separator();
~Separator();

4
scene/gui/tab_container.cpp
View file

@ -40,7 +40,7 @@ int TabContainer::_get_top_margin() const {
int h = MAX( tab_bg->get_minimum_size().height,tab_fg->get_minimum_size().height);
int ch = font->get_height();;
int ch = font->get_height();
for(int i=0;i<get_child_count();i++) {
Control *c = get_child(i)->cast_to<Control>();
@ -99,7 +99,7 @@ void TabContainer::_input_event(const InputEvent& p_event) {
pp_pos.y+=menu->get_height();
popup->set_global_pos( pp_pos );
popup->popup();;
popup->popup();
return;
}
pos.x-=tabs_ofs_cache;

2
scene/gui/text_edit.cpp
View file

@ -246,7 +246,7 @@ void TextEdit::Text::clear_caches() {
void TextEdit::Text::clear() {
text.clear();;
text.clear();
insert(0,"");
}

10
scene/gui/tree.cpp
View file

@ -596,7 +596,7 @@ void TreeItem::clear_custom_color(int p_column) {
ERR_FAIL_INDEX( p_column, cells.size() );
cells[p_column].custom_color=false;
cells[p_column].color=Color();;
cells[p_column].color=Color();
_changed_notify(p_column);
}
@ -627,7 +627,7 @@ void TreeItem::clear_custom_bg_color(int p_column) {
ERR_FAIL_INDEX( p_column, cells.size() );
cells[p_column].custom_bg_color=false;
cells[p_column].bg_color=Color();;
cells[p_column].bg_color=Color();
_changed_notify(p_column);
}
@ -1230,7 +1230,7 @@ int Tree::draw_item(const Point2i& p_pos,const Point2& p_draw_ofs, const Size2&
icon_ofs+=item_rect.pos;
draw_texture_rect(p_item->cells[i].icon,Rect2(icon_ofs,icon_size));;
draw_texture_rect(p_item->cells[i].icon,Rect2(icon_ofs,icon_size));
//p_item->cells[i].icon->draw(ci, icon_ofs);
} break;
@ -2646,7 +2646,7 @@ void Tree::_notification(int p_what) {
if (p_what==NOTIFICATION_ENTER_TREE) {
update_cache();;
update_cache();
}
if (p_what==NOTIFICATION_DRAG_END) {
@ -3303,7 +3303,7 @@ TreeItem* Tree::_find_item_at_pos(TreeItem*p_item, const Point2& p_pos,int& r_co
if (root!=p_item || ! hide_root) {
h = compute_item_height(p_item)+cache.vseparation;;
h = compute_item_height(p_item)+cache.vseparation;
if (pos.y<h) {
if (drop_mode_flags==DROP_MODE_ON_ITEM) {