diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-05-14 12:53:38 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-14 12:53:38 +0200 |
| commit | 5f5f53e8eba5c9b708714de58d3cca6ceb010279 (patch) | |
| tree | 8bebdce946466ce8e9476ccd46c9dba62c323938 /modules/gdscript/gdscript_editor.cpp | |
| parent | e7c9d818766a119089873e4941e4865fb36883ec (diff) | |
| parent | 1f6f364a56319eabd02c050746fe7df3f55ffee3 (diff) | |
| download | redot-engine-5f5f53e8eba5c9b708714de58d3cca6ceb010279.tar.gz | |
Merge pull request #38697 from akien-mga/member-init-c++11
Port member default initialization from constructor to declaration (C++11)
Diffstat (limited to 'modules/gdscript/gdscript_editor.cpp')
| -rw-r--r-- | modules/gdscript/gdscript_editor.cpp | 27 |
1 files changed, 10 insertions, 17 deletions
diff --git a/modules/gdscript/gdscript_editor.cpp b/modules/gdscript/gdscript_editor.cpp index 8af98c187f..56381e8af7 100644 --- a/modules/gdscript/gdscript_editor.cpp +++ b/modules/gdscript/gdscript_editor.cpp @@ -492,31 +492,24 @@ String GDScriptLanguage::make_function(const String &p_class, const String &p_na struct GDScriptCompletionContext { - const GDScriptParser::ClassNode *_class; - const GDScriptParser::FunctionNode *function; - const GDScriptParser::BlockNode *block; - Object *base; + const GDScriptParser::ClassNode *_class = nullptr; + const GDScriptParser::FunctionNode *function = nullptr; + const GDScriptParser::BlockNode *block = nullptr; + Object *base = nullptr; String base_path; - int line; - uint32_t depth; - - GDScriptCompletionContext() : - _class(nullptr), - function(nullptr), - block(nullptr), - base(nullptr), - line(0), - depth(0) {} + int line = 0; + uint32_t depth = 0; + + GDScriptCompletionContext() {} }; struct GDScriptCompletionIdentifier { GDScriptParser::DataType type; String enumeration; Variant value; - const GDScriptParser::Node *assigned_expression; + const GDScriptParser::Node *assigned_expression = nullptr; - GDScriptCompletionIdentifier() : - assigned_expression(nullptr) {} + GDScriptCompletionIdentifier() {} }; static void _get_directory_contents(EditorFileSystemDirectory *p_dir, Map<String, ScriptCodeCompletionOption> &r_list) { |
