Remove #include "gui/..." prefix

MRtrix3 · Oct 16, 2024 · c51c9c4 · c51c9c4
1 parent e5424bc
commit c51c9c4
Show file tree

Hide file tree

Showing 157 changed files with 417 additions and 417 deletions.
diff --git a/cpp/cmd/mrview.cpp b/cpp/cmd/mrview.cpp
@@ -15,15 +15,15 @@
  */
 
 // clang-format off
-#include "gui/gui.h"
+#include "gui.h"
 #include "command.h"
 // clang-format on
 
-#include "gui/mrview/icons.h"
-#include "gui/mrview/mode/list.h"
-#include "gui/mrview/sync/syncmanager.h"
-#include "gui/mrview/tool/list.h"
-#include "gui/mrview/window.h"
+#include "mrview/icons.h"
+#include "mrview/mode/list.h"
+#include "mrview/sync/syncmanager.h"
+#include "mrview/tool/list.h"
+#include "mrview/window.h"
 #include "memory.h"
 #include "progressbar.h"
 
@@ -75,7 +75,7 @@ void usage() {
   MR::GUI::MRView::Tool::classname::add_commandline_options(OPTIONS);
   {
     using namespace MR::GUI::MRView::Tool;
-#include "gui/mrview/tool/list.h"
+#include "mrview/tool/list.h"
   }
 
   REQUIRES_AT_LEAST_ONE_ARGUMENT = false;

diff --git a/cpp/cmd/shview.cpp b/cpp/cmd/shview.cpp
@@ -15,13 +15,13 @@
  */
 
 // clang-format off
-#include "gui/gui.h"
+#include "gui.h"
 #include "command.h"
 // clang-format on
 
 #include "file/path.h"
-#include "gui/shview/icons.h"
-#include "gui/shview/render_window.h"
+#include "shview/icons.h"
+#include "shview/render_window.h"
 #include "math/SH.h"
 #include "progressbar.h"
 

diff --git a/cpp/lib/gui/CMakeLists.txt b/cpp/lib/gui/CMakeLists.txt
@@ -23,7 +23,7 @@ set_target_properties(mrtrix-gui PROPERTIES
 )
 
 if(MRTRIX_USE_PCH)
-    target_precompile_headers(mrtrix-gui PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/gui/gui_pch.h)
+    target_precompile_headers(mrtrix-gui PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/gui_pch.h)
 endif()
 
 target_include_directories(mrtrix-gui PUBLIC

diff --git a/cpp/lib/gui/color_button.cpp b/cpp/lib/gui/color_button.cpp
@@ -14,7 +14,7 @@
  * For more details, see http://www.mrtrix.org/.
  */
 
-#include "gui/color_button.h"
+#include "color_button.h"
 
 QColorButton::QColorButton(QWidget *parent, const char *name) : QPushButton(name, parent) {
   connect(this, SIGNAL(clicked()), this, SLOT(chooseColor()));

diff --git a/cpp/lib/gui/color_button.h b/cpp/lib/gui/color_button.h
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include "gui/opengl/gl.h"
+#include "opengl/gl.h"
 
 class QColorButton : public QPushButton {
   Q_OBJECT

diff --git a/cpp/lib/gui/crosshair.cpp b/cpp/lib/gui/crosshair.cpp
@@ -14,9 +14,9 @@
  * For more details, see http://www.mrtrix.org/.
  */
 
-#include "gui/crosshair.h"
+#include "crosshair.h"
 
-#include "gui/projection.h"
+#include "projection.h"
 
 namespace MR::GUI {
 

diff --git a/cpp/lib/gui/crosshair.h b/cpp/lib/gui/crosshair.h
@@ -18,8 +18,8 @@
 
 #include "types.h"
 
-#include "gui/opengl/gl.h"
-#include "gui/opengl/shader.h"
+#include "opengl/gl.h"
+#include "opengl/shader.h"
 
 namespace MR::GUI {
 

diff --git a/cpp/lib/gui/cursor.cpp b/cpp/lib/gui/cursor.cpp
@@ -14,7 +14,7 @@
  * For more details, see http://www.mrtrix.org/.
  */
 
-#include "gui/cursor.h"
+#include "cursor.h"
 
 namespace MR::GUI {
 

diff --git a/cpp/lib/gui/cursor.h b/cpp/lib/gui/cursor.h
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include "gui/opengl/gl.h"
+#include "opengl/gl.h"
 
 namespace MR::GUI {
 class Cursor {

diff --git a/cpp/lib/gui/dialog/dialog.cpp b/cpp/lib/gui/dialog/dialog.cpp
@@ -14,17 +14,17 @@
  * For more details, see http://www.mrtrix.org/.
  */
 
-#include "gui/dialog/dialog.h"
+#include "dialog/dialog.h"
 
 #include "app.h"
 #include "exception.h"
 #include "file/dicom/tree.h"
 #include "progressbar.h"
 
-#include "gui/dialog/dicom.h"
-#include "gui/dialog/file.h"
-#include "gui/dialog/progress.h"
-#include "gui/dialog/report_exception.h"
+#include "dialog/dicom.h"
+#include "dialog/file.h"
+#include "dialog/progress.h"
+#include "dialog/report_exception.h"
 
 namespace MR::GUI::Dialog {
 

diff --git a/cpp/lib/gui/dialog/dicom.cpp b/cpp/lib/gui/dialog/dicom.cpp
@@ -14,10 +14,10 @@
  * For more details, see http://www.mrtrix.org/.
  */
 
-#include "gui/dialog/dicom.h"
+#include "dialog/dicom.h"
 #include "file/dicom/tree.h"
-#include "gui/dialog/list.h"
-#include "gui/gui.h"
+#include "dialog/list.h"
+#include "gui.h"
 
 namespace MR::GUI::Dialog {
 

diff --git a/cpp/lib/gui/dialog/dicom.h b/cpp/lib/gui/dialog/dicom.h
@@ -17,7 +17,7 @@
 #pragma once
 
 #include "file/dicom/tree.h"
-#include "gui/opengl/gl.h"
+#include "opengl/gl.h"
 
 namespace MR::GUI::Dialog {
 

diff --git a/cpp/lib/gui/dialog/file.cpp b/cpp/lib/gui/dialog/file.cpp
@@ -18,8 +18,8 @@
 
 #include "app.h"
 #include "formats/list.h"
-#include "gui/dialog/file.h"
-#include "gui/gui.h"
+#include "dialog/file.h"
+#include "gui.h"
 
 #ifdef MRTRIX_MACOSX
 #define FILE_DIALOG_OPTIONS QFileDialog::DontUseNativeDialog

diff --git a/cpp/lib/gui/dialog/file.h b/cpp/lib/gui/dialog/file.h
@@ -17,7 +17,7 @@
 #pragma once
 
 #include "file/path.h"
-#include "gui/opengl/gl.h"
+#include "opengl/gl.h"
 
 namespace MR::GUI::Dialog::File {
 

diff --git a/cpp/lib/gui/dialog/image_properties.cpp b/cpp/lib/gui/dialog/image_properties.cpp
@@ -14,11 +14,11 @@
  * For more details, see http://www.mrtrix.org/.
  */
 
-#include "gui/dialog/image_properties.h"
+#include "dialog/image_properties.h"
 #include "dwi/gradient.h"
 #include "file/matrix.h"
-#include "gui/dialog/file.h"
-#include "gui/dialog/list.h"
+#include "dialog/file.h"
+#include "dialog/list.h"
 #include "header.h"
 #include "stride.h"
 

diff --git a/cpp/lib/gui/dialog/image_properties.h b/cpp/lib/gui/dialog/image_properties.h
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include "gui/opengl/gl.h"
+#include "opengl/gl.h"
 #include "header.h"
 
 namespace MR {

diff --git a/cpp/lib/gui/dialog/list.cpp b/cpp/lib/gui/dialog/list.cpp
@@ -14,7 +14,7 @@
  * For more details, see http://www.mrtrix.org/.
  */
 
-#include "gui/dialog/list.h"
+#include "dialog/list.h"
 
 namespace MR::GUI::Dialog {
 

diff --git a/cpp/lib/gui/dialog/list.h b/cpp/lib/gui/dialog/list.h
@@ -16,8 +16,8 @@
 
 #pragma once
 
-#include "gui/gui.h"
-#include "gui/opengl/gl.h"
+#include "gui.h"
+#include "opengl/gl.h"
 
 namespace MR::GUI::Dialog {
 

diff --git a/cpp/lib/gui/dialog/opengl.cpp b/cpp/lib/gui/dialog/opengl.cpp
@@ -14,9 +14,9 @@
  * For more details, see http://www.mrtrix.org/.
  */
 
-#include "gui/dialog/opengl.h"
-#include "gui/dialog/list.h"
-#include "gui/opengl/gl.h"
+#include "dialog/opengl.h"
+#include "dialog/list.h"
+#include "opengl/gl.h"
 
 namespace MR::GUI::Dialog {
 

diff --git a/cpp/lib/gui/dialog/opengl.h b/cpp/lib/gui/dialog/opengl.h
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include "gui/opengl/gl.h"
+#include "opengl/gl.h"
 
 namespace MR::GUI::Dialog {
 

diff --git a/cpp/lib/gui/dialog/progress.cpp b/cpp/lib/gui/dialog/progress.cpp
@@ -14,8 +14,8 @@
  * For more details, see http://www.mrtrix.org/.
  */
 
-#include "gui/dialog/progress.h"
-#include "gui/gui.h"
+#include "dialog/progress.h"
+#include "gui.h"
 #include <cassert>
 
 namespace MR::GUI::Dialog::ProgressBar {

diff --git a/cpp/lib/gui/dialog/progress.h b/cpp/lib/gui/dialog/progress.h
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include "gui/opengl/gl.h"
+#include "opengl/gl.h"
 #include "progressbar.h"
 
 namespace MR::GUI::Dialog::ProgressBar {

diff --git a/cpp/lib/gui/dialog/report_exception.cpp b/cpp/lib/gui/dialog/report_exception.cpp
@@ -14,8 +14,8 @@
  * For more details, see http://www.mrtrix.org/.
  */
 
-#include "gui/dialog/report_exception.h"
-#include "gui/gui.h"
+#include "dialog/report_exception.h"
+#include "gui.h"
 
 namespace MR::GUI::Dialog {
 

diff --git a/cpp/lib/gui/dialog/report_exception.h b/cpp/lib/gui/dialog/report_exception.h
@@ -17,7 +17,7 @@
 #pragma once
 
 #include "exception.h"
-#include "gui/opengl/gl.h"
+#include "opengl/gl.h"
 
 namespace MR::GUI::Dialog {
 

diff --git a/cpp/lib/gui/dwi/render_frame.cpp b/cpp/lib/gui/dwi/render_frame.cpp
@@ -19,7 +19,7 @@
 #include <QOpenGLWidget>
 
 #include "app.h"
-#include "gui/dwi/render_frame.h"
+#include "dwi/render_frame.h"
 
 namespace MR::GUI::DWI {
 

diff --git a/cpp/lib/gui/dwi/render_frame.h b/cpp/lib/gui/dwi/render_frame.h
@@ -17,12 +17,12 @@
 #pragma once
 
 #include "dwi/directions/set.h"
-#include "gui/dwi/renderer.h"
-#include "gui/opengl/font.h"
-#include "gui/opengl/gl.h"
-#include "gui/opengl/lighting.h"
-#include "gui/opengl/transformation.h"
-#include "gui/projection.h"
+#include "dwi/renderer.h"
+#include "opengl/font.h"
+#include "opengl/gl.h"
+#include "opengl/lighting.h"
+#include "opengl/transformation.h"
+#include "projection.h"
 #include "memory.h"
 #include "types.h"
 

diff --git a/cpp/lib/gui/dwi/renderer.cpp b/cpp/lib/gui/dwi/renderer.cpp
@@ -16,10 +16,10 @@
 
 #include <map>
 
-#include "gui/dwi/renderer.h"
-#include "gui/gui.h"
-#include "gui/opengl/lighting.h"
-#include "gui/projection.h"
+#include "dwi/renderer.h"
+#include "gui.h"
+#include "opengl/lighting.h"
+#include "projection.h"
 #include "math/legendre.h"
 
 namespace MR::GUI::DWI {

diff --git a/cpp/lib/gui/dwi/renderer.h b/cpp/lib/gui/dwi/renderer.h
@@ -20,10 +20,10 @@
 #include <QOpenGLWidget>
 
 #include "dwi/directions/set.h"
-#include "gui/gui.h"
-#include "gui/opengl/gl.h"
-#include "gui/opengl/shader.h"
-#include "gui/shapes/halfsphere.h"
+#include "gui.h"
+#include "opengl/gl.h"
+#include "opengl/shader.h"
+#include "shapes/halfsphere.h"
 #include "math/SH.h"
 
 namespace MR::GUI {

diff --git a/cpp/lib/gui/gui.cpp b/cpp/lib/gui/gui.cpp
@@ -14,8 +14,8 @@
  * For more details, see http://www.mrtrix.org/.
  */
 
-#include "gui/gui.h"
-#include "gui/opengl/gl.h"
+#include "gui.h"
+#include "opengl/gl.h"
 #include <clocale>
 #include <locale>
 

diff --git a/cpp/lib/gui/gui.h b/cpp/lib/gui/gui.h
@@ -24,7 +24,7 @@
 
 #include "app.h"
 #include "file/config.h"
-#include "gui/opengl/gl.h"
+#include "opengl/gl.h"
 
 #include <functional>
 

diff --git a/cpp/lib/gui/gui_pch.h b/cpp/lib/gui/gui_pch.h
@@ -16,4 +16,4 @@
 #ifdef __APPLE__
 #define GL_SILENCE_DEPRECATION
 #endif
-#include "gui/opengl/gl.h"
+#include "opengl/gl.h"
diff --git a/cpp/lib/gui/lighting_dock.cpp b/cpp/lib/gui/lighting_dock.cpp
@@ -14,10 +14,10 @@
  * For more details, see http://www.mrtrix.org/.
  */
 
-#include "gui/lighting_dock.h"
+#include "lighting_dock.h"
 #include "file/config.h"
-#include "gui/color_button.h"
-#include "gui/gui.h"
+#include "color_button.h"
+#include "gui.h"
 #include "math/math.h"
 
 namespace MR::GUI {

diff --git a/cpp/lib/gui/lighting_dock.h b/cpp/lib/gui/lighting_dock.h
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include "gui/opengl/lighting.h"
+#include "opengl/lighting.h"
 
 namespace MR::GUI {
 class LightingSettings : public QFrame {