Remove additional unneeded tq method conversions

21 files changed, 77 insertions, 77 deletions

diff --git a/khtml/rendering/bidi.cpp b/khtml/rendering/bidi.cpp
index 30beadd7c..e866f8838 100644
--- a/khtml/rendering/bidi.cpp
+++ b/khtml/rendering/bidi.cpp
@@ -484,7 +484,7 @@ static void appendRunsForObject(int start, int end, RenderObject* obj, BidiState
     bool haveNextMidpoint = (smidpoints && sCurrMidpoint < sNumMidpoints);
     BidiIterator nextMidpoint;
     if (haveNextMidpoint)
-        nextMidpoint = smidpoints->tqat(sCurrMidpoint);
+        nextMidpoint = smidpoints->at(sCurrMidpoint);
     if (betweenMidpoints) {
         if (!(haveNextMidpoint && nextMidpoint.obj == obj))
             return;
diff --git a/khtml/rendering/render_arena.cpp b/khtml/rendering/render_arena.cpp
index 023b98e36..99fbf4f4d 100644
--- a/khtml/rendering/render_arena.cpp
+++ b/khtml/rendering/render_arena.cpp
@@ -88,7 +88,7 @@ void* RenderArena::allocate(size_t size)
 #else
     void* result = 0;
 
-    // Ensure we have correct tqalignment for pointers.  Important for Tru64
+    // Ensure we have correct alignment for pointers.  Important for Tru64
     size = KHTML_ROUNDUP(size, sizeof(void*));
 
     // Check recyclers first
@@ -130,7 +130,7 @@ void RenderArena::free(size_t size, void* ptr)
     VALGRIND_MEMPOOL_FREE(findContainingArena(&m_pool, ptr)->base, ptr);
 #endif
 
-    // Ensure we have correct tqalignment for pointers.  Important for Tru64
+    // Ensure we have correct alignment for pointers.  Important for Tru64
     size = KHTML_ROUNDUP(size, sizeof(void*));
 
     // See if it's a size that we recycle
diff --git a/khtml/rendering/render_body.cpp b/khtml/rendering/render_body.cpp
index 2ed114a53..930ec358c 100644
--- a/khtml/rendering/render_body.cpp
+++ b/khtml/rendering/render_body.cpp
@@ -81,11 +81,11 @@ void RenderBody::paintBoxDecorations(PaintInfo& paintInfo, int _tx, int _ty)
 
 }
 
-void RenderBody::tqrepaint(Priority p)
+void RenderBody::repaint(Priority p)
 {
     RenderObject *cb = containingBlock();
     if(cb)
-	cb->tqrepaint(p);
+	cb->repaint(p);
 }
 
 void RenderBody::layout()
diff --git a/khtml/rendering/render_body.h b/khtml/rendering/render_body.h
index 17c237e91..7951f73e1 100644
--- a/khtml/rendering/render_body.h
+++ b/khtml/rendering/render_body.h
@@ -40,7 +40,7 @@ public:
     virtual bool isBody() const { return true; }
 
     virtual const char *renderName() const { return "RenderBody"; }
-    virtual void tqrepaint(Priority p=NormalPriority);
+    virtual void repaint(Priority p=NormalPriority);
 
     virtual void layout();
     virtual void setStyle(RenderStyle* style);
diff --git a/khtml/rendering/render_box.cpp b/khtml/rendering/render_box.cpp
index e63115361..1dda168c2 100644
--- a/khtml/rendering/render_box.cpp
+++ b/khtml/rendering/render_box.cpp
@@ -622,7 +622,7 @@ void RenderBox::paintBackgroundExtended(TQPainter *p, const TQColor &c, const Ba
             sy+=b.y()-cy;
             cx=b.x();cy=b.y();cw=b.width();ch=b.height();
         }
-        // restrict painting to tqrepaint-clip
+        // restrict painting to repaint-clip
         if (cy < clipy) {
             ch -= (clipy - cy);
             sy += (clipy - cy);
@@ -795,7 +795,7 @@ void RenderBox::position(InlineBox* box, int /*from*/, int /*len*/, bool /*rever
         setPos( box->xPos(), box->yPos() );
 }
 
-void RenderBox::tqrepaint(Priority prior)
+void RenderBox::repaint(Priority prior)
 {
     int ow = style() ? style()->outlineSize() : 0;
     if( isInline() && !isReplaced() )
diff --git a/khtml/rendering/render_box.h b/khtml/rendering/render_box.h
index 78b85b5f4..c0c618d5c 100644
--- a/khtml/rendering/render_box.h
+++ b/khtml/rendering/render_box.h
@@ -87,7 +87,7 @@ public:
     virtual int rightmostPosition(bool includeOverflowInterior=true, bool includeSelf=true) const;
     virtual int leftmostPosition(bool includeOverflowInterior=true, bool includeSelf=true) const;
 
-    virtual void tqrepaint(Priority p=NormalPriority);
+    virtual void repaint(Priority p=NormalPriority);
 
     virtual void repaintRectangle(int x, int y, int w, int h, Priority p=NormalPriority, bool f=false);
 
diff --git a/khtml/rendering/render_canvas.cpp b/khtml/rendering/render_canvas.cpp
index e5947369d..6fdf45849 100644
--- a/khtml/rendering/render_canvas.cpp
+++ b/khtml/rendering/render_canvas.cpp
@@ -372,13 +372,13 @@ void RenderCanvas::scheduleDeferredRepaints()
     if (!needsFullRepaint()) {
         TQValueList<RenderObject*>::const_iterator it;
         for ( it = m_dirtyChildren.begin(); it != m_dirtyChildren.end(); ++it )
-            (*it)->tqrepaint();
+            (*it)->repaint();
     }
-    //kdDebug(6040) << "scheduled deferred repaints: " << m_dirtyChildren.count() << " needed full tqrepaint: " << needsFullRepaint() << endl;
+    //kdDebug(6040) << "scheduled deferred repaints: " << m_dirtyChildren.count() << " needed full repaint: " << needsFullRepaint() << endl;
     m_dirtyChildren.clear();
 }
 
-void RenderCanvas::tqrepaint(Priority p)
+void RenderCanvas::repaint(Priority p)
 {
     if (m_view && !m_staticMode) {
         if (p == RealtimePriority) {
@@ -567,7 +567,7 @@ void RenderCanvas::setSelection(RenderObject *s, int sp, RenderObject *e, int ep
 
     TQRect updateRect;
 
-    // Don't use tqrepaint() because it will cause all rects to
+    // Don't use repaint() because it will cause all rects to
     // be united (see khtmlview::scheduleRepaint()).  Instead
     // just draw damage rects for objects that have a change
     // in selection state.
@@ -651,9 +651,9 @@ void RenderCanvas::clearSelection(bool doRepaint)
     {
         if (o->selectionState()!=SelectionNone)
             if (doRepaint)
-                o->tqrepaint();
+                o->repaint();
         o->setSelectionState(SelectionNone);
-        o->tqrepaint();
+        o->repaint();
         RenderObject* no;
         if ( !(no = o->firstChild()) )
             if ( !(no = o->nextSibling()) )
@@ -669,7 +669,7 @@ void RenderCanvas::clearSelection(bool doRepaint)
     if (m_selectionEnd) {
         m_selectionEnd->setSelectionState(SelectionNone);
         if (doRepaint)
-            m_selectionEnd->tqrepaint();
+            m_selectionEnd->repaint();
     }
 
     // set selection start & end to 0
diff --git a/khtml/rendering/render_canvas.h b/khtml/rendering/render_canvas.h
index cd4ef30ca..17f279d7b 100644
--- a/khtml/rendering/render_canvas.h
+++ b/khtml/rendering/render_canvas.h
@@ -61,7 +61,7 @@ public:
 
     KHTMLView *view() const { return m_view; }
 
-    virtual void tqrepaint(Priority p=NormalPriority);
+    virtual void repaint(Priority p=NormalPriority);
     virtual void repaintRectangle(int x, int y, int w, int h, Priority p=NormalPriority, bool f=false);
     void repaintViewRectangle(int x, int y, int w, int h, bool asap=false);
     bool needsFullRepaint() const;
diff --git a/khtml/rendering/render_container.cpp b/khtml/rendering/render_container.cpp
index 13f17c08d..69f987477 100644
--- a/khtml/rendering/render_container.cpp
+++ b/khtml/rendering/render_container.cpp
@@ -170,11 +170,11 @@ 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
+    // 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());
diff --git a/khtml/rendering/render_flow.cpp b/khtml/rendering/render_flow.cpp
index 97dd40468..ae579bd46 100644
--- a/khtml/rendering/render_flow.cpp
+++ b/khtml/rendering/render_flow.cpp
@@ -267,7 +267,7 @@ bool RenderFlow::hitTestLines(NodeInfo& i, int x, int y, int tx, int ty, HitTest
 }
 
 
-void RenderFlow::tqrepaint(Priority prior)
+void RenderFlow::repaint(Priority prior)
 {
     if (isInlineFlow()) {
         // Find our leftmost position.
@@ -280,7 +280,7 @@ void RenderFlow::tqrepaint(Priority prior)
             if (curr == firstLineBox() || curr->xPos() < left)
                 left = curr->xPos();
 
-        // Now tqinvalidate a rectangle.
+        // Now invalidate a rectangle.
         int ow = style() ? style()->outlineSize() : 0;
 
         // We need to add in the relative position offsets of any inlines (including us) up to our
@@ -306,7 +306,7 @@ void RenderFlow::tqrepaint(Priority prior)
                              effectiveWidth()+ow*2, effectiveHeight()+ow*2, prior);
         }
         else
-            return RenderBox::tqrepaint(prior);
+            return RenderBox::repaint(prior);
     }
 }
 
diff --git a/khtml/rendering/render_flow.h b/khtml/rendering/render_flow.h
index 3267a92f1..1e23822bb 100644
--- a/khtml/rendering/render_flow.h
+++ b/khtml/rendering/render_flow.h
@@ -69,7 +69,7 @@ public:
     void paintLines(PaintInfo& i, int _tx, int _ty);
     bool hitTestLines(NodeInfo& i, int x, int y, int tx, int ty, HitTestAction hitTestAction);
 
-    virtual void tqrepaint(Priority p=NormalPriority);
+    virtual void repaint(Priority p=NormalPriority);
 
     virtual int highestPosition(bool includeOverflowInterior=true, bool includeSelf=true) const;
     virtual int lowestPosition(bool includeOverflowInterior=true, bool includeSelf=true) const;
diff --git a/khtml/rendering/render_image.cpp b/khtml/rendering/render_image.cpp
index b5357bba1..8626580d6 100644
--- a/khtml/rendering/render_image.cpp
+++ b/khtml/rendering/render_image.cpp
@@ -416,7 +416,7 @@ void RenderImage::notifyFinished(CachedObject *finishedObj)
     if ( ( m_cachedImage == finishedObj || m_oldImage == finishedObj ) && m_oldImage ) {
         m_oldImage->deref( this );
         m_oldImage = 0;
-        tqrepaint();
+        repaint();
     }
 
     RenderReplaced::notifyFinished(finishedObj);
diff --git a/khtml/rendering/render_layer.cpp b/khtml/rendering/render_layer.cpp
index e82e0d831..96b0236cb 100644
--- a/khtml/rendering/render_layer.cpp
+++ b/khtml/rendering/render_layer.cpp
@@ -168,7 +168,7 @@ TQRegion RenderLayer::paintedRegion(RenderLayer* rootLayer)
     if (m_negZOrderList) {
         uint count = m_negZOrderList->count();
         for (uint i = 0; i < count; i++) {
-            RenderLayer* child = m_negZOrderList->tqat(i);
+            RenderLayer* child = m_negZOrderList->at(i);
             r += child->paintedRegion(rootLayer);
         }
     }
@@ -188,19 +188,19 @@ TQRegion RenderLayer::paintedRegion(RenderLayer* rootLayer)
     if (m_posZOrderList) {
         uint count = m_posZOrderList->count();
         for (uint i = 0; i < count; i++) {
-            RenderLayer* child = m_posZOrderList->tqat(i);
+            RenderLayer* child = m_posZOrderList->at(i);
             r += child->paintedRegion(rootLayer);
         }
     }
     return r;
 }
 
-void RenderLayer::tqrepaint( Priority p, bool markForRepaint )
+void RenderLayer::repaint( Priority p, bool markForRepaint )
 {
     if (markForRepaint && m_markedForRepaint)
         return;
     for (RenderLayer* child = firstChild(); child; child = child->nextSibling())
-        child->tqrepaint( p, markForRepaint );
+        child->repaint( p, markForRepaint );
     TQRect layerBounds, damageRect, fgrect;
     calculateRects(renderer()->canvas()->layer(), renderer()->viewRect(), layerBounds, damageRect, fgrect);
     m_visibleRect = damageRect.intersect( layerBounds );
@@ -213,7 +213,7 @@ void RenderLayer::tqrepaint( Priority p, bool markForRepaint )
 void RenderLayer::updateLayerPositions(RenderLayer* rootLayer, bool doFullRepaint, bool checkForRepaint)
 {
     if (doFullRepaint) {
-        m_object->tqrepaint();
+        m_object->repaint();
         checkForRepaint = doFullRepaint = false;
     }
 
@@ -266,7 +266,7 @@ void RenderLayer::updateWidgetMasks(RenderLayer* rootLayer)
             m_region = TQRect(0,0,sv->contentsWidth(),sv->contentsHeight());
 
             for (uint i = 0; i < count; i++) {
-                RenderLayer* child = m_posZOrderList->tqat(i);
+                RenderLayer* child = m_posZOrderList->at(i);
                 if (child->zIndex() == 0 && child->renderer()->style()->position() == STATIC)
                     continue; // we don't know the widget's exact stacking position within flow
                 m_region -= child->paintedRegion(rootLayer);
@@ -537,7 +537,7 @@ void RenderLayer::checkInlineRelOffset(const RenderObject* o, int& x, int& y)
         y += sy;
 }
 
-void RenderLayer::scrollToOffset(int x, int y, bool updateScrollbars, bool tqrepaint)
+void RenderLayer::scrollToOffset(int x, int y, bool updateScrollbars, bool repaint)
 {
     if (renderer()->style()->overflowX() != OMARQUEE || !renderer()->hasOverflowClip()) {
         if (x < 0) x = 0;
@@ -569,9 +569,9 @@ void RenderLayer::scrollToOffset(int x, int y, bool updateScrollbars, bool tqrep
     // Fire the scroll DOM event.
     m_object->element()->dispatchHTMLEvent(EventImpl::SCROLL_EVENT, true, false);
 
-    // Just schedule a full tqrepaint of our object.
-    if (tqrepaint)
-        m_object->tqrepaint(RealtimePriority);
+    // Just schedule a full repaint of our object.
+    if (repaint)
+        m_object->repaint(RealtimePriority);
 
     if (updateScrollbars) {
         if (m_hBar)
@@ -898,7 +898,7 @@ void RenderLayer::paintLayer(RenderLayer* rootLayer, TQPainter *p,
     if (m_negZOrderList) {
         uint count = m_negZOrderList->count();
         for (uint i = 0; i < count; i++) {
-            RenderLayer* child = m_negZOrderList->tqat(i);
+            RenderLayer* child = m_negZOrderList->at(i);
             child->paintLayer(rootLayer, p, paintDirtyRect, selectionOnly);
         }
     }
@@ -946,7 +946,7 @@ void RenderLayer::paintLayer(RenderLayer* rootLayer, TQPainter *p,
     if (m_posZOrderList) {
         uint count = m_posZOrderList->count();
         for (uint i = 0; i < count; i++) {
-            RenderLayer* child = m_posZOrderList->tqat(i);
+            RenderLayer* child = m_posZOrderList->at(i);
             child->paintLayer(rootLayer, p, paintDirtyRect, selectionOnly);
         }
     }
@@ -1026,7 +1026,7 @@ RenderLayer* RenderLayer::nodeAtPointForLayer(RenderLayer* rootLayer, RenderObje
     if (m_posZOrderList) {
         uint count = m_posZOrderList->count();
         for (int i = count-1; i >= 0; i--) {
-            RenderLayer* child = m_posZOrderList->tqat(i);
+            RenderLayer* child = m_posZOrderList->at(i);
             insideLayer = child->nodeAtPointForLayer(rootLayer, info, xMousePos, yMousePos, hitTestRect);
             if (insideLayer)
                 return insideLayer;
@@ -1057,7 +1057,7 @@ RenderLayer* RenderLayer::nodeAtPointForLayer(RenderLayer* rootLayer, RenderObje
     if (m_negZOrderList) {
         uint count = m_negZOrderList->count();
         for (int i = count-1; i >= 0; i--) {
-            RenderLayer* child = m_negZOrderList->tqat(i);
+            RenderLayer* child = m_negZOrderList->at(i);
             insideLayer = child->nodeAtPointForLayer(rootLayer, info, xMousePos, yMousePos, hitTestRect);
             if (insideLayer)
                 return insideLayer;
@@ -1261,8 +1261,8 @@ static void sortByZOrder(TQPtrVector<RenderLayer>* buffer,
         for (uint i = end-1; i > start; i--) {
             bool sorted = true;
             for (uint j = start; j < i; j++) {
-                RenderLayer* elt = buffer->tqat(j);
-                RenderLayer* elt2 = buffer->tqat(j+1);
+                RenderLayer* elt = buffer->at(j);
+                RenderLayer* elt2 = buffer->at(j+1);
                 if (elt->zIndex() > elt2->zIndex()) {
                     sorted = false;
                     buffer->insert(j, elt2);
@@ -1279,8 +1279,8 @@ static void sortByZOrder(TQPtrVector<RenderLayer>* buffer,
         sortByZOrder(buffer, mergeBuffer, start, mid);
         sortByZOrder(buffer, mergeBuffer, mid, end);
 
-        RenderLayer* elt = buffer->tqat(mid-1);
-        RenderLayer* elt2 = buffer->tqat(mid);
+        RenderLayer* elt = buffer->at(mid-1);
+        RenderLayer* elt2 = buffer->at(mid);
 
         // Handle the fast common case (of equal z-indices).  The list may already
         // be completely sorted.
@@ -1293,26 +1293,26 @@ static void sortByZOrder(TQPtrVector<RenderLayer>* buffer,
         uint i1 = start;
         uint i2 = mid;
 
-        elt = buffer->tqat(i1);
-        elt2 = buffer->tqat(i2);
+        elt = buffer->at(i1);
+        elt2 = buffer->at(i2);
 
         while (i1 < mid || i2 < end) {
             if (i1 < mid && (i2 == end || elt->zIndex() <= elt2->zIndex())) {
                 mergeBuffer->insert(mergeBuffer->count(), elt);
                 i1++;
                 if (i1 < mid)
-                    elt = buffer->tqat(i1);
+                    elt = buffer->at(i1);
             }
             else {
                 mergeBuffer->insert(mergeBuffer->count(), elt2);
                 i2++;
                 if (i2 < end)
-                    elt2 = buffer->tqat(i2);
+                    elt2 = buffer->at(i2);
             }
         }
 
         for (uint i = start; i < end; i++)
-            buffer->insert(i, mergeBuffer->tqat(i-start));
+            buffer->insert(i, mergeBuffer->at(i-start));
 
         mergeBuffer->clear();
     }
@@ -1471,7 +1471,7 @@ static void writeLayers(TQTextStream &ts, const RenderLayer* rootLayer, RenderLa
 
     if (negList) {
         for (unsigned i = 0; i != negList->count(); ++i)
-            writeLayers(ts, rootLayer, negList->tqat(i), paintDirtyRect, indent );
+            writeLayers(ts, rootLayer, negList->at(i), paintDirtyRect, indent );
     }
 
     if (shouldPaint)
@@ -1485,7 +1485,7 @@ static void writeLayers(TQTextStream &ts, const RenderLayer* rootLayer, RenderLa
     TQPtrVector<RenderLayer>* posList = l->posZOrderList();
     if (posList) {
         for (unsigned i = 0; i != posList->count(); ++i)
-            writeLayers(ts, rootLayer, posList->tqat(i), paintDirtyRect, indent);
+            writeLayers(ts, rootLayer, posList->at(i), paintDirtyRect, indent);
     }
 }
 
diff --git a/khtml/rendering/render_layer.h b/khtml/rendering/render_layer.h
index 1176a63a3..a8f1e5adc 100644
--- a/khtml/rendering/render_layer.h
+++ b/khtml/rendering/render_layer.h
@@ -190,7 +190,7 @@ public:
     void checkInlineRelOffset(const RenderObject* o, int& x, int& y);
     short scrollXOffset() { return m_scrollX; }
     int scrollYOffset() { return m_scrollY; }
-    void scrollToOffset(int x, int y, bool updateScrollbars = true, bool tqrepaint = true);
+    void scrollToOffset(int x, int y, bool updateScrollbars = true, bool repaint = true);
     void scrollToXOffset(int x) { scrollToOffset(x, m_scrollY); }
     void scrollToYOffset(int y) { scrollToOffset(m_scrollX, y); }
     void showScrollbar(Qt::Orientation, bool);
@@ -202,7 +202,7 @@ public:
     void paintScrollbars(RenderObject::PaintInfo& pI);
     void checkScrollbarsAfterLayout();
     void slotValueChanged(int);
-    void tqrepaint(Priority p=NormalPriority, bool markForRepaint = false);
+    void repaint(Priority p=NormalPriority, bool markForRepaint = false);
     void updateScrollPositionFromScrollbars();
 
     void updateLayerPosition();
diff --git a/khtml/rendering/render_object.cpp b/khtml/rendering/render_object.cpp
index e69991930..162ca4956 100644
--- a/khtml/rendering/render_object.cpp
+++ b/khtml/rendering/render_object.cpp
@@ -535,9 +535,9 @@ bool RenderObject::hasStaticY() const
 
 void RenderObject::setPixmap(const TQPixmap&, const TQRect& /*r*/, CachedImage* image)
 {
-    //tqrepaint bg when it finished loading
+    //repaint bg when it finished loading
     if(image && parent() && style() && style()->backgroundLayers()->containsImage(image)) {
-        isBody() ? canvas()->tqrepaint() : tqrepaint();
+        isBody() ? canvas()->repaint() : repaint();
     }
 }
 
@@ -1283,11 +1283,11 @@ void RenderObject::setStyle(RenderStyle *style)
                m_style->outlineWidth() > style->outlineWidth() ||
                (!m_style->hidesOverflow() && style->hidesOverflow()) ||
                ( m_style->hasClip() && !(m_style->clip() == style->clip()) ) ) ) {
-            // schedule a tqrepaint with the old style
+            // schedule a repaint with the old style
             if (layer() && !isInlineFlow())
-                layer()->tqrepaint(pri);
+                layer()->repaint(pri);
             else
-                tqrepaint(pri);
+                repaint(pri);
         }
 
         if ( ( isFloating() && m_style->floating() != style->floating() ) ||
@@ -1345,7 +1345,7 @@ void RenderObject::setStyle(RenderStyle *style)
             }
             setNeedsLayoutAndMinMaxRecalc();
         } else if (!isText() && d >= RenderStyle::Visible) {
-            // a tqrepaint is enough
+            // a repaint is enough
             if (layer()) {
                 if (canvas() && canvas()->needsWidgetMasks()) {
                     // update our widget masks
@@ -1357,9 +1357,9 @@ void RenderObject::setStyle(RenderStyle *style)
                 }
             }
             if (layer() && !isInlineFlow())
-                layer()->tqrepaint(pri);
+                layer()->repaint(pri);
             else
-                tqrepaint(pri);
+                repaint(pri);
         }
     }
 }
@@ -1428,9 +1428,9 @@ void RenderObject::repaintDuringLayout()
     if (canvas()->needsFullRepaint() || isText())
         return;
     if (layer() && !isInlineFlow()) {
-        layer()->tqrepaint( NormalPriority, true );
+        layer()->repaint( NormalPriority, true );
     } else {
-       tqrepaint();
+       repaint();
        canvas()->deferredRepaint( this );
     }
 }
@@ -1850,7 +1850,7 @@ short RenderObject::getVerticalPosition( bool firstLine, RenderObject* ref ) con
             bool checkParent = ref->isInline() && !ref->isReplacedBlock() &&
                                !( ref->style()->verticalAlign() == TOP || ref->style()->verticalAlign() == BOTTOM );
             vpos = checkParent ? ref->verticalPositionHint( firstLine ) : 0;
-            // don't allow elements nested inside text-top to have a different vtqalignment.
+            // don't allow elements nested inside text-top to have a different valignment.
             if ( va == BASELINE )
                 return vpos;
             else if ( va == LENGTH )
diff --git a/khtml/rendering/render_object.h b/khtml/rendering/render_object.h
index e403601d3..f7f772387 100644
--- a/khtml/rendering/render_object.h
+++ b/khtml/rendering/render_object.h
@@ -441,7 +441,7 @@ public:
     void layoutIfNeeded() { if (needsLayout()) layout(); }
 
     // used for element state updates that can not be fixed with a
-    // tqrepaint and do not need a relayout
+    // repaint and do not need a relayout
     virtual void updateFromElement() {}
 
     // Called immediately after render-object is inserted
@@ -681,8 +681,8 @@ public:
     // Used by collapsed border tables.
     virtual void collectBorders(TQValueList<CollapsedBorderValue>& borderStyles);
 
-    // force a complete tqrepaint
-    virtual void tqrepaint(Priority p = NormalPriority) { if(m_parent) m_parent->tqrepaint(p); }
+    // force a complete repaint
+    virtual void repaint(Priority p = NormalPriority) { if(m_parent) m_parent->repaint(p); }
     virtual void repaintRectangle(int x, int y, int w, int h, Priority p=NormalPriority, bool f=false);
 
     virtual unsigned int length() const { return 1; }
@@ -747,7 +747,7 @@ public:
     virtual int leftmostPosition(bool /*includeOverflowInterior*/=true, bool /*includeSelf*/=true) const { return 0; }
     virtual int highestPosition(bool /*includeOverflowInterior*/=true, bool /*includeSelf*/=true) const { return 0; }
 
-    // recursively tqinvalidate current layout
+    // recursively invalidate current layout
     // unused: void invalidateLayout();
 
     virtual void calcVerticalMargins() {}
diff --git a/khtml/rendering/render_replaced.cpp b/khtml/rendering/render_replaced.cpp
index f0a6f94a9..7653b746c 100644
--- a/khtml/rendering/render_replaced.cpp
+++ b/khtml/rendering/render_replaced.cpp
@@ -183,7 +183,7 @@ bool RenderWidget::event( TQEvent *e )
             return true;
         TQWidgetResizeEvent *re = static_cast<TQWidgetResizeEvent *>(e);
         m_widget->resize( re->w,  re->h );
-        tqrepaint();
+        repaint();
     }
     // eat all events - except if this is a frame (in which case KHTMLView handles it all)
     if ( ::tqqt_cast<KHTMLView *>( m_widget ) )
@@ -543,10 +543,10 @@ static void copyWidget(const TQRect& r, TQPainter *p, TQWidget *widget, int tx,
             }
         }
     }
-    TQMemArray<TQRect> br = blit.tqrects();
+    TQMemArray<TQRect> br = blit.rects();
 
     const int cnt = br.size();
-    const bool external = p->tqdevice()->isExtDev();
+    const bool external = p->device()->isExtDev();
     TQPixmap* const pm = PaintBuffer::grab( widget->size() );
     if (!pm)
     {
diff --git a/khtml/rendering/render_style.cpp b/khtml/rendering/render_style.cpp
index 81d0b62ed..ecbbf6de2 100644
--- a/khtml/rendering/render_style.cpp
+++ b/khtml/rendering/render_style.cpp
@@ -726,7 +726,7 @@ bool RenderStyle::inheritedNotEqual( RenderStyle *other ) const
   CbLayout: The containing block of the object needs a relayout.
   Layout: the RenderObject needs a relayout after the style change
   Visible: The change is visible, but no relayout is needed
-  NonVisible: The object does need neither tqrepaint nor relayout after
+  NonVisible: The object does need neither repaint nor relayout after
        the change.
 
   ### TODO:
@@ -744,7 +744,7 @@ RenderStyle::Diff RenderStyle::diff( const RenderStyle *other ) const
 //	EUserInput _user_input : 2;	as long as :enabled is not impl'd
 
 // ### this needs work to know more exactly if we need a relayout
-//     or just a tqrepaint
+//     or just a repaint
 
 // non-inherited attributes
 //     DataRef<StyleBoxData> box;
diff --git a/khtml/rendering/render_table.cpp b/khtml/rendering/render_table.cpp
index 26e9c26d5..2cf1bf1f9 100644
--- a/khtml/rendering/render_table.cpp
+++ b/khtml/rendering/render_table.cpp
@@ -482,7 +482,7 @@ void RenderTable::paint( PaintInfo& pI, int _tx, int _ty)
 #if 0
        TQString m;
        for (uint i = 0; i < borderStyles.count(); i++)
-         m += TQString("%1 ").arg((*borderStyles.tqat(i)).width());
+         m += TQString("%1 ").arg((*borderStyles.at(i)).width());
        kdDebug(6040) << m << endl;
 #endif
         TQValueListIterator<CollapsedBorderValue> it = borderStyles.begin();
diff --git a/khtml/rendering/render_text.cpp b/khtml/rendering/render_text.cpp
index cc41a1688..58c9c33df 100644
--- a/khtml/rendering/render_text.cpp
+++ b/khtml/rendering/render_text.cpp
@@ -738,7 +738,7 @@ void RenderText::deleteInlineBoxes(RenderArena* arena)
         if (!arena)
             arena = renderArena();
         for(unsigned int i=0; i < len; i++) {
-            InlineTextBox* s = m_lines.tqat(i);
+            InlineTextBox* s = m_lines.at(i);
             if (s)
                 s->detach(arena);
             m_lines.remove(i);
@@ -1328,11 +1328,11 @@ short RenderText::width() const
     return w;
 }
 
-void RenderText::tqrepaint(Priority p)
+void RenderText::repaint(Priority p)
 {
     RenderObject *cb = containingBlock();
     if(cb)
-        cb->tqrepaint(p);
+        cb->repaint(p);
 }
 
 bool RenderText::isFixedWidthFont() const
@@ -1464,7 +1464,7 @@ static TQString quoteAndEscapeNonPrintables(const TQString &s)
     TQString result;
     result += '"';
     for (uint i = 0; i != s.length(); ++i) {
-        TQChar c = s.tqat(i);
+        TQChar c = s.at(i);
         if (c == '\\') {
             result += "\\\\";
         } else if (c == '"') {
diff --git a/khtml/rendering/render_text.h b/khtml/rendering/render_text.h
index 0923837b3..fabf5e051 100644
--- a/khtml/rendering/render_text.h
+++ b/khtml/rendering/render_text.h
@@ -247,7 +247,7 @@ public:
     virtual short marginLeft() const { return style()->marginLeft().minWidth(0); }
     virtual short marginRight() const { return style()->marginRight().minWidth(0); }
 
-    virtual void tqrepaint(Priority p=NormalPriority);
+    virtual void repaint(Priority p=NormalPriority);
 
     bool hasBreakableChar() const { return m_hasBreakableChar; }
     const TQFontMetrics &metrics(bool firstLine) const;