Revert wrong format

schaumb · schaumb · commit d3f6c9e3c8cd · 2024-08-07T11:57:56.000+02:00
diff --git a/src/base/anim/interpolated.h b/src/base/anim/interpolated.h
@@ -230,8 +230,8 @@ template <typename Type> class Interpolated
 		    std::less<T>>;
 		return !has_second ? this->values[0].value
 		                   : std::min(this->values[0].value,
-		                         this->values[1].value,
-		                         Less{});
+		                       this->values[1].value,
+		                       Less{});
 	}
 
 	template <typename T = Type> [[nodiscard]] T max() const
@@ -241,8 +241,8 @@ template <typename Type> class Interpolated
 		    std::less<T>>;
 		return !has_second ? this->values[0].value
 		                   : std::max(this->values[0].value,
-		                         this->values[1].value,
-		                         Less{});
+		                       this->values[1].value,
+		                       Less{});
 	}
 };
 
diff --git a/src/base/conv/parse.h b/src/base/conv/parse.h
@@ -43,7 +43,8 @@ template <typename To> To parse(const std::string &string)
 		[]<bool flag = false>()
 		{
 			static_assert(flag, "no conversion from string");
-		}();
+		}
+	();
 }
 
 }
diff --git a/src/base/conv/tostring.h b/src/base/conv/tostring.h
@@ -47,7 +47,8 @@ std::string toString(const From &value)
 		[]<bool flag = false>()
 		{
 			static_assert(flag, "no string conversion");
-		}();
+		}
+	();
 }
 
 }
diff --git a/src/base/math/interpolation.h b/src/base/math/interpolation.h
@@ -8,9 +8,8 @@ namespace Math
 
 template <typename T>
     requires(!std::is_same_v<std::remove_cvref_t<T>, bool>)
-auto interpolate(const T &op0,
-    const T &op1,
-    double factor) -> decltype(op0 * (1.0 - factor) + op1 * factor)
+auto interpolate(const T &op0, const T &op1, double factor)
+    -> decltype(op0 * (1.0 - factor) + op1 * factor)
 {
 	if (factor <= 0.0) return op0;
 	if (factor >= 1.0) return op1;
diff --git a/src/base/refl/auto_struct.h b/src/base/refl/auto_struct.h
@@ -535,8 +535,8 @@ namespace Functors
 namespace Composite
 {
 template <class T, class U>
-constexpr inline auto operator>>(U &&arg,
-    const T &) -> decltype(T::get(std::forward<U &&>(arg)))
+constexpr inline auto operator>>(U &&arg, const T &)
+    -> decltype(T::get(std::forward<U &&>(arg)))
 {
 	return T::get(std::forward<U &&>(arg));
 }
diff --git a/src/base/style/impl.tpp b/src/base/style/impl.tpp
@@ -15,22 +15,20 @@ template <class T> T Sheet<T>::getFullParams() const
 
 template <class T> ParamRegistry<T>::ParamRegistry()
 {
-	Refl::visit<T>(
-	    [this]<class U,
-	        class = std::enable_if_t<
-	            std::is_constructible_v<Accessor, U>>>(U &&accessor,
-	        const std::initializer_list<std::string_view> &thePath =
-	            {})
-	    {
-		    std::string currentPath;
-		    for (auto sv : thePath) {
-			    if (!currentPath.empty()) currentPath += '.';
-			    currentPath += sv;
-		    }
+	Refl::visit<T>([this]<class U,
+	    class =
+	        std::enable_if_t<std::is_constructible_v<Accessor, U>>>(
+	    U && accessor,
+	    const std::initializer_list<std::string_view> &thePath = {}) {
+		std::string currentPath;
+		for (auto sv : thePath) {
+			if (!currentPath.empty()) currentPath += '.';
+			currentPath += sv;
+		}
 
-		    accessors.try_emplace(std::move(currentPath),
-		        std::forward<U>(accessor));
-	    });
+		accessors.try_emplace(std::move(currentPath),
+		    std::forward<U>(accessor));
+	});
 }
 }
 
diff --git a/src/chart/generator/buckets.cpp b/src/chart/generator/buckets.cpp
@@ -40,14 +40,15 @@ Buckets::const_iterator &Buckets::const_iterator::operator++()
 	    curr_end == real_end
 	        ? curr_end
 	        : std::partition_point(curr_end,
-	              real_end,
-	              [this,
-	                  searched = (*curr_end->*parent->marker_id_get)
-	                                 .seriesId](Marker *lhs) -> bool
-	              {
-		              return (lhs->*parent->marker_id_get).seriesId
-		                  == searched;
-	              })};
+	            real_end,
+	            [this,
+	                searched =
+	                    (*curr_end->*parent->marker_id_get).seriesId](
+	                Marker *lhs) -> bool
+	            {
+		            return (lhs->*parent->marker_id_get).seriesId
+		                == searched;
+	            })};
 	return *this;
 }
 
diff --git a/src/chart/main/chart.cpp b/src/chart/main/chart.cpp
@@ -91,9 +91,9 @@ void Chart::draw(Gfx::ICanvas &canvas)
 {
 	renderedChart = Draw::RenderedChart{
 	    actPlot ? Draw::CoordinateSystem{layout.plotArea,
-	                  actPlot->getOptions()->angle,
-	                  actPlot->getOptions()->coordSystem,
-	                  actPlot->keepAspectRatio}
+	        actPlot->getOptions()->angle,
+	        actPlot->getOptions()->coordSystem,
+	        actPlot->keepAspectRatio}
 	            : Draw::CoordinateSystem{layout.plotArea},
 	    actPlot};
 
diff --git a/src/chart/rendering/drawaxes.cpp b/src/chart/rendering/drawaxes.cpp
@@ -212,13 +212,12 @@ void DrawAxes::drawTitle(Gen::ChannelId axisIndex) const
 		                      .value
 		                  == Styles::AxisTitle::Orientation::vertical
 		            : titleStyle.orientation->factor<double>(
-		                  Styles::AxisTitle::Orientation::vertical));
+		                Styles::AxisTitle::Orientation::vertical));
 
 		auto orientedSize =
 		    fades == ::Anim::second
 		        ? calcOrientation(
-		              titleStyle.orientation->get_or_first(index)
-		                  .value)
+		            titleStyle.orientation->get_or_first(index).value)
 		        : titleStyle.orientation->combine(calcOrientation);
 
 		auto center = offset * (orientedSize / 2.0);
@@ -321,7 +320,7 @@ void DrawAxes::drawDimensionLabel(bool horizontal,
 		            ? labelStyle.side->get_or_first(index).value
 		                  == Styles::AxisLabel::Side::negative
 		            : labelStyle.side->factor<double>(
-		                  Styles::AxisLabel::Side::negative);
+		                Styles::AxisLabel::Side::negative);
 
 		    auto sign = 1 - 2 * under;
 
diff --git a/src/chart/rendering/drawinterlacing.cpp b/src/chart/rendering/drawinterlacing.cpp
@@ -124,10 +124,9 @@ void DrawInterlacing::draw(
 
 		auto axisBottom = axis.origo() + stripWidth;
 
-		auto iMin = axisBottom > 0
-		              ? static_cast<int>(std::floor(
-		                    -axis.origo() / (2 * stripWidth)))
-		              : 0;
+		auto iMin = axisBottom > 0 ? static_cast<int>(
+		                std::floor(-axis.origo() / (2 * stripWidth)))
+		                           : 0;
 
 		if (stripWidth <= 0) return;
 		auto interlaceCount = 0U;
@@ -257,7 +256,7 @@ void DrawInterlacing::drawDataLabel(
 		               ? labelStyle.side->get_or_first(index).value
 		                     == Styles::AxisLabel::Side::negative
 		               : labelStyle.side->factor<double>(
-		                     Styles::AxisLabel::Side::negative);
+		                   Styles::AxisLabel::Side::negative);
 
 		auto &&posDir =
 		    coordSys.convertDirectionAt({refPos, refPos + normal})
diff --git a/src/chart/rendering/markerrenderer.cpp b/src/chart/rendering/markerrenderer.cpp
@@ -342,13 +342,12 @@ std::string MarkerRenderer::getLabelText(
 
 	std::string valueStr;
 	if (labelValue.hasValue()) {
-		auto value = needsInterpolation
-		               ? label.combine(
-		                     [](const auto &value)
-		                     {
-			                     return value.value.value_or(0.0);
-		                     })
-		               : labelValue.value.value();
+		auto value = needsInterpolation ? label.combine(
+		                 [](const auto &value)
+		                 {
+			                 return value.value.value_or(0.0);
+		                 })
+		                                : labelValue.value.value();
 		valueStr = Text::SmartString::fromPhysicalValue(value,
 		    *labelStyle.numberFormat,
 		    static_cast<size_t>(*labelStyle.maxFractionDigits),
@@ -434,9 +433,8 @@ Gfx::Color MarkerRenderer::getSelectedColor(const Gen::Marker &marker,
 	auto markerColor = colorBuilder.render(marker.colorBase);
 
 	return label ? Math::interpolate(markerColor,
-	                   rootStyle.plot.marker.label.color->transparent(
-	                       1.0),
-	                   rootStyle.plot.marker.label.color->alpha)
+	           rootStyle.plot.marker.label.color->transparent(1.0),
+	           rootStyle.plot.marker.label.color->alpha)
 	             : markerColor;
 }
 
diff --git a/src/chart/rendering/markers/connectingmarker.cpp b/src/chart/rendering/markers/connectingmarker.cpp
@@ -95,8 +95,8 @@ ConnectingMarker::ConnectingMarker(const DrawingContext &ctx,
 			points[3] = prevPos - prevSpacing;
 
 			lineWidth[0] = isLine ? std::max(minWidth,
-			                            maxWidth * prev->sizeFactor,
-			                            less)
+			                   maxWidth * prev->sizeFactor,
+			                   less)
 			                      : 0;
 
 			points[0] =
diff --git a/src/dataframe/impl/dataframe.cpp b/src/dataframe/impl/dataframe.cpp
@@ -32,7 +32,7 @@ std::shared_ptr<dataframe_interface> dataframe::copy(
 	    [newly = ptr_t{new (data) dataframe(
 	                       cp ? cp->other
 	                          : unsafe_get<source_type::owning>(
-	                                source),
+	                              source),
 	                       cp && cp->pre_remove ? &*cp->pre_remove
 	                                            : nullptr,
 	                       cp && inherit_sorting && cp->sorted_indices

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,8 @@ template <typename To> To parse(const std::string &string)`
`43`	`43`	`[]<bool flag = false>()`
`44`	`44`	`{`
`45`	`45`	`static_assert(flag, "no conversion from string");`
`46`		`- }();`
	`46`	`+ }`
	`47`	`+ ();`
`47`	`48`	`}`
`48`	`49`
`49`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,8 @@ std::string toString(const From &value)`
`47`	`47`	`[]<bool flag = false>()`
`48`	`48`	`{`
`49`	`49`	`static_assert(flag, "no string conversion");`
`50`		`- }();`
	`50`	`+ }`
	`51`	`+ ();`
`51`	`52`	`}`
`52`	`53`
`53`	`54`	`}`
Original file line number	Diff line number	Diff line change
`@@ -535,8 +535,8 @@ namespace Functors`
`535`	`535`	`namespace Composite`
`536`	`536`	`{`
`537`	`537`	`template <class T, class U>`
`538`		`-constexpr inline auto operator>>(U &&arg,`
`539`		`- const T &) -> decltype(T::get(std::forward<U &&>(arg)))`
	`538`	`+constexpr inline auto operator>>(U &&arg, const T &)`
	`539`	`+ -> decltype(T::get(std::forward<U &&>(arg)))`
`540`	`540`	`{`
`541`	`541`	`return T::get(std::forward<U &&>(arg));`
`542`	`542`	`}`