refactor: 💥 header files with the entire system definitions moved up …

…in the directory tree
mpusz · Apr 25, 2024 · 8ea346b · 8ea346b
1 parent dbc2259
commit 8ea346b
Show file tree

Hide file tree

Showing 62 changed files with 134 additions and 134 deletions.
diff --git a/docs/getting_started/look_and_feel.md b/docs/getting_started/look_and_feel.md
@@ -32,7 +32,7 @@ Here is a small example of operations possible on scalar quantities:
 === "Header files"
 
     ```cpp
-    #include <mp-units/systems/si/si.h>
+    #include <mp-units/systems/si.h>
 
     using namespace mp_units;
     using namespace mp_units::si::unit_symbols;
@@ -111,9 +111,9 @@ performed without sacrificing accuracy. Please see the below example for a quick
     ```cpp
     #include <mp-units/format.h>
     #include <mp-units/ostream.h>
-    #include <mp-units/systems/international/international.h>
-    #include <mp-units/systems/isq/isq.h>
-    #include <mp-units/systems/si/si.h>
+    #include <mp-units/systems/international.h>
+    #include <mp-units/systems/isq.h>
+    #include <mp-units/systems/si.h>
     #include <format>
     #include <iomanip>
     #include <iostream>

diff --git a/docs/getting_started/quick_start.md b/docs/getting_started/quick_start.md
@@ -33,7 +33,7 @@ a number with a predefined unit:
 === "Header files"
 
     ```cpp
-    #include <mp-units/systems/si/si.h>
+    #include <mp-units/systems/si.h>
 
     using namespace mp_units;
 
@@ -59,7 +59,7 @@ a number with a predefined unit:
     === "Header files"
 
         ```cpp
-        #include <mp-units/systems/si/si.h>
+        #include <mp-units/systems/si.h>
 
         using namespace mp_units;
 
@@ -83,7 +83,7 @@ The same can be obtained using optional unit symbols:
 === "Header files"
 
     ```cpp
-    #include <mp-units/systems/si/si.h>
+    #include <mp-units/systems/si.h>
 
     using namespace mp_units;
     using namespace mp_units::si::unit_symbols;
@@ -193,7 +193,7 @@ Quantities of the same kind can be added, subtracted, and compared to each other
 === "Header files"
 
     ```cpp
-    #include <mp-units/systems/si/si.h>
+    #include <mp-units/systems/si.h>
 
     using namespace mp_units;
     using namespace mp_units::si::unit_symbols;
@@ -249,8 +249,8 @@ This introduces an additional type-safety.
 
     ```cpp
     #include <mp-units/format.h>
-    #include <mp-units/systems/si/si.h>
-    #include <mp-units/systems/usc/usc.h>
+    #include <mp-units/systems/si.h>
+    #include <mp-units/systems/usc.h>
     #include <print>
 
     int main()

diff --git a/docs/index.md b/docs/index.md
@@ -47,8 +47,8 @@ The library source code is hosted on [GitHub](https://github.com/mpusz/mp-units)
 
     ```cpp
     #include <mp-units/format.h>
-    #include <mp-units/systems/si/si.h>
-    #include <mp-units/systems/usc/usc.h>
+    #include <mp-units/systems/si.h>
+    #include <mp-units/systems/usc.h>
     #include <print>
 
     using namespace mp_units;

diff --git a/docs/users_guide/framework_basics/simple_and_typed_quantities.md b/docs/users_guide/framework_basics/simple_and_typed_quantities.md
@@ -84,7 +84,7 @@ Here is a simple example showing how to deal with such quantities:
 
     ```cpp
     #include <mp-units/format.h>
-    #include <mp-units/systems/si/si.h>
+    #include <mp-units/systems/si.h>
     #include <print>
 
     using namespace mp_units;
@@ -203,8 +203,8 @@ The previous example can be re-typed using typed quantities in the following way
 
     ```cpp
     #include <mp-units/format.h>
-    #include <mp-units/systems/isq/isq.h>
-    #include <mp-units/systems/si/si.h>
+    #include <mp-units/systems/isq.h>
+    #include <mp-units/systems/si.h>
     #include <print>
 
     using namespace mp_units;
@@ -373,7 +373,7 @@ Let's see another example:
 
         ```cpp hl_lines="42"
         #include <mp-units/math.h>
-        #include <mp-units/systems/si/si.h>
+        #include <mp-units/systems/si.h>
         #include <numbers>
 
         using namespace mp_units;
@@ -422,8 +422,8 @@ Let's see another example:
 
         ```cpp hl_lines="53 54 55"
         #include <mp-units/math.h>
-        #include <mp-units/systems/isq/isq.h>
-        #include <mp-units/systems/si/si.h>
+        #include <mp-units/systems/isq.h>
+        #include <mp-units/systems/si.h>
         #include <numbers>
 
         using namespace mp_units;

diff --git a/docs/users_guide/use_cases/wide_compatibility.md b/docs/users_guide/use_cases/wide_compatibility.md
@@ -57,9 +57,9 @@ your code using **mp-units**:
     ```cpp
     #include <mp-units/format.h>
     #include <mp-units/ostream.h>
-    #include <mp-units/systems/international/international.h>
-    #include <mp-units/systems/isq/isq.h>
-    #include <mp-units/systems/si/si.h>
+    #include <mp-units/systems/international.h>
+    #include <mp-units/systems/isq.h>
+    #include <mp-units/systems/si.h>
     #include <format>
     #include <iostream>
 
@@ -77,9 +77,9 @@ your code using **mp-units**:
     ```cpp
     #include <mp-units/format.h>
     #include <mp-units/ostream.h>
-    #include <mp-units/systems/international/international.h>
-    #include <mp-units/systems/isq/isq.h>
-    #include <mp-units/systems/si/si.h>
+    #include <mp-units/systems/international.h>
+    #include <mp-units/systems/isq.h>
+    #include <mp-units/systems/si.h>
     #include <fmt/format.h>
     #include <iostream>
 
@@ -102,9 +102,9 @@ your code using **mp-units**:
     #else
     #include <mp-units/format.h>
     #include <mp-units/ostream.h>
-    #include <mp-units/systems/international/international.h>
-    #include <mp-units/systems/isq/isq.h>
-    #include <mp-units/systems/si/si.h>
+    #include <mp-units/systems/international.h>
+    #include <mp-units/systems/isq.h>
+    #include <mp-units/systems/si.h>
     #endif
 
     // ...

diff --git a/example/avg_speed.cpp b/example/avg_speed.cpp
@@ -31,10 +31,10 @@
 import mp_units;
 #else
 #include <mp-units/ostream.h>
-#include <mp-units/systems/cgs/cgs.h>
-#include <mp-units/systems/international/international.h>
-#include <mp-units/systems/isq/isq.h>
-#include <mp-units/systems/si/si.h>
+#include <mp-units/systems/cgs.h>
+#include <mp-units/systems/international.h>
+#include <mp-units/systems/isq.h>
+#include <mp-units/systems/si.h>
 #endif
 
 namespace {

diff --git a/example/capacitor_time_curve.cpp b/example/capacitor_time_curve.cpp
@@ -27,7 +27,7 @@ import mp_units;
 #include <mp-units/math.h>
 #include <mp-units/ostream.h>
 #include <mp-units/systems/isq/electromagnetism.h>
-#include <mp-units/systems/si/si.h>
+#include <mp-units/systems/si.h>
 #endif
 
 int main()

diff --git a/example/clcpp_response.cpp b/example/clcpp_response.cpp
@@ -22,13 +22,13 @@ import mp_units;
 #else
 #include <mp-units/format.h>
 #include <mp-units/ostream.h>
-#include <mp-units/systems/iau/iau.h>
-#include <mp-units/systems/imperial/imperial.h>
-#include <mp-units/systems/international/international.h>
+#include <mp-units/systems/iau.h>
+#include <mp-units/systems/imperial.h>
+#include <mp-units/systems/international.h>
 #include <mp-units/systems/isq/space_and_time.h>
-#include <mp-units/systems/si/si.h>
-#include <mp-units/systems/typographic/typographic.h>
-#include <mp-units/systems/usc/usc.h>
+#include <mp-units/systems/si.h>
+#include <mp-units/systems/typographic.h>
+#include <mp-units/systems/usc.h>
 #endif
 
 namespace {

diff --git a/example/conversion_factor.cpp b/example/conversion_factor.cpp
@@ -23,7 +23,7 @@
 import mp_units;
 #else
 #include <mp-units/format.h>
-#include <mp-units/systems/si/si.h>
+#include <mp-units/systems/si.h>
 #endif
 
 /*

diff --git a/example/foot_pound_second.cpp b/example/foot_pound_second.cpp
@@ -27,8 +27,8 @@
 import mp_units;
 #else
 #include <mp-units/format.h>
-#include <mp-units/systems/imperial/imperial.h>
-#include <mp-units/systems/international/international.h>
+#include <mp-units/systems/imperial.h>
+#include <mp-units/systems/international.h>
 #include <mp-units/systems/isq/mechanics.h>
 #include <mp-units/systems/isq/space_and_time.h>
 #include <mp-units/systems/si/unit_symbols.h>

diff --git a/example/glide_computer.cpp b/example/glide_computer.cpp
@@ -33,8 +33,8 @@
 import mp_units;
 #else
 #include <mp-units/math.h>
-#include <mp-units/systems/international/international.h>
-#include <mp-units/systems/si/si.h>
+#include <mp-units/systems/international.h>
+#include <mp-units/systems/si.h>
 #endif
 
 namespace {

diff --git a/example/hello_units.cpp b/example/hello_units.cpp
@@ -33,9 +33,9 @@ import mp_units;
 #else
 #include <mp-units/format.h>
 #include <mp-units/ostream.h>
-#include <mp-units/systems/international/international.h>
-#include <mp-units/systems/isq/isq.h>
-#include <mp-units/systems/si/si.h>
+#include <mp-units/systems/international.h>
+#include <mp-units/systems/isq.h>
+#include <mp-units/systems/si.h>
 #endif
 
 using namespace mp_units;

diff --git a/example/include/geographic.h b/example/include/geographic.h
@@ -34,7 +34,7 @@ import mp_units;
 #include <mp-units/format.h>
 #include <mp-units/framework.h>
 #include <mp-units/systems/isq/space_and_time.h>
-#include <mp-units/systems/si/si.h>
+#include <mp-units/systems/si.h>
 #endif
 
 namespace geographic {

diff --git a/example/measurement.cpp b/example/measurement.cpp
@@ -34,7 +34,7 @@ import mp_units;
 #include <mp-units/framework.h>
 #include <mp-units/ostream.h>
 #include <mp-units/systems/isq/space_and_time.h>
-#include <mp-units/systems/si/si.h>
+#include <mp-units/systems/si.h>
 #endif
 
 namespace {

diff --git a/example/si_constants.cpp b/example/si_constants.cpp
@@ -31,7 +31,7 @@
 import mp_units;
 #else
 #include <mp-units/format.h>
-#include <mp-units/systems/si/si.h>
+#include <mp-units/systems/si.h>
 #endif
 
 template<class T>

diff --git a/example/spectroscopy_units.cpp b/example/spectroscopy_units.cpp
@@ -27,8 +27,8 @@
 import mp_units;
 #else
 #include <mp-units/format.h>
-#include <mp-units/systems/isq/isq.h>
-#include <mp-units/systems/si/si.h>
+#include <mp-units/systems/isq.h>
+#include <mp-units/systems/si.h>
 #endif
 
 // This example implements a table of units provided in the following article

diff --git a/example/storage_tank.cpp b/example/storage_tank.cpp
@@ -31,8 +31,8 @@ import mp_units;
 #else
 #include <mp-units/format.h>
 #include <mp-units/math.h>
-#include <mp-units/systems/isq/isq.h>
-#include <mp-units/systems/si/si.h>
+#include <mp-units/systems/isq.h>
+#include <mp-units/systems/si.h>
 #endif
 
 // allows standard gravity (acceleration) and weight (force) to be expressed with scalar representation

diff --git a/example/strong_angular_quantities.cpp b/example/strong_angular_quantities.cpp
@@ -25,8 +25,8 @@
 import mp_units;
 #else
 #include <mp-units/ostream.h>
-#include <mp-units/systems/isq_angle/isq_angle.h>
-#include <mp-units/systems/si/si.h>
+#include <mp-units/systems/isq_angle.h>
+#include <mp-units/systems/si.h>
 #endif
 
 template<class T>

diff --git a/example/total_energy.cpp b/example/total_energy.cpp
@@ -29,8 +29,8 @@ import mp_units;
 #include <mp-units/ostream.h>
 #include <mp-units/systems/isq/mechanics.h>
 #include <mp-units/systems/isq/space_and_time.h>
-#include <mp-units/systems/natural/natural.h>
-#include <mp-units/systems/si/si.h>
+#include <mp-units/systems/natural.h>
+#include <mp-units/systems/si.h>
 #endif
 
 template<class T>

diff --git a/example/unmanned_aerial_vehicle.cpp b/example/unmanned_aerial_vehicle.cpp
@@ -29,9 +29,9 @@ import mp_units;
 #else
 #include <mp-units/framework/quantity_point.h>
 #include <mp-units/ostream.h>
-#include <mp-units/systems/international/international.h>
+#include <mp-units/systems/international.h>
 #include <mp-units/systems/isq/space_and_time.h>
-#include <mp-units/systems/si/unit_symbols.h>
+#include <mp-units/systems/si.h>
 #endif
 
 using namespace mp_units;

diff --git a/src/systems/CMakeLists.txt b/src/systems/CMakeLists.txt
@@ -25,38 +25,38 @@ cmake_minimum_required(VERSION 3.23)
 add_mp_units_module(
     systems mp-units-systems
     DEPENDENCIES mp-units::core
-    HEADERS include/mp-units/systems/angular/angular.h
-            include/mp-units/systems/angular/math.h
+    HEADERS include/mp-units/systems/angular/math.h
             include/mp-units/systems/angular/units.h
-            include/mp-units/systems/cgs/cgs.h
-            include/mp-units/systems/hep/hep.h
-            include/mp-units/systems/iau/iau.h
             include/mp-units/systems/iec80000/binary_prefixes.h
-            include/mp-units/systems/iec80000/iec80000.h
             include/mp-units/systems/iec80000/quantities.h
             include/mp-units/systems/iec80000/unit_symbols.h
             include/mp-units/systems/iec80000/units.h
-            include/mp-units/systems/imperial/imperial.h
-            include/mp-units/systems/international/international.h
             include/mp-units/systems/isq/atomic_and_nuclear_physics.h
             include/mp-units/systems/isq/base_quantities.h
             include/mp-units/systems/isq/electromagnetism.h
-            include/mp-units/systems/isq/isq.h
             include/mp-units/systems/isq/light_and_radiation.h
             include/mp-units/systems/isq/mechanics.h
             include/mp-units/systems/isq/si_quantities.h
             include/mp-units/systems/isq/space_and_time.h
             include/mp-units/systems/isq/thermodynamics.h
-            include/mp-units/systems/isq_angle/isq_angle.h
-            include/mp-units/systems/natural/natural.h
             include/mp-units/systems/si/chrono.h
             include/mp-units/systems/si/constants.h
             include/mp-units/systems/si/math.h
             include/mp-units/systems/si/prefixes.h
-            include/mp-units/systems/si/si.h
             include/mp-units/systems/si/unit_symbols.h
             include/mp-units/systems/si/units.h
-            include/mp-units/systems/typographic/typographic.h
-            include/mp-units/systems/usc/usc.h
+            include/mp-units/systems/angular.h
+            include/mp-units/systems/cgs.h
+            include/mp-units/systems/hep.h
+            include/mp-units/systems/iau.h
+            include/mp-units/systems/iec80000.h
+            include/mp-units/systems/imperial.h
+            include/mp-units/systems/international.h
+            include/mp-units/systems/isq.h
+            include/mp-units/systems/isq_angle.h
+            include/mp-units/systems/natural.h
+            include/mp-units/systems/si.h
+            include/mp-units/systems/typographic.h
+            include/mp-units/systems/usc.h
     MODULE_INTERFACE_UNIT mp-units-systems.cpp
 )
diff --git a/...nclude/mp-units/systems/angular/angular.h → ...ystems/include/mp-units/systems/angular.h b/...nclude/mp-units/systems/angular/angular.h → ...ystems/include/mp-units/systems/angular.h
diff --git a/...ystems/include/mp-units/systems/cgs/cgs.h → src/systems/include/mp-units/systems/cgs.h b/...ystems/include/mp-units/systems/cgs/cgs.h → src/systems/include/mp-units/systems/cgs.h
diff --git a/...ystems/include/mp-units/systems/hep/hep.h → src/systems/include/mp-units/systems/hep.h b/...ystems/include/mp-units/systems/hep/hep.h → src/systems/include/mp-units/systems/hep.h
@@ -23,7 +23,7 @@
 #pragma once
 
 #include <mp-units/bits/module_macros.h>
-#include <mp-units/systems/si/si.h>
+#include <mp-units/systems/si.h>
 #include <cstdint>
 
 // IWYU pragma: begin_exports

diff --git a/...ystems/include/mp-units/systems/iau/iau.h → src/systems/include/mp-units/systems/iau.h b/...ystems/include/mp-units/systems/iau/iau.h → src/systems/include/mp-units/systems/iau.h
diff --git a/...lude/mp-units/systems/iec80000/iec80000.h → ...stems/include/mp-units/systems/iec80000.h b/...lude/mp-units/systems/iec80000/iec80000.h → ...stems/include/mp-units/systems/iec80000.h