Move KisLightnessStrengthOptionData back into the standard data objects

Originally I though it would need some baking functionality so put it into a separate file. Now this baking is implemented at the level of KisCurveOptionWidget, so the file is not needed anymore.
KDE · Nov 22, 2022 · 3c5cee1 · 3c5cee1
1 parent abc879b
commit 3c5cee1
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 35 deletions.
diff --git a/plugins/paintops/libpaintop/CMakeLists.txt b/plugins/paintops/libpaintop/CMakeLists.txt
@@ -50,7 +50,6 @@ set(kritalibpaintop_LIB_SRCS
     KisColorSourceOptionData.cpp
     KisColorSourceOptionModel.cpp
     KisColorSourceOptionWidget.cpp
-    KisLightnessStrengthOptionData.cpp
     KisLightnessStrengthOptionWidget.cpp
     KisTextureOptionData.cpp
     KisEmbeddedTextureData.cpp

diff --git a/plugins/paintops/libpaintop/KisLightnessStrengthOptionData.cpp b/plugins/paintops/libpaintop/KisLightnessStrengthOptionData.cpp
diff --git a/plugins/paintops/libpaintop/KisLightnessStrengthOptionData.h b/plugins/paintops/libpaintop/KisLightnessStrengthOptionData.h
diff --git a/plugins/paintops/libpaintop/KisLightnessStrengthOptionWidget.cpp b/plugins/paintops/libpaintop/KisLightnessStrengthOptionWidget.cpp
@@ -8,6 +8,8 @@
 #include <QLabel>
 #include <QVBoxLayout>
 #include <KisZug.h>
+#include <KisStandardOptionData.h>
+
 
 struct KisLightnessStrengthOptionWidget::Private
 {

diff --git a/plugins/paintops/libpaintop/KisLightnessStrengthOptionWidget.h b/plugins/paintops/libpaintop/KisLightnessStrengthOptionWidget.h
@@ -7,7 +7,9 @@
 #define KISLIGHTNESSSTRENGTHOPTIONWIDGET_H
 
 #include <KisCurveOptionWidget2.h>
-#include <KisLightnessStrengthOptionData.h>
+
+class KisLightnessStrengthOptionData;
+
 
 class PAINTOP_EXPORT KisLightnessStrengthOptionWidget : public KisCurveOptionWidget2
 {

diff --git a/plugins/paintops/libpaintop/KisStandardOptionData.h b/plugins/paintops/libpaintop/KisStandardOptionData.h
@@ -131,6 +131,18 @@ class KisStrengthOptionData : public KisCurveOptionData
     {}
 };
 
+class KisLightnessStrengthOptionData : public KisCurveOptionData
+{
+public:
+    KisLightnessStrengthOptionData(const QString &prefix = QString())
+        : KisCurveOptionData(
+              KoID("LightnessStrength", i18n("Lightness Strength")))
+    {
+        this->prefix = prefix;
+    }
+};
+
+
 class KisCurveOptionWidget2;
 
 namespace KisPaintOpOptionUtils {

diff --git a/plugins/paintops/libpaintop/KisStandardOptions.h b/plugins/paintops/libpaintop/KisStandardOptions.h
@@ -11,7 +11,6 @@
 
 #include <KisStandardOptionData.h>
 #include <KisSizeOptionData.h>
-#include <KisLightnessStrengthOptionData.h>
 
 template <typename Data>
 class KisStandardOption : public KisCurveOption2