PencilToolbar: GtkAction migration

10 files changed, 24 insertions, 38 deletions

diff --git a/src/live_effects/effect.h b/src/live_effects/effect.h
index d21240b72..57d6b4425 100644
--- a/src/live_effects/effect.h
+++ b/src/live_effects/effect.h
@@ -59,6 +59,8 @@ public:
     static void createAndApply(EffectType type, SPDocument *doc, SPItem *item);
 
     virtual ~Effect();
+    Effect(const Effect&) = delete;
+    Effect& operator=(const Effect&) = delete;
 
     EffectType effectType() const;
 
@@ -187,9 +189,6 @@ private:
 
     bool is_ready;
     bool defaultsopen;
-
-    Effect(const Effect&) = delete;
-    Effect& operator=(const Effect&) = delete;
 };
 
 } //namespace LivePathEffect
diff --git a/src/live_effects/lpe-bspline.h b/src/live_effects/lpe-bspline.h
index 7aebb0826..9d0850fdc 100644
--- a/src/live_effects/lpe-bspline.h
+++ b/src/live_effects/lpe-bspline.h
@@ -18,6 +18,8 @@ class LPEBSpline : public Effect {
 public:
     LPEBSpline(LivePathEffectObject *lpeobject);
     ~LPEBSpline() override;
+    LPEBSpline(const LPEBSpline &) = delete;
+    LPEBSpline &operator=(const LPEBSpline &) = delete;
 
     LPEPathFlashType pathFlashType() const override
     {
@@ -43,10 +45,6 @@ private:
     BoolParam apply_with_weight;
     BoolParam only_selected;
     ScalarParam weight;
-
-    LPEBSpline(const LPEBSpline &) = delete;
-    LPEBSpline &operator=(const LPEBSpline &) = delete;
-
 };
 void sp_bspline_do_effect(SPCurve *curve, double helper_size);
 
diff --git a/src/live_effects/lpe-powerstroke.h b/src/live_effects/lpe-powerstroke.h
index 21b024581..96ee2a192 100644
--- a/src/live_effects/lpe-powerstroke.h
+++ b/src/live_effects/lpe-powerstroke.h
@@ -25,7 +25,8 @@ class LPEPowerStroke : public Effect {
 public:
     LPEPowerStroke(LivePathEffectObject *lpeobject);
     ~LPEPowerStroke() override;
-
+    LPEPowerStroke(const LPEPowerStroke&) = delete;
+    LPEPowerStroke& operator=(const LPEPowerStroke&) = delete;
     
     Geom::PathVector doEffect_path (Geom::PathVector const & path_in) override;
     void doBeforeEffect(SPLPEItem const *lpeItem) override;
@@ -46,8 +47,6 @@ private:
     EnumParam<unsigned> linejoin_type;
     ScalarParam miter_limit;
     EnumParam<unsigned> end_linecap_type;
-    LPEPowerStroke(const LPEPowerStroke&) = delete;
-    LPEPowerStroke& operator=(const LPEPowerStroke&) = delete;
 };
 
 } //namespace LivePathEffect
diff --git a/src/live_effects/lpe-simplify.h b/src/live_effects/lpe-simplify.h
index 2477e97cf..a04fff76c 100644
--- a/src/live_effects/lpe-simplify.h
+++ b/src/live_effects/lpe-simplify.h
@@ -19,6 +19,8 @@ class LPESimplify : public Effect , GroupBBoxEffect {
 public:
     LPESimplify(LivePathEffectObject *lpeobject);
     ~LPESimplify() override;
+    LPESimplify(const LPESimplify &) = delete;
+    LPESimplify &operator=(const LPESimplify &) = delete;
 
     void doEffect(SPCurve *curve) override;
 
@@ -48,10 +50,6 @@ private:
     double radius_helper_nodes;
     Geom::PathVector hp;
     Geom::OptRect bbox;
-
-    LPESimplify(const LPESimplify &) = delete;
-    LPESimplify &operator=(const LPESimplify &) = delete;
-
 };
 
 }; //namespace LivePathEffect
diff --git a/src/live_effects/lpe-spiro.h b/src/live_effects/lpe-spiro.h
index 9b1ae76c3..ce07de854 100644
--- a/src/live_effects/lpe-spiro.h
+++ b/src/live_effects/lpe-spiro.h
@@ -18,14 +18,12 @@ class LPESpiro : public Effect {
 public:
     LPESpiro(LivePathEffectObject *lpeobject);
     ~LPESpiro() override;
+    LPESpiro(const LPESpiro&) = delete;
+    LPESpiro& operator=(const LPESpiro&) = delete;
 
     LPEPathFlashType pathFlashType() const override { return SUPPRESS_FLASH; }
 
     void doEffect(SPCurve * curve) override;
-
-private:
-    LPESpiro(const LPESpiro&) = delete;
-    LPESpiro& operator=(const LPESpiro&) = delete;
 };
 
 void sp_spiro_do_effect(SPCurve *curve);
diff --git a/src/live_effects/parameter/bool.h b/src/live_effects/parameter/bool.h
index 557511979..c66626cbd 100644
--- a/src/live_effects/parameter/bool.h
+++ b/src/live_effects/parameter/bool.h
@@ -28,6 +28,8 @@ public:
                Effect* effect,
                bool default_value = false);
     ~BoolParam() override;
+    BoolParam(const BoolParam&) = delete;
+    BoolParam& operator=(const BoolParam&) = delete;
 
     Gtk::Widget * param_newWidget() override;
 
@@ -43,9 +45,6 @@ public:
     inline operator bool() const { return value; };
 
 private:
-    BoolParam(const BoolParam&) = delete;
-    BoolParam& operator=(const BoolParam&) = delete;
-
     bool value;
     bool defvalue;
 };
diff --git a/src/live_effects/parameter/enum.h b/src/live_effects/parameter/enum.h
index dcf42f258..b7964d988 100644
--- a/src/live_effects/parameter/enum.h
+++ b/src/live_effects/parameter/enum.h
@@ -39,6 +39,8 @@ public:
     };
 
     ~EnumParam() override = default;;
+    EnumParam(const EnumParam&) = delete;
+    EnumParam& operator=(const EnumParam&) = delete;
 
     Gtk::Widget * param_newWidget() override {
         Inkscape::UI::Widget::RegisteredEnum<E> *regenum = Gtk::manage ( 
@@ -98,9 +100,6 @@ public:
     }
 
 private:
-    EnumParam(const EnumParam&) = delete;
-    EnumParam& operator=(const EnumParam&) = delete;
-
     E value;
     E defvalue;
     bool sorted;
diff --git a/src/live_effects/parameter/parameter.h b/src/live_effects/parameter/parameter.h
index 82250f652..4ef31427e 100644
--- a/src/live_effects/parameter/parameter.h
+++ b/src/live_effects/parameter/parameter.h
@@ -56,6 +56,9 @@ public:
                 Effect* effect);
     virtual ~Parameter() = default;;
 
+    Parameter(const Parameter&) = delete;
+    Parameter& operator=(const Parameter&) = delete;
+
     virtual bool param_readSVGValue(const gchar * strvalue) = 0;   // returns true if new value is valid / accepted.
     virtual gchar * param_getSVGValue() const = 0;
     virtual gchar * param_getDefaultSVGValue() const = 0;
@@ -92,10 +95,6 @@ protected:
     Effect* param_effect;
 
     void param_write_to_repr(const char * svgd);
-
-private:
-    Parameter(const Parameter&) = delete;
-    Parameter& operator=(const Parameter&) = delete;
 };
 
 
@@ -108,6 +107,8 @@ public:
                 Effect* effect,
                 gdouble default_value = 1.0);
     ~ScalarParam() override;
+    ScalarParam(const ScalarParam&) = delete;
+    ScalarParam& operator=(const ScalarParam&) = delete;
 
     bool param_readSVGValue(const gchar * strvalue) override;
     gchar * param_getSVGValue() const override;
@@ -140,10 +141,6 @@ protected:
     double inc_page;
     bool add_slider;
     bool _set_undo;
-
-private:
-    ScalarParam(const ScalarParam&) = delete;
-    ScalarParam& operator=(const ScalarParam&) = delete;
 };
 
 } //namespace LivePathEffect
diff --git a/src/live_effects/parameter/powerstrokepointarray.h b/src/live_effects/parameter/powerstrokepointarray.h
index 51c94ae7a..bb655ed96 100644
--- a/src/live_effects/parameter/powerstrokepointarray.h
+++ b/src/live_effects/parameter/powerstrokepointarray.h
@@ -30,6 +30,9 @@ public:
                 Effect* effect);
     ~PowerStrokePointArrayParam() override;
 
+    PowerStrokePointArrayParam(const PowerStrokePointArrayParam&) = delete;
+    PowerStrokePointArrayParam& operator=(const PowerStrokePointArrayParam&) = delete;
+
     Gtk::Widget * param_newWidget() override;
 
     void param_transform_multiply(Geom::Affine const& postmul, bool /*set*/) override;
@@ -54,9 +57,6 @@ public:
     friend class PowerStrokePointArrayParamKnotHolderEntity;
 
 private:
-    PowerStrokePointArrayParam(const PowerStrokePointArrayParam&) = delete;
-    PowerStrokePointArrayParam& operator=(const PowerStrokePointArrayParam&) = delete;
-
     SPKnotShapeType knot_shape;
     SPKnotModeType knot_mode;
     guint32 knot_color;
diff --git a/src/live_effects/parameter/togglebutton.h b/src/live_effects/parameter/togglebutton.h
index 3cae69f1d..d1845de5b 100644
--- a/src/live_effects/parameter/togglebutton.h
+++ b/src/live_effects/parameter/togglebutton.h
@@ -36,6 +36,8 @@ public:
                char const * icon_inactive = nullptr,
                GtkIconSize icon_size = GTK_ICON_SIZE_SMALL_TOOLBAR);
     ~ToggleButtonParam() override;
+    ToggleButtonParam(const ToggleButtonParam&) = delete;
+    ToggleButtonParam& operator=(const ToggleButtonParam&) = delete;
 
     Gtk::Widget * param_newWidget() override;
 
@@ -56,9 +58,6 @@ public:
     void param_update_default(const gchar * default_value) override;
 
 private:
-    ToggleButtonParam(const ToggleButtonParam&) = delete;
-    ToggleButtonParam& operator=(const ToggleButtonParam&) = delete;
-
     void refresh_button();
     bool value;
     bool defvalue;