mirror of
https://github.com/godotengine/godot.git
synced 2026-01-03 18:11:19 +03:00
Style: Replaces uses of 0/NULL by nullptr (C++11)
Using clang-tidy's `modernize-use-nullptr`. https://clang.llvm.org/extra/clang-tidy/checks/modernize-use-nullptr.html
This commit is contained in:
@@ -35,7 +35,7 @@
|
||||
////////////////////////////////////////////////////////
|
||||
// CameraServer
|
||||
|
||||
CameraServer::CreateFunc CameraServer::create_func = NULL;
|
||||
CameraServer::CreateFunc CameraServer::create_func = nullptr;
|
||||
|
||||
void CameraServer::_bind_methods() {
|
||||
ClassDB::bind_method(D_METHOD("get_feed", "index"), &CameraServer::get_feed);
|
||||
@@ -54,7 +54,7 @@ void CameraServer::_bind_methods() {
|
||||
BIND_ENUM_CONSTANT(FEED_CBCR_IMAGE);
|
||||
};
|
||||
|
||||
CameraServer *CameraServer::singleton = NULL;
|
||||
CameraServer *CameraServer::singleton = nullptr;
|
||||
|
||||
CameraServer *CameraServer::get_singleton() {
|
||||
return singleton;
|
||||
@@ -92,7 +92,7 @@ Ref<CameraFeed> CameraServer::get_feed_by_id(int p_id) {
|
||||
int index = get_feed_index(p_id);
|
||||
|
||||
if (index == -1) {
|
||||
return NULL;
|
||||
return nullptr;
|
||||
} else {
|
||||
return feeds[index];
|
||||
}
|
||||
@@ -134,7 +134,7 @@ void CameraServer::remove_feed(const Ref<CameraFeed> &p_feed) {
|
||||
};
|
||||
|
||||
Ref<CameraFeed> CameraServer::get_feed(int p_index) {
|
||||
ERR_FAIL_INDEX_V(p_index, feeds.size(), NULL);
|
||||
ERR_FAIL_INDEX_V(p_index, feeds.size(), nullptr);
|
||||
|
||||
return feeds[p_index];
|
||||
};
|
||||
@@ -169,5 +169,5 @@ CameraServer::CameraServer() {
|
||||
};
|
||||
|
||||
CameraServer::~CameraServer() {
|
||||
singleton = NULL;
|
||||
singleton = nullptr;
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user