diff options
Diffstat (limited to 'dw/iterator.hh')
| -rw-r--r-- | dw/iterator.hh | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/dw/iterator.hh b/dw/iterator.hh index a48356ef..d8a59eec 100644 --- a/dw/iterator.hh +++ b/dw/iterator.hh @@ -16,7 +16,7 @@ namespace core { * * \sa dw::core::Widget::iterator */ -class Iterator: public lout::object::Object, public lout::misc::Comparable +class Iterator: public lout::object::Comparable { protected: Iterator(Widget *widget, Content::Type mask, bool atEnd); @@ -103,7 +103,7 @@ public: EmptyIterator (Widget *widget, Content::Type mask, bool atEnd); lout::object::Object *clone(); - int compareTo(lout::misc::Comparable *other); + int compareTo(lout::object::Comparable *other); bool next (); bool prev (); void highlight (int start, int end, HighlightLayer layer); @@ -128,7 +128,7 @@ public: TextIterator (Widget *widget, Content::Type mask, bool atEnd, const char *text); - int compareTo(lout::misc::Comparable *other); + int compareTo(lout::object::Comparable *other); bool next (); bool prev (); @@ -144,7 +144,7 @@ public: * iterators do not have the limitation, that iteration is only done within * a widget, instead, child widgets are iterated through recursively. */ -class DeepIterator: public lout::object::Object, public lout::misc::Comparable +class DeepIterator: public lout::object::Comparable { private: class Stack: public lout::container::typed::Vector<Iterator> @@ -189,7 +189,7 @@ public: bool next (); bool prev (); inline DeepIterator *cloneDeepIterator() { return (DeepIterator*)clone(); } - int compareTo(lout::misc::Comparable *other); + int compareTo(lout::object::Comparable *other); /** * \brief Highlight a part of the current content. @@ -222,7 +222,7 @@ public: start, end, hpos, vpos); } }; -class CharIterator: public lout::object::Object, public lout::misc::Comparable +class CharIterator: public lout::object::Comparable { public: // START and END must not clash with any char value @@ -240,7 +240,7 @@ public: ~CharIterator (); lout::object::Object *clone(); - int compareTo(lout::misc::Comparable *other); + int compareTo(lout::object::Comparable *other); bool next (); bool prev (); |