From 07bc4e2f96f8f47991339654ff4ab16acc19d44f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Thu, 14 May 2020 14:29:06 +0200 Subject: Style: Enforce separation line between function definitions I couldn't find a tool that enforces it, so I went the manual route: ``` find -name "thirdparty" -prune \ -o -name "*.cpp" -o -name "*.h" -o -name "*.m" -o -name "*.mm" \ -o -name "*.glsl" > files perl -0777 -pi -e 's/\n}\n([^#])/\n}\n\n\1/g' $(cat files) misc/scripts/fix_style.sh -c ``` This adds a newline after all `}` on the first column, unless they are followed by `#` (typically `#endif`). This leads to having lots of places with two lines between function/class definitions, but clang-format then fixes it as we enforce max one line of separation. This doesn't fix potential occurrences of function definitions which are indented (e.g. for a helper class defined in a .cpp), but it's better than nothing. Also can't be made to run easily on CI/hooks so we'll have to be careful with new code. Part of #33027. --- scene/gui/dialogs.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'scene/gui/dialogs.cpp') diff --git a/scene/gui/dialogs.cpp b/scene/gui/dialogs.cpp index 3e1a72beb7..37d6784e35 100644 --- a/scene/gui/dialogs.cpp +++ b/scene/gui/dialogs.cpp @@ -127,6 +127,7 @@ void AcceptDialog::_cancel_pressed() { String AcceptDialog::get_text() const { return label->get_text(); } + void AcceptDialog::set_text(String p_text) { label->set_text(p_text); child_controls_changed(); @@ -138,6 +139,7 @@ void AcceptDialog::set_text(String p_text) { void AcceptDialog::set_hide_on_ok(bool p_hide) { hide_on_ok = p_hide; } + bool AcceptDialog::get_hide_on_ok() const { return hide_on_ok; } @@ -145,6 +147,7 @@ bool AcceptDialog::get_hide_on_ok() const { void AcceptDialog::set_autowrap(bool p_autowrap) { label->set_autowrap(p_autowrap); } + bool AcceptDialog::has_autowrap() { return label->has_autowrap(); } -- cgit v1.2.3