Partially turn off clang-format for in cpp/gui/shapes headers

We ensure that glutils.h is included prior to gl_core_3_3.h since it indirectly includes Qt's OpenGL headers (which breaks the build).
MRtrix3 · Oct 30, 2024 · 9972548 · 9972548
1 parent 99b27e6
commit 9972548
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 0 deletions.
diff --git a/cpp/gui/shapes/cube.h b/cpp/gui/shapes/cube.h
@@ -16,8 +16,12 @@
 
 #pragma once
 
+// glutils.h must be included before gl_core_3_3.h since it include Qt OpenGL headers
+// which must be included before gl_core_3_3.h
+// clang-format off
 #include "opengl/glutils.h"
 #include "opengl/gl_core_3_3.h"
+// clang-format on
 
 namespace MR::GUI::Shapes {
 

diff --git a/cpp/gui/shapes/cylinder.h b/cpp/gui/shapes/cylinder.h
@@ -16,8 +16,12 @@
 
 #pragma once
 
+// glutils.h must be included before gl_core_3_3.h since it include Qt OpenGL headers
+// which must be included before gl_core_3_3.h
+// clang-format off
 #include "opengl/glutils.h"
 #include "opengl/gl_core_3_3.h"
+// clang-format on
 
 namespace MR::GUI::Shapes {
 

diff --git a/cpp/gui/shapes/halfsphere.h b/cpp/gui/shapes/halfsphere.h
@@ -18,8 +18,12 @@
 
 #include "types.h"
 
+// glutils.h must be included before gl_core_3_3.h since it include Qt OpenGL headers
+// which must be included before gl_core_3_3.h
+// clang-format off
 #include "opengl/glutils.h"
 #include "opengl/gl_core_3_3.h"
+// clang-format on
 
 namespace MR::GUI::Shapes {
 

diff --git a/cpp/gui/shapes/sphere.h b/cpp/gui/shapes/sphere.h
@@ -18,8 +18,12 @@
 
 #include "types.h"
 
+// glutils.h must be included before gl_core_3_3.h since it include Qt OpenGL headers
+// which must be included before gl_core_3_3.h
+// clang-format off
 #include "opengl/glutils.h"
 #include "opengl/gl_core_3_3.h"
+// clang-format on
 
 namespace MR::GUI::Shapes {