From 9657955e6244e949e82ef5be1ae147f20690603b Mon Sep 17 00:00:00 2001 From: jerrrrycho Date: Sat, 10 Oct 2026 15:05:47 +0200 Subject: [PATCH] refactor(sonar): use nullptr literal (cpp:S4962) --- gl/framebuffer.cpp | 4 ++-- gl/pbo.cpp | 2 +- gl/shader.cpp | 6 +++--- input/messaging.cpp | 2 +- scripting/PyInt.cpp | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/gl/framebuffer.cpp b/gl/framebuffer.cpp index af1f63de..898c8e07 100644 --- a/gl/framebuffer.cpp +++ b/gl/framebuffer.cpp @@ -91,14 +91,14 @@ void gl::framebuffer::blit(framebuffer *src, framebuffer *dst, int sx, int sy, i { GLenum outputs[8] = { GL_NONE }; - outputs[attachment_n] = src != 0 ? attachment : GL_BACK_LEFT; + outputs[attachment_n] = src != nullptr ? attachment : GL_BACK_LEFT; glReadBuffer(attachment); } { GLenum outputs[8] = { GL_NONE }; - outputs[attachment_n] = dst != 0 ? attachment : GL_BACK_LEFT; + outputs[attachment_n] = dst != nullptr ? attachment : GL_BACK_LEFT; glDrawBuffers(attachment_n + 1, outputs); } diff --git a/gl/pbo.cpp b/gl/pbo.cpp index 6923e09d..4cad2c9d 100644 --- a/gl/pbo.cpp +++ b/gl/pbo.cpp @@ -12,7 +12,7 @@ void gl::pbo::request_read(int x, int y, int lx, int ly, int pixsize, GLenum for sync.reset(); bind(PIXEL_PACK_BUFFER); - glReadPixels(x, y, lx, ly, format, type, 0); + glReadPixels(x, y, lx, ly, format, type, nullptr); unbind(PIXEL_PACK_BUFFER); sync.emplace(); diff --git a/gl/shader.cpp b/gl/shader.cpp index 5d818833..7815a470 100644 --- a/gl/shader.cpp +++ b/gl/shader.cpp @@ -313,7 +313,7 @@ gl::shader::shader(const std::string &filename) const GLchar *cstr = source.second.c_str(); **this = glCreateShader(source.first); - glShaderSource(*this, 1, &cstr, 0); + glShaderSource(*this, 1, &cstr, nullptr); glCompileShader(*this); GLint status; @@ -321,7 +321,7 @@ gl::shader::shader(const std::string &filename) if (!status) { GLchar info[512]; - glGetShaderInfoLog(*this, 512, 0, info); + glGetShaderInfoLog(*this, 512, nullptr, info); log_error(std::string(info)); throw shader_exception("failed to compile " + filename + ": " + std::string(info)); @@ -395,7 +395,7 @@ void gl::program::link() if (!status) { GLchar info[512]; - glGetProgramInfoLog(*this, 512, 0, info); + glGetProgramInfoLog(*this, 512, nullptr, info); throw shader_exception("failed to link program: " + std::string(info)); } diff --git a/input/messaging.cpp b/input/messaging.cpp index 36ed853c..754defb4 100644 --- a/input/messaging.cpp +++ b/input/messaging.cpp @@ -66,7 +66,7 @@ OnCommandGet(multiplayer::DaneRozkaz *pRozkaz) if( event != nullptr ) { if( typeid(*event) == typeid(multi_event) || typeid(*event) == typeid(lights_event) - || event->m_sibling != 0 ) { + || event->m_sibling != nullptr ) { // tylko jawne albo niejawne Multiple command_relay relay; relay.post(user_command::queueevent, 0.0, 0.0, GLFW_PRESS, 0, glm::vec3(0.0f), &event->name()); diff --git a/scripting/PyInt.cpp b/scripting/PyInt.cpp index 53daec43..8ffa29e1 100644 --- a/scripting/PyInt.cpp +++ b/scripting/PyInt.cpp @@ -395,7 +395,7 @@ void python_taskqueue::exit() auto python_taskqueue::insert(task_request const &Task) -> bool { - if (!m_initialized || false == Global.python_enabled || Task.renderer.empty() || Task.input == nullptr || Task.target == 0) + if (!m_initialized || false == Global.python_enabled || Task.renderer.empty() || Task.input == nullptr || Task.target == nullptr) { return false; }