diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-10-04 17:17:27 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-04 17:17:27 +0200 |
| commit | bb201c5887684044eb3ba35344d15bd476908f9e (patch) | |
| tree | b75bbe24bc594393b49765b2698d6cce225f227b /core | |
| parent | 4a4995524cd8f0ddeef934eeece7911496d77f79 (diff) | |
| parent | b85dfd990e26ffb22643d78e5f00ba135d1f97e7 (diff) | |
Merge pull request #53303 from akien-mga/53295-gdscript-completion-quote-style
Diffstat (limited to 'core')
| -rw-r--r-- | core/input/input.cpp | 10 | ||||
| -rw-r--r-- | core/os/os.cpp | 1 | ||||
| -rw-r--r-- | core/string/translation.cpp | 1 |
3 files changed, 1 insertions, 11 deletions
diff --git a/core/input/input.cpp b/core/input/input.cpp index 05b02408a1..f9a361c761 100644 --- a/core/input/input.cpp +++ b/core/input/input.cpp @@ -35,10 +35,6 @@ #include "core/input/input_map.h" #include "core/os/os.h" -#ifdef TOOLS_ENABLED -#include "editor/editor_settings.h" -#endif - static const char *_joy_buttons[JOY_BUTTON_SDL_MAX] = { "a", "b", @@ -162,9 +158,6 @@ void Input::_bind_methods() { } void Input::get_argument_options(const StringName &p_function, int p_idx, List<String> *r_options) const { -#ifdef TOOLS_ENABLED - const String quote_style = EDITOR_GET("text_editor/completion/use_single_quotes") ? "'" : "\""; - String pf = p_function; if (p_idx == 0 && (pf == "is_action_pressed" || pf == "action_press" || pf == "action_release" || pf == "is_action_just_pressed" || pf == "is_action_just_released" || @@ -179,10 +172,9 @@ void Input::get_argument_options(const StringName &p_function, int p_idx, List<S } String name = pi.name.substr(pi.name.find("/") + 1, pi.name.length()); - r_options->push_back(name.quote(quote_style)); + r_options->push_back(name.quote()); } } -#endif } void Input::SpeedTrack::update(const Vector2 &p_delta_p) { diff --git a/core/os/os.cpp b/core/os/os.cpp index 69366f688c..12f85858c3 100644 --- a/core/os/os.cpp +++ b/core/os/os.cpp @@ -36,7 +36,6 @@ #include "core/io/file_access.h" #include "core/os/midi_driver.h" #include "core/version_generated.gen.h" -#include "servers/audio_server.h" #include <stdarg.h> diff --git a/core/string/translation.cpp b/core/string/translation.cpp index 5e3b8297aa..37dc8915ab 100644 --- a/core/string/translation.cpp +++ b/core/string/translation.cpp @@ -35,7 +35,6 @@ #include "core/os/os.h" #ifdef TOOLS_ENABLED -#include "editor/editor_settings.h" #include "main/main.h" #endif |