mewin/godot-cpp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

NULL -> nullptr

Browse Source
This commit is contained in:
Nickolai Korshunov
2018-02-23 16:08:36 +03:00
parent 3f8456135f
commit f1c35f24f6
7 changed files with 43 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/core/GodotGlobal.cpp
View File

@@ -5,8 +5,8 @@
namespace godot {
void *_RegisterState::nativescript_handle;
const godot_gdnative_core_api_struct *api = NULL;
const godot_gdnative_ext_nativescript_api_struct *nativescript_api = NULL;
const godot_gdnative_core_api_struct *api = nullptr;
const godot_gdnative_ext_nativescript_api_struct *nativescript_api = nullptr;
void Godot::print(const String& message)
{
@@ -21,13 +21,13 @@ void Godot::print_warning(const String& description, const String& function, con
char * c_func = function.alloc_c_string();
char * c_file = file.alloc_c_string();
if (c_desc != NULL && c_func !=NULL && c_file != NULL) {
if (c_desc != nullptr && c_func !=nullptr && c_file != nullptr) {
godot::api->godot_print_warning(c_desc, c_func, c_file, line);
};
if (c_desc != NULL) godot::api->godot_free(c_desc);
if (c_func != NULL) godot::api->godot_free(c_func);
if (c_file != NULL) godot::api->godot_free(c_file);
if (c_desc != nullptr) godot::api->godot_free(c_desc);
if (c_func != nullptr) godot::api->godot_free(c_func);
if (c_file != nullptr) godot::api->godot_free(c_file);
}
void Godot::print_error(const String& description, const String& function, const String& file, int line)
@@ -38,13 +38,13 @@ void Godot::print_error(const String& description, const String& function, const
char * c_func = function.alloc_c_string();
char * c_file = file.alloc_c_string();
if (c_desc != NULL && c_func !=NULL && c_file != NULL) {
if (c_desc != nullptr && c_func !=nullptr && c_file != nullptr) {
godot::api->godot_print_error(c_desc, c_func, c_file, line);
};
if (c_desc != NULL) godot::api->godot_free(c_desc);
if (c_func != NULL) godot::api->godot_free(c_func);
if (c_file != NULL) godot::api->godot_free(c_file);
if (c_desc != nullptr) godot::api->godot_free(c_desc);
if (c_func != nullptr) godot::api->godot_free(c_func);
if (c_file != nullptr) godot::api->godot_free(c_file);
}
void Godot::gdnative_init(godot_gdnative_init_options *options)