godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #33734 from merumelu/editor-vcs-init 

Editor: fix typo in VCS plugin method names
This commit is contained in:
Rémi Verschelde 2019-11-20 21:17:32 +01:00 committed by GitHub
parent bdf0037a9c 94fc676019
commit ccebd1f4fc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/classes/EditorVCSInterface.xml
View File

@ -34,7 +34,7 @@
- [code]"offset"[/code] to store the offset of the line change since the first contextual line content. - [code]"offset"[/code] to store the offset of the line change since the first contextual line content.
</description> </description>
</method> </method>
<method name="get_is_vcs_intialized"> <method name="is_vcs_initialized">
<return type="bool"> <return type="bool">
</return> </return>
<description> <description>

10
editor/editor_vcs_interface.cpp
View File

@ -36,7 +36,7 @@ void EditorVCSInterface::_bind_methods() {
// Proxy end points that act as fallbacks to unavailability of a function in the VCS addon // Proxy end points that act as fallbacks to unavailability of a function in the VCS addon
ClassDB::bind_method(D_METHOD("_initialize", "project_root_path"), &EditorVCSInterface::_initialize); ClassDB::bind_method(D_METHOD("_initialize", "project_root_path"), &EditorVCSInterface::_initialize);
ClassDB::bind_method(D_METHOD("_get_is_vcs_intialized"), &EditorVCSInterface::_get_is_vcs_intialized); ClassDB::bind_method(D_METHOD("_is_vcs_initialized"), &EditorVCSInterface::_is_vcs_initialized);
ClassDB::bind_method(D_METHOD("_get_vcs_name"), &EditorVCSInterface::_get_vcs_name); ClassDB::bind_method(D_METHOD("_get_vcs_name"), &EditorVCSInterface::_get_vcs_name);
ClassDB::bind_method(D_METHOD("_shut_down"), &EditorVCSInterface::_shut_down); ClassDB::bind_method(D_METHOD("_shut_down"), &EditorVCSInterface::_shut_down);
ClassDB::bind_method(D_METHOD("_get_project_name"), &EditorVCSInterface::_get_project_name); ClassDB::bind_method(D_METHOD("_get_project_name"), &EditorVCSInterface::_get_project_name);
@ -50,7 +50,7 @@ void EditorVCSInterface::_bind_methods() {
// API methods that redirect calls to the proxy end points // API methods that redirect calls to the proxy end points
ClassDB::bind_method(D_METHOD("initialize", "project_root_path"), &EditorVCSInterface::initialize); ClassDB::bind_method(D_METHOD("initialize", "project_root_path"), &EditorVCSInterface::initialize);
ClassDB::bind_method(D_METHOD("get_is_vcs_intialized"), &EditorVCSInterface::get_is_vcs_intialized); ClassDB::bind_method(D_METHOD("is_vcs_initialized"), &EditorVCSInterface::is_vcs_initialized);
ClassDB::bind_method(D_METHOD("get_modified_files_data"), &EditorVCSInterface::get_modified_files_data); ClassDB::bind_method(D_METHOD("get_modified_files_data"), &EditorVCSInterface::get_modified_files_data);
ClassDB::bind_method(D_METHOD("stage_file", "file_path"), &EditorVCSInterface::stage_file); ClassDB::bind_method(D_METHOD("stage_file", "file_path"), &EditorVCSInterface::stage_file);
ClassDB::bind_method(D_METHOD("unstage_file", "file_path"), &EditorVCSInterface::unstage_file); ClassDB::bind_method(D_METHOD("unstage_file", "file_path"), &EditorVCSInterface::unstage_file);
@ -67,7 +67,7 @@ bool EditorVCSInterface::_initialize(String p_project_root_path) {
return true; return true;
} }
bool EditorVCSInterface::_get_is_vcs_intialized() { bool EditorVCSInterface::_is_vcs_initialized() {
return false; return false;
} }
@ -112,9 +112,9 @@ bool EditorVCSInterface::initialize(String p_project_root_path) {
return is_initialized; return is_initialized;
} }
bool EditorVCSInterface::get_is_vcs_intialized() { bool EditorVCSInterface::is_vcs_initialized() {
return call("_get_is_vcs_intialized"); return call("_is_vcs_initialized");
} }
Dictionary EditorVCSInterface::get_modified_files_data() { Dictionary EditorVCSInterface::get_modified_files_data() {

4
editor/editor_vcs_interface.h
View File

@ -48,7 +48,7 @@ protected:
// Implemented by addons as end points for the proxy functions // Implemented by addons as end points for the proxy functions
bool _initialize(String p_project_root_path); bool _initialize(String p_project_root_path);
bool _get_is_vcs_intialized(); bool _is_vcs_initialized();
Dictionary _get_modified_files_data(); Dictionary _get_modified_files_data();
void _stage_file(String p_file_path); void _stage_file(String p_file_path);
void _unstage_file(String p_file_path); void _unstage_file(String p_file_path);
@ -66,7 +66,7 @@ public:
// Proxy functions to the editor for use // Proxy functions to the editor for use
bool initialize(String p_project_root_path); bool initialize(String p_project_root_path);
bool get_is_vcs_intialized(); bool is_vcs_initialized();
Dictionary get_modified_files_data(); Dictionary get_modified_files_data();
void stage_file(String p_file_path); void stage_file(String p_file_path);
void unstage_file(String p_file_path); void unstage_file(String p_file_path);

5
editor/plugins/version_control_editor_plugin.cpp
View File

@ -29,6 +29,7 @@
/*************************************************************************/ /*************************************************************************/
#include "version_control_editor_plugin.h" #include "version_control_editor_plugin.h"
#include "core/script_language.h" #include "core/script_language.h"
#include "editor/editor_file_system.h" #include "editor/editor_file_system.h"
#include "editor/editor_node.h" #include "editor/editor_node.h"
@ -398,9 +399,9 @@ void VersionControlEditorPlugin::shut_down() {
} }
} }
bool VersionControlEditorPlugin::get_is_vcs_intialized() const { bool VersionControlEditorPlugin::is_vcs_initialized() const {
return EditorVCSInterface::get_singleton() ? EditorVCSInterface::get_singleton()->get_is_vcs_intialized() : false; return EditorVCSInterface::get_singleton() ? EditorVCSInterface::get_singleton()->is_vcs_initialized() : false;
} }
const String VersionControlEditorPlugin::get_vcs_name() const { const String VersionControlEditorPlugin::get_vcs_name() const {

2
editor/plugins/version_control_editor_plugin.h
View File

@ -129,7 +129,7 @@ public:
PanelContainer *get_version_control_dock() const { return version_control_dock; } PanelContainer *get_version_control_dock() const { return version_control_dock; }
List<StringName> get_available_vcs_names() const { return available_addons; } List<StringName> get_available_vcs_names() const { return available_addons; }
bool get_is_vcs_intialized() const; bool is_vcs_initialized() const;
const String get_vcs_name() const; const String get_vcs_name() const;
void register_editor(); void register_editor();