diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-05-14 13:23:58 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2020-05-14 16:54:55 +0200 |
| commit | 0be6d925dc3c6413bce7a3ccb49631b8e4a6e67a (patch) | |
| tree | a27e497da7104dd0a64f98a04fa3067668735e91 /editor/editor_run.cpp | |
| parent | 710b34b70227becdc652b4ae027fe0ac47409642 (diff) | |
| download | redot-engine-0be6d925dc3c6413bce7a3ccb49631b8e4a6e67a.tar.gz | |
Style: clang-format: Disable KeepEmptyLinesAtTheStartOfBlocks
Which means that reduz' beloved style which we all became used to
will now be changed automatically to remove the first empty line.
This makes us lean closer to 1TBS (the one true brace style) instead
of hybridating it with some Allman-inspired spacing.
There's still the case of braces around single-statement blocks that
needs to be addressed (but clang-format can't help with that, but
clang-tidy may if we agree about it).
Part of #33027.
Diffstat (limited to 'editor/editor_run.cpp')
| -rw-r--r-- | editor/editor_run.cpp | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/editor/editor_run.cpp b/editor/editor_run.cpp index 01156d9809..00befb89f2 100644 --- a/editor/editor_run.cpp +++ b/editor/editor_run.cpp @@ -35,12 +35,10 @@ #include "servers/display_server.h" EditorRun::Status EditorRun::get_status() const { - return status; } Error EditorRun::run(const String &p_scene, const String &p_custom_args, const List<String> &p_breakpoints, const bool &p_skip_breakpoints) { - List<String> args; String resource_path = ProjectSettings::get_singleton()->get_resource_path(); @@ -106,7 +104,6 @@ Error EditorRun::run(const String &p_scene, const String &p_custom_args, const L test_size.x = ProjectSettings::get_singleton()->get("display/window/size/test_width"); test_size.y = ProjectSettings::get_singleton()->get("display/window/size/test_height"); if (test_size.x > 0 && test_size.y > 0) { - desired_size = test_size; } @@ -155,11 +152,9 @@ Error EditorRun::run(const String &p_scene, const String &p_custom_args, const L } if (p_breakpoints.size()) { - args.push_back("--breakpoints"); String bpoints; for (const List<String>::Element *E = p_breakpoints.front(); E; E = E->next()) { - bpoints += E->get().replace(" ", "%20"); if (E->next()) bpoints += ","; @@ -187,7 +182,6 @@ Error EditorRun::run(const String &p_scene, const String &p_custom_args, const L printf("Running: %ls", exec.c_str()); for (List<String>::Element *E = args.front(); E; E = E->next()) { - printf(" %ls", E->get().c_str()); }; printf("\n"); @@ -221,9 +215,7 @@ void EditorRun::stop_child_process(OS::ProcessID p_pid) { } void EditorRun::stop() { - if (status != STATUS_STOP && pids.size() > 0) { - for (List<OS::ProcessID>::Element *E = pids.front(); E; E = E->next()) { OS::get_singleton()->kill(E->get()); } @@ -233,6 +225,5 @@ void EditorRun::stop() { } EditorRun::EditorRun() { - status = STATUS_STOP; } |