Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 25149 → Rev 25148

/trunk/Scribus/scribus/third_party/lib2geom/path.h
350,6 → 350,7
 
template <typename IteratorImpl>
class BaseIterator
: public std::iterator<std::forward_iterator_tag, Curve const>
{
public:
BaseIterator() {}
357,12 → 358,6
// default construct
// default copy
 
using iterator_category = std::forward_iterator_tag;
using value_type = Curve const;
using difference_type = ptrdiff_t;
using pointer = Curve const*;
using reference = Curve const&;
 
bool operator==(BaseIterator const &other) {
return other.impl_ == impl_;
}
393,17 → 388,12
 
template <typename Iterator>
class DuplicatingIterator
: public std::iterator<std::input_iterator_tag, Curve *>
{
public:
DuplicatingIterator() {}
DuplicatingIterator(Iterator const &iter) : impl_(iter) {}
 
using iterator_category = std::input_iterator_tag;
using value_type = Curve*;
using difference_type = ptrdiff_t;
using pointer = Curve*;
using reference = Curve*&;
 
bool operator==(DuplicatingIterator const &other) {
return other.impl_ == impl_;
}
/trunk/Scribus/scribus/third_party/lib2geom/d2-sbasis.h
44,16 → 44,11
bool closed=false);
 
class CoordIterator
: public std::iterator<std::input_iterator_tag, SBasis const>
{
public:
CoordIterator(std::vector<D2<SBasis> >::const_iterator const &iter, unsigned d) : impl_(iter), ix_(d) {}
 
using iterator_category = std::input_iterator_tag;
using value_type = SBasis const;
using difference_type = ptrdiff_t;
using pointer = SBasis const*;
using reference = SBasis const&;
 
inline bool operator==(CoordIterator const &other) { return other.impl_ == impl_; }
inline bool operator!=(CoordIterator const &other) { return other.impl_ != impl_; }