aboutsummaryrefslogtreecommitdiff
path: root/dw/iterator.cc
diff options
context:
space:
mode:
authorSebastian Geerken <devnull@localhost>2016-04-02 22:48:21 +0200
committerSebastian Geerken <devnull@localhost>2016-04-02 22:48:21 +0200
commit70b9f2b70d9f0c0f48d2ae649023ea3ae5271367 (patch)
tree41c998067cde197225621171b0ab096734e5812e /dw/iterator.cc
parent639fbbfd350e32ab128482078d83a05a3f208983 (diff)
Content with type WIDGET_OOF_REF now refers to new class WidgetReference.
Diffstat (limited to 'dw/iterator.cc')
-rw-r--r--dw/iterator.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/dw/iterator.cc b/dw/iterator.cc
index dbb779f6..51b49125 100644
--- a/dw/iterator.cc
+++ b/dw/iterator.cc
@@ -362,7 +362,7 @@ Iterator *DeepIterator::searchDownward (Iterator *it, Content::Type mask,
// indent, "", from_end ? "back" : "for", a_Dw_iterator_text (it));
assert (it->getContent()->type & Content::ANY_WIDGET);
- it2 = it->getContent()->widget->iterator (mask, fromEnd);
+ it2 = it->getContent()->getWidget()->iterator (mask, fromEnd);
if (it2 == NULL) {
// Moving downwards failed.
@@ -442,7 +442,7 @@ Iterator *DeepIterator::searchSideward (Iterator *it, Content::Type mask,
misc::assertNotReached ();
if (it2->getContent()->type & Content::ANY_WIDGET &&
- it2->getContent()->widget == it->getWidget ()) {
+ it2->getContent()->getWidget () == it->getWidget ()) {
it3 = searchSideward (it2, mask, fromEnd);
it2->unref ();
//DEBUG_MSG (1, "%*smoving %swards succeeded: %s\n",
@@ -571,7 +571,7 @@ DeepIterator::DeepIterator (Iterator *it)
assert (hasNext);
if (it->getContent()->type & Content::ANY_WIDGET &&
- it->getContent()->widget == w)
+ it->getContent()->getWidget () == w)
break;
}
@@ -675,7 +675,7 @@ bool DeepIterator::next ()
if (it->next ()) {
if (it->getContent()->type & Content::ANY_WIDGET) {
// Widget: new iterator on stack, to search in this widget.
- stack.push (it->getContent()->widget->iterator (mask, false));
+ stack.push (it->getContent()->getWidget()->iterator (mask, false));
return next ();
} else {
// Simply return the content of the iterartor.
@@ -708,7 +708,7 @@ bool DeepIterator::prev ()
if (it->prev ()) {
if (it->getContent()->type & Content::ANY_WIDGET) {
// Widget: new iterator on stack, to search in this widget.
- stack.push (it->getContent()->widget->iterator (mask, true));
+ stack.push (it->getContent()->getWidget()->iterator (mask, true));
return prev ();
} else {
// Simply return the content of the iterartor.