From d237a845d649f5201850f8bf620c090724cd4450 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (o)" <j.wuttke@fz-juelich.de>
Date: Mon, 6 Jul 2020 17:42:14 +0200
Subject: [PATCH] rm extra level from GUI/ba3d <- GUI/ba3d/ba3d
---
GUI/CMakeLists.txt | 2 +-
GUI/ba3d/.gitignore | 1 -
GUI/ba3d/{ba3d => }/CMakeLists.txt | 0
GUI/ba3d/{ba3d => }/def.cpp | 2 +-
GUI/ba3d/{ba3d => }/def.h | 2 +-
GUI/ba3d/{ba3d => }/model/geometry.cpp | 2 +-
GUI/ba3d/{ba3d => }/model/geometry.h | 2 +-
GUI/ba3d/{ba3d => }/model/geometry/box.cpp | 2 +-
GUI/ba3d/{ba3d => }/model/geometry/column.cpp | 2 +-
GUI/ba3d/{ba3d => }/model/geometry/cuboctahedron.cpp | 2 +-
GUI/ba3d/{ba3d => }/model/geometry/dodecahedron.cpp | 2 +-
GUI/ba3d/{ba3d => }/model/geometry/icosahedron.cpp | 2 +-
GUI/ba3d/{ba3d => }/model/geometry/plane.cpp | 2 +-
GUI/ba3d/{ba3d => }/model/geometry/ripple.cpp | 2 +-
GUI/ba3d/{ba3d => }/model/geometry/sphere.cpp | 2 +-
GUI/ba3d/{ba3d => }/model/geometry/truncbox.cpp | 2 +-
GUI/ba3d/{ba3d => }/model/geometry_inc.cpp | 2 +-
GUI/ba3d/{ba3d => }/model/geometry_inc.h | 2 +-
GUI/ba3d/{ba3d => }/model/layer.cpp | 2 +-
GUI/ba3d/{ba3d => }/model/layer.h | 2 +-
GUI/ba3d/{ba3d => }/model/model.cpp | 2 +-
GUI/ba3d/{ba3d => }/model/model.h | 2 +-
GUI/ba3d/{ba3d => }/model/object.cpp | 2 +-
GUI/ba3d/{ba3d => }/model/object.h | 2 +-
GUI/ba3d/{ba3d => }/model/particles.cpp | 2 +-
GUI/ba3d/{ba3d => }/model/particles.h | 2 +-
GUI/ba3d/{ba3d => }/shaders.qrc | 0
GUI/ba3d/{ba3d => }/shaders/fragment_shader.frag | 0
GUI/ba3d/{ba3d => }/shaders/vertex_shader.vert | 0
GUI/ba3d/{ba3d => }/view/buffer.cpp | 2 +-
GUI/ba3d/{ba3d => }/view/buffer.h | 2 +-
GUI/ba3d/{ba3d => }/view/camera.cpp | 2 +-
GUI/ba3d/{ba3d => }/view/camera.h | 2 +-
GUI/ba3d/{ba3d => }/view/canvas.cpp | 2 +-
GUI/ba3d/{ba3d => }/view/canvas.h | 2 +-
GUI/ba3d/{ba3d => }/view/program.cpp | 2 +-
GUI/ba3d/{ba3d => }/view/program.h | 2 +-
GUI/ba3d/{ba3d => }/widget.cpp | 2 +-
GUI/ba3d/{ba3d => }/widget.h | 2 +-
GUI/coregui/Views/RealSpaceWidgets/RealSpaceBuilder.h | 2 +-
40 files changed, 35 insertions(+), 36 deletions(-)
delete mode 100644 GUI/ba3d/.gitignore
rename GUI/ba3d/{ba3d => }/CMakeLists.txt (100%)
rename GUI/ba3d/{ba3d => }/def.cpp (98%)
rename GUI/ba3d/{ba3d => }/def.h (98%)
rename GUI/ba3d/{ba3d => }/model/geometry.cpp (99%)
rename GUI/ba3d/{ba3d => }/model/geometry.h (98%)
rename GUI/ba3d/{ba3d => }/model/geometry/box.cpp (95%)
rename GUI/ba3d/{ba3d => }/model/geometry/column.cpp (97%)
rename GUI/ba3d/{ba3d => }/model/geometry/cuboctahedron.cpp (96%)
rename GUI/ba3d/{ba3d => }/model/geometry/dodecahedron.cpp (97%)
rename GUI/ba3d/{ba3d => }/model/geometry/icosahedron.cpp (98%)
rename GUI/ba3d/{ba3d => }/model/geometry/plane.cpp (94%)
rename GUI/ba3d/{ba3d => }/model/geometry/ripple.cpp (98%)
rename GUI/ba3d/{ba3d => }/model/geometry/sphere.cpp (98%)
rename GUI/ba3d/{ba3d => }/model/geometry/truncbox.cpp (97%)
rename GUI/ba3d/{ba3d => }/model/geometry_inc.cpp (96%)
rename GUI/ba3d/{ba3d => }/model/geometry_inc.h (97%)
rename GUI/ba3d/{ba3d => }/model/layer.cpp (94%)
rename GUI/ba3d/{ba3d => }/model/layer.h (94%)
rename GUI/ba3d/{ba3d => }/model/model.cpp (99%)
rename GUI/ba3d/{ba3d => }/model/model.h (97%)
rename GUI/ba3d/{ba3d => }/model/object.cpp (98%)
rename GUI/ba3d/{ba3d => }/model/object.h (97%)
rename GUI/ba3d/{ba3d => }/model/particles.cpp (99%)
rename GUI/ba3d/{ba3d => }/model/particles.h (99%)
rename GUI/ba3d/{ba3d => }/shaders.qrc (100%)
rename GUI/ba3d/{ba3d => }/shaders/fragment_shader.frag (100%)
rename GUI/ba3d/{ba3d => }/shaders/vertex_shader.vert (100%)
rename GUI/ba3d/{ba3d => }/view/buffer.cpp (99%)
rename GUI/ba3d/{ba3d => }/view/buffer.h (96%)
rename GUI/ba3d/{ba3d => }/view/camera.cpp (98%)
rename GUI/ba3d/{ba3d => }/view/camera.h (97%)
rename GUI/ba3d/{ba3d => }/view/canvas.cpp (99%)
rename GUI/ba3d/{ba3d => }/view/canvas.h (98%)
rename GUI/ba3d/{ba3d => }/view/program.cpp (98%)
rename GUI/ba3d/{ba3d => }/view/program.h (96%)
rename GUI/ba3d/{ba3d => }/widget.cpp (97%)
rename GUI/ba3d/{ba3d => }/widget.h (96%)
diff --git a/GUI/CMakeLists.txt b/GUI/CMakeLists.txt
index 3be38fe0030..62655b408b3 100644
--- a/GUI/CMakeLists.txt
+++ b/GUI/CMakeLists.txt
@@ -8,7 +8,7 @@ set(CMAKE_AUTOMOC ON)
if(BORNAGAIN_OPENGL)
message(STATUS "Configuring BornAgain OpenGL")
- add_subdirectory(ba3d/ba3d)
+ add_subdirectory(ba3d)
endif()
add_subdirectory(coregui)
diff --git a/GUI/ba3d/.gitignore b/GUI/ba3d/.gitignore
deleted file mode 100644
index 01e00f3af81..00000000000
--- a/GUI/ba3d/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-CMakeLists.txt.user
diff --git a/GUI/ba3d/ba3d/CMakeLists.txt b/GUI/ba3d/CMakeLists.txt
similarity index 100%
rename from GUI/ba3d/ba3d/CMakeLists.txt
rename to GUI/ba3d/CMakeLists.txt
diff --git a/GUI/ba3d/ba3d/def.cpp b/GUI/ba3d/def.cpp
similarity index 98%
rename from GUI/ba3d/ba3d/def.cpp
rename to GUI/ba3d/def.cpp
index 980e11e8e50..a5f9866c74e 100644
--- a/GUI/ba3d/ba3d/def.cpp
+++ b/GUI/ba3d/def.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit scattering at grazing incidence
//
-//! @file GUI/ba3d/ba3d/def.cpp
+//! @file GUI/ba3d/def.cpp
//! @brief Definitions
//!
//! @homepage http://www.bornagainproject.org
diff --git a/GUI/ba3d/ba3d/def.h b/GUI/ba3d/def.h
similarity index 98%
rename from GUI/ba3d/ba3d/def.h
rename to GUI/ba3d/def.h
index effb332f8c0..a699b07ff65 100644
--- a/GUI/ba3d/ba3d/def.h
+++ b/GUI/ba3d/def.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit scattering at grazing incidence
//
-//! @file GUI/ba3d/ba3d/def.h
+//! @file GUI/ba3d/def.h
//! @brief Definitions
//!
//! @homepage http://www.bornagainproject.org
diff --git a/GUI/ba3d/ba3d/model/geometry.cpp b/GUI/ba3d/model/geometry.cpp
similarity index 99%
rename from GUI/ba3d/ba3d/model/geometry.cpp
rename to GUI/ba3d/model/geometry.cpp
index 5ccdbd348ce..0619e6876a1 100644
--- a/GUI/ba3d/ba3d/model/geometry.cpp
+++ b/GUI/ba3d/model/geometry.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit scattering at grazing incidence
//
-//! @file GUI/ba3d/ba3d/model/geometry.cpp
+//! @file GUI/ba3d/model/geometry.cpp
//! @brief Implements Geometry class
//!
//! @homepage http://www.bornagainproject.org
diff --git a/GUI/ba3d/ba3d/model/geometry.h b/GUI/ba3d/model/geometry.h
similarity index 98%
rename from GUI/ba3d/ba3d/model/geometry.h
rename to GUI/ba3d/model/geometry.h
index f95a426536b..302e86ae138 100644
--- a/GUI/ba3d/ba3d/model/geometry.h
+++ b/GUI/ba3d/model/geometry.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit scattering at grazing incidence
//
-//! @file GUI/ba3d/ba3d/model/geometry.h
+//! @file GUI/ba3d/model/geometry.h
//! @brief Defines Geometry class
//!
//! @homepage http://www.bornagainproject.org
diff --git a/GUI/ba3d/ba3d/model/geometry/box.cpp b/GUI/ba3d/model/geometry/box.cpp
similarity index 95%
rename from GUI/ba3d/ba3d/model/geometry/box.cpp
rename to GUI/ba3d/model/geometry/box.cpp
index 84ae36cc081..915dfc99b12 100644
--- a/GUI/ba3d/ba3d/model/geometry/box.cpp
+++ b/GUI/ba3d/model/geometry/box.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit scattering at grazing incidence
//
-//! @file GUI/ba3d/ba3d/model/geometry/box.cpp
+//! @file GUI/ba3d/model/geometry/box.cpp
//! @brief Implements utility functions in ba3d namespace
//!
//! @homepage http://www.bornagainproject.org
diff --git a/GUI/ba3d/ba3d/model/geometry/column.cpp b/GUI/ba3d/model/geometry/column.cpp
similarity index 97%
rename from GUI/ba3d/ba3d/model/geometry/column.cpp
rename to GUI/ba3d/model/geometry/column.cpp
index d719c025241..549dd6d229d 100644
--- a/GUI/ba3d/ba3d/model/geometry/column.cpp
+++ b/GUI/ba3d/model/geometry/column.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit scattering at grazing incidence
//
-//! @file GUI/ba3d/ba3d/model/geometry/column.cpp
+//! @file GUI/ba3d/model/geometry/column.cpp
//! @brief Implements utility functions in ba3d namespace
//!
//! @homepage http://www.bornagainproject.org
diff --git a/GUI/ba3d/ba3d/model/geometry/cuboctahedron.cpp b/GUI/ba3d/model/geometry/cuboctahedron.cpp
similarity index 96%
rename from GUI/ba3d/ba3d/model/geometry/cuboctahedron.cpp
rename to GUI/ba3d/model/geometry/cuboctahedron.cpp
index fb7be4e1c9b..1885597c32c 100644
--- a/GUI/ba3d/ba3d/model/geometry/cuboctahedron.cpp
+++ b/GUI/ba3d/model/geometry/cuboctahedron.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit scattering at grazing incidence
//
-//! @file GUI/ba3d/ba3d/model/geometry/cuboctahedron.cpp
+//! @file GUI/ba3d/model/geometry/cuboctahedron.cpp
//! @brief Implements utility functions in ba3d namespace
//!
//! @homepage http://www.bornagainproject.org
diff --git a/GUI/ba3d/ba3d/model/geometry/dodecahedron.cpp b/GUI/ba3d/model/geometry/dodecahedron.cpp
similarity index 97%
rename from GUI/ba3d/ba3d/model/geometry/dodecahedron.cpp
rename to GUI/ba3d/model/geometry/dodecahedron.cpp
index 0ee8b4ec7bb..3a5fd6c2619 100644
--- a/GUI/ba3d/ba3d/model/geometry/dodecahedron.cpp
+++ b/GUI/ba3d/model/geometry/dodecahedron.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit scattering at grazing incidence
//
-//! @file GUI/ba3d/ba3d/model/geometry/dodecahedron.cpp
+//! @file GUI/ba3d/model/geometry/dodecahedron.cpp
//! @brief Implements utility functions in ba3d namespace
//!
//! @homepage http://www.bornagainproject.org
diff --git a/GUI/ba3d/ba3d/model/geometry/icosahedron.cpp b/GUI/ba3d/model/geometry/icosahedron.cpp
similarity index 98%
rename from GUI/ba3d/ba3d/model/geometry/icosahedron.cpp
rename to GUI/ba3d/model/geometry/icosahedron.cpp
index bfac8f0641d..17c5212c55a 100644
--- a/GUI/ba3d/ba3d/model/geometry/icosahedron.cpp
+++ b/GUI/ba3d/model/geometry/icosahedron.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit scattering at grazing incidence
//
-//! @file GUI/ba3d/ba3d/model/geometry/icosahedron.cpp
+//! @file GUI/ba3d/model/geometry/icosahedron.cpp
//! @brief Implements utility functions in ba3d namespace
//!
//! @homepage http://www.bornagainproject.org
diff --git a/GUI/ba3d/ba3d/model/geometry/plane.cpp b/GUI/ba3d/model/geometry/plane.cpp
similarity index 94%
rename from GUI/ba3d/ba3d/model/geometry/plane.cpp
rename to GUI/ba3d/model/geometry/plane.cpp
index 99fd03c7d40..7f75c0c01f0 100644
--- a/GUI/ba3d/ba3d/model/geometry/plane.cpp
+++ b/GUI/ba3d/model/geometry/plane.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit scattering at grazing incidence
//
-//! @file GUI/ba3d/ba3d/model/geometry/plane.cpp
+//! @file GUI/ba3d/model/geometry/plane.cpp
//! @brief Implements utility functions in ba3d namespace
//!
//! @homepage http://www.bornagainproject.org
diff --git a/GUI/ba3d/ba3d/model/geometry/ripple.cpp b/GUI/ba3d/model/geometry/ripple.cpp
similarity index 98%
rename from GUI/ba3d/ba3d/model/geometry/ripple.cpp
rename to GUI/ba3d/model/geometry/ripple.cpp
index 3e0ea3db66e..c9606198049 100644
--- a/GUI/ba3d/ba3d/model/geometry/ripple.cpp
+++ b/GUI/ba3d/model/geometry/ripple.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit scattering at grazing incidence
//
-//! @file GUI/ba3d/ba3d/model/geometry/ripple.cpp
+//! @file GUI/ba3d/model/geometry/ripple.cpp
//! @brief Implements utility functions in ba3d namespace
//!
//! @homepage http://www.bornagainproject.org
diff --git a/GUI/ba3d/ba3d/model/geometry/sphere.cpp b/GUI/ba3d/model/geometry/sphere.cpp
similarity index 98%
rename from GUI/ba3d/ba3d/model/geometry/sphere.cpp
rename to GUI/ba3d/model/geometry/sphere.cpp
index 4f1836ceb57..7cfc77d3377 100644
--- a/GUI/ba3d/ba3d/model/geometry/sphere.cpp
+++ b/GUI/ba3d/model/geometry/sphere.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit scattering at grazing incidence
//
-//! @file GUI/ba3d/ba3d/model/geometry/sphere.cpp
+//! @file GUI/ba3d/model/geometry/sphere.cpp
//! @brief Implements utility functions in ba3d namespace
//!
//! @homepage http://www.bornagainproject.org
diff --git a/GUI/ba3d/ba3d/model/geometry/truncbox.cpp b/GUI/ba3d/model/geometry/truncbox.cpp
similarity index 97%
rename from GUI/ba3d/ba3d/model/geometry/truncbox.cpp
rename to GUI/ba3d/model/geometry/truncbox.cpp
index efb2646ef51..8a4a4a3661d 100644
--- a/GUI/ba3d/ba3d/model/geometry/truncbox.cpp
+++ b/GUI/ba3d/model/geometry/truncbox.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit scattering at grazing incidence
//
-//! @file GUI/ba3d/ba3d/model/geometry/truncbox.cpp
+//! @file GUI/ba3d/model/geometry/truncbox.cpp
//! @brief Implements utility functions in ba3d namespace
//!
//! @homepage http://www.bornagainproject.org
diff --git a/GUI/ba3d/ba3d/model/geometry_inc.cpp b/GUI/ba3d/model/geometry_inc.cpp
similarity index 96%
rename from GUI/ba3d/ba3d/model/geometry_inc.cpp
rename to GUI/ba3d/model/geometry_inc.cpp
index acbdd3c3428..0ecfa185ee6 100644
--- a/GUI/ba3d/ba3d/model/geometry_inc.cpp
+++ b/GUI/ba3d/model/geometry_inc.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit scattering at grazing incidence
//
-//! @file GUI/ba3d/ba3d/model/geometry_inc.cpp
+//! @file GUI/ba3d/model/geometry_inc.cpp
//! @brief Implements geometry namespace
//!
//! @homepage http://www.bornagainproject.org
diff --git a/GUI/ba3d/ba3d/model/geometry_inc.h b/GUI/ba3d/model/geometry_inc.h
similarity index 97%
rename from GUI/ba3d/ba3d/model/geometry_inc.h
rename to GUI/ba3d/model/geometry_inc.h
index b6179e3391c..0b317a60e49 100644
--- a/GUI/ba3d/ba3d/model/geometry_inc.h
+++ b/GUI/ba3d/model/geometry_inc.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit scattering at grazing incidence
//
-//! @file GUI/ba3d/ba3d/model/geometry_inc.h
+//! @file GUI/ba3d/model/geometry_inc.h
//! @brief Defines geometry namespace
//!
//! @homepage http://www.bornagainproject.org
diff --git a/GUI/ba3d/ba3d/model/layer.cpp b/GUI/ba3d/model/layer.cpp
similarity index 94%
rename from GUI/ba3d/ba3d/model/layer.cpp
rename to GUI/ba3d/model/layer.cpp
index 7bd9be223f6..c752d5a07f3 100644
--- a/GUI/ba3d/ba3d/model/layer.cpp
+++ b/GUI/ba3d/model/layer.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit scattering at grazing incidence
//
-//! @file GUI/ba3d/ba3d/model/layer.cpp
+//! @file GUI/ba3d/model/layer.cpp
//! @brief Implements Layer class
//!
//! @homepage http://www.bornagainproject.org
diff --git a/GUI/ba3d/ba3d/model/layer.h b/GUI/ba3d/model/layer.h
similarity index 94%
rename from GUI/ba3d/ba3d/model/layer.h
rename to GUI/ba3d/model/layer.h
index 2724f64e10f..a13b2e05afa 100644
--- a/GUI/ba3d/ba3d/model/layer.h
+++ b/GUI/ba3d/model/layer.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit scattering at grazing incidence
//
-//! @file GUI/ba3d/ba3d/model/layer.h
+//! @file GUI/ba3d/model/layer.h
//! @brief Defines Layer class
//!
//! @homepage http://www.bornagainproject.org
diff --git a/GUI/ba3d/ba3d/model/model.cpp b/GUI/ba3d/model/model.cpp
similarity index 99%
rename from GUI/ba3d/ba3d/model/model.cpp
rename to GUI/ba3d/model/model.cpp
index e12cf8dff35..1b77c9cdca3 100644
--- a/GUI/ba3d/ba3d/model/model.cpp
+++ b/GUI/ba3d/model/model.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit scattering at grazing incidence
//
-//! @file GUI/ba3d/ba3d/model/model.cpp
+//! @file GUI/ba3d/model/model.cpp
//! @brief Implements Model class
//!
//! @homepage http://www.bornagainproject.org
diff --git a/GUI/ba3d/ba3d/model/model.h b/GUI/ba3d/model/model.h
similarity index 97%
rename from GUI/ba3d/ba3d/model/model.h
rename to GUI/ba3d/model/model.h
index 258f55fb100..2e80fe3b037 100644
--- a/GUI/ba3d/ba3d/model/model.h
+++ b/GUI/ba3d/model/model.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit scattering at grazing incidence
//
-//! @file GUI/ba3d/ba3d/model/model.h
+//! @file GUI/ba3d/model/model.h
//! @brief Defines Model class
//!
//! @homepage http://www.bornagainproject.org
diff --git a/GUI/ba3d/ba3d/model/object.cpp b/GUI/ba3d/model/object.cpp
similarity index 98%
rename from GUI/ba3d/ba3d/model/object.cpp
rename to GUI/ba3d/model/object.cpp
index 146594781f9..f0807d0d66f 100644
--- a/GUI/ba3d/ba3d/model/object.cpp
+++ b/GUI/ba3d/model/object.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit scattering at grazing incidence
//
-//! @file GUI/ba3d/ba3d/model/object.cpp
+//! @file GUI/ba3d/model/object.cpp
//! @brief Implements Object class
//!
//! @homepage http://www.bornagainproject.org
diff --git a/GUI/ba3d/ba3d/model/object.h b/GUI/ba3d/model/object.h
similarity index 97%
rename from GUI/ba3d/ba3d/model/object.h
rename to GUI/ba3d/model/object.h
index 93c4de71538..e0354050de1 100644
--- a/GUI/ba3d/ba3d/model/object.h
+++ b/GUI/ba3d/model/object.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit scattering at grazing incidence
//
-//! @file GUI/ba3d/ba3d/model/object.h
+//! @file GUI/ba3d/model/object.h
//! @brief Defines Object class
//!
//! @homepage http://www.bornagainproject.org
diff --git a/GUI/ba3d/ba3d/model/particles.cpp b/GUI/ba3d/model/particles.cpp
similarity index 99%
rename from GUI/ba3d/ba3d/model/particles.cpp
rename to GUI/ba3d/model/particles.cpp
index f5fecaed07c..5a17364059f 100644
--- a/GUI/ba3d/ba3d/model/particles.cpp
+++ b/GUI/ba3d/model/particles.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit scattering at grazing incidence
//
-//! @file GUI/ba3d/ba3d/model/particles.cpp
+//! @file GUI/ba3d/model/particles.cpp
//! @brief Implements Particle class
//!
//! @homepage http://www.bornagainproject.org
diff --git a/GUI/ba3d/ba3d/model/particles.h b/GUI/ba3d/model/particles.h
similarity index 99%
rename from GUI/ba3d/ba3d/model/particles.h
rename to GUI/ba3d/model/particles.h
index ffc5892002d..228573124aa 100644
--- a/GUI/ba3d/ba3d/model/particles.h
+++ b/GUI/ba3d/model/particles.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit scattering at grazing incidence
//
-//! @file GUI/ba3d/ba3d/model/particles.h
+//! @file GUI/ba3d/model/particles.h
//! @brief Defines Particle class
//!
//! @homepage http://www.bornagainproject.org
diff --git a/GUI/ba3d/ba3d/shaders.qrc b/GUI/ba3d/shaders.qrc
similarity index 100%
rename from GUI/ba3d/ba3d/shaders.qrc
rename to GUI/ba3d/shaders.qrc
diff --git a/GUI/ba3d/ba3d/shaders/fragment_shader.frag b/GUI/ba3d/shaders/fragment_shader.frag
similarity index 100%
rename from GUI/ba3d/ba3d/shaders/fragment_shader.frag
rename to GUI/ba3d/shaders/fragment_shader.frag
diff --git a/GUI/ba3d/ba3d/shaders/vertex_shader.vert b/GUI/ba3d/shaders/vertex_shader.vert
similarity index 100%
rename from GUI/ba3d/ba3d/shaders/vertex_shader.vert
rename to GUI/ba3d/shaders/vertex_shader.vert
diff --git a/GUI/ba3d/ba3d/view/buffer.cpp b/GUI/ba3d/view/buffer.cpp
similarity index 99%
rename from GUI/ba3d/ba3d/view/buffer.cpp
rename to GUI/ba3d/view/buffer.cpp
index d1b11ea4d10..6c176338c79 100644
--- a/GUI/ba3d/ba3d/view/buffer.cpp
+++ b/GUI/ba3d/view/buffer.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit scattering at grazing incidence
//
-//! @file GUI/ba3d/ba3d/view/buffer.cpp
+//! @file GUI/ba3d/view/buffer.cpp
//! @brief Implements Buffer class
//!
//! @homepage http://www.bornagainproject.org
diff --git a/GUI/ba3d/ba3d/view/buffer.h b/GUI/ba3d/view/buffer.h
similarity index 96%
rename from GUI/ba3d/ba3d/view/buffer.h
rename to GUI/ba3d/view/buffer.h
index 225cec7f9c5..577425a6705 100644
--- a/GUI/ba3d/ba3d/view/buffer.h
+++ b/GUI/ba3d/view/buffer.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit scattering at grazing incidence
//
-//! @file GUI/ba3d/ba3d/view/buffer.h
+//! @file GUI/ba3d/view/buffer.h
//! @brief Defines Buffer class
//!
//! @homepage http://www.bornagainproject.org
diff --git a/GUI/ba3d/ba3d/view/camera.cpp b/GUI/ba3d/view/camera.cpp
similarity index 98%
rename from GUI/ba3d/ba3d/view/camera.cpp
rename to GUI/ba3d/view/camera.cpp
index e7a7a10b52a..7f14cf0d1e8 100644
--- a/GUI/ba3d/ba3d/view/camera.cpp
+++ b/GUI/ba3d/view/camera.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit scattering at grazing incidence
//
-//! @file GUI/ba3d/ba3d/view/camera.cpp
+//! @file GUI/ba3d/view/camera.cpp
//! @brief Implements Camera class
//!
//! @homepage http://www.bornagainproject.org
diff --git a/GUI/ba3d/ba3d/view/camera.h b/GUI/ba3d/view/camera.h
similarity index 97%
rename from GUI/ba3d/ba3d/view/camera.h
rename to GUI/ba3d/view/camera.h
index 2d8d0e970d4..a9885a279f0 100644
--- a/GUI/ba3d/ba3d/view/camera.h
+++ b/GUI/ba3d/view/camera.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit scattering at grazing incidence
//
-//! @file GUI/ba3d/ba3d/view/camera.h
+//! @file GUI/ba3d/view/camera.h
//! @brief Defines Camera class
//!
//! @homepage http://www.bornagainproject.org
diff --git a/GUI/ba3d/ba3d/view/canvas.cpp b/GUI/ba3d/view/canvas.cpp
similarity index 99%
rename from GUI/ba3d/ba3d/view/canvas.cpp
rename to GUI/ba3d/view/canvas.cpp
index f336115662b..af38ec89f86 100644
--- a/GUI/ba3d/ba3d/view/canvas.cpp
+++ b/GUI/ba3d/view/canvas.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit scattering at grazing incidence
//
-//! @file GUI/ba3d/ba3d/view/canvas.cpp
+//! @file GUI/ba3d/view/canvas.cpp
//! @brief Implements Canvas class
//!
//! @homepage http://www.bornagainproject.org
diff --git a/GUI/ba3d/ba3d/view/canvas.h b/GUI/ba3d/view/canvas.h
similarity index 98%
rename from GUI/ba3d/ba3d/view/canvas.h
rename to GUI/ba3d/view/canvas.h
index 76a8acab599..be6df8a69a7 100644
--- a/GUI/ba3d/ba3d/view/canvas.h
+++ b/GUI/ba3d/view/canvas.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit scattering at grazing incidence
//
-//! @file GUI/ba3d/ba3d/view/canvas.h
+//! @file GUI/ba3d/view/canvas.h
//! @brief Defines Canvas class
//!
//! @homepage http://www.bornagainproject.org
diff --git a/GUI/ba3d/ba3d/view/program.cpp b/GUI/ba3d/view/program.cpp
similarity index 98%
rename from GUI/ba3d/ba3d/view/program.cpp
rename to GUI/ba3d/view/program.cpp
index 55d85d5fa5f..c26c307eb15 100644
--- a/GUI/ba3d/ba3d/view/program.cpp
+++ b/GUI/ba3d/view/program.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit scattering at grazing incidence
//
-//! @file GUI/ba3d/ba3d/view/program.cpp
+//! @file GUI/ba3d/view/program.cpp
//! @brief Implements Program class
//!
//! @homepage http://www.bornagainproject.org
diff --git a/GUI/ba3d/ba3d/view/program.h b/GUI/ba3d/view/program.h
similarity index 96%
rename from GUI/ba3d/ba3d/view/program.h
rename to GUI/ba3d/view/program.h
index 53f1cfeea09..b5f90891e62 100644
--- a/GUI/ba3d/ba3d/view/program.h
+++ b/GUI/ba3d/view/program.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit scattering at grazing incidence
//
-//! @file GUI/ba3d/ba3d/view/program.h
+//! @file GUI/ba3d/view/program.h
//! @brief Defines Program class
//!
//! @homepage http://www.bornagainproject.org
diff --git a/GUI/ba3d/ba3d/widget.cpp b/GUI/ba3d/widget.cpp
similarity index 97%
rename from GUI/ba3d/ba3d/widget.cpp
rename to GUI/ba3d/widget.cpp
index 68abe50ff55..63affacb95b 100644
--- a/GUI/ba3d/ba3d/widget.cpp
+++ b/GUI/ba3d/widget.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit scattering at grazing incidence
//
-//! @file GUI/ba3d/ba3d/widget.cpp
+//! @file GUI/ba3d/widget.cpp
//! @brief Implement Widget class
//!
//! @homepage http://www.bornagainproject.org
diff --git a/GUI/ba3d/ba3d/widget.h b/GUI/ba3d/widget.h
similarity index 96%
rename from GUI/ba3d/ba3d/widget.h
rename to GUI/ba3d/widget.h
index 2471d25f7ce..343d61a4691 100644
--- a/GUI/ba3d/ba3d/widget.h
+++ b/GUI/ba3d/widget.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit scattering at grazing incidence
//
-//! @file GUI/ba3d/ba3d/widget.h
+//! @file GUI/ba3d/widget.h
//! @brief Defines Widget class
//!
//! @homepage http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceBuilder.h b/GUI/coregui/Views/RealSpaceWidgets/RealSpaceBuilder.h
index 9f4f2b8a3b6..f64b3a76c51 100644
--- a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceBuilder.h
+++ b/GUI/coregui/Views/RealSpaceWidgets/RealSpaceBuilder.h
@@ -15,7 +15,7 @@
#ifndef REALSPACEBUILDER_H
#define REALSPACEBUILDER_H
-#include "../../ba3d/ba3d/view/camera.h"
+#include "../../ba3d/view/camera.h"
#include "WinDllMacros.h"
#include <QVector3D>
#include <QWidget>
--
GitLab