Change bad named vars

(bzr r15703.1.1)

13 files changed, 27 insertions, 24 deletions

diff --git a/src/live_effects/effect.cpp b/src/live_effects/effect.cpp
index a4b44b1a9..23a4c9f3d 100644
--- a/src/live_effects/effect.cpp
+++ b/src/live_effects/effect.cpp
@@ -355,7 +355,7 @@ Effect::Effect(LivePathEffectObject *lpeobject)
       oncanvasedit_it(0),
       is_visible(_("Is visible?"), _("If unchecked, the effect remains applied to the object but is temporarily disabled on canvas"), "is_visible", &wr, this, true),
       show_orig_path(false),
-      erase_extra_objects(true),
+      keep_paths(false),
       lpeobj(lpeobject),
       concatenate_before_pwd2(false),
       sp_lpe_item(NULL),
diff --git a/src/live_effects/effect.h b/src/live_effects/effect.h
index 60ee8d98f..cc0d53f12 100644
--- a/src/live_effects/effect.h
+++ b/src/live_effects/effect.h
@@ -132,7 +132,7 @@ public:
 
     void editNextParamOncanvas(SPItem * item, SPDesktop * desktop);
     bool apply_to_clippath_and_mask;
-    bool erase_extra_objects; // set this to false allow retain extra generated objects, see measure line LPE
+    bool keep_paths; // set this to false allow retain extra generated objects, see measure line LPE
     bool upd_params;
     BoolParam is_visible;
     SPCurve * sp_curve;
diff --git a/src/live_effects/lpe-copy_rotate.cpp b/src/live_effects/lpe-copy_rotate.cpp
index ff24b46da..2364f4f66 100644
--- a/src/live_effects/lpe-copy_rotate.cpp
+++ b/src/live_effects/lpe-copy_rotate.cpp
@@ -722,8 +722,8 @@ LPECopyRotate::doOnVisibilityToggled(SPLPEItem const* /*lpeitem*/)
 void 
 LPECopyRotate::doOnRemove (SPLPEItem const* /*lpeitem*/)
 {
-    //unset "erase_extra_objects" hook on sp-lpe-item.cpp
-    if (!erase_extra_objects) {
+    //set "keep paths" hook on sp-lpe-item.cpp
+    if (keep_paths) {
         processObjects(LPE_TO_OBJECTS);
         return;
     }
diff --git a/src/live_effects/lpe-fillet-chamfer.cpp b/src/live_effects/lpe-fillet-chamfer.cpp
index 08ceab3c3..a2f0b829d 100644
--- a/src/live_effects/lpe-fillet-chamfer.cpp
+++ b/src/live_effects/lpe-fillet-chamfer.cpp
@@ -38,7 +38,7 @@ LPEFilletChamfer::LPEFilletChamfer(LivePathEffectObject *lpeobject)
       method(_("Method:"), _("Methods to calculate the fillet or chamfer"),
              "method", FMConverter, &wr, this, FM_AUTO),
       mode(_("Mode:"), _("Mode, fillet or chamfer"),
-             "mode", &wr, this, "F"),
+             "mode", &wr, this, "F", true),
       radius(_("Radius (unit or %):"), _("Radius, in unit or %"), "radius", &wr,
              this, 0.0),
       chamfer_steps(_("Chamfer steps:"), _("Chamfer steps"), "chamfer_steps",
diff --git a/src/live_effects/lpe-measure-line.cpp b/src/live_effects/lpe-measure-line.cpp
index f7892cbe7..f18ba2dcd 100644
--- a/src/live_effects/lpe-measure-line.cpp
+++ b/src/live_effects/lpe-measure-line.cpp
@@ -674,8 +674,8 @@ LPEMeasureLine::doOnVisibilityToggled(SPLPEItem const* /*lpeitem*/)
 void 
 LPEMeasureLine::doOnRemove (SPLPEItem const* /*lpeitem*/)
 {
-    //unset "erase_extra_objects" hook on sp-lpe-item.cpp
-    if (!erase_extra_objects) {
+    //set "keep paths" hook on sp-lpe-item.cpp
+    if (keep_paths) {
         processObjects(LPE_TO_OBJECTS);
         items.clear();
         return;
diff --git a/src/live_effects/lpe-mirror_symmetry.cpp b/src/live_effects/lpe-mirror_symmetry.cpp
index bd3dedc86..9c2b876db 100644
--- a/src/live_effects/lpe-mirror_symmetry.cpp
+++ b/src/live_effects/lpe-mirror_symmetry.cpp
@@ -350,8 +350,8 @@ LPEMirrorSymmetry::doOnVisibilityToggled(SPLPEItem const* /*lpeitem*/)
 void 
 LPEMirrorSymmetry::doOnRemove (SPLPEItem const* /*lpeitem*/)
 {
-    //unset "erase_extra_objects" hook on sp-lpe-item.cpp
-    if (!erase_extra_objects) {
+    //set "keep paths" hook on sp-lpe-item.cpp
+    if (keep_paths) {
         processObjects(LPE_TO_OBJECTS);
         return;
     }
diff --git a/src/live_effects/parameter/bool.cpp b/src/live_effects/parameter/bool.cpp
index 3184bfa80..d9e8ecc90 100644
--- a/src/live_effects/parameter/bool.cpp
+++ b/src/live_effects/parameter/bool.cpp
@@ -21,8 +21,8 @@ namespace LivePathEffect {
 
 BoolParam::BoolParam( const Glib::ustring& label, const Glib::ustring& tip,
                       const Glib::ustring& key, Inkscape::UI::Widget::Registry* wr,
-                      Effect* effect, bool default_value , bool no_widget)
-    : Parameter(label, tip, key, wr, effect), value(default_value), defvalue(default_value), hide_widget(no_widget)
+                      Effect* effect, bool default_value , bool is_visible)
+    : Parameter(label, tip, key, wr, effect), value(default_value), defvalue(default_value), widget_is_visible(is_visible)
 {
 }
 
@@ -65,7 +65,7 @@ BoolParam::param_getSVGValue() const
 Gtk::Widget *
 BoolParam::param_newWidget()
 {
-    if(!hide_widget){
+    if(widget_is_visible){
         Inkscape::UI::Widget::RegisteredCheckButton * checkwdg = Gtk::manage(
             new Inkscape::UI::Widget::RegisteredCheckButton( param_label,
                                                              param_tooltip,
diff --git a/src/live_effects/parameter/bool.h b/src/live_effects/parameter/bool.h
index 39f328eaa..86681e764 100644
--- a/src/live_effects/parameter/bool.h
+++ b/src/live_effects/parameter/bool.h
@@ -26,7 +26,7 @@ public:
                Inkscape::UI::Widget::Registry* wr,
                Effect* effect,
                bool default_value = false,
-               bool no_widget = false);
+               bool widget_is_visible = true);
     virtual ~BoolParam();
 
     virtual Gtk::Widget * param_newWidget();
@@ -40,6 +40,7 @@ public:
     virtual void param_update_default(const gchar * default_value);
     bool get_value() const { return value; };
     inline operator bool() const { return value; };
+    bool widget_is_visible;
 
 private:
     BoolParam(const BoolParam&);
@@ -47,7 +48,6 @@ private:
 
     bool value;
     bool defvalue;
-    bool hide_widget;
 };
 
 
diff --git a/src/live_effects/parameter/hidden.cpp b/src/live_effects/parameter/hidden.cpp
index 2f218847a..95735d50f 100644
--- a/src/live_effects/parameter/hidden.cpp
+++ b/src/live_effects/parameter/hidden.cpp
@@ -22,10 +22,12 @@ namespace LivePathEffect {
 
 HiddenParam::HiddenParam( const Glib::ustring& label, const Glib::ustring& tip,
                       const Glib::ustring& key, Inkscape::UI::Widget::Registry* wr,
-                      Effect* effect, const Glib::ustring default_value )
+                      Effect* effect, const Glib::ustring default_value, bool is_visible)
     : Parameter(label, tip, key, wr, effect),
       value(default_value),
-      defvalue(default_value)
+      defvalue(default_value),
+      //This last is to allow set or unset default parameters on hidden ones
+      widget_is_visible(is_visible)
 {
 }
 
diff --git a/src/live_effects/parameter/hidden.h b/src/live_effects/parameter/hidden.h
index d565272b6..f07dd9edc 100644
--- a/src/live_effects/parameter/hidden.h
+++ b/src/live_effects/parameter/hidden.h
@@ -29,7 +29,8 @@ public:
                const Glib::ustring& key,
                Inkscape::UI::Widget::Registry* wr,
                Effect* effect,
-               const Glib::ustring default_value = "");
+               const Glib::ustring default_value = "",
+               bool widget_is_visible = false);
     virtual ~HiddenParam() {}
 
     virtual Gtk::Widget * param_newWidget();
@@ -42,7 +43,7 @@ public:
     virtual void param_update_default(const gchar * default_value);
 
     const Glib::ustring get_value() const { return value; };
-
+    bool widget_is_visible;
 private:
     HiddenParam(const HiddenParam&);
     HiddenParam& operator=(const HiddenParam&);
diff --git a/src/live_effects/parameter/parameter.cpp b/src/live_effects/parameter/parameter.cpp
index 45f46a0a7..cc7b476d7 100644
--- a/src/live_effects/parameter/parameter.cpp
+++ b/src/live_effects/parameter/parameter.cpp
@@ -55,7 +55,7 @@ void Parameter::write_to_SVG(void)
  */
 ScalarParam::ScalarParam( const Glib::ustring& label, const Glib::ustring& tip,
                       const Glib::ustring& key, Inkscape::UI::Widget::Registry* wr,
-                      Effect* effect, gdouble default_value, bool no_widget)
+                      Effect* effect, gdouble default_value, bool is_visible)
     : Parameter(label, tip, key, wr, effect),
       value(default_value),
       min(-SCALARPARAM_G_MAXDOUBLE),
@@ -67,7 +67,7 @@ ScalarParam::ScalarParam( const Glib::ustring& label, const Glib::ustring& tip,
       inc_page(1),
       add_slider(false),
       overwrite_widget(false),
-      hide_widget(no_widget)
+      widget_is_visible(is_visible)
 {
 }
 
@@ -172,7 +172,7 @@ ScalarParam::param_overwrite_widget(bool overwrite_widget)
 Gtk::Widget *
 ScalarParam::param_newWidget()
 {
-    if(!hide_widget){
+    if(widget_is_visible){
         Inkscape::UI::Widget::RegisteredScalar *rsu = Gtk::manage( new Inkscape::UI::Widget::RegisteredScalar(
             param_label, param_tooltip, param_key, *param_wr, param_effect->getRepr(), param_effect->getSPDoc() ) );
 
diff --git a/src/live_effects/parameter/parameter.h b/src/live_effects/parameter/parameter.h
index ee1d2d547..bdba9f860 100644
--- a/src/live_effects/parameter/parameter.h
+++ b/src/live_effects/parameter/parameter.h
@@ -104,7 +104,7 @@ public:
                 Inkscape::UI::Widget::Registry* wr,
                 Effect* effect,
                 gdouble default_value = 1.0,
-                bool no_widget = false);
+                bool widget_is_visible = true);
     virtual ~ScalarParam();
 
     virtual bool param_readSVGValue(const gchar * strvalue);
@@ -125,6 +125,7 @@ public:
     virtual Gtk::Widget * param_newWidget();
 
     inline operator gdouble() const { return value; };
+    bool widget_is_visible;
 
 protected:
     gdouble value;
@@ -137,7 +138,6 @@ protected:
     double inc_page;
     bool add_slider;
     bool overwrite_widget;
-    bool hide_widget;
 
 private:
     ScalarParam(const ScalarParam&);
diff --git a/src/sp-lpe-item.cpp b/src/sp-lpe-item.cpp
index efb1f4353..b08772826 100644
--- a/src/sp-lpe-item.cpp
+++ b/src/sp-lpe-item.cpp
@@ -519,7 +519,7 @@ void SPLPEItem::removeAllPathEffects(bool keep_paths)
             LivePathEffectObject *lpeobj = (*it)->lpeobject;
             if (lpeobj) {
                 Inkscape::LivePathEffect::Effect * lpe = lpeobj->get_lpe();
-                lpe->erase_extra_objects = false;
+                lpe->keep_paths = true;
             }
         }
     }