summaryrefslogtreecommitdiffstats
path: root/khtml/rendering/render_container.cpp
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-03 04:12:51 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-03 04:12:51 +0000
commit560378aaca1784ba19806a0414a32b20c744de39 (patch)
treece0dfd7c3febf2a1adc7603d1019a8be2083c415 /khtml/rendering/render_container.cpp
parentd4d5af1cdbd3cc65d095e0afc5b1f4260091cf5d (diff)
downloadtdelibs-560378aaca1784ba19806a0414a32b20c744de39.tar.gz
tdelibs-560378aaca1784ba19806a0414a32b20c744de39.zip
Automated conversion for enhanced compatibility with TQt for Qt4 3.4.0 TP1
NOTE: This will not compile with Qt4 (yet), however it does compile with Qt3 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1211081 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'khtml/rendering/render_container.cpp')
-rw-r--r--khtml/rendering/render_container.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/khtml/rendering/render_container.cpp b/khtml/rendering/render_container.cpp
index 69f987477..df7bfab79 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 finds the arena
+ table->setParent( this ); // so it tqfinds 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 repaint, so that the area exposed when the child
- // disappears gets repainted properly.
+ // that a positioned child got yanked). We also tqrepaint, so that the area exposed when the child
+ // disappears gets tqrepainted properly.
if ( document()->renderer() ) {
oldChild->setNeedsLayoutAndMinMaxRecalc();
- oldChild->repaint();
+ oldChild->tqrepaint();
// Keep our layer hierarchy updated.
oldChild->removeLayers(enclosingLayer());
- // remove the child from any special layout lists
+ // remove the child from any special tqlayout 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::layout()
+void RenderContainer::tqlayout()
{
KHTMLAssert( needsLayout() );
KHTMLAssert( minMaxKnown() );
@@ -532,8 +532,8 @@ void RenderContainer::layout()
RenderObject *child = firstChild();
while( child ) {
if (pagedMode) child->setNeedsLayout(true);
- child->layoutIfNeeded();
- if (child->containsPageBreak()) setContainsPageBreak(true);
+ child->tqlayoutIfNeeded();
+ if (child->tqcontainsPageBreak()) setContainsPageBreak(true);
if (child->needsPageClear()) setNeedsPageClear(true);
child = child->nextSibling();
}