--- kdelibs/khtml/rendering/render_body.cpp 2008/05/26 18:13:43 812954 +++ kdelibs/khtml/rendering/render_body.cpp 2008/05/26 18:15:46 812955 @@ -51,7 +51,7 @@ style->setPosition(STATIC); RenderBlock::setStyle(style); - element()->getDocument()->setTextColor( style->color() ); + document()->setTextColor( style->color() ); scrollbarsStyled = false; } --- kdelibs/khtml/rendering/render_box.cpp 2008/05/26 18:13:43 812954 +++ kdelibs/khtml/rendering/render_box.cpp 2008/05/26 18:15:46 812955 @@ -2364,7 +2364,7 @@ QWheelEvent we(p, -me.detail()*40, buttons, state, orient); KHTMLAssert(layer()); - KHTMLView* v = element()->getDocument()->view(); + KHTMLView* v = document()->view(); if ( ((orient == Qt::Vertical && (v->contentsHeight() > v->visibleHeight())) || (orient == Qt::Horizontal && (v->contentsWidth() > v->visibleWidth()))) && v->isScrollingFromMouseWheel() ) { --- kdelibs/khtml/rendering/render_layer.cpp 2008/05/26 18:13:43 812954 +++ kdelibs/khtml/rendering/render_layer.cpp 2008/05/26 18:15:46 812955 @@ -368,7 +368,7 @@ bool needUpdate = false; KHTMLView* sa = 0; if (count) { - sa = m_object->element()->getDocument()->view(); + sa = m_object->document()->view(); m_region = QRect(0,0,sa->contentsWidth(),sa->contentsHeight()); for (uint i = 0; i < count; i++) { RenderLayer* child = m_posZOrderList->at(i); @@ -390,7 +390,7 @@ found |= sc->m_negZOrderList->at(i)->zIndex() > zx; if (found) { if (!sa) { - sa = m_object->element()->getDocument()->view(); + sa = m_object->document()->view(); m_region = QRect(0,0,sa->contentsWidth(),sa->contentsHeight()); } m_region -= sc->m_negZOrderList->at(i)->paintedRegion(rootLayer); @@ -403,7 +403,7 @@ found |= sc->m_posZOrderList->at(i)->zIndex() > zx; if (found) { if (!sa) { - sa = m_object->element()->getDocument()->view(); + sa = m_object->document()->view(); m_region = QRect(0,0,sa->contentsWidth(),sa->contentsHeight()); } m_region -= sc->m_posZOrderList->at(i)->paintedRegion(rootLayer); @@ -757,7 +757,7 @@ ScrollBarWidget *sb = (o == Qt::Horizontal) ? m_hBar : m_vBar; if (show && !sb) { - KHTMLView* view = m_object->element()->getDocument()->view(); + KHTMLView* view = m_object->document()->view(); sb = new ScrollBarWidget(o, view->widget()); sb->move(0, -50000); sb->setAttribute(Qt::WA_NoSystemBackground); @@ -977,7 +977,7 @@ { if (paintDirtyRect == clipRect) return; - KHTMLView* v = m_object->element()->getDocument()->view(); + KHTMLView* v = m_object->document()->view(); if (v->clipHolder() && !v->clipHolder()->isEmpty()) p->setClipRegion( v->clipHolder()->pop() ); else --- kdelibs/khtml/rendering/render_line.cpp 2008/05/26 18:13:43 812954 +++ kdelibs/khtml/rendering/render_line.cpp 2008/05/26 18:15:46 812955 @@ -483,7 +483,7 @@ RenderObject* curr = object(); while (curr && !curr->element()) curr = curr->container(); - bool strictMode = (curr && curr->element()->getDocument()->inStrictMode()); + bool strictMode = (curr && curr->document()->inStrictMode()); computeLogicalBoxHeights(maxPositionTop, maxPositionBottom, maxAscent, maxDescent, strictMode); --- kdelibs/khtml/rendering/render_replaced.cpp 2008/05/26 18:13:43 812954 +++ kdelibs/khtml/rendering/render_replaced.cpp 2008/05/26 18:15:46 812955 @@ -744,7 +744,7 @@ filtered = true; //We already delivered it! //kDebug(6000) << "RenderWidget::eventFilter captures FocusIn"; - element()->getDocument()->setFocusNode(element()); + document()->setFocusNode(element()); // if ( isEditable() ) { // KHTMLPartBrowserExtension *ext = static_cast( element()->view->part()->browserExtension() ); // if ( ext ) ext->editableWidgetFocused( m_widget );