asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #70342 from twaritwaikar/fix-vcs-bindings

Browse source 
VCS: Fix GDExtension return types for VCS after Array type hardening
This commit is contained in:
Rémi Verschelde 2022-12-20 12:43:15 +01:00
commit 08f6a46a8d
No known key found for this signature in database
GPG key ID: C3336907360768E1
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
doc/classes/EditorVCSInterface.xml
View file

@ -53,7 +53,7 @@
</description>
</method>
<method name="_get_branch_list" qualifiers="virtual">
<return type="Dictionary[]" />
<return type="String[]" />
<description>
Gets an instance of an [Array] of [String]s containing available branch names in the VCS.
</description>
@ -94,7 +94,7 @@
</description>
</method>
<method name="_get_remotes" qualifiers="virtual">
<return type="Dictionary[]" />
<return type="String[]" />
<description>
Returns an [Array] of [String]s, each containing the name of a remote configured in the VCS.
</description>

4
editor/editor_vcs_interface.cpp
View file

@ -57,7 +57,7 @@ void EditorVCSInterface::set_credentials(String p_username, String p_password, S
}
List<String> EditorVCSInterface::get_remotes() {
TypedArray<Dictionary> result;
TypedArray<String> result;
if (!GDVIRTUAL_CALL(_get_remotes, result)) {
UNIMPLEMENTED();
return {};
@ -137,7 +137,7 @@ List<EditorVCSInterface::Commit> EditorVCSInterface::get_previous_commits(int p_
}
List<String> EditorVCSInterface::get_branch_list() {
TypedArray<Dictionary> result;
TypedArray<String> result;
if (!GDVIRTUAL_CALL(_get_branch_list, result)) {
UNIMPLEMENTED();
return {};

4
editor/editor_vcs_interface.h
View file

@ -117,8 +117,8 @@ protected:
GDVIRTUAL0R(bool, _shut_down);
GDVIRTUAL0R(String, _get_vcs_name);
GDVIRTUAL1R(TypedArray<Dictionary>, _get_previous_commits, int);
GDVIRTUAL0R(TypedArray<Dictionary>, _get_branch_list);
GDVIRTUAL0R(TypedArray<Dictionary>, _get_remotes);
GDVIRTUAL0R(TypedArray<String>, _get_branch_list);
GDVIRTUAL0R(TypedArray<String>, _get_remotes);
GDVIRTUAL1(_create_branch, String);
GDVIRTUAL1(_remove_branch, String);
GDVIRTUAL2(_create_remote, String, String);