diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-07 03:45:53 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-07 03:45:53 +0000 |
commit | 10308be19ef7fa44699562cc75946e7ea1fdf6b9 (patch) | |
tree | 4bc444c00a79e88105f2cfce5b6209994c413ca0 /khtml/rendering/render_container.cpp | |
parent | 307136d8eef0ba133b78ceee8e901138d4c996a1 (diff) | |
download | tdelibs-10308be19ef7fa44699562cc75946e7ea1fdf6b9.tar.gz tdelibs-10308be19ef7fa44699562cc75946e7ea1fdf6b9.zip |
Revert automated changes
Sorry guys, they are just not ready for prime time
Work will continue as always
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1212479 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'khtml/rendering/render_container.cpp')
-rw-r--r-- | khtml/rendering/render_container.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/khtml/rendering/render_container.cpp b/khtml/rendering/render_container.cpp index df7bfab79..69f987477 100644 --- a/khtml/rendering/render_container.cpp +++ b/khtml/rendering/render_container.cpp @@ -144,7 +144,7 @@ void RenderContainer::addChild(RenderObject *newChild, RenderObject *beforeChild newStyle->inheritFrom(style()); newStyle->setDisplay( TABLE ); newStyle->setFlowAroundFloats( true ); - table->setParent( this ); // so it tqfinds the arena + table->setParent( this ); // so it finds the arena table->setStyle(newStyle); table->setParent( 0 ); addChild(table, beforeChild); @@ -170,15 +170,15 @@ RenderObject* RenderContainer::removeChildNode(RenderObject* oldChild) KHTMLAssert(oldChild->parent() == this); // So that we'll get the appropriate dirty bit set (either that a normal flow child got yanked or - // that a positioned child got yanked). We also tqrepaint, so that the area exposed when the child - // disappears gets tqrepainted properly. + // that a positioned child got yanked). We also repaint, so that the area exposed when the child + // disappears gets repainted properly. if ( document()->renderer() ) { oldChild->setNeedsLayoutAndMinMaxRecalc(); - oldChild->tqrepaint(); + oldChild->repaint(); // Keep our layer hierarchy updated. oldChild->removeLayers(enclosingLayer()); - // remove the child from any special tqlayout lists + // remove the child from any special layout lists oldChild->removeFromObjectLists(); // if oldChild is the start or end of the selection, then clear @@ -524,7 +524,7 @@ void RenderContainer::insertChildNode(RenderObject* child, RenderObject* beforeC } -void RenderContainer::tqlayout() +void RenderContainer::layout() { KHTMLAssert( needsLayout() ); KHTMLAssert( minMaxKnown() ); @@ -532,8 +532,8 @@ void RenderContainer::tqlayout() RenderObject *child = firstChild(); while( child ) { if (pagedMode) child->setNeedsLayout(true); - child->tqlayoutIfNeeded(); - if (child->tqcontainsPageBreak()) setContainsPageBreak(true); + child->layoutIfNeeded(); + if (child->containsPageBreak()) setContainsPageBreak(true); if (child->needsPageClear()) setNeedsPageClear(true); child = child->nextSibling(); } |