From a70c7514a9dd5fc8d5eabe486141dfd259d2ed55 Mon Sep 17 00:00:00 2001
From: "Johan B. C. Engelen" <jbc.engelen@swissonline.ch>
Date: Thu, 17 Jan 2013 20:00:40 +0100
Subject: more const happiness (and removal of duplicate code in sp-object.h)

(bzr r12038)
---
 src/live_effects/effect.cpp              | 4 ++--
 src/live_effects/effect.h                | 4 ++--
 src/live_effects/lpe-bendpath.cpp        | 2 +-
 src/live_effects/lpe-bendpath.h          | 2 +-
 src/live_effects/lpe-copy_rotate.cpp     | 4 ++--
 src/live_effects/lpe-copy_rotate.h       | 2 +-
 src/live_effects/lpe-curvestitch.cpp     | 2 +-
 src/live_effects/lpe-curvestitch.h       | 2 +-
 src/live_effects/lpe-envelope.cpp        | 2 +-
 src/live_effects/lpe-envelope.h          | 2 +-
 src/live_effects/lpe-extrude.cpp         | 2 +-
 src/live_effects/lpe-extrude.h           | 2 +-
 src/live_effects/lpe-interpolate.cpp     | 2 +-
 src/live_effects/lpe-interpolate.h       | 2 +-
 src/live_effects/lpe-lattice.cpp         | 2 +-
 src/live_effects/lpe-lattice.h           | 2 +-
 src/live_effects/lpe-mirror_symmetry.cpp | 2 +-
 src/live_effects/lpe-mirror_symmetry.h   | 2 +-
 src/live_effects/lpe-offset.cpp          | 2 +-
 src/live_effects/lpe-offset.h            | 2 +-
 src/live_effects/lpe-parallel.cpp        | 2 +-
 src/live_effects/lpe-parallel.h          | 2 +-
 src/live_effects/lpe-perp_bisector.cpp   | 2 +-
 src/live_effects/lpe-perp_bisector.h     | 2 +-
 src/live_effects/lpe-powerstroke.cpp     | 2 +-
 src/live_effects/lpe-powerstroke.h       | 2 +-
 src/live_effects/lpe-rough-hatches.cpp   | 2 +-
 src/live_effects/lpe-rough-hatches.h     | 2 +-
 src/live_effects/lpe-vonkoch.cpp         | 2 +-
 src/live_effects/lpe-vonkoch.h           | 2 +-
 30 files changed, 33 insertions(+), 33 deletions(-)

(limited to 'src/live_effects')

diff --git a/src/live_effects/effect.cpp b/src/live_effects/effect.cpp
index 4d6fb0979..26095d84b 100644
--- a/src/live_effects/effect.cpp
+++ b/src/live_effects/effect.cpp
@@ -317,7 +317,7 @@ Effect::effectType() const {
  * Is performed a single time when the effect is freshly applied to a path
  */
 void
-Effect::doOnApply (SPLPEItem */*lpeitem*/)
+Effect::doOnApply (SPLPEItem const*/*lpeitem*/)
 {
 }
 
@@ -643,7 +643,7 @@ Effect::editNextParamOncanvas(SPItem * item, SPDesktop * desktop)
 * The nice thing about this is that this function can use knowledge of the original path and set things accordingly for example to the size or origin of the original path!
 */
 void
-Effect::resetDefaults(SPItem * /*item*/)
+Effect::resetDefaults(SPItem const* /*item*/)
 {
     std::vector<Inkscape::LivePathEffect::Parameter *>::iterator p;
     for (p = param_vector.begin(); p != param_vector.end(); ++p) {
diff --git a/src/live_effects/effect.h b/src/live_effects/effect.h
index 8725129b5..5862a24ba 100644
--- a/src/live_effects/effect.h
+++ b/src/live_effects/effect.h
@@ -53,7 +53,7 @@ public:
 
     EffectType effectType() const;
 
-    virtual void doOnApply (SPLPEItem *lpeitem);
+    virtual void doOnApply (SPLPEItem const* lpeitem);
     virtual void doBeforeEffect (SPLPEItem *lpeitem);
 
     void writeParamsToSVG();
@@ -78,7 +78,7 @@ public:
     /**
      * Sets all parameters to their default values and writes them to SVG.
      */
-    virtual void resetDefaults(SPItem * item);
+    virtual void resetDefaults(SPItem const* item);
 
     /// /todo: is this method really necessary? it causes UI inconsistensies... (johan)
     virtual void transform_multiply(Geom::Affine const& postmul, bool set);
diff --git a/src/live_effects/lpe-bendpath.cpp b/src/live_effects/lpe-bendpath.cpp
index 3732ae3ef..59fd145d1 100644
--- a/src/live_effects/lpe-bendpath.cpp
+++ b/src/live_effects/lpe-bendpath.cpp
@@ -123,7 +123,7 @@ LPEBendPath::doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd
 }
 
 void
-LPEBendPath::resetDefaults(SPItem * item)
+LPEBendPath::resetDefaults(SPItem const* item)
 {
     Effect::resetDefaults(item);
 
diff --git a/src/live_effects/lpe-bendpath.h b/src/live_effects/lpe-bendpath.h
index 98421df88..0e4b3f726 100644
--- a/src/live_effects/lpe-bendpath.h
+++ b/src/live_effects/lpe-bendpath.h
@@ -37,7 +37,7 @@ public:
 
     virtual Geom::Piecewise<Geom::D2<Geom::SBasis> > doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd2_in);
 
-    virtual void resetDefaults(SPItem * item);
+    virtual void resetDefaults(SPItem const* item);
 
 
 private:
diff --git a/src/live_effects/lpe-copy_rotate.cpp b/src/live_effects/lpe-copy_rotate.cpp
index 9ac553ed5..f946f0568 100644
--- a/src/live_effects/lpe-copy_rotate.cpp
+++ b/src/live_effects/lpe-copy_rotate.cpp
@@ -73,9 +73,9 @@ LPECopyRotate::~LPECopyRotate()
 }
 
 void
-LPECopyRotate::doOnApply(SPLPEItem *lpeitem)
+LPECopyRotate::doOnApply(SPLPEItem const* lpeitem)
 {
-    SPCurve *curve = SP_SHAPE(lpeitem)->_curve;
+    SPCurve const *curve = SP_SHAPE(lpeitem)->_curve;
 
     A = *(curve->first_point());
     B = *(curve->last_point());
diff --git a/src/live_effects/lpe-copy_rotate.h b/src/live_effects/lpe-copy_rotate.h
index b14bc4128..1354b980a 100644
--- a/src/live_effects/lpe-copy_rotate.h
+++ b/src/live_effects/lpe-copy_rotate.h
@@ -31,7 +31,7 @@ public:
     LPECopyRotate(LivePathEffectObject *lpeobject);
     virtual ~LPECopyRotate();
 
-    virtual void doOnApply (SPLPEItem *lpeitem);
+    virtual void doOnApply (SPLPEItem const* lpeitem);
 
     virtual Geom::Piecewise<Geom::D2<Geom::SBasis> > doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd2_in);
 
diff --git a/src/live_effects/lpe-curvestitch.cpp b/src/live_effects/lpe-curvestitch.cpp
index edf8ab55e..af928fff8 100644
--- a/src/live_effects/lpe-curvestitch.cpp
+++ b/src/live_effects/lpe-curvestitch.cpp
@@ -151,7 +151,7 @@ LPECurveStitch::doEffect_path (std::vector<Geom::Path> const & path_in)
 }
 
 void
-LPECurveStitch::resetDefaults(SPItem * item)
+LPECurveStitch::resetDefaults(SPItem const* item)
 {
     Effect::resetDefaults(item);
 
diff --git a/src/live_effects/lpe-curvestitch.h b/src/live_effects/lpe-curvestitch.h
index f46f2a5d2..38a11b4af 100644
--- a/src/live_effects/lpe-curvestitch.h
+++ b/src/live_effects/lpe-curvestitch.h
@@ -30,7 +30,7 @@ public:
 
     virtual std::vector<Geom::Path> doEffect_path (std::vector<Geom::Path> const & path_in);
 
-    virtual void resetDefaults(SPItem * item);
+    virtual void resetDefaults(SPItem const* item);
 
     virtual void transform_multiply(Geom::Affine const& postmul, bool set);
 
diff --git a/src/live_effects/lpe-envelope.cpp b/src/live_effects/lpe-envelope.cpp
index 9fd299ee8..bcd63e8cb 100644
--- a/src/live_effects/lpe-envelope.cpp
+++ b/src/live_effects/lpe-envelope.cpp
@@ -225,7 +225,7 @@ LPEEnvelope::doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd
 }
 
 void
-LPEEnvelope::resetDefaults(SPItem * item)
+LPEEnvelope::resetDefaults(SPItem const* item)
 {
     Effect::resetDefaults(item);
 
diff --git a/src/live_effects/lpe-envelope.h b/src/live_effects/lpe-envelope.h
index fe1d9561d..6a9fe1c0a 100644
--- a/src/live_effects/lpe-envelope.h
+++ b/src/live_effects/lpe-envelope.h
@@ -35,7 +35,7 @@ public:
 
     virtual Geom::Piecewise<Geom::D2<Geom::SBasis> > doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd2_in);
 
-    virtual void resetDefaults(SPItem * item);
+    virtual void resetDefaults(SPItem const* item);
 
 private:
     PathParam  bend_path1;
diff --git a/src/live_effects/lpe-extrude.cpp b/src/live_effects/lpe-extrude.cpp
index 4351f3aa0..7f5a00cf8 100644
--- a/src/live_effects/lpe-extrude.cpp
+++ b/src/live_effects/lpe-extrude.cpp
@@ -170,7 +170,7 @@ LPEExtrude::doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd2
 }
 
 void
-LPEExtrude::resetDefaults(SPItem * item)
+LPEExtrude::resetDefaults(SPItem const* item)
 {
     Effect::resetDefaults(item);
 
diff --git a/src/live_effects/lpe-extrude.h b/src/live_effects/lpe-extrude.h
index 0c9f11444..491fe4959 100644
--- a/src/live_effects/lpe-extrude.h
+++ b/src/live_effects/lpe-extrude.h
@@ -26,7 +26,7 @@ public:
 
     virtual Geom::Piecewise<Geom::D2<Geom::SBasis> > doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd2_in);
 
-    virtual void resetDefaults(SPItem * item);
+    virtual void resetDefaults(SPItem const* item);
 
 private:
     VectorParam extrude_vector;
diff --git a/src/live_effects/lpe-interpolate.cpp b/src/live_effects/lpe-interpolate.cpp
index 227185f91..e41bc6f0e 100644
--- a/src/live_effects/lpe-interpolate.cpp
+++ b/src/live_effects/lpe-interpolate.cpp
@@ -99,7 +99,7 @@ LPEInterpolate::doEffect_path (Geom::PathVector const & path_in)
 }
 
 void
-LPEInterpolate::resetDefaults(SPItem * item)
+LPEInterpolate::resetDefaults(SPItem const* item)
 {
     Effect::resetDefaults(item);
 
diff --git a/src/live_effects/lpe-interpolate.h b/src/live_effects/lpe-interpolate.h
index 3091537f3..679001a81 100644
--- a/src/live_effects/lpe-interpolate.h
+++ b/src/live_effects/lpe-interpolate.h
@@ -29,7 +29,7 @@ public:
 
     virtual std::vector<Geom::Path> doEffect_path (std::vector<Geom::Path> const & path_in);
 
-    virtual void resetDefaults(SPItem * item);
+    virtual void resetDefaults(SPItem const* item);
 private:
     PathParam   trajectory_path;
     ScalarParam number_of_steps;
diff --git a/src/live_effects/lpe-lattice.cpp b/src/live_effects/lpe-lattice.cpp
index 2d04c4d41..84fba4659 100644
--- a/src/live_effects/lpe-lattice.cpp
+++ b/src/live_effects/lpe-lattice.cpp
@@ -179,7 +179,7 @@ LPELattice::doBeforeEffect (SPLPEItem *lpeitem)
 }
 
 void
-LPELattice::resetDefaults(SPItem * item)
+LPELattice::resetDefaults(SPItem const* item)
 {
     Effect::resetDefaults(item);
 
diff --git a/src/live_effects/lpe-lattice.h b/src/live_effects/lpe-lattice.h
index f95e33b0b..521875bcf 100644
--- a/src/live_effects/lpe-lattice.h
+++ b/src/live_effects/lpe-lattice.h
@@ -35,7 +35,7 @@ public:
 
     virtual Geom::Piecewise<Geom::D2<Geom::SBasis> > doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd2_in);
     
-    virtual void resetDefaults(SPItem * item);
+    virtual void resetDefaults(SPItem const* item);
 
 protected:
     //virtual void addHelperPathsImpl(SPLPEItem *lpeitem, SPDesktop *desktop);
diff --git a/src/live_effects/lpe-mirror_symmetry.cpp b/src/live_effects/lpe-mirror_symmetry.cpp
index a56909338..4d4837d8d 100644
--- a/src/live_effects/lpe-mirror_symmetry.cpp
+++ b/src/live_effects/lpe-mirror_symmetry.cpp
@@ -43,7 +43,7 @@ LPEMirrorSymmetry::~LPEMirrorSymmetry()
 }
 
 void
-LPEMirrorSymmetry::doOnApply (SPLPEItem *lpeitem)
+LPEMirrorSymmetry::doOnApply (SPLPEItem const* lpeitem)
 {
     using namespace Geom;
 
diff --git a/src/live_effects/lpe-mirror_symmetry.h b/src/live_effects/lpe-mirror_symmetry.h
index a37e0d45c..c01d1bf6f 100644
--- a/src/live_effects/lpe-mirror_symmetry.h
+++ b/src/live_effects/lpe-mirror_symmetry.h
@@ -28,7 +28,7 @@ public:
     LPEMirrorSymmetry(LivePathEffectObject *lpeobject);
     virtual ~LPEMirrorSymmetry();
 
-    virtual void doOnApply (SPLPEItem *lpeitem);
+    virtual void doOnApply (SPLPEItem const* lpeitem);
 
     virtual std::vector<Geom::Path> doEffect_path (std::vector<Geom::Path> const & path_in);
 
diff --git a/src/live_effects/lpe-offset.cpp b/src/live_effects/lpe-offset.cpp
index 26d42a94f..192bd17ca 100644
--- a/src/live_effects/lpe-offset.cpp
+++ b/src/live_effects/lpe-offset.cpp
@@ -40,7 +40,7 @@ LPEOffset::~LPEOffset()
 }
 
 void
-LPEOffset::doOnApply(SPLPEItem *lpeitem)
+LPEOffset::doOnApply(SPLPEItem const* lpeitem)
 {
     offset_pt.param_set_and_write_new_value(*(SP_SHAPE(lpeitem)->_curve->first_point()));
 }
diff --git a/src/live_effects/lpe-offset.h b/src/live_effects/lpe-offset.h
index f57d41a14..9966fd45d 100644
--- a/src/live_effects/lpe-offset.h
+++ b/src/live_effects/lpe-offset.h
@@ -26,7 +26,7 @@ public:
     LPEOffset(LivePathEffectObject *lpeobject);
     virtual ~LPEOffset();
 
-    virtual void doOnApply (SPLPEItem *lpeitem);
+    virtual void doOnApply (SPLPEItem const* lpeitem);
 
     virtual Geom::Piecewise<Geom::D2<Geom::SBasis> > doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd2_in);
 
diff --git a/src/live_effects/lpe-parallel.cpp b/src/live_effects/lpe-parallel.cpp
index 4d4b0c17d..cbe3ba509 100644
--- a/src/live_effects/lpe-parallel.cpp
+++ b/src/live_effects/lpe-parallel.cpp
@@ -65,7 +65,7 @@ LPEParallel::~LPEParallel()
 }
 
 void
-LPEParallel::doOnApply (SPLPEItem *lpeitem)
+LPEParallel::doOnApply (SPLPEItem const* lpeitem)
 {
     SPCurve const *curve = SP_SHAPE(lpeitem)->_curve;
 
diff --git a/src/live_effects/lpe-parallel.h b/src/live_effects/lpe-parallel.h
index e23361675..ff19d690e 100644
--- a/src/live_effects/lpe-parallel.h
+++ b/src/live_effects/lpe-parallel.h
@@ -32,7 +32,7 @@ public:
     LPEParallel(LivePathEffectObject *lpeobject);
     virtual ~LPEParallel();
 
-    virtual void doOnApply (SPLPEItem *lpeitem);
+    virtual void doOnApply (SPLPEItem const* lpeitem);
 
     virtual Geom::Piecewise<Geom::D2<Geom::SBasis> > doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd2_in);
 
diff --git a/src/live_effects/lpe-perp_bisector.cpp b/src/live_effects/lpe-perp_bisector.cpp
index c528ef692..95e56f1ce 100644
--- a/src/live_effects/lpe-perp_bisector.cpp
+++ b/src/live_effects/lpe-perp_bisector.cpp
@@ -111,7 +111,7 @@ LPEPerpBisector::~LPEPerpBisector()
 }
 
 void
-LPEPerpBisector::doOnApply (SPLPEItem */*lpeitem*/)
+LPEPerpBisector::doOnApply (SPLPEItem const*/*lpeitem*/)
 {
     /* make the path a straight line */
     /**
diff --git a/src/live_effects/lpe-perp_bisector.h b/src/live_effects/lpe-perp_bisector.h
index f5a918028..4ff9909a4 100644
--- a/src/live_effects/lpe-perp_bisector.h
+++ b/src/live_effects/lpe-perp_bisector.h
@@ -37,7 +37,7 @@ public:
 
     virtual EffectType effectType () { return PERP_BISECTOR; }
 
-    void doOnApply (SPLPEItem *lpeitem);
+    void doOnApply (SPLPEItem const* lpeitem);
 
     virtual Geom::Piecewise<Geom::D2<Geom::SBasis> >
       doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd2_in);
diff --git a/src/live_effects/lpe-powerstroke.cpp b/src/live_effects/lpe-powerstroke.cpp
index b042f8d41..0533c1ed6 100644
--- a/src/live_effects/lpe-powerstroke.cpp
+++ b/src/live_effects/lpe-powerstroke.cpp
@@ -263,7 +263,7 @@ LPEPowerStroke::~LPEPowerStroke()
 
 
 void
-LPEPowerStroke::doOnApply(SPLPEItem *lpeitem)
+LPEPowerStroke::doOnApply(SPLPEItem const* lpeitem)
 {
     if (SP_IS_SHAPE(lpeitem)) {
         std::vector<Geom::Point> points;
diff --git a/src/live_effects/lpe-powerstroke.h b/src/live_effects/lpe-powerstroke.h
index e6c915234..7bc736820 100644
--- a/src/live_effects/lpe-powerstroke.h
+++ b/src/live_effects/lpe-powerstroke.h
@@ -27,7 +27,7 @@ public:
 
     virtual std::vector<Geom::Path> doEffect_path (std::vector<Geom::Path> const & path_in);
 
-    virtual void doOnApply(SPLPEItem *lpeitem);
+    virtual void doOnApply(SPLPEItem const* lpeitem);
 
     // methods called by path-manipulator upon edits
     void adjustForNewPath(std::vector<Geom::Path> const & path_in);
diff --git a/src/live_effects/lpe-rough-hatches.cpp b/src/live_effects/lpe-rough-hatches.cpp
index f52977fcb..14b21fe39 100644
--- a/src/live_effects/lpe-rough-hatches.cpp
+++ b/src/live_effects/lpe-rough-hatches.cpp
@@ -555,7 +555,7 @@ LPERoughHatches::doBeforeEffect (SPLPEItem */*lpeitem*/)
 
 
 void
-LPERoughHatches::resetDefaults(SPItem * item)
+LPERoughHatches::resetDefaults(SPItem const* item)
 {
     Effect::resetDefaults(item);
 
diff --git a/src/live_effects/lpe-rough-hatches.h b/src/live_effects/lpe-rough-hatches.h
index 5051b313a..867801e74 100644
--- a/src/live_effects/lpe-rough-hatches.h
+++ b/src/live_effects/lpe-rough-hatches.h
@@ -31,7 +31,7 @@ public:
     virtual Geom::Piecewise<Geom::D2<Geom::SBasis> >
     doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd2_in);
 
-    virtual void resetDefaults(SPItem * item);
+    virtual void resetDefaults(SPItem const* item);
 
     virtual void doBeforeEffect(SPLPEItem * item);
 
diff --git a/src/live_effects/lpe-vonkoch.cpp b/src/live_effects/lpe-vonkoch.cpp
index 7e4b5f5fe..ee3daff82 100644
--- a/src/live_effects/lpe-vonkoch.cpp
+++ b/src/live_effects/lpe-vonkoch.cpp
@@ -269,7 +269,7 @@ LPEVonKoch::doBeforeEffect (SPLPEItem *lpeitem)
 
 
 void
-LPEVonKoch::resetDefaults(SPItem * item)
+LPEVonKoch::resetDefaults(SPItem const* item)
 {
     Effect::resetDefaults(item);
 
diff --git a/src/live_effects/lpe-vonkoch.h b/src/live_effects/lpe-vonkoch.h
index 7862cdbb5..1a36ab410 100644
--- a/src/live_effects/lpe-vonkoch.h
+++ b/src/live_effects/lpe-vonkoch.h
@@ -51,7 +51,7 @@ public:
 
     virtual std::vector<Geom::Path> doEffect_path (std::vector<Geom::Path> const & path_in);
 
-    virtual void resetDefaults(SPItem * item);
+    virtual void resetDefaults(SPItem const* item);
 
     virtual void doBeforeEffect(SPLPEItem * item);
 
-- 
cgit v1.2.3