rm 'Power' from unit names

GUI/Model/Sample/InterferenceItems.cpp

@@ -25,7 +25,7 @@
 InterferenceItem::InterferenceItem()
 {
     m_positionVariance.init("PositionVariance", "Variance of the position in each dimension", 0.0,
-                            Unit::nanometerPower2, "PositionVariance");
+                            Unit::nanometer2, "PositionVariance");
 }
 
 DoubleDescriptor InterferenceItem::positionVariance() const
@@ -313,7 +313,7 @@ InterferenceHardDiskItem::InterferenceHardDiskItem()
 {
     m_radius.init("Radius", "Hard disk radius", 5.0, Unit::nanometer, "radius");
     m_density.init("Total particle density", "Particle density in particles per area", 0.002,
-                   Unit::nanometerPowerMinus2, "density");
+                   Unit::nanometerMinus2, "density");
 }
 
 std::unique_ptr<IInterference> InterferenceHardDiskItem::createInterference() const

GUI/Model/Sample/ParticleLayoutItem.cpp

@@ -28,7 +28,7 @@ ParticleLayoutItem::ParticleLayoutItem(const MaterialItems* materials)
     m_ownDensity.init("Total particle density",
                       "Number of particles per area (particle surface density).\n "
                       "Should be defined for disordered and 1d-ordered particle collections.",
-                      0.01, Unit::nanometerPowerMinus2, 10, RealLimits::nonnegative(), "density");
+                      0.01, Unit::nanometerMinus2, 10, RealLimits::nonnegative(), "density");
     m_weight.init("Weight",
                   "Weight of this particle layout.\nShould be used when multiple layouts define "
                   "different domains in the sample.",

GUI/Support/Type/Unit.cpp

@@ -28,16 +28,16 @@ double convert(double d, Unit from, Unit to)
     if (from == Unit::nanometer && to == Unit::angstrom)
         return d * 10.0;
 
-    if (from == Unit::angstromPower2 && to == Unit::nanometerPower2)
+    if (from == Unit::angstrom2 && to == Unit::nanometer2)
         return d / 100.0;
 
-    if (from == Unit::nanometerPower2 && to == Unit::angstromPower2)
+    if (from == Unit::nanometer2 && to == Unit::angstrom2)
         return d * 100.0;
 
-    if (from == Unit::angstromPowerMinus2 && to == Unit::nanometerPowerMinus2)
+    if (from == Unit::angstromMinus2 && to == Unit::nanometerMinus2)
         return d * 100.0;
 
-    if (from == Unit::nanometerPowerMinus2 && to == Unit::angstromPowerMinus2)
+    if (from == Unit::nanometerMinus2 && to == Unit::angstromMinus2)
         return d / 100.0;
 
     if (from == Unit::radiant && to == Unit::degree)
@@ -62,15 +62,15 @@ QString unitAsString(const Unit& unit)
         return "";
     case Unit::nanometer:
         return "nm";
-    case Unit::nanometerPower2:
+    case Unit::nanometer2:
         return u8"nm\u00B2";
-    case Unit::nanometerPowerMinus2:
+    case Unit::nanometerMinus2:
         return u8"1/nm\u00B2";
     case Unit::angstrom:
         return u8"\u00c5";
-    case Unit::angstromPower2:
+    case Unit::angstrom2:
         return u8"\u00c5\u00B2";
-    case Unit::angstromPowerMinus2:
+    case Unit::angstromMinus2:
         return u8"1/\u00c5\u00B2";
     case Unit::degree:
         return "°";

GUI/Support/Type/Unit.h

@@ -26,11 +26,11 @@ class QString;
 enum class Unit {
     unitless,
     nanometer,
-    nanometerPower2,
-    nanometerPowerMinus2,
+    nanometer2,
+    nanometerMinus2,
     angstrom,
-    angstromPower2,
-    angstromPowerMinus2,
+    angstrom2,
+    angstromMinus2,
     degree,
     radiant,
     other //!< The unit has no enum value defined in here (e.g. when defined as an explicit string)

GUI/View/SampleDesigner/MultiLayerForm.cpp

@@ -220,17 +220,17 @@ void MultiLayerForm::updateUnits()
         if (m_useAngstrom) {
             set(editor, Unit::nanometer, Unit::angstrom);
             set(editor, Unit::angstrom, Unit::angstrom);
-            set(editor, Unit::nanometerPower2, Unit::angstromPower2);
-            set(editor, Unit::angstromPower2, Unit::angstromPower2);
-            set(editor, Unit::nanometerPowerMinus2, Unit::angstromPowerMinus2);
-            set(editor, Unit::angstromPowerMinus2, Unit::angstromPowerMinus2);
+            set(editor, Unit::nanometer2, Unit::angstrom2);
+            set(editor, Unit::angstrom2, Unit::angstrom2);
+            set(editor, Unit::nanometerMinus2, Unit::angstromMinus2);
+            set(editor, Unit::angstromMinus2, Unit::angstromMinus2);
         } else {
             set(editor, Unit::nanometer, Unit::nanometer);
             set(editor, Unit::angstrom, Unit::nanometer);
-            set(editor, Unit::nanometerPower2, Unit::nanometerPower2);
-            set(editor, Unit::angstromPower2, Unit::nanometerPower2);
-            set(editor, Unit::nanometerPowerMinus2, Unit::nanometerPowerMinus2);
-            set(editor, Unit::angstromPowerMinus2, Unit::nanometerPowerMinus2);
+            set(editor, Unit::nanometer2, Unit::nanometer2);
+            set(editor, Unit::angstrom2, Unit::nanometer2);
+            set(editor, Unit::nanometerMinus2, Unit::nanometerMinus2);
+            set(editor, Unit::angstromMinus2, Unit::nanometerMinus2);
         }
 
         if (m_useRadiant) {