Merge pull request #14332 from akien-mga/clang-format

Update style for clang-format 5.0.0, new min required version

6 files changed, 20 insertions, 20 deletions

diff --git a/scene/gui/box_container.h b/scene/gui/box_container.h
index 4d00a2011f..ebbbbed1f9 100644
--- a/scene/gui/box_container.h
+++ b/scene/gui/box_container.h
@@ -70,8 +70,8 @@ class HBoxContainer : public BoxContainer {
 	GDCLASS(HBoxContainer, BoxContainer);
 
 public:
-	HBoxContainer()
-		: BoxContainer(false) {}
+	HBoxContainer() :
+			BoxContainer(false) {}
 };
 
 class MarginContainer;
@@ -82,8 +82,8 @@ class VBoxContainer : public BoxContainer {
 public:
 	MarginContainer *add_margin_child(const String &p_label, Control *p_control, bool p_expand = false);
 
-	VBoxContainer()
-		: BoxContainer(true) {}
+	VBoxContainer() :
+			BoxContainer(true) {}
 };
 
 VARIANT_ENUM_CAST(BoxContainer::AlignMode);
diff --git a/scene/gui/check_box.cpp b/scene/gui/check_box.cpp
index e2b10a948f..00f6153062 100644
--- a/scene/gui/check_box.cpp
+++ b/scene/gui/check_box.cpp
@@ -56,8 +56,8 @@ bool CheckBox::is_radio() {
 	return get_button_group().is_valid();
 }
 
-CheckBox::CheckBox(const String &p_text)
-	: Button(p_text) {
+CheckBox::CheckBox(const String &p_text) :
+		Button(p_text) {
 	set_toggle_mode(true);
 	set_text_align(ALIGN_LEFT);
 }
diff --git a/scene/gui/color_picker.cpp b/scene/gui/color_picker.cpp
index 7a0593bc87..cb6283507e 100644
--- a/scene/gui/color_picker.cpp
+++ b/scene/gui/color_picker.cpp
@@ -486,8 +486,8 @@ void ColorPicker::_bind_methods() {
 	ADD_SIGNAL(MethodInfo("color_changed", PropertyInfo(Variant::COLOR, "color")));
 }
 
-ColorPicker::ColorPicker()
-	: BoxContainer(true) {
+ColorPicker::ColorPicker() :
+		BoxContainer(true) {
 
 	updating = true;
 	edit_alpha = true;
diff --git a/scene/gui/scroll_bar.h b/scene/gui/scroll_bar.h
index 373483a8a0..753bd35de7 100644
--- a/scene/gui/scroll_bar.h
+++ b/scene/gui/scroll_bar.h
@@ -117,8 +117,8 @@ class HScrollBar : public ScrollBar {
 	GDCLASS(HScrollBar, ScrollBar);
 
 public:
-	HScrollBar()
-		: ScrollBar(HORIZONTAL) { set_v_size_flags(0); }
+	HScrollBar() :
+			ScrollBar(HORIZONTAL) { set_v_size_flags(0); }
 };
 
 class VScrollBar : public ScrollBar {
@@ -126,8 +126,8 @@ class VScrollBar : public ScrollBar {
 	GDCLASS(VScrollBar, ScrollBar);
 
 public:
-	VScrollBar()
-		: ScrollBar(VERTICAL) { set_h_size_flags(0); }
+	VScrollBar() :
+			ScrollBar(VERTICAL) { set_h_size_flags(0); }
 };
 
 #endif
diff --git a/scene/gui/slider.h b/scene/gui/slider.h
index a2334a69fc..95ae429d63 100644
--- a/scene/gui/slider.h
+++ b/scene/gui/slider.h
@@ -77,8 +77,8 @@ class HSlider : public Slider {
 	GDCLASS(HSlider, Slider);
 
 public:
-	HSlider()
-		: Slider(HORIZONTAL) { set_v_size_flags(0); }
+	HSlider() :
+			Slider(HORIZONTAL) { set_v_size_flags(0); }
 };
 
 class VSlider : public Slider {
@@ -86,8 +86,8 @@ class VSlider : public Slider {
 	GDCLASS(VSlider, Slider);
 
 public:
-	VSlider()
-		: Slider(VERTICAL) { set_h_size_flags(0); }
+	VSlider() :
+			Slider(VERTICAL) { set_h_size_flags(0); }
 };
 
 #endif // SLIDER_H
diff --git a/scene/gui/split_container.h b/scene/gui/split_container.h
index 8ec21b5eaa..c7a484c4c5 100644
--- a/scene/gui/split_container.h
+++ b/scene/gui/split_container.h
@@ -87,8 +87,8 @@ class HSplitContainer : public SplitContainer {
 	GDCLASS(HSplitContainer, SplitContainer);
 
 public:
-	HSplitContainer()
-		: SplitContainer(false) { set_default_cursor_shape(CURSOR_HSPLIT); }
+	HSplitContainer() :
+			SplitContainer(false) { set_default_cursor_shape(CURSOR_HSPLIT); }
 };
 
 class VSplitContainer : public SplitContainer {
@@ -96,8 +96,8 @@ class VSplitContainer : public SplitContainer {
 	GDCLASS(VSplitContainer, SplitContainer);
 
 public:
-	VSplitContainer()
-		: SplitContainer(true) { set_default_cursor_shape(CURSOR_VSPLIT); }
+	VSplitContainer() :
+			SplitContainer(true) { set_default_cursor_shape(CURSOR_VSPLIT); }
 };
 
 #endif // SPLIT_CONTAINER_H