From 75289b4017166012f1eb639a061cc37f7b321131 Mon Sep 17 00:00:00 2001 From: Hein-Pieter van Braam Date: Wed, 21 Feb 2018 22:57:50 +0100 Subject: [PATCH] revert the renaming _tree_db_selected function --- scene/gui/file_dialog.cpp | 6 +++--- scene/gui/file_dialog.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scene/gui/file_dialog.cpp b/scene/gui/file_dialog.cpp index bf014065664..78d6d0505bc 100644 --- a/scene/gui/file_dialog.cpp +++ b/scene/gui/file_dialog.cpp @@ -345,7 +345,7 @@ void FileDialog::_tree_selected() { get_ok()->set_disabled(_is_open_should_be_disabled()); } -void FileDialog::_tree_dc_selected() { +void FileDialog::_tree_db_selected() { TreeItem *ti = tree->get_selected(); if (!ti) @@ -754,7 +754,7 @@ void FileDialog::_bind_methods() { ClassDB::bind_method(D_METHOD("_unhandled_input"), &FileDialog::_unhandled_input); ClassDB::bind_method(D_METHOD("_tree_selected"), &FileDialog::_tree_selected); - ClassDB::bind_method(D_METHOD("_tree_dc_selected"), &FileDialog::_tree_dc_selected); + ClassDB::bind_method(D_METHOD("_tree_db_selected"), &FileDialog::_tree_dc_selected); ClassDB::bind_method(D_METHOD("_dir_entered"), &FileDialog::_dir_entered); ClassDB::bind_method(D_METHOD("_file_entered"), &FileDialog::_file_entered); ClassDB::bind_method(D_METHOD("_action_pressed"), &FileDialog::_action_pressed); @@ -889,7 +889,7 @@ FileDialog::FileDialog() { connect("confirmed", this, "_action_pressed"); tree->connect("cell_selected", this, "_tree_selected", varray(), CONNECT_DEFERRED); - tree->connect("item_activated", this, "_tree_dc_selected", varray()); + tree->connect("item_activated", this, "_tree_db_selected", varray()); tree->connect("nothing_selected", this, "deselect_items"); dir->connect("text_entered", this, "_dir_entered"); file->connect("text_entered", this, "_file_entered"); diff --git a/scene/gui/file_dialog.h b/scene/gui/file_dialog.h index 2a094946820..e431b3845e2 100644 --- a/scene/gui/file_dialog.h +++ b/scene/gui/file_dialog.h @@ -107,7 +107,7 @@ private: void _tree_selected(); void _select_drive(int p_idx); - void _tree_dc_selected(); + void _tree_db_selected(); void _dir_entered(String p_dir); void _file_entered(const String &p_file); void _action_pressed();