Add a workaround for the lager issue with lenses

arximboldi/lager#160
KDE · Nov 22, 2022 · 3477105 · 3477105
1 parent 3c5cee1
commit 3477105
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/libs/global/KisZug.h b/libs/global/KisZug.h
@@ -122,7 +122,7 @@ template <typename Derived, typename Base,
           typename = std::enable_if_t<
               std::is_base_of_v<Base, Derived>>>
 auto to_base2 = lager::lenses::getset(
-        [] (const Derived &value) { return static_cast<Base>(value); },
+        [] (const Derived &value) -> Base { return static_cast<const Base&>(value); },
         [] (Derived src, const Base &value) { static_cast<Base&>(src) = value; return src; }
     );
 
@@ -136,7 +136,7 @@ auto to_base2 = lager::lenses::getset(
  */
 template <typename Base>
 auto to_base = lager::lenses::getset(
-        [] (const auto &value) { return static_cast<Base>(value); },
+        [] (const auto &value) -> Base { return static_cast<const Base&>(value); },
         [] (auto src, const Base &value) { static_cast<Base&>(src) = value; return src; }
     );
 

diff --git a/plugins/paintops/libpaintop/KisCurveOptionModel.cpp b/plugins/paintops/libpaintop/KisCurveOptionModel.cpp
@@ -9,7 +9,7 @@
 #include <KisZug.h>
 
 auto activeCurveLens = lager::lenses::getset(
-    [](std::tuple<KisCurveOptionData, QString> data) -> QString {
+    [](const std::tuple<KisCurveOptionData, QString> &data) -> QString {
         QString activeCurve;
         const bool useSameCurve = std::get<0>(data).useSameCurve;
 
@@ -18,7 +18,7 @@ auto activeCurveLens = lager::lenses::getset(
         } else {
             const QString activeSensorId = std::get<1>(data);
             KIS_SAFE_ASSERT_RECOVER_RETURN_VALUE(!activeSensorId.isEmpty(), activeCurve);
-            std::vector<KisSensorData*> srcSensors = std::get<0>(data).sensors();
+            std::vector<const KisSensorData*> srcSensors = std::get<0>(data).sensors();
             auto it =
                 std::find_if(srcSensors.begin(), srcSensors.end(),
                     [activeSensorId] (const KisSensorData *sensor) {

diff --git a/plugins/paintops/libpaintop/KisMultiSensorsSelector2.cpp b/plugins/paintops/libpaintop/KisMultiSensorsSelector2.cpp
@@ -21,13 +21,13 @@ struct KisMultiSensorsSelector2::Private {
 };
 
 auto sensorsLens = lager::lenses::getset(
-    [](KisCurveOptionData data) -> KisMultiSensorsModel2::MultiSensorData {
-        std::vector<KisSensorData*> srcSensors = data.sensors();
+    [](const KisCurveOptionData &data) -> KisMultiSensorsModel2::MultiSensorData {
+        std::vector<const KisSensorData*> srcSensors = data.sensors();
 
         KisMultiSensorsModel2::MultiSensorData sensors;
         sensors.reserve(srcSensors.size());
 
-        Q_FOREACH(KisSensorData* srcSensor, srcSensors) {
+        Q_FOREACH(const KisSensorData* srcSensor, srcSensors) {
             sensors.emplace_back(srcSensor->id, srcSensor->isActive);
         }
         return sensors;

diff --git a/plugins/paintops/libpaintop/KisPredefinedBrushModel.cpp b/plugins/paintops/libpaintop/KisPredefinedBrushModel.cpp
@@ -8,7 +8,7 @@
 namespace {
 
 auto brushSizeLens = lager::lenses::getset(
-    [](std::tuple<QSize, qreal> x) -> qreal { return std::get<0>(x).width() * std::get<1>(x); },
+    [](const std::tuple<QSize, qreal> &x) -> qreal { return std::get<0>(x).width() * std::get<1>(x); },
     [](std::tuple<QSize, qreal> x, qreal brushSize) -> std::tuple<QSize, qreal> {
         return std::make_tuple(std::get<0>(x), brushSize / std::get<0>(x).width());
     });