From 999ff52d701dda9c8d118e688612e5026209e552 Mon Sep 17 00:00:00 2001
From: Mateusz Pusz <mateusz.pusz@gmail.com>
Date: Tue, 19 Apr 2022 18:48:46 +0200
Subject: [PATCH] refactor: `knot` unit helper renamed to `kn` in FPS

Relates to #357
---
 example/aliases/foot_pound_second.cpp               | 6 +++---
 example/literals/foot_pound_second.cpp              | 4 ++--
 example/references/foot_pound_second.cpp            | 4 ++--
 src/systems/si-fps/include/units/isq/si/fps/speed.h | 8 ++++----
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/example/aliases/foot_pound_second.cpp b/example/aliases/foot_pound_second.cpp
index 588e328d..12b1082d 100644
--- a/example/aliases/foot_pound_second.cpp
+++ b/example/aliases/foot_pound_second.cpp
@@ -68,7 +68,7 @@ void print_details(std::string_view description, const Ship& ship)
             << STD_FMT::format("{:20} : {}\n", "beam", fmt_line<si::fps::length::yd<>, si::length::m<>>(ship.beam))
             << STD_FMT::format("{:20} : {}\n", "mass", fmt_line<si::fps::mass::lton<>, si::mass::t<>>(ship.mass))
             << STD_FMT::format("{:20} : {}\n", "speed",
-                               fmt_line<si::fps::speed::knot<>, si::speed::km_per_h<>>(ship.speed))
+                               fmt_line<si::fps::speed::kn<>, si::speed::km_per_h<>>(ship.speed))
             << STD_FMT::format("{:20} : {}\n", "power", fmt_line<si::fps::power::hp<>, si::power::kW<>>(ship.power))
             << STD_FMT::format("{:20} : {}\n", "main guns",
                                fmt_line<si::fps::length::in<>, si::length::mm<>>(ship.mainGuns))
@@ -101,7 +101,7 @@ int main()
   auto iowa = Ship{.length{ft<>(860.)},
                    .draft{ft<>(37.) + in<>(2.)},
                    .beam{ft<>(108.) + in<>(2.)},
-                   .speed{knot<>(33)},
+                   .speed{kn<>(33)},
                    .mass{lton<>(57'540)},
                    .mainGuns{in<>(16)},
                    .shellMass{lb<>(2700)},
@@ -112,7 +112,7 @@ int main()
   auto kgv = Ship{.length{ft<>(745.1)},
                   .draft{ft<>(33.) + in<>(7.5)},
                   .beam{ft<>(103.2) + in<>(2.5)},
-                  .speed{knot<>(28.3)},
+                  .speed{kn<>(28.3)},
                   .mass{lton<>(42'245)},
                   .mainGuns{in<>(14)},
                   .shellMass{lb<>(1'590)},
diff --git a/example/literals/foot_pound_second.cpp b/example/literals/foot_pound_second.cpp
index 69df4f51..67d1d296 100644
--- a/example/literals/foot_pound_second.cpp
+++ b/example/literals/foot_pound_second.cpp
@@ -108,7 +108,7 @@ int main()
   auto iowa = Ship{.length{860._q_ft},
                    .draft{37._q_ft + 2._q_in},
                    .beam{108._q_ft + 2._q_in},
-                   .speed{33_q_knot},
+                   .speed{33_q_kn},
                    .mass{57'540_q_lton},
                    .mainGuns{16_q_in},
                    .shellMass{2700_q_lb},
@@ -119,7 +119,7 @@ int main()
   auto kgv = Ship{.length{745.1_q_ft},
                   .draft{33._q_ft + 7.5_q_in},
                   .beam{103.2_q_ft + 2.5_q_in},
-                  .speed{28.3_q_knot},
+                  .speed{28.3_q_kn},
                   .mass{42'245_q_lton},
                   .mainGuns{14_q_in},
                   .shellMass{1'590_q_lb},
diff --git a/example/references/foot_pound_second.cpp b/example/references/foot_pound_second.cpp
index f947ed4c..ca1f5447 100644
--- a/example/references/foot_pound_second.cpp
+++ b/example/references/foot_pound_second.cpp
@@ -112,7 +112,7 @@ int main()
   auto iowa = Ship{.length{860. * ft},
                    .draft{37. * ft + 2. * in},
                    .beam{108. * ft + 2. * in},
-                   .speed{33 * knot},
+                   .speed{33 * kn},
                    .mass{57'540 * lton},
                    .mainGuns{16 * in},
                    .shellMass{2700 * lb},
@@ -123,7 +123,7 @@ int main()
   auto kgv = Ship{.length{745.1 * ft},
                   .draft{33. * ft + 7.5 * in},
                   .beam{103.2 * ft + 2.5 * in},
-                  .speed{28.3 * knot},
+                  .speed{28.3 * kn},
                   .mass{42'245 * lton},
                   .mainGuns{14 * in},
                   .shellMass{1'590 * lb},
diff --git a/src/systems/si-fps/include/units/isq/si/fps/speed.h b/src/systems/si-fps/include/units/isq/si/fps/speed.h
index 04302b86..cc78443f 100644
--- a/src/systems/si-fps/include/units/isq/si/fps/speed.h
+++ b/src/systems/si-fps/include/units/isq/si/fps/speed.h
@@ -66,12 +66,12 @@ constexpr auto operator"" _q_mph(unsigned long long l)
 constexpr auto operator"" _q_mph(long double l) { return speed<mile_per_hour, long double>(l); }
 
 // kn
-constexpr auto operator"" _q_knot(unsigned long long l)
+constexpr auto operator"" _q_kn(unsigned long long l)
 {
   gsl_ExpectsAudit(std::in_range<std::int64_t>(l));
   return speed<knot, std::int64_t>(static_cast<std::int64_t>(l));
 }
-constexpr auto operator"" _q_knot(long double l) { return speed<knot, long double>(l); }
+constexpr auto operator"" _q_kn(long double l) { return speed<knot, long double>(l); }
 
 }  // namespace literals
 
@@ -82,7 +82,7 @@ constexpr auto operator"" _q_knot(long double l) { return speed<knot, long doubl
 namespace speed_references {
 
 inline constexpr auto mph = reference<dim_speed, mile_per_hour>{};
-inline constexpr auto knot = reference<dim_speed, fps::knot>{};
+inline constexpr auto kn = reference<dim_speed, fps::knot>{};
 
 }  // namespace speed_references
 
@@ -105,7 +105,7 @@ using ft_per_s = units::isq::si::fps::speed<units::isq::si::fps::foot_per_second
 template<Representation Rep = double>
 using mph = units::isq::si::fps::speed<units::isq::si::fps::mile_per_hour, Rep>;
 template<Representation Rep = double>
-using knot = units::isq::si::fps::speed<units::isq::si::fps::knot, Rep>;
+using kn = units::isq::si::fps::speed<units::isq::si::fps::knot, Rep>;
 
 }  // namespace units::aliases::isq::si::fps::inline speed