summaryrefslogtreecommitdiff
path: root/core/os
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 /core/os
parent0be6d925dc3c6413bce7a3ccb49631b8e4a6e67a (diff)
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 'core/os')
-rw-r--r--core/os/dir_access.cpp1
-rw-r--r--core/os/file_access.cpp4
-rw-r--r--core/os/main_loop.cpp2
-rw-r--r--core/os/os.cpp4
4 files changed, 11 insertions, 0 deletions
diff --git a/core/os/dir_access.cpp b/core/os/dir_access.cpp
index 520968c9a9..5763c74862 100644
--- a/core/os/dir_access.cpp
+++ b/core/os/dir_access.cpp
@@ -45,6 +45,7 @@ String DirAccess::_get_root_path() const {
return "";
}
}
+
String DirAccess::_get_root_string() const {
switch (_access_type) {
case ACCESS_RESOURCES:
diff --git a/core/os/file_access.cpp b/core/os/file_access.cpp
index f31842bcae..8b13e53812 100644
--- a/core/os/file_access.cpp
+++ b/core/os/file_access.cpp
@@ -170,6 +170,7 @@ uint16_t FileAccess::get_16() const {
return res;
}
+
uint32_t FileAccess::get_32() const {
uint32_t res;
uint16_t a, b;
@@ -187,6 +188,7 @@ uint32_t FileAccess::get_32() const {
return res;
}
+
uint64_t FileAccess::get_64() const {
uint64_t res;
uint32_t a, b;
@@ -394,6 +396,7 @@ void FileAccess::store_16(uint16_t p_dest) {
store_8(a);
store_8(b);
}
+
void FileAccess::store_32(uint32_t p_dest) {
uint16_t a, b;
@@ -407,6 +410,7 @@ void FileAccess::store_32(uint32_t p_dest) {
store_16(a);
store_16(b);
}
+
void FileAccess::store_64(uint64_t p_dest) {
uint32_t a, b;
diff --git a/core/os/main_loop.cpp b/core/os/main_loop.cpp
index 7c00af8d1f..1ce49b544b 100644
--- a/core/os/main_loop.cpp
+++ b/core/os/main_loop.cpp
@@ -65,12 +65,14 @@ void MainLoop::init() {
if (get_script_instance())
get_script_instance()->call("_initialize");
}
+
bool MainLoop::iteration(float p_time) {
if (get_script_instance())
return get_script_instance()->call("_iteration", p_time);
return false;
}
+
bool MainLoop::idle(float p_time) {
if (get_script_instance())
return get_script_instance()->call("_idle", p_time);
diff --git a/core/os/os.cpp b/core/os/os.cpp
index 02d1dfe895..4414b582bd 100644
--- a/core/os/os.cpp
+++ b/core/os/os.cpp
@@ -82,15 +82,18 @@ String OS::get_iso_date_time(bool local) const {
uint64_t OS::get_splash_tick_msec() const {
return _msec_splash;
}
+
uint64_t OS::get_unix_time() const {
return 0;
};
uint64_t OS::get_system_time_secs() const {
return 0;
}
+
uint64_t OS::get_system_time_msecs() const {
return 0;
}
+
void OS::debug_break(){
// something
@@ -224,6 +227,7 @@ bool OS::is_no_window_mode_enabled() const {
int OS::get_exit_code() const {
return _exit_code;
}
+
void OS::set_exit_code(int p_code) {
_exit_code = p_code;
}