summaryrefslogtreecommitdiffstats
path: root/scene/main/timer.cpp
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2020-05-14 14:29:06 +0200
committerRémi Verschelde <rverschelde@gmail.com>2020-05-14 16:54:55 +0200
commit07bc4e2f96f8f47991339654ff4ab16acc19d44f (patch)
tree43cdc7cfe8239c23065616a931de3769d2db1e86 /scene/main/timer.cpp
parent0be6d925dc3c6413bce7a3ccb49631b8e4a6e67a (diff)
downloadredot-engine-07bc4e2f96f8f47991339654ff4ab16acc19d44f.tar.gz
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.
Diffstat (limited to 'scene/main/timer.cpp')
-rw-r--r--scene/main/timer.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/scene/main/timer.cpp b/scene/main/timer.cpp
index 81ab7e3391..286f332ba5 100644
--- a/scene/main/timer.cpp
+++ b/scene/main/timer.cpp
@@ -80,6 +80,7 @@ void Timer::set_wait_time(float p_time) {
ERR_FAIL_COND_MSG(p_time <= 0, "Time should be greater than zero.");
wait_time = p_time;
}
+
float Timer::get_wait_time() const {
return wait_time;
}
@@ -87,6 +88,7 @@ float Timer::get_wait_time() const {
void Timer::set_one_shot(bool p_one_shot) {
one_shot = p_one_shot;
}
+
bool Timer::is_one_shot() const {
return one_shot;
}
@@ -94,6 +96,7 @@ bool Timer::is_one_shot() const {
void Timer::set_autostart(bool p_start) {
autostart = p_start;
}
+
bool Timer::has_autostart() const {
return autostart;
}