diff options
Diffstat (limited to 'kword/KWTableFrameSet.cpp')
-rw-r--r-- | kword/KWTableFrameSet.cpp | 286 |
1 files changed, 143 insertions, 143 deletions
diff --git a/kword/KWTableFrameSet.cpp b/kword/KWTableFrameSet.cpp index 983c9e07b..e7f557b11 100644 --- a/kword/KWTableFrameSet.cpp +++ b/kword/KWTableFrameSet.cpp @@ -50,16 +50,16 @@ DESCRIPTION #include <kdebug.h> #include <klocale.h> #include <dcopobject.h> -#include <qapplication.h> -#include <qpopupmenu.h> -#include <qclipboard.h> +#include <tqapplication.h> +#include <tqpopupmenu.h> +#include <tqclipboard.h> -KWTableFrameSet::KWTableFrameSet( KWDocument *doc, const QString & name ) : +KWTableFrameSet::KWTableFrameSet( KWDocument *doc, const TQString & name ) : KWFrameSet( doc ) { m_rows = m_cols = m_nr_cells = 0; - m_name = QString::null; + m_name = TQString(); m_active = true; m_frames.setAutoDelete(false); if ( name.isEmpty() ) @@ -143,7 +143,7 @@ KWAnchor * KWTableFrameSet::createAnchor( KoTextDocument *txt, int frameNum ) } void KWTableFrameSet::createAnchors( KoTextParag * parag, int index, bool placeHolderExists /*= false */ /*only used when loading*/, - bool repaint ) + bool tqrepaint ) { //kdDebug(32004) << "KWTableFrameSet::createAnchors" << endl; // TODO make one rect per page, and create one anchor per page @@ -154,8 +154,8 @@ void KWTableFrameSet::createAnchors( KoTextParag * parag, int index, bool placeH parag->setCustomItem( index, anchor, 0 ); kdDebug(32004) << "KWTableFrameSet::createAnchors setting anchor" << endl; parag->setChanged( true ); - if ( repaint ) - emit repaintChanged( m_anchorTextFs ); + if ( tqrepaint ) + emit tqrepaintChanged( m_anchorTextFs ); } void KWTableFrameSet::deleteAnchors() @@ -453,9 +453,9 @@ void KWTableFrameSet::recalcRows(unsigned int col, unsigned int row) { unsigned int fromRow = m_rows; // possible reposition rows starting with this one, default to no repositioning unsigned int untilRow=0; // possible reposition rows ending with this one - if( QABS( difference ) > 1E-10 ) { // means "difference != 0.0" - QValueList<unsigned int>::iterator pageBound = m_pageBoundaries.begin(); - QValueList<double>::iterator j = m_rowPositions.begin(); + if( TQABS( difference ) > 1E-10 ) { // means "difference != 0.0" + TQValueList<unsigned int>::iterator pageBound = m_pageBoundaries.begin(); + TQValueList<double>::iterator j = m_rowPositions.begin(); double last=0.0; int lineNumber=-1; while(j != m_rowPositions.end()) { @@ -463,13 +463,13 @@ void KWTableFrameSet::recalcRows(unsigned int col, unsigned int row) { if(pageBound!=m_pageBoundaries.end()) { if((int)*pageBound == lineNumber) { // next page if(lineNumber >= (int)row) { // then delete line j - QValueList<double>::iterator nextJ = j; + TQValueList<double>::iterator nextJ = j; ++nextJ; difference -= *(nextJ)-*(j); kdDebug(32004) << "Deleting line with old pos: " << *j << endl; j=m_rowPositions.remove(j); j--; - QValueList<unsigned int>::iterator tmp = pageBound; + TQValueList<unsigned int>::iterator tmp = pageBound; ++pageBound; m_pageBoundaries.remove(tmp); j++; @@ -494,7 +494,7 @@ void KWTableFrameSet::recalcRows(unsigned int col, unsigned int row) { row=0; } #if 0 -{ QValueList<unsigned int>::iterator pb = m_pageBoundaries.begin(); +{ TQValueList<unsigned int>::iterator pb = m_pageBoundaries.begin(); unsigned int i=0; double last=0; do { @@ -514,8 +514,8 @@ void KWTableFrameSet::recalcRows(unsigned int col, unsigned int row) { //double pageHeight = m_doc->ptPaperHeight() - m_doc->ptBottomBorder() - m_doc->ptTopBorder(); unsigned int pageNumber=cell(0,0)->frame(0)->pageNumber() +1; unsigned int lineNumber=1; - QValueList<unsigned int>::iterator pageBound = m_pageBoundaries.begin(); - QValueList<double>::iterator j = m_rowPositions.begin(); + TQValueList<unsigned int>::iterator pageBound = m_pageBoundaries.begin(); + TQValueList<double>::iterator j = m_rowPositions.begin(); double diff=0.0; double pageBottom = pageNumber * m_doc->ptPaperHeight() - m_doc->ptBottomBorder(); @@ -570,7 +570,7 @@ void KWTableFrameSet::recalcRows(unsigned int col, unsigned int row) { double topOfPage = m_doc->ptPaperHeight() * pageNumber + m_doc->ptTopBorder(); - QValueList<double>::iterator tmp = m_rowPositions.at(breakRow); + TQValueList<double>::iterator tmp = m_rowPositions.at(breakRow); diff += topOfPage - (*tmp); // diff between bottom of last row on page and top of new page //kdDebug() << "diff += " << topOfPage << " - " << (*tmp) << ". diff += " << topOfPage - (*tmp) <<" ="<< diff << endl; lineNumber++; @@ -603,7 +603,7 @@ void KWTableFrameSet::recalcRows(unsigned int col, unsigned int row) { #if 0 // def SUPPORT_MULTI_PAGE_TABLES // Note: produces much ouput! int i = 1; // DEBUG - for ( QValueList<double>::iterator itDebug = m_rowPositions.begin(); itDebug != m_rowPositions.end(); ++itDebug, ++i ) + for ( TQValueList<double>::iterator itDebug = m_rowPositions.begin(); itDebug != m_rowPositions.end(); ++itDebug, ++i ) { kdDebug(32004) << "m_rowPosition[" << i << "]= " << (*itDebug) << endl; } @@ -612,7 +612,7 @@ void KWTableFrameSet::recalcRows(unsigned int col, unsigned int row) { } #endif #if 0 -{ QValueList<unsigned int>::iterator pb = m_pageBoundaries.begin(); +{ TQValueList<unsigned int>::iterator pb = m_pageBoundaries.begin(); unsigned int i=0; double last=0; do { @@ -644,7 +644,7 @@ void KWTableFrameSet::recalcRows(unsigned int col, unsigned int row) { // check if any rowPosition entries are unused // first create a hash of all row entries - QMap<unsigned int,int> rows; // rownr, count + TQMap<unsigned int,int> rows; // rownr, count unsigned int top=m_rowPositions.count() - m_pageBoundaries.count()-1; for(unsigned int i=0; i < top; rows[i++]=0); @@ -877,7 +877,7 @@ void KWTableFrameSet::position( Cell *theCell, bool setMinFrameHeight ) { double KWTableFrameSet::getPositionOfRow( unsigned int row, bool bottom ) { unsigned int adjustment=0; - QValueList<unsigned int>::iterator pageBound = m_pageBoundaries.begin(); + TQValueList<unsigned int>::iterator pageBound = m_pageBoundaries.begin(); while(pageBound != m_pageBoundaries.end() && (*pageBound) <= row + adjustment) { adjustment++; pageBound++; @@ -893,7 +893,7 @@ void KWTableFrameSet::moveBy( double dx, double dy ) { //for(unsigned int i=0; i < m_rowPositions.count() ; kdDebug(32004) << "row " << i << ": " << m_rowPositions[i++] << endl); if(!(dy > -0.001 && dy < 0.001)) { redraw=true; - QValueList<double>::iterator row = m_rowPositions.begin(); + TQValueList<double>::iterator row = m_rowPositions.begin(); while(row != m_rowPositions.end()) { (*row)= (*row)+dy; row++; @@ -901,7 +901,7 @@ void KWTableFrameSet::moveBy( double dx, double dy ) { } if(!(dx > -0.001 && dx < 0.001)) { redraw=true; - QValueList<double>::iterator col = m_colPositions.begin(); + TQValueList<double>::iterator col = m_colPositions.begin(); while(col != m_colPositions.end()) { (*col)= (*col)+dx; col++; @@ -921,7 +921,7 @@ void KWTableFrameSet::deleteRow( unsigned int row, RemovedRow &rr, bool _recalc) const unsigned int rowspan=1; double height= getPositionOfRow(row+rowspan-1,true) - getPositionOfRow(row); - QValueList<double>::iterator tmp = m_rowPositions.at(row+rowspan); + TQValueList<double>::iterator tmp = m_rowPositions.at(row+rowspan); tmp=m_rowPositions.erase(tmp); while(tmp!=m_rowPositions.end()) { (*tmp)= (*tmp)-height; @@ -981,7 +981,7 @@ void KWTableFrameSet::reInsertRow(RemovedRow &rr) // put back m_frames that were removed for(uint i = 0; i < rlen; i++){ - if( m_frames.findRef((*r)[i]->frame(0)) == -1 ) + if( m_frames.tqfindRef((*r)[i]->frame(0)) == -1 ) m_frames.append( (*r)[i]->frame(0) ); } @@ -991,8 +991,8 @@ void KWTableFrameSet::reInsertRow(RemovedRow &rr) m_rowPositions.append(d); } else { - QValueList<double>::iterator top = m_rowPositions.at(row); - QValueList<double>::iterator i = m_rowPositions.at(row+1); + TQValueList<double>::iterator top = m_rowPositions.at(row); + TQValueList<double>::iterator i = m_rowPositions.at(row+1); i = m_rowPositions.insert(i, *top + rr.height()); i++; for(; i != m_rowPositions.end(); ++i) { @@ -1024,10 +1024,10 @@ void KWTableFrameSet::insertNewRow( uint idx, bool recalc, bool _removeable) // What height to use for the new row double height = getPositionOfRow(copyFromRow,true) - getPositionOfRow(copyFromRow); - // Calculate offset in QValueList because of page breaks. + // Calculate offset in TQValueList because of page breaks. unsigned int adjustment=0; unsigned int untilRow=m_rows; - QValueList<unsigned int>::iterator pageBound = m_pageBoundaries.begin(); + TQValueList<unsigned int>::iterator pageBound = m_pageBoundaries.begin(); while(pageBound != m_pageBoundaries.end() && (*pageBound) <= idx) { // Find out how many pages we already had. adjustment++; @@ -1035,7 +1035,7 @@ void KWTableFrameSet::insertNewRow( uint idx, bool recalc, bool _removeable) } // Move all rows down from newRow to bottom of page - QValueList<double>::iterator tmp = m_rowPositions.at(idx); + TQValueList<double>::iterator tmp = m_rowPositions.at(idx); double newPos = *tmp + height; tmp++; m_rowPositions.insert(tmp, newPos); @@ -1071,7 +1071,7 @@ void KWTableFrameSet::insertNewRow( uint idx, bool recalc, bool _removeable) } KWFrame *theFrame = new KWFrame(copyRow->m_cellArray[i]->frame(0)); - Cell *newCell=new Cell( this, idx, i, QString::null ); + Cell *newCell=new Cell( this, idx, i, TQString() ); newCell->setColumnSpan( cell(copyFromRow,i)->columnSpan() ); addCell(newCell); newCell->addFrame( theFrame, false ); @@ -1096,7 +1096,7 @@ void KWTableFrameSet::deleteColumn(uint col, RemovedColumn &rc) } // move the colomn positions - QValueList<double>::iterator tmp = m_colPositions.at(col+1); + TQValueList<double>::iterator tmp = m_colPositions.at(col+1); tmp = m_colPositions.erase(tmp); while(tmp != m_colPositions.end()) { (*tmp) = (*tmp) - rc.m_width; @@ -1154,7 +1154,7 @@ void KWTableFrameSet::deleteColumn(uint col, RemovedColumn &rc) void KWTableFrameSet::reInsertColumn(RemovedColumn &rc) { - QValueList<double>::iterator tmp = m_colPositions.at(rc.m_index); + TQValueList<double>::iterator tmp = m_colPositions.at(rc.m_index); tmp = m_colPositions.insert(tmp, *tmp); tmp++; @@ -1198,7 +1198,7 @@ void KWTableFrameSet::reInsertColumn(RemovedColumn &rc) void KWTableFrameSet::insertNewColumn( uint idx, double width) { - QValueList<double>::iterator tmp = m_colPositions.at(idx); + TQValueList<double>::iterator tmp = m_colPositions.at(idx); tmp = m_colPositions.insert(tmp, *tmp); tmp++; @@ -1234,7 +1234,7 @@ void KWTableFrameSet::insertNewColumn( uint idx, double width) } } - Cell *newCell = new Cell( this, i, idx, QString::null ); + Cell *newCell = new Cell( this, i, idx, TQString() ); KWFrame *theFrame = new KWFrame(cell(i, copyCol)->frame(0)); newCell->addFrame( theFrame, false ); position(newCell); @@ -1267,8 +1267,8 @@ KCommand *KWTableFrameSet::joinCells(unsigned int colBegin,unsigned int rowBegin // if just one cell selected for joining; exit. if(rowBegin == rowEnd && colBegin == colEnd || cell(rowBegin,colBegin) == cell(rowEnd,colEnd)) return 0L; - QPtrList<KWFrameSet> listFrameSet; - QPtrList<KWFrame> listCopyFrame; + TQPtrList<KWFrameSet> listFrameSet; + TQPtrList<KWFrame> listCopyFrame; // do the actual merge. for(unsigned int i=colBegin; i<=colEnd;i++) { @@ -1294,11 +1294,11 @@ KCommand *KWTableFrameSet::joinCells(unsigned int colBegin,unsigned int rowBegin validate(); m_doc->updateAllFrames(); // TODO: only fs->updateFrames() & m_doc->updateFramesOnTopOrBelow(pageNum) - m_doc->repaintAllViews(); + m_doc->tqrepaintAllViews(); return new KWJoinCellCommand( i18n("Join Cells"), this,colBegin,rowBegin, colEnd,rowEnd,listFrameSet,listCopyFrame); } -KCommand *KWTableFrameSet::splitCell(unsigned int intoRows, unsigned int intoCols, unsigned int col, unsigned int row, QPtrList<KWFrameSet> listFrameSet, QPtrList<KWFrame>listFrame) { +KCommand *KWTableFrameSet::splitCell(unsigned int intoRows, unsigned int intoCols, unsigned int col, unsigned int row, TQPtrList<KWFrameSet> listFrameSet, TQPtrList<KWFrame>listFrame) { if(intoRows < 1 || intoCols < 1) return 0L; @@ -1309,14 +1309,14 @@ KCommand *KWTableFrameSet::splitCell(unsigned int intoRows, unsigned int intoCol if(rowsDiff >0) { unsigned int adjustment=0; - QValueList<unsigned int>::iterator pageBound = m_pageBoundaries.begin(); + TQValueList<unsigned int>::iterator pageBound = m_pageBoundaries.begin(); while(pageBound != m_pageBoundaries.end() && (*pageBound) <= row) { adjustment++; pageBound++; } double height = (m_rowPositions[row+adjustment+1] - m_rowPositions[row+adjustment])/intoRows; - QValueList<double>::iterator iRow = m_rowPositions.at(adjustment+row); + TQValueList<double>::iterator iRow = m_rowPositions.at(adjustment+row); for (int i=0; i < rowsDiff; i++) { double newPos = *iRow + height; iRow++; @@ -1336,7 +1336,7 @@ KCommand *KWTableFrameSet::splitCell(unsigned int intoRows, unsigned int intoCol if(colsDiff >0) { double width = (m_colPositions[col+1] - m_colPositions[col])/intoCols; - QValueList<double>::iterator iCol = m_colPositions.at(col); + TQValueList<double>::iterator iCol = m_colPositions.at(col); for (int i=0; i < colsDiff; i++) { double newPos = *iCol + width; iCol++; @@ -1436,7 +1436,7 @@ KCommand *KWTableFrameSet::splitCell(unsigned int intoRows, unsigned int intoCol return new KWSplitCellCommand(i18n("Split Cells"),this,col,row,intoCols, intoRows); } -void KWTableFrameSet::viewFormatting( QPainter &/*painter*/, int ) +void KWTableFrameSet::viewFormatting( TQPainter &/*painter*/, int ) { } @@ -1454,7 +1454,7 @@ void KWTableFrameSet::validate() for(uint j = cells->firstColumn(); j < cells->columnAfter(); ++j) { if( cell(i,j) != cells.current() ) { - QString str = QString("| 0x%1 ").arg( (unsigned long)cells.current(), 0, 16 ); + TQString str = TQString("| 0x%1 ").tqarg( (unsigned long)cells.current(), 0, 16 ); kdDebug(32004) << " KWTableFrameSet::validate() failed " << endl; kdDebug(32004) << "at row: "<< i << " col: "<< j << " cell: "<< str << endl; kdDebug(32004) << cells->firstRow() << " " << cells->firstColumn() << " " << cells->rowSpan() @@ -1466,21 +1466,21 @@ void KWTableFrameSet::validate() } } -void KWTableFrameSet::createEmptyRegion( const QRect & crect, QRegion & emptyRegion, KWViewMode *viewMode ) +void KWTableFrameSet::createEmptyRegion( const TQRect & crect, TQRegion & emptyRegion, KWViewMode *viewMode ) { // Avoid iterating over all cells if we are out of view if ( !viewMode->normalToView( m_doc->zoomRect( boundingRect() ) ).intersects( crect ) ) return; - QRect outerRect( viewMode->normalToView( m_doc->zoomRect( boundingRect() ))); + TQRect outerRect( viewMode->normalToView( m_doc->zoomRect( boundingRect() ))); outerRect &= crect; if ( !outerRect.isEmpty() ) emptyRegion = emptyRegion.subtract( outerRect ); - QPtrListIterator<KWFrame> frameIt = frameIterator(); + TQPtrListIterator<KWFrame> frameIt = frameIterator(); for ( ; frameIt.current(); ++frameIt ) { - QRect outerRect( viewMode->normalToView( frameIt.current()->outerRect(viewMode) ) ); + TQRect outerRect( viewMode->normalToView( frameIt.current()->outerRect(viewMode) ) ); //kdDebug(32004) << "KWTableFrameSet::createEmptyRegion outerRect=" << DEBUGRECT( outerRect ) // << " crect=" << DEBUGRECT( crect ) << endl; outerRect &= crect; @@ -1489,7 +1489,7 @@ void KWTableFrameSet::createEmptyRegion( const QRect & crect, QRegion & emptyReg } } -void KWTableFrameSet::drawBorders( QPainter& painter, const QRect &crect, KWViewMode *viewMode ) { +void KWTableFrameSet::drawBorders( TQPainter& painter, const TQRect &crect, KWViewMode *viewMode ) { /* Draw the borders on top of the lines stores in the m_rowPositions and m_colPositions arrays. * check the relevant cells for borders and thus line thickness. @@ -1497,14 +1497,14 @@ void KWTableFrameSet::drawBorders( QPainter& painter, const QRect &crect, KWView * inside the boundary of the table! */ painter.save(); - QPen previewLinePen( QApplication::palette().color( QPalette::Active, QColorGroup::Mid ) ); - QColor defaultBorderColor = KoTextFormat::defaultTextColor( &painter ); + TQPen previewLinePen( TQApplication::palette().color( TQPalette::Active, TQColorGroup::Mid ) ); + TQColor defaultBorderColor = KoTextFormat::defaultTextColor( &painter ); const int minborder = 1; bool drawPreviewLines = viewMode && viewMode->drawFrameBorders(); // *** draw horizontal lines *** // unsigned int row=0; - QValueList<unsigned int>::iterator pageBound = m_pageBoundaries.begin(); + TQValueList<unsigned int>::iterator pageBound = m_pageBoundaries.begin(); for (unsigned int i=0 ; i < m_rowPositions.count() ; i++) { //kdDebug(32004) << "Horizontal line code. i: " << i << endl; bool bottom=false; @@ -1543,9 +1543,9 @@ void KWTableFrameSet::drawBorders( QPainter& painter, const QRect &crect, KWView } } double x = m_colPositions[col] + offset; - QPoint topLeft = viewMode->normalToView(QPoint(m_doc->zoomItX(startPos), ypix)); - QPoint bottomRight = viewMode->normalToView(QPoint(m_doc->zoomItX(x), ypix)); - QRect line = QRect(topLeft, bottomRight); + TQPoint topLeft = viewMode->normalToView(TQPoint(m_doc->zoomItX(startPos), ypix)); + TQPoint bottomRight = viewMode->normalToView(TQPoint(m_doc->zoomItX(x), ypix)); + TQRect line = TQRect(topLeft, bottomRight); if(crect.intersects( line )) { //if(border->width() <= 0) kdDebug(32004) << "preview line" << endl; if(border->width() <= 0) @@ -1642,7 +1642,7 @@ void KWTableFrameSet::drawBorders( QPainter& painter, const QRect &crect, KWView } // Draw when something changed (different kind of border) or we're at the end - // This code could be rewritten in a more QRT-like way + // This code could be rewritten in a more TQRT-like way // (iterate and compare with next, instead of the startRow/cell/border hack...) if(startRow != -1 && (!daCell || row == getRows() || @@ -1657,7 +1657,7 @@ void KWTableFrameSet::drawBorders( QPainter& painter, const QRect &crect, KWView x-=border->width() / 2; } int xpix = m_doc->zoomItX(x); - QValueList<unsigned int>::iterator pageBound = m_pageBoundaries.begin(); + TQValueList<unsigned int>::iterator pageBound = m_pageBoundaries.begin(); unsigned int topRow=startRow; //kdDebug(32004) << "Drawing from topRow=" << topRow << endl; do { // draw minimum of one line per page. @@ -1694,9 +1694,9 @@ void KWTableFrameSet::drawBorders( QPainter& painter, const QRect &crect, KWView } double bottom=m_rowPositions[toRow] + offset; - QPoint topLeft = viewMode->normalToView(QPoint(xpix, m_doc->zoomItY(top))); - QPoint bottomRight = viewMode->normalToView(QPoint(xpix, m_doc->zoomItY(bottom))); - QRect line = QRect(topLeft, bottomRight); + TQPoint topLeft = viewMode->normalToView(TQPoint(xpix, m_doc->zoomItY(top))); + TQPoint bottomRight = viewMode->normalToView(TQPoint(xpix, m_doc->zoomItY(bottom))); + TQRect line = TQRect(topLeft, bottomRight); if(crect.intersects( line )) { if(border->width() <= 0) painter.setPen( previewLinePen ); @@ -1731,16 +1731,16 @@ void KWTableFrameSet::drawBorders( QPainter& painter, const QRect &crect, KWView #if 0 if(drawPreviewLines) { - QPen minsizeLinePen( red ); + TQPen minsizeLinePen( red ); painter.setPen( minsizeLinePen ); for ( unsigned int i = 0; i < m_cells.count(); i++ ) { Cell *daCell = m_cells.at( i ); double y = daCell->frame(0)->top() + daCell->frame(0)->minimumFrameHeight() + 1.5; if(y >= daCell->frame(0)->bottom()) continue; int ypix=m_doc->zoomItY(y); - QPoint topLeft = viewMode->normalToView(QPoint(m_doc->zoomItX(daCell->frame(0)->left()), ypix)); - QPoint bottomRight = viewMode->normalToView(QPoint(m_doc->zoomItX(daCell->frame(0)->right()), ypix)); - QRect line = QRect(topLeft, bottomRight); + TQPoint topLeft = viewMode->normalToView(TQPoint(m_doc->zoomItX(daCell->frame(0)->left()), ypix)); + TQPoint bottomRight = viewMode->normalToView(TQPoint(m_doc->zoomItX(daCell->frame(0)->right()), ypix)); + TQRect line = TQRect(topLeft, bottomRight); if(crect.intersects( line )) { painter.drawLine( line.left(), line.top(), line.right(), line.bottom()); } @@ -1751,8 +1751,8 @@ void KWTableFrameSet::drawBorders( QPainter& painter, const QRect &crect, KWView painter.restore(); } -void KWTableFrameSet::drawContents( QPainter * painter, const QRect & crect, - const QColorGroup & cg, bool onlyChanged, bool resetChanged, +void KWTableFrameSet::drawContents( TQPainter * painter, const TQRect & crect, + const TQColorGroup & cg, bool onlyChanged, bool resetChanged, KWFrameSetEdit * edit, KWViewMode * viewMode, KWFrameViewManager *fvm ) { @@ -1783,7 +1783,7 @@ void KWTableFrameSet::saveOasis( KoXmlWriter& writer, KoSavingContext& context, KoGenStyle tableStyle( KWDocument::STYLE_TABLE, "table" ); tableStyle.addProperty( "table:align", "margins" ); tableStyle.addPropertyPt( "style:width", m_colPositions.last()-m_colPositions[0] ); - const QString tableStyleName = context.mainStyles().lookup( tableStyle, "table" ); + const TQString tableStyleName = context.mainStyles().lookup( tableStyle, "table" ); writer.addAttribute( "table:style-name", tableStyleName ); // ### to minimize the XML, we could use table:number-columns-repeated here @@ -1793,7 +1793,7 @@ void KWTableFrameSet::saveOasis( KoXmlWriter& writer, KoSavingContext& context, writer.startElement( "table:table-column" ); KoGenStyle columnStyle( KWDocument::STYLE_TABLE_COLUMN, "table-column" ); columnStyle.addPropertyPt( "style:column-width", m_colPositions[colNr+1] - m_colPositions[colNr] ); - const QString colStyleName = context.mainStyles().lookup( columnStyle, "col" ); + const TQString colStyleName = context.mainStyles().lookup( columnStyle, "col" ); writer.addAttribute( "table:style-name", colStyleName ); writer.endElement(); // table:table-column } @@ -1807,7 +1807,7 @@ void KWTableFrameSet::saveOasis( KoXmlWriter& writer, KoSavingContext& context, KoGenStyle rowStyle( KWDocument::STYLE_TABLE_ROW, "table-row" ); rowStyle.addPropertyPt( "table:row-height", m_rowPositions[row+1] - m_rowPositions[row] ); // TODO is min-row-height or use-optimal-row-height necessary? - const QString rowStyleName = context.mainStyles().lookup( rowStyle, "row" ); + const TQString rowStyleName = context.mainStyles().lookup( rowStyle, "row" ); writer.addAttribute( "table:style-name", rowStyleName ); for ( uint col = 0; col < getColumns(); ++col ) @@ -1824,7 +1824,7 @@ void KWTableFrameSet::saveOasis( KoXmlWriter& writer, KoSavingContext& context, // Style: background, border, padding. KoGenStyle cellStyle( KWDocument::STYLE_TABLE_CELL_AUTO, "table-cell" ); daCell->frame( 0 )->saveBorderProperties( cellStyle ); - const QString colStyleName = context.mainStyles().lookup( cellStyle, "cell" ); + const TQString colStyleName = context.mainStyles().lookup( cellStyle, "cell" ); writer.addAttribute( "table:style-name", colStyleName ); // Attributes @@ -1851,15 +1851,15 @@ void KWTableFrameSet::saveOasis( KoXmlWriter& writer, KoSavingContext& context, writer.endElement(); // table:table } -void KWTableFrameSet::loadOasis( const QDomElement& tableTag, KoOasisContext& context ) +void KWTableFrameSet::loadOasis( const TQDomElement& tableTag, KoOasisContext& context ) { // Left position of each column. The last one defined is the right position of the last cell/column. - QMemArray<double> columnLefts(4); + TQMemArray<double> columnLefts(4); uint maxColumns = columnLefts.size() - 1; uint col = 0; columnLefts[0] = 0.0; // Initialize left of first cell - QDomElement elem; + TQDomElement elem; forEachElement( elem, tableTag ) { if ( elem.localName() == "table-column" && elem.namespaceURI() == KoXmlNS::table ) @@ -1872,7 +1872,7 @@ void KWTableFrameSet::loadOasis( const QDomElement& tableTag, KoOasisContext& co styleStack.save(); context.fillStyleStack( elem, KoXmlNS::table, "style-name", "table-column" ); - QString strWidth = styleStack.attributeNS( KoXmlNS::style, "column-width" ); + TQString strWidth = styleStack.attributeNS( KoXmlNS::style, "column-width" ); double width = KoUnit::parseValue( strWidth ); if ( width < 1.0 ) // Something is wrong with the width @@ -1890,7 +1890,7 @@ void KWTableFrameSet::loadOasis( const QDomElement& tableTag, KoOasisContext& co { // We need more columns maxColumns += 4; - columnLefts.resize( maxColumns+1, QGArray::SpeedOptim ); + columnLefts.resize( maxColumns+1, TQGArray::SpeedOptim ); } columnLefts[col] = width + columnLefts[col-1]; kdDebug(32004) << "Cell column " << col-1 << " left " << columnLefts[col-1] << " right " << columnLefts[col] << endl; @@ -1904,18 +1904,18 @@ void KWTableFrameSet::loadOasis( const QDomElement& tableTag, KoOasisContext& co parseInsideOfTable( tableTag, context, columnLefts, row, column, 0 ); } -void KWTableFrameSet::parseInsideOfTable( const QDomElement& parent, KoOasisContext& context, - const QMemArray<double> & columnLefts, uint& row, uint& column, +void KWTableFrameSet::parseInsideOfTable( const TQDomElement& tqparent, KoOasisContext& context, + const TQMemArray<double> & columnLefts, uint& row, uint& column, double currentRowHeight ) { kdDebug(32004) << "parseInsideOfTable" << endl; KoStyleStack& styleStack = context.styleStack(); - QDomElement e; - forEachElement( e, parent ) + TQDomElement e; + forEachElement( e, tqparent ) { - const QString localName = e.localName(); - const QString ns = e.namespaceURI(); + const TQString localName = e.localName(); + const TQString ns = e.namespaceURI(); if ( ns != KoXmlNS::table ) { kdWarning(32004) << "Skipping element " << e.tagName() << " (in parseInsideOfTable)" << endl; continue; @@ -1961,21 +1961,21 @@ void KWTableFrameSet::parseInsideOfTable( const QDomElement& parent, KoOasisCont } } -void KWTableFrameSet::loadOasisCell( const QDomElement& element, KoOasisContext& context, - const QMemArray<double> & columnLefts, uint row, uint column, +void KWTableFrameSet::loadOasisCell( const TQDomElement& element, KoOasisContext& context, + const TQMemArray<double> & columnLefts, uint row, uint column, double currentRowHeight ) { //kdDebug(32004) << k_funcinfo << element.localName() << " " << row << "," << column << endl; KoStyleStack& styleStack = context.styleStack(); - uint rowSpan = element.attributeNS( KoXmlNS::table, "number-rows-spanned", QString::null ).toUInt(); + uint rowSpan = element.attributeNS( KoXmlNS::table, "number-rows-spanned", TQString() ).toUInt(); if ( rowSpan == 0 ) rowSpan = 1; - uint colSpan = element.attributeNS( KoXmlNS::table, "number-columns-spanned", QString::null ).toUInt(); + uint colSpan = element.attributeNS( KoXmlNS::table, "number-columns-spanned", TQString() ).toUInt(); if ( colSpan == 0 ) colSpan = 1; - // m_rowPositions / m_colPositions could be QMemArrays, or QValueVectors... + // m_rowPositions / m_colPositions could be TQMemArrays, or TQValueVectors... while(m_rowPositions.count() <= row + rowSpan + m_pageBoundaries.count()) { m_rowPositions.append(0); } @@ -1983,13 +1983,13 @@ void KWTableFrameSet::loadOasisCell( const QDomElement& element, KoOasisContext& m_colPositions.append(0); } - Cell *daCell = new Cell( this, row, column, QString::null /*unused*/ ); + Cell *daCell = new Cell( this, row, column, TQString() /*unused*/ ); daCell->setRowSpan( rowSpan ); daCell->setColumnSpan( colSpan ); addCell( daCell ); // rowSpan/colSpan have changed -> update array - double width = columnLefts[ QMIN( column+colSpan, columnLefts.size()-1 ) ] - columnLefts[column]; + double width = columnLefts[ TQMIN( column+colSpan, columnLefts.size()-1 ) ] - columnLefts[column]; double height = currentRowHeight > 0 ? currentRowHeight : 20; KWFrame* frame = new KWFrame( daCell, columnLefts[column], 0, width, height ); if ( currentRowHeight > 0 ) @@ -2009,19 +2009,19 @@ void KWTableFrameSet::loadOasisCell( const QDomElement& element, KoOasisContext& } // Old XML -QDomElement KWTableFrameSet::save( QDomElement &parentElem, bool saveFrames ) { +TQDomElement KWTableFrameSet::save( TQDomElement &tqparentElem, bool saveFrames ) { // When saving to a file, we don't have anything specific to the frameset to save. // Save the cells only. for (TableIter cells(this) ; cells ; ++cells) - cells->save(parentElem, saveFrames); - return QDomElement(); // No englobing element for tables... + cells->save(tqparentElem, saveFrames); + return TQDomElement(); // No englobing element for tables... } // Old XML -QDomElement KWTableFrameSet::toXML( QDomElement &parentElem, bool saveFrames ) +TQDomElement KWTableFrameSet::toXML( TQDomElement &tqparentElem, bool saveFrames ) { - QDomElement framesetElem = parentElem.ownerDocument().createElement( "FRAMESET" ); - parentElem.appendChild( framesetElem ); + TQDomElement framesetElem = tqparentElem.ownerDocument().createElement( "FRAMESET" ); + tqparentElem.appendChild( framesetElem ); KWFrameSet::saveCommon( framesetElem, false ); // Save the frameset attributes // Save the cells save( framesetElem, saveFrames ); @@ -2029,11 +2029,11 @@ QDomElement KWTableFrameSet::toXML( QDomElement &parentElem, bool saveFrames ) } // Old XML -void KWTableFrameSet::fromXML( QDomElement &framesetElem, bool loadFrames, bool useNames ) +void KWTableFrameSet::fromXML( TQDomElement &framesetElem, bool loadFrames, bool useNames ) { KWFrameSet::load( framesetElem, false ); // Load the frameset attributes // Load the cells - QDomElement cellElem = framesetElem.firstChild().toElement(); + TQDomElement cellElem = framesetElem.firstChild().toElement(); for ( ; !cellElem.isNull() ; cellElem = cellElem.nextSibling().toElement() ) { if ( cellElem.tagName() == "FRAMESET" ) @@ -2042,7 +2042,7 @@ void KWTableFrameSet::fromXML( QDomElement &framesetElem, bool loadFrames, bool } // Old XML -KWTableFrameSet::Cell* KWTableFrameSet::loadCell( QDomElement &framesetElem, bool loadFrames, bool useNames ) +KWTableFrameSet::Cell* KWTableFrameSet::loadCell( TQDomElement &framesetElem, bool loadFrames, bool useNames ) { int _row = KWDocument::getAttribute( framesetElem, "row", 0 ); if(_row <0) _row =0; @@ -2054,7 +2054,7 @@ KWTableFrameSet::Cell* KWTableFrameSet::loadCell( QDomElement &framesetElem, boo int _cols = KWDocument::getAttribute( framesetElem, "cols", 1 ); if(_cols <0) _cols = 1; - // m_rowPositions / m_colPositions could be QMemArrays, or QValueVectors... + // m_rowPositions / m_colPositions could be TQMemArrays, or TQValueVectors... while(m_rowPositions.count() <= static_cast<unsigned int>(row + _rows + m_pageBoundaries.count())) { m_rowPositions.append(0); } @@ -2062,8 +2062,8 @@ KWTableFrameSet::Cell* KWTableFrameSet::loadCell( QDomElement &framesetElem, boo m_colPositions.append(0); } - Cell *daCell = new Cell( this, row, _col, QString::null /*unused*/ ); - QString autoName = daCell->name(); + Cell *daCell = new Cell( this, row, _col, TQString() /*unused*/ ); + TQString autoName = daCell->name(); //kdDebug(32004) << "KWTableFrameSet::loadCell autoName=" << autoName << endl; daCell->load( framesetElem, loadFrames ); daCell->setRowSpan(_rows); @@ -2084,7 +2084,7 @@ void KWTableFrameSet::afterLoadingCell( Cell* daCell ) uint colSpan = daCell->columnSpan(); if(m_pageBoundaries.count() > 0) { unsigned int adjustment=0; - QValueList<unsigned int>::iterator pageBound = m_pageBoundaries.begin(); + TQValueList<unsigned int>::iterator pageBound = m_pageBoundaries.begin(); while(pageBound != m_pageBoundaries.end() && (*pageBound) <= row + adjustment) { adjustment++; pageBound++; @@ -2095,7 +2095,7 @@ void KWTableFrameSet::afterLoadingCell( Cell* daCell ) kdDebug(32004) << "loading cell (" << row << "," << col << ")\n"; if(daCell->frame(0)) { daCell->frame(0)->setMinimumFrameHeight(daCell->frame(0)->height()); // TODO run the formatter over the text here - QValueList<double>::iterator tmp = m_colPositions.at(col); + TQValueList<double>::iterator tmp = m_colPositions.at(col); if(*tmp == 0) (*tmp) = daCell->frame(0)->left(); else (*tmp) = (daCell->frame(0)->left() + *tmp) / 2; @@ -2109,7 +2109,7 @@ void KWTableFrameSet::afterLoadingCell( Cell* daCell ) else { if (static_cast<int>(*tmp/m_doc->pageLayout().ptHeight) < static_cast<int>(daCell->frame(0)->top()/m_doc->pageLayout().ptHeight)) { kdDebug(32004) << "This cell is on a new page" << endl; - QValueList<unsigned int>::iterator pageBound = m_pageBoundaries.begin(); + TQValueList<unsigned int>::iterator pageBound = m_pageBoundaries.begin(); while(pageBound != m_pageBoundaries.end() && (*pageBound) < row) ++pageBound; if(*pageBound!=row) { m_pageBoundaries.insert(pageBound,row++); @@ -2126,7 +2126,7 @@ void KWTableFrameSet::afterLoadingCell( Cell* daCell ) else { // untested... if (static_cast<int>(*tmp/m_doc->pageLayout().ptHeight) > static_cast<int>(daCell->frame(0)->top()/m_doc->pageLayout().ptHeight)) { kdDebug(32004) << "next cell is on a new page" << endl; - QValueList<unsigned int>::iterator pageBound = m_pageBoundaries.begin(); + TQValueList<unsigned int>::iterator pageBound = m_pageBoundaries.begin(); while(pageBound != m_pageBoundaries.end() && (*pageBound) < row) ++pageBound; if(*pageBound!=row) { m_pageBoundaries.insert(pageBound,row++); @@ -2158,7 +2158,7 @@ int KWTableFrameSet::paragraphsSelected() return paragraphs; } -bool KWTableFrameSet::statistics( QProgressDialog *progress, ulong & charsWithSpace, ulong & charsWithoutSpace, ulong & words, +bool KWTableFrameSet::statistics( TQProgressDialog *progress, ulong & charsWithSpace, ulong & charsWithoutSpace, ulong & words, ulong & sentences, ulong & syllables, ulong & lines, bool selected ) { for (TableIter cells(this) ; cells ; ++cells) @@ -2183,16 +2183,16 @@ void KWTableFrameSet::finalize( ) { KWFrameSet::finalize(); } -void KWTableFrameSet::layout() +void KWTableFrameSet::tqlayout() { for (TableIter cells(this) ; cells ; ++cells) - cells->layout(); + cells->tqlayout(); } -void KWTableFrameSet::invalidate() +void KWTableFrameSet::tqinvalidate() { for (TableIter cells(this) ; cells ; ++cells) - cells->invalidate(); + cells->tqinvalidate(); } void KWTableFrameSet::setVisible( bool v ) @@ -2208,7 +2208,7 @@ bool KWTableFrameSet::canRemovePage( int num ) { to check if the frame contains something, the simple existence of a frame is enough */ - QPtrListIterator<KWFrame> frameIt( frameIterator() ); + TQPtrListIterator<KWFrame> frameIt( frameIterator() ); for ( ; frameIt.current(); ++frameIt ) { if ( frameIt.current()->pageNumber() == num ) { return false; @@ -2217,7 +2217,7 @@ bool KWTableFrameSet::canRemovePage( int num ) { return true; } -void KWTableFrameSet::addTextFrameSets( QPtrList<KWTextFrameSet> & lst, bool onlyReadWrite ) +void KWTableFrameSet::addTextFrameSets( TQPtrList<KWTextFrameSet> & lst, bool onlyReadWrite ) { for (TableIter cells(this) ; cells ; ++cells) if (!cells->textObject()->protectContent() || onlyReadWrite ) @@ -2262,7 +2262,7 @@ void KWTableFrameSet::setZOrder() // TODO provide toPlainText() (reimplemented from KWFrameSet) -QByteArray KWTableFrameSet::convertTableToText() // should be const, but TableIter doesn't allow it +TQByteArray KWTableFrameSet::convertTableToText() // should be const, but TableIter doesn't allow it { KWOasisSaver oasisSaver( m_doc ); for (TableIter cells(this); cells; ++cells) @@ -2270,7 +2270,7 @@ QByteArray KWTableFrameSet::convertTableToText() // should be const, but TableIt cells->textObject()->saveOasisContent( oasisSaver.bodyWriter(), oasisSaver.savingContext() ); } if ( !oasisSaver.finish() ) - return QByteArray(); + return TQByteArray(); return oasisSaver.data(); } @@ -2291,9 +2291,9 @@ void KWTableFrameSet::printArrayDebug() { kdDebug(32004) << " | Row/Cell arrays" << endl; Q_ASSERT( m_rows == m_rowArray.size() ); for ( unsigned int row = 0; row < m_rows; ++row ) { - QString str = QString( " | Row %1: " ).arg( row ); + TQString str = TQString( " | Row %1: " ).tqarg( row ); for ( unsigned int col = 0; col < getColumns(); ++col ) - str += QString("| 0x%1 ").arg( (unsigned long)(*m_rowArray[row])[col], 0, 16 ); + str += TQString("| 0x%1 ").tqarg( (unsigned long)(*m_rowArray[row])[col], 0, 16 ); kdDebug(32004) << str<< " |" << endl; } } @@ -2315,11 +2315,11 @@ void KWTableFrameSet::printDebug() { // === -KWTableFrameSet::Cell::Cell( KWTableFrameSet *table, unsigned int row, unsigned int col, const QString &/*name*/ ) : +KWTableFrameSet::Cell::Cell( KWTableFrameSet *table, unsigned int row, unsigned int col, const TQString &/*name*/ ) : KWTextFrameSet( table->m_doc, // Generate frameset name from table_name+row+col i18n("Hello dear translator :), 1 is the table name, 2 and 3 are row and column", "%1 Cell %2,%3") - .arg( table->name() ).arg(row).arg(col) ) + .tqarg( table->name() ).tqarg(row).tqarg(col) ) { m_row = row; m_col = col; @@ -2457,24 +2457,24 @@ void KWTableFrameSet::Cell::setBottomBorder(KoBorder newBorder) { void KWTableFrameSet::Cell::setZOrder() { - QPtrListIterator<KWFrame> frameIt = frameIterator(); + TQPtrListIterator<KWFrame> frameIt = frameIterator(); for ( ; frameIt.current(); ++frameIt ) { (*frameIt)->setZOrder( kWordDocument()->maxZOrder( (*frameIt)->pageNumber() ) + 1 ); } } -void KWTableFrameSet::Cell::drawContents( QPainter * painter, const QRect & crect, - const QColorGroup & cg, bool onlyChanged, bool resetChanged, +void KWTableFrameSet::Cell::drawContents( TQPainter * painter, const TQRect & crect, + const TQColorGroup & cg, bool onlyChanged, bool resetChanged, KWFrameSetEdit * edit, KWViewMode * viewMode, KWFrameViewManager *fvm ) { - bool printing = painter->device()->devType() == QInternal::Printer; + bool printing = painter->device()->devType() == TQInternal::Printer; bool drawPreviewLines = viewMode && viewMode->drawFrameBorders(); - QRect cellRect = crect; + TQRect cellRect = crect; if(!printing && drawPreviewLines) { // Make sure the clipping is changed so the preview lines (frame borders) are not overwritten. - QRect zoomedRect( m_doc->zoomRect(*frame(0)) ); - QRect innerFrameRect( viewMode->normalToView( zoomedRect ) ); + TQRect zoomedRect( m_doc->zoomRect(*frame(0)) ); + TQRect innerFrameRect( viewMode->normalToView( zoomedRect ) ); innerFrameRect.addCoords(1, 1, -1, -1); // move and shrink cellRect = innerFrameRect.intersect(crect); } @@ -2488,7 +2488,7 @@ KWTableFrameSetEdit::~KWTableFrameSetEdit() delete m_currentCell; } -void KWTableFrameSetEdit::mousePressEvent( QMouseEvent * e, const QPoint & nPoint, const KoPoint & dPoint ) +void KWTableFrameSetEdit::mousePressEvent( TQMouseEvent * e, const TQPoint & nPoint, const KoPoint & dPoint ) { setCurrentCell( dPoint ); if ( m_currentCell ) @@ -2548,7 +2548,7 @@ KWFrameSetEdit* KWTableFrameSetEdit::currentTextEdit() } -void KWTableFrameSetEdit::keyPressEvent( QKeyEvent * e ) +void KWTableFrameSetEdit::keyPressEvent( TQKeyEvent * e ) { // This method handles the up/left/down/right navigation keys in tables if ( !m_currentCell ) @@ -2569,7 +2569,7 @@ void KWTableFrameSetEdit::keyPressEvent( QKeyEvent * e ) if(moveToOtherCell) { switch( e->key() ) { - case QKeyEvent::Qt::Key_Up: + case TQt::Key_Up: { if(!(static_cast<KWTextFrameSetEdit *>(m_currentCell))->cursor()->parag()->prev()) { @@ -2593,7 +2593,7 @@ void KWTableFrameSetEdit::keyPressEvent( QKeyEvent * e ) } } break; - case QKeyEvent::Qt::Key_Down: + case TQt::Key_Down: { if(!(static_cast<KWTextFrameSetEdit *>(m_currentCell))->cursor()->parag()->next()) { @@ -2615,12 +2615,12 @@ void KWTableFrameSetEdit::keyPressEvent( QKeyEvent * e ) } } break; - case QKeyEvent::Qt::Key_Backtab: + case TQt::Key_Backtab: tab=true; - if (e->state() & QKeyEvent::ControlButton) + if (e->state() & TQt::ControlButton) break; // Break if tab was pressed with Control (in *any* key combination) // Do not break - case QKeyEvent::Qt::Key_Left: + case TQt::Key_Left: { KoTextCursor *cur = (static_cast<KWTextFrameSetEdit *>(m_currentCell))->cursor(); if ( tab || (!cur->parag()->prev()&&cur->index()==0) ) @@ -2645,12 +2645,12 @@ void KWTableFrameSetEdit::keyPressEvent( QKeyEvent * e ) } } break; - case QKeyEvent::Qt::Key_Tab: + case TQt::Key_Tab: tab=true; - if (e->state() & QKeyEvent::ControlButton) + if (e->state() & TQt::ControlButton) break; // Break if tab was pressed with Control (in *any* key combination) // Do not break - case QKeyEvent::Qt::Key_Right: + case TQt::Key_Right: { KoTextCursor *cur = (static_cast<KWTextFrameSetEdit *>(m_currentCell))->cursor(); if( tab || (!cur->parag()->next()&&cur->index()==cur->parag()->string()->length()-1) ) @@ -2686,9 +2686,9 @@ void KWTableFrameSetEdit::keyPressEvent( QKeyEvent * e ) { if ( !textframeSet->textObject()->protectContent() ) { - if (tab && (e->state() & QKeyEvent::ControlButton) ) + if (tab && (e->state() & TQt::ControlButton) ) { - QKeyEvent event(QEvent::KeyPress, QKeyEvent::Qt::Key_Tab, 9, 0, QChar(9)); + TQKeyEvent event(TQEvent::KeyPress, TQt::Key_Tab, 9, 0, TQChar(9)); m_currentCell->keyPressEvent( &event ); } else @@ -2699,31 +2699,31 @@ void KWTableFrameSetEdit::keyPressEvent( QKeyEvent * e ) } } -void KWTableFrameSetEdit::keyReleaseEvent( QKeyEvent * e ) +void KWTableFrameSetEdit::keyReleaseEvent( TQKeyEvent * e ) { if ( m_currentCell ) m_currentCell->keyReleaseEvent( e ); } -void KWTableFrameSetEdit::imStartEvent( QIMEvent* e ) +void KWTableFrameSetEdit::imStartEvent( TQIMEvent* e ) { if ( m_currentCell ) m_currentCell->imStartEvent( e ); } -void KWTableFrameSetEdit::imComposeEvent( QIMEvent* e ) +void KWTableFrameSetEdit::imComposeEvent( TQIMEvent* e ) { if ( m_currentCell ) m_currentCell->imComposeEvent( e ); } -void KWTableFrameSetEdit::imEndEvent( QIMEvent* e ) +void KWTableFrameSetEdit::imEndEvent( TQIMEvent* e ) { if ( m_currentCell ) m_currentCell->imEndEvent( e ); } -void KWTableFrameSetEdit::dragMoveEvent( QDragMoveEvent * e, const QPoint &n, const KoPoint &d ) +void KWTableFrameSetEdit::dragMoveEvent( TQDragMoveEvent * e, const TQPoint &n, const KoPoint &d ) { kdDebug(32004)<<"m_currentCell :"<<m_currentCell<<endl; if ( m_currentCell ) @@ -2829,7 +2829,7 @@ KWTableFrameSet::MarkedIterator::MarkedIterator(KWTableFrameSet *table) : if ( current() ) { // kdDebug() << "MarkedIterator: visit: " -// << QString("| 0x%1 ").arg((unsigned long)current(), 0, 16) << endl; +// << TQString("| 0x%1 ").tqarg((unsigned long)current(), 0, 16) << endl; current()->setMark(); } } @@ -2844,7 +2844,7 @@ KWTableFrameSet::MarkedIterator::operator++() } if ( current() ) { // kdDebug() << "MarkedIterator: visit: " -// << QString("| 0x%1 ").arg((unsigned long)current(), 0, 16) << endl; +// << TQString("| 0x%1 ").tqarg((unsigned long)current(), 0, 16) << endl; current()->setMark(); } return ret; |