https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena Index: ChangeLog from Thierry Geraud <thierry.geraud@lrde.epita.fr> Get rid of dpoints_piter. * mln/core/dpoints_piter.hh: Remove; obsolete thanks to the more general file dpsites_piter.hh. * mln/core/w_window.hh, * mln/core/clock_neighb.hh, * sandbox/nivault/dyn_line.hh, * sandbox/garrigues/fllt/fllt_simple.cc: Update. mln/core/clock_neighb.hh | 10 +++++----- mln/core/w_window.hh | 6 +++--- sandbox/garrigues/fllt/fllt_simple.cc | 4 ++-- sandbox/nivault/dyn_line.hh | 6 +++--- 4 files changed, 13 insertions(+), 13 deletions(-) Index: mln/core/w_window.hh --- mln/core/w_window.hh (revision 2243) +++ mln/core/w_window.hh (working copy) @@ -37,7 +37,7 @@ # include <mln/core/window.hh> # include <mln/core/concept/weighted_window.hh> -# include <mln/core/dpoints_piter.hh> +# include <mln/core/dpsites_piter.hh> namespace mln { @@ -70,10 +70,10 @@ /// Site_Iterator type to browse (forward) the points of a generic w_window. - typedef with_w_< dpoints_fwd_piter<D>, W > fwd_qiter; + typedef with_w_< dpsites_fwd_piter<D>, W > fwd_qiter; /// Site_Iterator type to browse (backward) the points of a generic w_window. - typedef with_w_< dpoints_bkd_piter<D>, W > bkd_qiter; + typedef with_w_< dpsites_bkd_piter<D>, W > bkd_qiter; /// Constructor without argument. Index: mln/core/clock_neighb.hh --- mln/core/clock_neighb.hh (revision 2243) +++ mln/core/clock_neighb.hh (working copy) @@ -42,8 +42,8 @@ { // fwd decls - template <typename D> class dpoints_fwd_piter; - template <typename D> class dpoints_bkd_piter; + template <typename D> class dpsites_fwd_piter; + template <typename D> class dpsites_bkd_piter; /*! \brief Generic neighborhood class. @@ -63,14 +63,14 @@ /*! \brief Site_Iterator type to browse the points of a generic * neighborhood w.r.t. the ordering of delta-points. */ - typedef dpoints_fwd_piter<D> fwd_niter; + typedef dpsites_fwd_piter<D> fwd_niter; /*! \brief Site_Iterator type to browse the points of a generic * neighborhood w.r.t. the reverse ordering of delta-points. * * !!! Be careful the start delta point become the last now. */ - typedef dpoints_bkd_piter<D> bkd_niter; + typedef dpsites_bkd_piter<D> bkd_niter; /*! \brief Same as fwd_niter. */ @@ -126,7 +126,7 @@ } // end of namespace mln -# include <mln/core/dpoints_piter.hh> +# include <mln/core/dpsites_piter.hh> #endif // ! MLN_CORE_CLOCK_NEIGHB_HH Index: sandbox/nivault/dyn_line.hh --- sandbox/nivault/dyn_line.hh (revision 2243) +++ sandbox/nivault/dyn_line.hh (working copy) @@ -36,7 +36,7 @@ # include <mln/core/concept/window.hh> # include <mln/core/internal/dpoints_base.hh> # include <mln/core/dpoint.hh> -# include <mln/core/dpoints_piter.hh> +# include <mln/core/dpsites_piter.hh> namespace mln @@ -56,10 +56,10 @@ typedef dpoint_<M, int> dpoint; /// Site_Iterator type to browse a dyn_line forward - typedef dpoints_fwd_piter<dpoint> fwd_qiter; + typedef dpsites_fwd_piter<dpoint> fwd_qiter; /// Site_Iterator type to browse a dyn_line backward - typedef dpoints_bkd_piter<dpoint> bkd_qiter; + typedef dpsites_bkd_piter<dpoint> bkd_qiter; /// Same as fwd_qiter typedef fwd_qiter qiter; Index: sandbox/garrigues/fllt/fllt_simple.cc --- sandbox/garrigues/fllt/fllt_simple.cc (revision 2243) +++ sandbox/garrigues/fllt/fllt_simple.cc (working copy) @@ -276,9 +276,9 @@ const c6_interpixel& ip_ref_; }; - struct c6_niter : public dpoints_fwd_piter<dpoint2d> + struct c6_niter : public dpsites_fwd_piter<dpoint2d> { - typedef dpoints_fwd_piter<dpoint2d> super; + typedef dpsites_fwd_piter<dpoint2d> super; c6_niter(const point2d& p) : super(c6_neighb::get(p), p)