fix tidy

.clang-format

@@ -2,7 +2,7 @@ BasedOnStyle: Google
 
 SortIncludes: CaseInsensitive
 IncludeCategories:
-  - Regex:           '<(imgui|implot|SDL|GLFW).*>'
+  - Regex:           '<(imgui|implot|SDL|GLFW|GL).*>'
     Priority:        2
   - Regex:           '<[[:alnum:]._]+>'
     Priority:        1

misc/default.nix

@@ -5,10 +5,10 @@ pkgs.mkShell {
   nativeBuildInputs = with pkgs; [
     cmake
     ninja
+    clang-tools_18
   ];
 
   buildInputs = with pkgs; [
-    clang-tools
     SDL2
     libGL
     glfw

misc/scripts/format.sh

@@ -1,2 +1,2 @@
-clang-format --verbose -i `find src -name *.cpp -or -name *.hpp`
-clang-format --verbose -i `find examples -name *.cpp -or -name *.hpp`
+clang-format-18 --verbose -i `find src -name *.cpp -or -name *.hpp`
+clang-format-18 --verbose -i `find examples -name *.cpp -or -name *.hpp`

src/glfw_opengl3_app.cpp

@@ -3,8 +3,10 @@
 #include "glfw_opengl3_app.hpp"
 
 #include <algorithm>
+#include <array>
 #include <iostream>
 
+#include <GL/gl.h>
 #include <GLFW/glfw3.h>
 #include <imgui.h>
 #include <imgui_impl_glfw.h>
@@ -15,7 +17,7 @@ namespace imguiplot {
 
 namespace {
 void GlfwErrorCallback(int error, const char* description) {
-  std::cerr << "Glfw Error " << error << ": " << description << std::endl;
+  std::cerr << "Glfw Error " << error << ": " << description << '\n';
 }
 
 constexpr int kColorMaxValue = 255.0f;
@@ -33,7 +35,7 @@ std::array<float, 4> ToFloat(const std::array<int, 4>& clear_color,
 bool GlfwOpenGL3Backend::Init() {
   glfwSetErrorCallback(GlfwErrorCallback);
   if (glfwInit() == GLFW_FALSE) {
-    std::cerr << "Failed to initialize GLFW" << std::endl;
+    std::cerr << "Failed to initialize GLFW" << '\n';
     return false;
   }
 
@@ -45,7 +47,7 @@ bool GlfwOpenGL3Backend::Init() {
   window_ = glfwCreateWindow(options_.window_width, options_.window_height,
                              options_.window_title.c_str(), nullptr, nullptr);
   if (window_ == nullptr) {
-    std::cerr << "Failed to create GLFW window" << std::endl;
+    std::cerr << "Failed to create GLFW window" << '\n';
     return false;
   }
 
@@ -63,7 +65,7 @@ bool GlfwOpenGL3Backend::Init() {
   if (imgui_io.Fonts->AddFontFromFileTTF(
           options_.font_path.c_str(),
           options_.font_size * options_.gui_scale) == nullptr) {
-    std::cerr << "Error loading font " << options_.font_path << std::endl;
+    std::cerr << "Error loading font " << options_.font_path << '\n';
     return false;
   }
 
@@ -91,7 +93,7 @@ GlfwOpenGL3Backend::~GlfwOpenGL3Backend() {
 }
 
 bool GlfwOpenGL3Backend::IsRunning() {
-  bool should_close = glfwWindowShouldClose(window_) != GLFW_FALSE;
+  const bool should_close = glfwWindowShouldClose(window_) != GLFW_FALSE;
   if (!should_close) {
     glfwPollEvents();
   }

src/glfw_opengl3_app.hpp

@@ -2,6 +2,7 @@
 
 #include <array>
 #include <cstdio>
+#include <utility>
 
 #include <GLFW/glfw3.h>
 

src/sdl_renderer_app.cpp

@@ -14,7 +14,7 @@ namespace imguiplot {
 
 bool SdlRendererBackend::Init() {
   if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_TIMER) != 0) {
-    std::cerr << "Failed to initialize SDL: " << SDL_GetError() << std::endl;
+    std::cerr << "Failed to initialize SDL: " << SDL_GetError() << '\n';
     return false;
   }
 

src/sdl_renderer_app.hpp

@@ -1,6 +1,7 @@
 #pragma once
 
 #include <cstdio>
+#include <utility>
 
 #include <SDL.h>