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

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();
     }