Rename additional global TQt functions

10 files changed, 76 insertions, 76 deletions

diff --git a/khtml/rendering/bidi.cpp b/khtml/rendering/bidi.cpp
index bd010047a..2dcfe48c9 100644
--- a/khtml/rendering/bidi.cpp
+++ b/khtml/rendering/bidi.cpp
@@ -548,7 +548,7 @@ static void appendRun( BidiState &bidi )
 static void embed( TQChar::Direction d, BidiState &bidi )
 {
 #if BIDI_DEBUG > 1
-    qDebug("*** embed dir=%d emptyrun=%d", d, emptyRun );
+    tqDebug("*** embed dir=%d emptyrun=%d", d, emptyRun );
 #endif
     bool b = adjustEmbedding ;
     adjustEmbedding = false;
diff --git a/khtml/rendering/font.cpp b/khtml/rendering/font.cpp
index a33f0e082..1a0591192 100644
--- a/khtml/rendering/font.cpp
+++ b/khtml/rendering/font.cpp
@@ -462,7 +462,7 @@ void Font::update( TQPaintDeviceMetrics* devMetrics ) const
     // Also, Qt does not support sizing a TQFont to zero.
     size = kMax(1, kMin(255, size));
 
-//       qDebug("setting font to %s, italic=%d, weight=%d, size=%d", fontDef.family.latin1(), fontDef.italic,
+//       tqDebug("setting font to %s, italic=%d, weight=%d, size=%d", fontDef.family.latin1(), fontDef.italic,
 //    	   fontDef.weight, size );
 
 
diff --git a/khtml/rendering/render_body.cpp b/khtml/rendering/render_body.cpp
index 930ec358c..541c9676d 100644
--- a/khtml/rendering/render_body.cpp
+++ b/khtml/rendering/render_body.cpp
@@ -43,7 +43,7 @@ RenderBody::~RenderBody()
 
 void RenderBody::setStyle(RenderStyle* style)
 {
-//     qDebug("RenderBody::setStyle()");
+//     tqDebug("RenderBody::setStyle()");
     // ignore position: fixed on body
     if (style->htmlHacks() && style->position() == FIXED)
         style->setPosition(STATIC);
diff --git a/khtml/rendering/render_image.cpp b/khtml/rendering/render_image.cpp
index 46104adb8..e387920d6 100644
--- a/khtml/rendering/render_image.cpp
+++ b/khtml/rendering/render_image.cpp
@@ -143,7 +143,7 @@ void RenderImage::setPixmap( const TQPixmap &p, const TQRect& r, CachedImage *o)
     if( o->pixmap_size().width() != intrinsicWidth() ||
        o->pixmap_size().height() != intrinsicHeight() || iwchanged )
     {
-//           qDebug("image dimensions have been changed, old: %d/%d  new: %d/%d",
+//           tqDebug("image dimensions have been changed, old: %d/%d  new: %d/%d",
 //                  intrinsicWidth(), intrinsicHeight(),
 //               o->pixmap_size().width(), o->pixmap_size().height());
 
@@ -264,7 +264,7 @@ void RenderImage::paint(PaintInfo& paintInfo, int _tx, int _ty)
         if(cWidth > 2 && cHeight > 2)
         {
             if ( !berrorPic ) {
-                //qDebug("qDrawShadePanel %d/%d/%d/%d", _tx + leftBorder, _ty + topBorder, cWidth, cHeight);
+                //tqDebug("qDrawShadePanel %d/%d/%d/%d", _tx + leftBorder, _ty + topBorder, cWidth, cHeight);
                 qDrawShadePanel( paintInfo.p, _tx + leftBorder + leftPad, _ty + topBorder + topPad, cWidth, cHeight,
                                  KApplication::palette().inactive(), true, 1 );
             }
@@ -299,7 +299,7 @@ void RenderImage::paint(PaintInfo& paintInfo, int _tx, int _ty)
                 TQRect scaledrect(i->valid_rect());
 //                 kdDebug(6040) << "time elapsed: " << dt->elapsed() << endl;
 //                  kdDebug( 6040 ) << "have to scale: " << endl;
-//                  qDebug("cw=%d ch=%d  pw=%d ph=%d  rcw=%d, rch=%d",
+//                  tqDebug("cw=%d ch=%d  pw=%d ph=%d  rcw=%d, rch=%d",
 //                          cWidth, cHeight, intrinsicWidth(), intrinsicHeight(), resizeCache.width(), resizeCache.height());
                 TQWMatrix matrix;
                 matrix.scale( (float)(cWidth)/intrinsicWidth(),
@@ -307,8 +307,8 @@ void RenderImage::paint(PaintInfo& paintInfo, int _tx, int _ty)
                 resizeCache = pix.xForm( matrix );
                 scaledrect.setWidth( ( cWidth*scaledrect.width() ) / intrinsicWidth() );
                 scaledrect.setHeight( ( cHeight*scaledrect.height() ) / intrinsicHeight() );
-//                   qDebug("resizeCache size: %d/%d", resizeCache.width(), resizeCache.height());
-//                   qDebug("valid: %d/%d, scaled: %d/%d",
+//                   tqDebug("resizeCache size: %d/%d", resizeCache.width(), resizeCache.height());
+//                   tqDebug("valid: %d/%d, scaled: %d/%d",
 //                          i->valid_rect().width(), i->valid_rect().height(),
 //                          scaledrect.width(), scaledrect.height());
 
@@ -336,12 +336,12 @@ void RenderImage::paint(PaintInfo& paintInfo, int _tx, int _ty)
                        : TQRect(0, 0, intrinsicWidth(), intrinsicHeight()));
 
             TQPoint offs( _tx + leftBorder + leftPad, _ty + topBorder + topPad);
-//             qDebug("normal paint rect %d/%d/%d/%d", rect.x(), rect.y(), rect.width(), rect.height());
+//             tqDebug("normal paint rect %d/%d/%d/%d", rect.x(), rect.y(), rect.width(), rect.height());
 //             rect = rect & TQRect( 0 , y - offs.y() - 10, w, 10 + y + h  - offs.y());
 
-//             qDebug("normal paint rect after %d/%d/%d/%d", rect.x(), rect.y(), rect.width(), rect.height());
-//             qDebug("normal paint: offs.y(): %d, y: %d, diff: %d", offs.y(), y, y - offs.y());
-//             qDebug("");
+//             tqDebug("normal paint rect after %d/%d/%d/%d", rect.x(), rect.y(), rect.width(), rect.height());
+//             tqDebug("normal paint: offs.y(): %d, y: %d, diff: %d", offs.y(), y, y - offs.y());
+//             tqDebug("");
 
 //           p->setClipRect(TQRect(x,y,w,h));
 
diff --git a/khtml/rendering/render_object.cpp b/khtml/rendering/render_object.cpp
index 162ca4956..f03039759 100644
--- a/khtml/rendering/render_object.cpp
+++ b/khtml/rendering/render_object.cpp
@@ -1273,7 +1273,7 @@ void RenderObject::setStyle(RenderStyle *style)
         return;
 
     RenderStyle::Diff d = m_style ? m_style->diff( style ) : RenderStyle::Layout;
-    //qDebug("m_style: %p new style, diff=%d", m_style,  d);
+    //tqDebug("m_style: %p new style, diff=%d", m_style,  d);
 
     Priority pri = NormalPriority;
     if (m_style) {
diff --git a/khtml/rendering/render_object.h b/khtml/rendering/render_object.h
index f7f772387..e15dabbbc 100644
--- a/khtml/rendering/render_object.h
+++ b/khtml/rendering/render_object.h
@@ -49,7 +49,7 @@ class KHTMLView;
 #define KHTMLAssert( x ) if( !(x) ) { \
     const RenderObject *o = this; while( o->parent() ) o = o->parent(); \
     o->printTree(); \
-    qDebug(" this object = %p, %s", (void*) this, kdBacktrace().latin1() ); \
+    tqDebug(" this object = %p, %s", (void*) this, kdBacktrace().latin1() ); \
     assert( x ); \
 }
 #else
diff --git a/khtml/rendering/render_replaced.cpp b/khtml/rendering/render_replaced.cpp
index 7653b746c..6d6823455 100644
--- a/khtml/rendering/render_replaced.cpp
+++ b/khtml/rendering/render_replaced.cpp
@@ -413,14 +413,14 @@ void RenderWidget::paint(PaintInfo& paintInfo, int _tx, int _ty)
         int xNew = xPos;
         int yNew = childy;
 
-        //         qDebug("cy=%d, ch=%d, childy=%d, childh=%d", cy, ch, childy, childh );
+        //         tqDebug("cy=%d, ch=%d, childy=%d, childh=%d", cy, ch, childy, childh );
         if ( childh == 3072 ) {
             if ( cy + ch > childy + childh ) {
                 yNew = cy + ( ch - childh )/2;
             } else if ( cy < childy ) {
                 yNew = cy + ( ch - childh )/2;
             }
-//             qDebug("calculated yNew=%d", yNew);
+//             tqDebug("calculated yNew=%d", yNew);
         }
         yNew = kMin( yNew, yPos + m_height - childh );
         yNew = kMax( yNew, yPos );
@@ -880,7 +880,7 @@ bool RenderWidget::handleEvent(const DOM::EventImpl& ev)
 void RenderWidget::deref()
 {
     if (_ref) _ref--;
-//     qDebug( "deref(%p): width get count is %d", this, _ref);
+//     tqDebug( "deref(%p): width get count is %d", this, _ref);
     if (!_ref) {
         khtml::SharedPtr<RenderArena> guard(m_arena); //Since delete on us gets called -first-,
                                                       //before the arena free
diff --git a/khtml/rendering/render_table.cpp b/khtml/rendering/render_table.cpp
index 2cf1bf1f9..d98aa2072 100644
--- a/khtml/rendering/render_table.cpp
+++ b/khtml/rendering/render_table.cpp
@@ -566,7 +566,7 @@ void RenderTable::splitColumn( int pos, int firstSpan )
     int oldSize = columns.size();
     columns.resize( oldSize + 1 );
     int oldSpan = columns[pos].span;
-//     qDebug("splitColumn( %d,%d ), oldSize=%d, oldSpan=%d", pos, firstSpan, oldSize, oldSpan );
+//     tqDebug("splitColumn( %d,%d ), oldSize=%d, oldSpan=%d", pos, firstSpan, oldSize, oldSpan );
     KHTMLAssert( oldSpan > firstSpan );
     columns[pos].span = firstSpan;
     memmove( columns.data()+pos+1, columns.data()+pos, (oldSize-pos)*sizeof(ColumnStruct) );
@@ -585,7 +585,7 @@ void RenderTable::splitColumn( int pos, int firstSpan )
 		section->grid[row].row->resize( oldSize+1 );
 		RenderTableSection::Row &r = *section->grid[row].row;
 		memmove( r.data()+pos+1, r.data()+pos, (oldSize-pos)*sizeof( RenderTableCell * ) );
-// 		qDebug("moving from %d to %d, num=%d", pos, pos+1, (oldSize-pos-1) );
+// 		tqDebug("moving from %d to %d, num=%d", pos, pos+1, (oldSize-pos-1) );
 		r[pos+1] = r[pos] ? (RenderTableCell *)-1 : 0;
 		row++;
 	    }
@@ -600,11 +600,11 @@ void RenderTable::appendColumn( int span )
 {
     // easy case.
     int pos = columns.size();
-//     qDebug("appendColumn( %d ), size=%d", span, pos );
+//     tqDebug("appendColumn( %d ), size=%d", span, pos );
     int newSize = pos + 1;
     columns.resize( newSize );
     columns[pos].span = span;
-    //qDebug("appending column at %d, span %d", pos,  span );
+    //tqDebug("appending column at %d, span %d", pos,  span );
 
     // change width of all rows.
     RenderObject *child = firstChild();
@@ -1086,7 +1086,7 @@ void RenderTableSection::addCell( RenderTableCell *cell, RenderTableRow *row )
     while ( cCol < nCols && cellAt( cRow, cCol ) )
 	cCol++;
 
-//       qDebug("adding cell at %d/%d span=(%d/%d)",  cRow, cCol, rSpan, cSpan );
+//       tqDebug("adding cell at %d/%d span=(%d/%d)",  cRow, cCol, rSpan, cSpan );
 
     if ( rSpan == 1 ) {
 	// we ignore height settings on rowspan cells
@@ -1139,7 +1139,7 @@ void RenderTableSection::addCell( RenderTableCell *cell, RenderTableRow *row )
 	int r = 0;
 	while ( r < rSpan ) {
 	    if ( !cellAt( cRow + r, cCol ) ) {
-// 		qDebug("    adding cell at %d, %d",  cRow + r, cCol );
+// 		tqDebug("    adding cell at %d, %d",  cRow + r, cCol );
 		cellAt( cRow + r, cCol ) = set;
 	    }
 	    r++;
@@ -1169,7 +1169,7 @@ void RenderTableSection::setCellWidths()
 	int cols = row.size();
 	for ( int j = 0; j < cols; j++ ) {
 	    RenderTableCell *cell = row[j];
-// 	    qDebug("cell[%d,%d] = %p", i, j, cell );
+// 	    tqDebug("cell[%d,%d] = %p", i, j, cell );
 	    if ( !cell || cell == (RenderTableCell *)-1 )
 		continue;
 	    int endCol = j;
@@ -1213,7 +1213,7 @@ void RenderTableSection::calcRowHeight()
 
 	int baseline=0;
 	int bdesc = 0;
-// 	qDebug("height of row %d is %d/%d", r, grid[r].height.value, grid[r].height.type );
+// 	tqDebug("height of row %d is %d/%d", r, grid[r].height.value, grid[r].height.type );
 	int ch = grid[r].height.minWidth( 0 );
 	int pos = rowPos[r] + ch + (grid[r].rowRenderer ? vspacing : 0);
 
@@ -1290,7 +1290,7 @@ void RenderTableSection::calcRowHeight()
 
 	if ( rowPos[r+1] < rowPos[r] )
 	    rowPos[r+1] = rowPos[r];
-//   	qDebug("rowpos(%d)=%d",  r, rowPos[r] );
+//   	tqDebug("rowpos(%d)=%d",  r, rowPos[r] );
     }
 }
 
@@ -1313,7 +1313,7 @@ int RenderTableSection::layoutRows( int toAdd )
     if (toAdd && totalRows && (rowPos[totalRows] || !nextSibling())) {
 
 	int totalHeight = rowPos[totalRows] + toAdd;
-//	qDebug("layoutRows: totalHeight = %d",  totalHeight );
+//	tqDebug("layoutRows: totalHeight = %d",  totalHeight );
 
         int dh = toAdd;
 	int totalPercent = 0;
@@ -1325,7 +1325,7 @@ int RenderTableSection::layoutRows( int toAdd )
 		totalPercent += grid[r].height.value();
 	}
 	if ( totalPercent ) {
-//	    qDebug("distributing %d over percent rows totalPercent=%d", dh,  totalPercent );
+//	    tqDebug("distributing %d over percent rows totalPercent=%d", dh,  totalPercent );
 	    // try to satisfy percent
 	    int add = 0;
 	    if ( totalPercent > 100 )
@@ -1340,7 +1340,7 @@ int RenderTableSection::layoutRows( int toAdd )
 		    add += toAdd;
 		    dh -= toAdd;
 		    totalPercent -= grid[r].height.value();
-//		    qDebug( "adding %d to row %d", toAdd, r );
+//		    tqDebug( "adding %d to row %d", toAdd, r );
 		}
 		if ( r < totalRows-1 )
 		    rh = rowPos[r+2] - rowPos[r+1];
@@ -1349,7 +1349,7 @@ int RenderTableSection::layoutRows( int toAdd )
 	}
 	if ( numVariable ) {
 	    // distribute over non-empty variable rows
-//	    qDebug("distributing %d over variable rows numVariable=%d", dh,  numVariable );
+//	    tqDebug("distributing %d over variable rows numVariable=%d", dh,  numVariable );
 	    int add = 0;
             int toAdd = dh/numVariable;
             for ( int r = 0; r < totalRows; r++ ) {
diff --git a/khtml/rendering/render_text.cpp b/khtml/rendering/render_text.cpp
index f5fa2e373..770e8cd4d 100644
--- a/khtml/rendering/render_text.cpp
+++ b/khtml/rendering/render_text.cpp
@@ -912,7 +912,7 @@ FindSelectionResult RenderText::checkSelectionPoint(int _x, int _y, int _tx, int
 
     // set offset to max
     offset = str->l;
-    //qDebug("setting node to %p", element());
+    //tqDebug("setting node to %p", element());
     node = element();
 //     kdDebug(6040) << "RenderText::checkSelectionPoint: node " << node << " offset " << offset << endl;
     return SelectionPointAfter;
diff --git a/khtml/rendering/table_layout.cpp b/khtml/rendering/table_layout.cpp
index 7b5215d02..f745640e7 100644
--- a/khtml/rendering/table_layout.cpp
+++ b/khtml/rendering/table_layout.cpp
@@ -99,8 +99,8 @@ int FixedTableLayout::calcWidthArray()
     width.fill( Length( Variable ) );
 
 #ifdef DEBUG_LAYOUT
-    qDebug("FixedTableLayout::calcWidthArray()" );
-    qDebug("    col elements:");
+    tqDebug("FixedTableLayout::calcWidthArray()" );
+    tqDebug("    col elements:");
 #endif
 
     Length grpWidth;
@@ -120,7 +120,7 @@ int FixedTableLayout::calcWidthArray()
 		    effWidth = KMIN( effWidth, 32760 );
 		}
 #ifdef DEBUG_LAYOUT
-		qDebug("    col element: effCol=%d, span=%d: %d w=%d type=%d",
+		tqDebug("    col element: effCol=%d, span=%d: %d w=%d type=%d",
                        cCol, span, effWidth,  w.value(), w.type());
 #endif
 		int usedSpan = 0;
@@ -137,7 +137,7 @@ int FixedTableLayout::calcWidthArray()
 			width[cCol+i] = Length( w.value() * eSpan, w.type() );
 			usedWidth += effWidth * eSpan;
 #ifdef DEBUG_LAYOUT
-			qDebug("    setting effCol %d (span=%d) to width %d(type=%d)",
+			tqDebug("    setting effCol %d (span=%d) to width %d(type=%d)",
                                cCol+i, eSpan, width[cCol+i].value(), width[cCol+i].type() );
 #endif
 		    }
@@ -161,7 +161,7 @@ int FixedTableLayout::calcWidthArray()
     }
 
 #ifdef DEBUG_LAYOUT
-    qDebug("    first row:");
+    tqDebug("    first row:");
 #endif
     // iterate over the first row in case some are unspecified.
     RenderTableSection *section = table->head;
@@ -184,7 +184,7 @@ int FixedTableLayout::calcWidthArray()
 		    effWidth = kMin( effWidth, 32760 );
 		}
 #ifdef DEBUG_LAYOUT
-		qDebug("    table cell: effCol=%d, span=%d: %d",  cCol, span, effWidth);
+		tqDebug("    table cell: effCol=%d, span=%d: %d",  cCol, span, effWidth);
 #endif
 		int usedSpan = 0;
 		int i = 0;
@@ -196,13 +196,13 @@ int FixedTableLayout::calcWidthArray()
 			width[cCol+i] = Length( w.value()*eSpan, w.type() );
 			usedWidth += effWidth*eSpan;
 #ifdef DEBUG_LAYOUT
-			qDebug("    setting effCol %d (span=%d) to width %d(type=%d)",
+			tqDebug("    setting effCol %d (span=%d) to width %d(type=%d)",
                                cCol+i, eSpan, width[cCol+i].value(), width[cCol+i].type() );
 #endif
 		    }
 #ifdef DEBUG_LAYOUT
 		    else {
-			qDebug("    width of col %d already defined (span=%d)", cCol, table->spanOfEffCol( cCol ) );
+			tqDebug("    width of col %d already defined (span=%d)", cCol, table->spanOfEffCol( cCol ) );
 		    }
 #endif
 		    usedSpan += eSpan;
@@ -254,7 +254,7 @@ void FixedTableLayout::calcMinMaxWidth()
 	    table->m_maxWidth = 0x7fff;
     }
 #ifdef DEBUG_LAYOUT
-    qDebug("FixedTableLayout::calcMinMaxWidth: minWidth=%d, maxWidth=%d", table->m_minWidth, table->m_maxWidth );
+    tqDebug("FixedTableLayout::calcMinMaxWidth: minWidth=%d, maxWidth=%d", table->m_minWidth, table->m_maxWidth );
 #endif
 }
 
@@ -264,7 +264,7 @@ void FixedTableLayout::layout()
     int available = tableWidth;
     int nEffCols = table->numEffCols();
 #ifdef DEBUG_LAYOUT
-    qDebug("FixedTableLayout::layout: tableWidth=%d, numEffCols=%d",  tableWidth, nEffCols);
+    tqDebug("FixedTableLayout::layout: tableWidth=%d, numEffCols=%d",  tableWidth, nEffCols);
 #endif
 
 
@@ -293,7 +293,7 @@ void FixedTableLayout::layout()
 	    base = available;
 
 #ifdef DEBUG_LAYOUT
-    qDebug("FixedTableLayout::layout: assigning percent width, base=%d, totalPercent=%d", base, totalPercent);
+    tqDebug("FixedTableLayout::layout: assigning percent width, base=%d, totalPercent=%d", base, totalPercent);
 #endif
         for ( int i = 0; available > 0 && i < nEffCols; i++ ) {
             if ( width[i].isPercent() ) {
@@ -344,7 +344,7 @@ void FixedTableLayout::layout()
     int hspacing = table->borderHSpacing();
     for ( int i = 0; i < nEffCols; i++ ) {
 #ifdef DEBUG_LAYOUT
-	qDebug("col %d: %d (width %d)", i, pos, calcWidth[i] );
+	tqDebug("col %d: %d (width %d)", i, pos, calcWidth[i] );
 #endif
 	table->columnPos[i] = pos;
 	pos += calcWidth[i] + hspacing;
@@ -464,7 +464,7 @@ void AutoTableLayout::recalcColumn( int effCol )
 
     l.maxWidth = kMax(l.maxWidth, int(l.minWidth));
 #ifdef DEBUG_LAYOUT
-    qDebug("col %d, final min=%d, max=%d, width=%d(%d)", effCol, l.minWidth, l.maxWidth, l.width.value(),  l.width.type() );
+    tqDebug("col %d, final min=%d, max=%d, width=%d(%d)", effCol, l.minWidth, l.maxWidth, l.width.value(),  l.width.type() );
 #endif
 
     // ### we need to add col elements aswell
@@ -500,7 +500,7 @@ void AutoTableLayout::fullRecalc()
 		    w = Length();
 		int cEffCol = table->colToEffCol( cCol );
 #ifdef DEBUG_LAYOUT
-		qDebug("    col element %d (eff=%d): Length=%d(%d), span=%d, effColSpan=%d",  cCol, cEffCol, w.value(), w.type(), span, table->spanOfEffCol(cEffCol ) );
+		tqDebug("    col element %d (eff=%d): Length=%d(%d), span=%d, effColSpan=%d",  cCol, cEffCol, w.value(), w.type(), span, table->spanOfEffCol(cEffCol ) );
 #endif
 		if ( !w.isVariable() && span == 1 && cEffCol < nEffCols ) {
 		    if ( table->spanOfEffCol( cEffCol ) == 1 ) {
@@ -566,7 +566,7 @@ static bool shouldScaleColumns(RenderTable* table)
 void AutoTableLayout::calcMinMaxWidth()
 {
 #ifdef DEBUG_LAYOUT
-    qDebug("AutoTableLayout::calcMinMaxWidth");
+    tqDebug("AutoTableLayout::calcMinMaxWidth");
 #endif
     fullRecalc();
 
@@ -612,7 +612,7 @@ void AutoTableLayout::calcMinMaxWidth()
     table->m_maxWidth = kMin(maxWidth, 0x7fff);
     table->m_minWidth = kMin(minWidth, 0x7fff);
 #ifdef DEBUG_LAYOUT
-    qDebug("    minWidth=%d, maxWidth=%d", table->m_minWidth, table->m_maxWidth );
+    tqDebug("    minWidth=%d, maxWidth=%d", table->m_minWidth, table->m_maxWidth );
 #endif
 }
 
@@ -627,7 +627,7 @@ int AutoTableLayout::calcEffectiveWidth()
     unsigned int nEffCols = layoutStruct.size();
     int hspacing = table->borderHSpacing();
 #ifdef DEBUG_LAYOUT
-    qDebug("AutoTableLayout::calcEffectiveWidth for %d cols", nEffCols );
+    tqDebug("AutoTableLayout::calcEffectiveWidth for %d cols", nEffCols );
 #endif
     for ( unsigned int i = 0; i < nEffCols; i++ ) {
 	layoutStruct[i].effWidth = layoutStruct[i].width;
@@ -701,7 +701,7 @@ int AutoTableLayout::calcEffectiveWidth()
 	    cMaxWidth -= hspacing;
 	}
 #ifdef DEBUG_LAYOUT
-	qDebug("    colspan cell %p at effCol %d, span %d, type %d, value %d cmin=%d min=%d fixedwidth=%d", cell, col, cSpan, w.type(), w.value(), cMinWidth, minWidth, fixedWidth );
+	tqDebug("    colspan cell %p at effCol %d, span %d, type %d, value %d cmin=%d min=%d fixedwidth=%d", cell, col, cSpan, w.type(), w.value(), cMinWidth, minWidth, fixedWidth );
 #endif
 
 	// adjust table max width if needed
@@ -712,7 +712,7 @@ int AutoTableLayout::calcEffectiveWidth()
 	    } else {
 		int spanMax = kMax( maxWidth, cMaxWidth );
 #ifdef DEBUG_LAYOUT
-		qDebug("    adjusting tMaxWidth (%d): spanMax=%d, value=%d, totalPercent=%d", tMaxWidth, spanMax, w.value(), totalPercent );
+		tqDebug("    adjusting tMaxWidth (%d): spanMax=%d, value=%d, totalPercent=%d", tMaxWidth, spanMax, w.value(), totalPercent );
 #endif
 		tMaxWidth = kMax( tMaxWidth, spanMax * 100 / w.value() );
 
@@ -728,7 +728,7 @@ int AutoTableLayout::calcEffectiveWidth()
 		    if ( !(layoutStruct[pos].width.isPercent() ) ) {
 			int percent = percentMissing * layoutStruct[pos].effMaxWidth / totalWidth;
 #ifdef DEBUG_LAYOUT
-			qDebug("   col %d: setting percent value %d effMaxWidth=%d totalWidth=%d", pos, percent, layoutStruct[pos].effMaxWidth, totalWidth );
+			tqDebug("   col %d: setting percent value %d effMaxWidth=%d totalWidth=%d", pos, percent, layoutStruct[pos].effMaxWidth, totalWidth );
 #endif
 			totalWidth -= layoutStruct[pos].effMaxWidth;
 			percentMissing -= percent;
@@ -746,12 +746,12 @@ int AutoTableLayout::calcEffectiveWidth()
 	if ( cMinWidth > minWidth ) {
 	    if ( allColsAreFixed ) {
 #ifdef DEBUG_LAYOUT
-		qDebug("extending minWidth of cols %d-%d to %dpx currentMin=%d accroding to fixed sum %d", col, lastCol-1, cMinWidth, minWidth, fixedWidth );
+		tqDebug("extending minWidth of cols %d-%d to %dpx currentMin=%d accroding to fixed sum %d", col, lastCol-1, cMinWidth, minWidth, fixedWidth );
 #endif
 		for ( unsigned int pos = col; fixedWidth > 0 && pos < lastCol; pos++ ) {
 		    int w = kMax( int( layoutStruct[pos].effMinWidth ), cMinWidth * layoutStruct[pos].width.value() / fixedWidth );
 #ifdef DEBUG_LAYOUT
-		    qDebug("   col %d: min=%d, effMin=%d, new=%d", pos, layoutStruct[pos].effMinWidth, layoutStruct[pos].effMinWidth, w );
+		    tqDebug("   col %d: min=%d, effMin=%d, new=%d", pos, layoutStruct[pos].effMinWidth, layoutStruct[pos].effMinWidth, w );
 #endif
 		    fixedWidth -= layoutStruct[pos].width.value();
 		    cMinWidth -= w;
@@ -769,7 +769,7 @@ int AutoTableLayout::calcEffectiveWidth()
                         w = kMax( w, cminw*layoutStruct[pos].effWidth.value()/totalPercent );
                         w = kMin(layoutStruct[pos].effMinWidth+(cMinWidth-minw), w);
 #ifdef DEBUG_LAYOUT
-                        qDebug("   col %d: min=%d, effMin=%d, new=%d", pos, layoutStruct[pos].effMinWidth, layoutStruct[pos].effMinWidth, w );
+                        tqDebug("   col %d: min=%d, effMin=%d, new=%d", pos, layoutStruct[pos].effMinWidth, layoutStruct[pos].effMinWidth, w );
 #endif
                         maxw -= layoutStruct[pos].effMaxWidth;
                         minw -= layoutStruct[pos].effMinWidth;
@@ -779,7 +779,7 @@ int AutoTableLayout::calcEffectiveWidth()
                 }
 	    } else {
 #ifdef DEBUG_LAYOUT
-		qDebug("extending minWidth of cols %d-%d to %dpx currentMin=%d", col, lastCol-1, cMinWidth, minWidth );
+		tqDebug("extending minWidth of cols %d-%d to %dpx currentMin=%d", col, lastCol-1, cMinWidth, minWidth );
 #endif
 		int maxw = maxWidth;
 		int minw = minWidth;
@@ -791,7 +791,7 @@ int AutoTableLayout::calcEffectiveWidth()
 			fixedWidth -= layoutStruct[pos].width.value();
                         minw -= layoutStruct[pos].effMinWidth;
 #ifdef DEBUG_LAYOUT
-			qDebug("   col %d: min=%d, effMin=%d, new=%d", pos, layoutStruct[pos].effMinWidth, layoutStruct[pos].effMinWidth, w );
+			tqDebug("   col %d: min=%d, effMin=%d, new=%d", pos, layoutStruct[pos].effMinWidth, layoutStruct[pos].effMinWidth, w );
 #endif
 			maxw -= layoutStruct[pos].effMaxWidth;
 			cMinWidth -= w;
@@ -805,7 +805,7 @@ int AutoTableLayout::calcEffectiveWidth()
                         w = kMin(layoutStruct[pos].effMinWidth+(cMinWidth-minw), w);
 
 #ifdef DEBUG_LAYOUT
-			qDebug("   col %d: min=%d, effMin=%d, new=%d", pos, layoutStruct[pos].effMinWidth, layoutStruct[pos].effMinWidth, w );
+			tqDebug("   col %d: min=%d, effMin=%d, new=%d", pos, layoutStruct[pos].effMinWidth, layoutStruct[pos].effMinWidth, w );
 #endif
 			maxw -= layoutStruct[pos].effMaxWidth;
                         minw -= layoutStruct[pos].effMinWidth;
@@ -818,12 +818,12 @@ int AutoTableLayout::calcEffectiveWidth()
 	if ( !w.isPercent() ) {
 	    if ( cMaxWidth > maxWidth ) {
 #ifdef DEBUG_LAYOUT
-		qDebug("extending maxWidth of cols %d-%d to %dpx", col, lastCol-1, cMaxWidth );
+		tqDebug("extending maxWidth of cols %d-%d to %dpx", col, lastCol-1, cMaxWidth );
 #endif
 		for ( unsigned int pos = col; maxWidth > 0 && pos < lastCol; pos++ ) {
 		    int w = kMax( int( layoutStruct[pos].effMaxWidth ), cMaxWidth * layoutStruct[pos].effMaxWidth / maxWidth );
 #ifdef DEBUG_LAYOUT
-		    qDebug("   col %d: max=%d, effMax=%d, new=%d", pos, layoutStruct[pos].effMaxWidth, layoutStruct[pos].effMaxWidth, w );
+		    tqDebug("   col %d: max=%d, effMax=%d, new=%d", pos, layoutStruct[pos].effMaxWidth, layoutStruct[pos].effMaxWidth, w );
 #endif
 		    maxWidth -= layoutStruct[pos].effMaxWidth;
 		    cMaxWidth -= w;
@@ -837,7 +837,7 @@ int AutoTableLayout::calcEffectiveWidth()
     }
     effWidthDirty = false;
 
-//     qDebug("calcEffectiveWidth: tMaxWidth=%d",  tMaxWidth );
+//     tqDebug("calcEffectiveWidth: tMaxWidth=%d",  tMaxWidth );
     return tMaxWidth;
 }
 
@@ -849,7 +849,7 @@ void AutoTableLayout::insertSpanCell( RenderTableCell *cell )
     if ( !cell || cell == (RenderTableCell *)-1 || cell->colSpan() == 1 )
 	return;
 
-//     qDebug("inserting span cell %p with span %d", cell, cell->colSpan() );
+//     tqDebug("inserting span cell %p with span %d", cell, cell->colSpan() );
     int size = spanCells.size();
     if ( !size || spanCells[size-1] != 0 ) {
 	spanCells.resize( size + 10 );
@@ -876,24 +876,24 @@ void AutoTableLayout::layout()
     int nEffCols = table->numEffCols();
 
     if ( nEffCols != (int)layoutStruct.size() ) {
-	qWarning("WARNING: nEffCols is not equal to layoutstruct!" );
+	tqWarning("WARNING: nEffCols is not equal to layoutstruct!" );
 	fullRecalc();
 	nEffCols = table->numEffCols();
     }
 #ifdef DEBUG_LAYOUT
-    qDebug("AutoTableLayout::layout()");
+    tqDebug("AutoTableLayout::layout()");
 #endif
 
     if ( effWidthDirty )
 	calcEffectiveWidth();
 
 #ifdef DEBUG_LAYOUT
-    qDebug("    tableWidth=%d,  nEffCols=%d", tableWidth,  nEffCols );
+    tqDebug("    tableWidth=%d,  nEffCols=%d", tableWidth,  nEffCols );
     for ( int i = 0; i < nEffCols; i++ ) {
-	qDebug("    effcol %d is of type %d value %d, minWidth=%d, maxWidth=%d",
+	tqDebug("    effcol %d is of type %d value %d, minWidth=%d, maxWidth=%d",
                i, layoutStruct[i].width.type(), layoutStruct[i].width.value(),
 	       layoutStruct[i].minWidth, layoutStruct[i].maxWidth );
-	qDebug("        effective: type %d value %d, minWidth=%d, maxWidth=%d",
+	tqDebug("        effective: type %d value %d, minWidth=%d, maxWidth=%d",
                layoutStruct[i].effWidth.type(), layoutStruct[i].effWidth.value(),
 	       layoutStruct[i].effMinWidth, layoutStruct[i].effMaxWidth );
     }
@@ -959,13 +959,13 @@ void AutoTableLayout::layout()
 		    int newWidth = kMax( int (layoutStruct[i].effMinWidth), w - reduction );
 		    available += w - newWidth;
 		    layoutStruct[i].calcWidth = newWidth;
-		    //qDebug("col %d: reducing to %d px (reduction=%d)", i, newWidth, reduction );
+		    //tqDebug("col %d: reducing to %d px (reduction=%d)", i, newWidth, reduction );
 		}
 	    }
 	}
     }
 #ifdef DEBUG_LAYOUT
-    qDebug("percent satisfied: available is %d", available);
+    tqDebug("percent satisfied: available is %d", available);
 #endif
 
     // then allocate width to fixed cols
@@ -979,7 +979,7 @@ void AutoTableLayout::layout()
 	}
     }
 #ifdef DEBUG_LAYOUT
-    qDebug("fixed satisfied: available is %d", available);
+    tqDebug("fixed satisfied: available is %d", available);
 #endif
 
     // now satisfy relative
@@ -998,7 +998,7 @@ void AutoTableLayout::layout()
     // now satisfy variable
     if ( available > 0 && numVariable ) {
 	available += allocVariable; // this gets redistributed
- 	//qDebug("redistributing %dpx to %d variable columns. totalVariable=%d",  available,  numVariable,  totalVariable );
+ 	//tqDebug("redistributing %dpx to %d variable columns. totalVariable=%d",  available,  numVariable,  totalVariable );
 	for ( int i = 0; i < nEffCols; i++ ) {
 	    const Length &width = layoutStruct[i].effWidth;
 	    if ( width.isVariable() && totalVariable != 0 ) {
@@ -1011,7 +1011,7 @@ void AutoTableLayout::layout()
 	}
     }
 #ifdef DEBUG_LAYOUT
-    qDebug("variable satisfied: available is %d",  available );
+    tqDebug("variable satisfied: available is %d",  available );
 #endif
 
     // spread over fixed colums
@@ -1029,7 +1029,7 @@ void AutoTableLayout::layout()
     }
 
 #ifdef DEBUG_LAYOUT
-    qDebug("after fixed distribution: available=%d",  available );
+    tqDebug("after fixed distribution: available=%d",  available );
 #endif
 
     // spread over percent colums
@@ -1048,7 +1048,7 @@ void AutoTableLayout::layout()
     }
 
 #ifdef DEBUG_LAYOUT
-    qDebug("after percent distribution: available=%d",  available );
+    tqDebug("after percent distribution: available=%d",  available );
 #endif
 
     // spread over the rest
@@ -1065,7 +1065,7 @@ void AutoTableLayout::layout()
     }
 
 #ifdef DEBUG_LAYOUT
-    qDebug("after equal distribution: available=%d",  available );
+    tqDebug("after equal distribution: available=%d",  available );
 #endif
     // if we have overallocated, reduce every cell according to the difference between desired width and minwidth
     // this seems to produce to the pixel exaxt results with IE. Wonder is some of this also holds for width distributing.
@@ -1165,12 +1165,12 @@ void AutoTableLayout::layout()
         }
     }
 
-    //qDebug( "    final available=%d", available );
+    //tqDebug( "    final available=%d", available );
 
     int pos = 0;
     for ( int i = 0; i < nEffCols; i++ ) {
 #ifdef DEBUG_LAYOUT
-	qDebug("col %d: %d (width %d)", i, pos, layoutStruct[i].calcWidth );
+	tqDebug("col %d: %d (width %d)", i, pos, layoutStruct[i].calcWidth );
 #endif
 	table->columnPos[i] = pos;
 	pos += layoutStruct[i].calcWidth + table->borderHSpacing();