summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruno de Oliveira Abinader <bruno@mapbox.com>2016-06-12 13:01:45 +0300
committerBruno de Oliveira Abinader <bruno@mapbox.com>2016-06-13 23:32:05 +0300
commit92f605df326ac4b1f4dd65928d6350b97eea6096 (patch)
treedbabc7d20fdb447efbd3d7d7025ff747cd17bf9e
parent9142c447e82c002a68fbf333f97508dba0e0e50c (diff)
downloadqtlocation-mapboxgl-92f605df326ac4b1f4dd65928d6350b97eea6096.tar.gz
[tidy] Check modernize-use-nullptr
Ref: http://clang.llvm.org/extra/clang-tidy/checks/modernize-use-nullptr.html
-rw-r--r--platform/darwin/src/headless_view_cgl.cpp2
-rw-r--r--platform/default/glfw_view.cpp4
-rw-r--r--src/mbgl/geometry/vao.hpp2
-rw-r--r--test/api/custom_layer.cpp2
4 files changed, 5 insertions, 5 deletions
diff --git a/platform/darwin/src/headless_view_cgl.cpp b/platform/darwin/src/headless_view_cgl.cpp
index a4f809a250..dc58463b5d 100644
--- a/platform/darwin/src/headless_view_cgl.cpp
+++ b/platform/darwin/src/headless_view_cgl.cpp
@@ -19,7 +19,7 @@ gl::glProc HeadlessView::initializeExtension(const char* name) {
}
void HeadlessView::createContext() {
- CGLError error = CGLCreateContext(display->pixelFormat, NULL, &glContext);
+ CGLError error = CGLCreateContext(display->pixelFormat, nullptr, &glContext);
if (error != kCGLNoError) {
throw std::runtime_error(std::string("Error creating GL context object:") + CGLErrorString(error) + "\n");
}
diff --git a/platform/default/glfw_view.cpp b/platform/default/glfw_view.cpp
index 67e9748a70..7bf40496f6 100644
--- a/platform/default/glfw_view.cpp
+++ b/platform/default/glfw_view.cpp
@@ -23,7 +23,7 @@ GLFWView::GLFWView(bool fullscreen_, bool benchmark_)
: fullscreen(fullscreen_), benchmark(benchmark_) {
glfwSetErrorCallback(glfwError);
- std::srand(std::time(0));
+ std::srand(std::time(nullptr));
if (!glfwInit()) {
mbgl::Log::Error(mbgl::Event::OpenGL, "failed to initialize glfw");
@@ -55,7 +55,7 @@ GLFWView::GLFWView(bool fullscreen_, bool benchmark_)
glfwWindowHint(GLFW_STENCIL_BITS, 8);
glfwWindowHint(GLFW_DEPTH_BITS, 16);
- window = glfwCreateWindow(width, height, "Mapbox GL", monitor, NULL);
+ window = glfwCreateWindow(width, height, "Mapbox GL", monitor, nullptr);
if (!window) {
glfwTerminate();
mbgl::Log::Error(mbgl::Event::OpenGL, "failed to initialize window");
diff --git a/src/mbgl/geometry/vao.hpp b/src/mbgl/geometry/vao.hpp
index 150a6badbd..93489fcc7b 100644
--- a/src/mbgl/geometry/vao.hpp
+++ b/src/mbgl/geometry/vao.hpp
@@ -65,7 +65,7 @@ private:
const char *bound_shader_name = "";
GLuint bound_vertex_buffer = 0;
GLuint bound_elements_buffer = 0;
- GLbyte *bound_offset = 0;
+ GLbyte *bound_offset = nullptr;
};
} // namespace mbgl
diff --git a/test/api/custom_layer.cpp b/test/api/custom_layer.cpp
index e0be341c4b..90c94aaea4 100644
--- a/test/api/custom_layer.cpp
+++ b/test/api/custom_layer.cpp
@@ -56,7 +56,7 @@ public:
MBGL_CHECK_ERROR(glUseProgram(program));
MBGL_CHECK_ERROR(glBindBuffer(GL_ARRAY_BUFFER, buffer));
MBGL_CHECK_ERROR(glEnableVertexAttribArray(a_pos));
- MBGL_CHECK_ERROR(glVertexAttribPointer(a_pos, 2, GL_FLOAT, GL_FALSE, 0, NULL));
+ MBGL_CHECK_ERROR(glVertexAttribPointer(a_pos, 2, GL_FLOAT, GL_FALSE, 0, nullptr));
MBGL_CHECK_ERROR(glDisable(GL_STENCIL_TEST));
MBGL_CHECK_ERROR(glDisable(GL_DEPTH_TEST));
MBGL_CHECK_ERROR(glDrawArrays(GL_TRIANGLE_STRIP, 0, 4));