TQt4 port koffice

This should enable compilation under both Qt3 and Qt4; fixes for any missed components will be forthcoming


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/koffice@1238284 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 122 insertions, 122 deletions

diff --git a/kspread/manipulator.cc b/kspread/manipulator.cc
index 0bca8c81..31a33a0f 100644
--- a/kspread/manipulator.cc
+++ b/kspread/manipulator.cc
@@ -19,7 +19,7 @@
 
 #include <float.h>
 
-#include <qcolor.h>
+#include <tqcolor.h>
 
 #include <kdebug.h>
 #include <klocale.h>
@@ -169,7 +169,7 @@ bool Manipulator::process(Element* element)
     return true;
   }
 
-  QRect range = element->rect().normalize();
+  TQRect range = element->rect().normalize();
   if (m_format && element->isColumn())
   {
     for (int col = range.left(); col <= range.right(); ++col)
@@ -238,19 +238,19 @@ FormatManipulator::FormatManipulator()
 {
   m_properties = 0;
   // initialize pens with invalid color
-  m_topBorderPen = QPen(QColor(), 0, Qt::NoPen);
-  m_bottomBorderPen = QPen(QColor(), 0, Qt::NoPen);
-  m_leftBorderPen = QPen(QColor(), 0, Qt::NoPen);
-  m_rightBorderPen = QPen(QColor(), 0, Qt::NoPen);
-  m_horizontalPen = QPen(QColor(), 0, Qt::NoPen);
-  m_verticalPen = QPen(QColor(), 0, Qt::NoPen);
-  m_fallDiagonalPen = QPen(QColor(), 0, Qt::NoPen);
-  m_goUpDiagonalPen = QPen(QColor(), 0, Qt::NoPen);
+  m_topBorderPen = TQPen(TQColor(), 0, TQt::NoPen);
+  m_bottomBorderPen = TQPen(TQColor(), 0, TQt::NoPen);
+  m_leftBorderPen = TQPen(TQColor(), 0, TQt::NoPen);
+  m_rightBorderPen = TQPen(TQColor(), 0, TQt::NoPen);
+  m_horizontalPen = TQPen(TQColor(), 0, TQt::NoPen);
+  m_verticalPen = TQPen(TQColor(), 0, TQt::NoPen);
+  m_fallDiagonalPen = TQPen(TQColor(), 0, TQt::NoPen);
+  m_goUpDiagonalPen = TQPen(TQColor(), 0, TQt::NoPen);
 }
 
 FormatManipulator::~FormatManipulator()
 {
-  QValueList<layoutCell>::Iterator it2;
+  TQValueList<tqlayoutCell>::Iterator it2;
   for ( it2 = m_lstFormats.begin(); it2 != m_lstFormats.end(); ++it2 )
   {
     delete (*it2).l;
@@ -263,7 +263,7 @@ FormatManipulator::~FormatManipulator()
   }
   m_lstRedoFormats.clear();
 
-  QValueList<layoutColumn>::Iterator it3;
+  TQValueList<tqlayoutColumn>::Iterator it3;
   for ( it3 = m_lstColFormats.begin(); it3 != m_lstColFormats.end(); ++it3 )
   {
     delete (*it3).l;
@@ -276,7 +276,7 @@ FormatManipulator::~FormatManipulator()
   }
   m_lstRedoColFormats.clear();
 
-  QValueList<layoutRow>::Iterator it4;
+  TQValueList<tqlayoutRow>::Iterator it4;
   for ( it4 = m_lstRowFormats.begin(); it4 != m_lstRowFormats.end(); ++it4 )
   {
     delete (*it4).l;
@@ -302,7 +302,7 @@ bool FormatManipulator::preProcessing ()
 bool FormatManipulator::process (Element *element)
 {
   // see what is selected; if nothing, take marker position
-  QRect range = element->rect().normalize();
+  TQRect range = element->rect().normalize();
 
   if (!m_reverse) {
 
@@ -391,7 +391,7 @@ bool FormatManipulator::process (Element *element)
   {  // undoing
     if( element->isColumn() )
     {
-      QValueList<layoutColumn>::Iterator it2;
+      TQValueList<tqlayoutColumn>::Iterator it2;
       for ( it2 = m_lstColFormats.begin(); it2 != m_lstColFormats.end(); ++it2 )
       {
         ColumnFormat * col = m_sheet->nonDefaultColumnFormat( (*it2).col );
@@ -400,7 +400,7 @@ bool FormatManipulator::process (Element *element)
     }
     else if( element->isRow() )
     {
-      QValueList<layoutRow>::Iterator it2;
+      TQValueList<tqlayoutRow>::Iterator it2;
       for ( it2 = m_lstRowFormats.begin(); it2 != m_lstRowFormats.end(); ++it2 )
       {
         RowFormat * row = m_sheet->nonDefaultRowFormat( (*it2).row );
@@ -408,7 +408,7 @@ bool FormatManipulator::process (Element *element)
       }
     }
 
-    QValueList<layoutCell>::Iterator it2;
+    TQValueList<tqlayoutCell>::Iterator it2;
     for ( it2 = m_lstFormats.begin(); it2 != m_lstFormats.end(); ++it2 )
     {
       Cell *cell = m_sheet->nonDefaultCell( (*it2).col,(*it2).row );
@@ -421,12 +421,12 @@ bool FormatManipulator::process (Element *element)
   return true;
 }
 
-void FormatManipulator::copyFormat(QValueList<layoutCell> & list,
-                                   QValueList<layoutColumn> & listCol,
-                                   QValueList<layoutRow> & listRow)
+void FormatManipulator::copyFormat(TQValueList<tqlayoutCell> & list,
+                                   TQValueList<tqlayoutColumn> & listCol,
+                                   TQValueList<tqlayoutRow> & listRow)
 {
-  QValueList<layoutCell>::Iterator end = list.end();
-  for (QValueList<layoutCell>::Iterator it2 = list.begin(); it2 != end; ++it2)
+  TQValueList<tqlayoutCell>::Iterator end = list.end();
+  for (TQValueList<tqlayoutCell>::Iterator it2 = list.begin(); it2 != end; ++it2)
   {
       delete (*it2).l;
   }
@@ -436,7 +436,7 @@ void FormatManipulator::copyFormat(QValueList<layoutCell> & list,
   Region::ConstIterator endOfList(cells().constEnd());
   for (Region::ConstIterator it = cells().constBegin(); it != endOfList; ++it)
   {
-    QRect range = (*it)->rect().normalize();
+    TQRect range = (*it)->rect().normalize();
     int bottom = range.bottom();
     int right  = range.right();
 
@@ -445,20 +445,20 @@ void FormatManipulator::copyFormat(QValueList<layoutCell> & list,
       /* Don't need to go through the loop twice...
         for (int i = range.left(); i <= right; ++i)
         {
-        layoutColumn tmplayout;
-        tmplayout.col = i;
-        tmplayout.l = new ColumnFormat( m_sheet, i );
-        tmplayout.l->copy( *(m_sheet->columnFormat( i )) );
-        listCol.append(tmplayout);
+        tqlayoutColumn tmptqlayout;
+        tmptqlayout.col = i;
+        tmptqlayout.l = new ColumnFormat( m_sheet, i );
+        tmptqlayout.l->copy( *(m_sheet->columnFormat( i )) );
+        listCol.append(tmptqlayout);
         }
       */
       for ( int col = range.left(); col <= right; ++col )
       {
-        layoutColumn tmplayout;
-        tmplayout.col = col;
-        tmplayout.l = new ColumnFormat( m_sheet, col );
-        tmplayout.l->copy( *(m_sheet->columnFormat( col )) );
-        listCol.append(tmplayout);
+        tqlayoutColumn tmptqlayout;
+        tmptqlayout.col = col;
+        tmptqlayout.l = new ColumnFormat( m_sheet, col );
+        tmptqlayout.l->copy( *(m_sheet->columnFormat( col )) );
+        listCol.append(tmptqlayout);
 
         cell = m_sheet->getFirstCellColumn( col );
         while ( cell )
@@ -469,12 +469,12 @@ void FormatManipulator::copyFormat(QValueList<layoutCell> & list,
             continue;
           }
 
-          layoutCell tmplayout;
-          tmplayout.col = col;
-          tmplayout.row = cell->row();
-          tmplayout.l = new Format( m_sheet, 0 );
-          tmplayout.l->copy( *(m_sheet->cellAt( tmplayout.col, tmplayout.row )->format()) );
-          list.append(tmplayout);
+          tqlayoutCell tmptqlayout;
+          tmptqlayout.col = col;
+          tmptqlayout.row = cell->row();
+          tmptqlayout.l = new Format( m_sheet, 0 );
+          tmptqlayout.l->copy( *(m_sheet->cellAt( tmptqlayout.col, tmptqlayout.row )->format()) );
+          list.append(tmptqlayout);
 
           cell = m_sheet->getNextCellDown( col, cell->row() );
         }
@@ -487,12 +487,12 @@ void FormatManipulator::copyFormat(QValueList<layoutCell> & list,
         if ( range.left() <= col && right >= col
             && !cell->isPartOfMerged())
         {
-          layoutCell tmplayout;
-          tmplayout.col = cell->column();
-          tmplayout.row = cell->row();
-          tmplayout.l = new Format( m_sheet, 0 );
-          tmplayout.l->copy( *(m_sheet->cellAt( tmplayout.col, tmplayout.row )) );
-          list.append(tmplayout);
+          tqlayoutCell tmptqlayout;
+          tmptqlayout.col = cell->column();
+          tmptqlayout.row = cell->row();
+          tmptqlayout.l = new Format( m_sheet, 0 );
+          tmptqlayout.l->copy( *(m_sheet->cellAt( tmptqlayout.col, tmptqlayout.row )) );
+          list.append(tmptqlayout);
         }
         }
       */
@@ -501,11 +501,11 @@ void FormatManipulator::copyFormat(QValueList<layoutCell> & list,
     {
       for ( int row = range.top(); row <= bottom; ++row )
       {
-        layoutRow tmplayout;
-        tmplayout.row = row;
-        tmplayout.l = new RowFormat( m_sheet, row );
-        tmplayout.l->copy( *(m_sheet->rowFormat( row )) );
-        listRow.append(tmplayout);
+        tqlayoutRow tmptqlayout;
+        tmptqlayout.row = row;
+        tmptqlayout.l = new RowFormat( m_sheet, row );
+        tmptqlayout.l->copy( *(m_sheet->rowFormat( row )) );
+        listRow.append(tmptqlayout);
 
         cell = m_sheet->getFirstCellRow( row );
         while ( cell )
@@ -515,12 +515,12 @@ void FormatManipulator::copyFormat(QValueList<layoutCell> & list,
             cell = m_sheet->getNextCellRight( cell->column(), row );
             continue;
           }
-          layoutCell tmplayout;
-          tmplayout.col = cell->column();
-          tmplayout.row = row;
-          tmplayout.l = new Format( m_sheet, 0 );
-          tmplayout.l->copy( *(m_sheet->cellAt( cell->column(), row )->format()) );
-          list.append(tmplayout);
+          tqlayoutCell tmptqlayout;
+          tmptqlayout.col = cell->column();
+          tmptqlayout.row = row;
+          tmptqlayout.l = new Format( m_sheet, 0 );
+          tmptqlayout.l->copy( *(m_sheet->cellAt( cell->column(), row )->format()) );
+          list.append(tmptqlayout);
 
           cell = m_sheet->getNextCellRight( cell->column(), row );
         }
@@ -533,12 +533,12 @@ void FormatManipulator::copyFormat(QValueList<layoutCell> & list,
         if ( range.top() <= row && bottom >= row
             && !cell->isPartOfMerged())
         {
-          layoutCell tmplayout;
-          tmplayout.col = cell->column();
-          tmplayout.row = cell->row();
-          tmplayout.l = new Format( m_sheet, 0 );
-          tmplayout.l->copy( *(m_sheet->cellAt( tmplayout.col, tmplayout.row )) );
-          list.append(tmplayout);
+          tqlayoutCell tmptqlayout;
+          tmptqlayout.col = cell->column();
+          tmptqlayout.row = cell->row();
+          tmptqlayout.l = new Format( m_sheet, 0 );
+          tmptqlayout.l->copy( *(m_sheet->cellAt( tmptqlayout.col, tmptqlayout.row )) );
+          list.append(tmptqlayout);
         }
         }
       */
@@ -551,12 +551,12 @@ void FormatManipulator::copyFormat(QValueList<layoutCell> & list,
           Cell * cell = m_sheet->nonDefaultCell( col, row );
           if ( !cell->isPartOfMerged() )
           {
-            layoutCell tmplayout;
-            tmplayout.col = col;
-            tmplayout.row = row;
-            tmplayout.l = new Format( m_sheet, 0 );
-            tmplayout.l->copy( *(m_sheet->cellAt( col, row )->format()) );
-            list.append(tmplayout);
+            tqlayoutCell tmptqlayout;
+            tmptqlayout.col = col;
+            tmptqlayout.row = row;
+            tmptqlayout.l = new Format( m_sheet, 0 );
+            tmptqlayout.l->copy( *(m_sheet->cellAt( col, row )->format()) );
+            list.append(tmptqlayout);
           }
         }
     }
@@ -565,7 +565,7 @@ void FormatManipulator::copyFormat(QValueList<layoutCell> & list,
 
 bool FormatManipulator::testCondition(RowFormat* row)
 {
-  for (Q_UINT32 property = Format::PAlign;
+  for (TQ_UINT32 property = Format::PAlign;
        property <= Format::PHideFormula;
        property *= 2)
   {
@@ -772,7 +772,7 @@ void FormatManipulator::doWork(Format* format,
 
 void FormatManipulator::prepareCell(Cell* cell)
 {
-  for (Q_UINT32 property = Format::PAlign;
+  for (TQ_UINT32 property = Format::PAlign;
        property <= Format::PHideFormula;
        property *= 2)
   {
@@ -818,7 +818,7 @@ bool MergeManipulator::process(Element* element)
     return false;
   }
 
-  QRect range = element->rect().normalize();
+  TQRect range = element->rect().normalize();
   int left   = range.left();
   int right  = range.right();
   int top    = range.top();
@@ -840,7 +840,7 @@ bool MergeManipulator::process(Element* element)
           Cell *cell = m_sheet->cellAt( col, row );
           if (cell->doesMergeCells())
           {
-            rows = QMAX(rows, cell->mergedYCells());
+            rows = TQMAX(rows, cell->mergedYCells());
             cell->mergeCells( col, row, 0, 0 );
           }
         }
@@ -861,7 +861,7 @@ bool MergeManipulator::process(Element* element)
           Cell *cell = m_sheet->cellAt( col, row );
           if (cell->doesMergeCells())
           {
-            cols = QMAX(cols, cell->mergedXCells());
+            cols = TQMAX(cols, cell->mergedXCells());
             cell->mergeCells( col, row, 0, 0 );
           }
         }
@@ -897,17 +897,17 @@ bool MergeManipulator::process(Element* element)
   return true;
 }
 
-QString MergeManipulator::name() const
+TQString MergeManipulator::name() const
 {
   if (m_merge) // MergeManipulator
   {
     if (m_mergeHorizontal)
     {
-      return i18n("Merge Cells Horizontally");
+      return i18n("Merge CellsQt::Horizontally");
     }
     else if (m_mergeVertical)
     {
-      return i18n("Merge Cells Vertically");
+      return i18n("Merge CellsQt::Vertically");
     }
     else
     {
@@ -933,7 +933,7 @@ bool MergeManipulator::preProcessing()
     for (ConstIterator it = constBegin(); it != endOfList; ++it)
     {
       Element* element = *it;
-      QRect range = element->rect().normalize();
+      TQRect range = element->rect().normalize();
       int right = range.right();
       int bottom = range.bottom();
       for (int row = range.top(); row <= bottom; ++row)
@@ -943,7 +943,7 @@ bool MergeManipulator::preProcessing()
           Cell *cell = m_sheet->cellAt(col, row);
           if (cell->doesMergeCells())
           {
-            QRect rect(col, row, cell->mergedXCells() + 1, cell->mergedYCells() + 1);
+            TQRect rect(col, row, cell->mergedXCells() + 1, cell->mergedYCells() + 1);
             mergedCells.add(rect);
           }
         }
@@ -1047,7 +1047,7 @@ void DilationManipulator::execute()
   for (ConstIterator it = cells().constBegin(); it != end; ++it)
   {
     Element* element = *it;
-  QRect area = element->rect().normalize();
+  TQRect area = element->rect().normalize();
 
   ColumnFormat *col;
   RowFormat *rl;
@@ -1139,11 +1139,11 @@ ResizeColumnManipulator::~ResizeColumnManipulator()
 
 bool ResizeColumnManipulator::process(Element* element)
 {
-  QRect range = element->rect().normalize();
+  TQRect range = element->rect().normalize();
   for (int col = range.right(); col >= range.left(); --col)
   {
     ColumnFormat *format = m_sheet->nonDefaultColumnFormat( col );
-    format->setDblWidth( QMAX( 2.0, m_reverse ? m_oldSize : m_newSize ) );
+    format->setDblWidth( TQMAX( 2.0, m_reverse ? m_oldSize : m_newSize ) );
   }
   return true;
 }
@@ -1164,11 +1164,11 @@ ResizeRowManipulator::~ResizeRowManipulator()
 
 bool ResizeRowManipulator::process(Element* element)
 {
-  QRect range = element->rect().normalize();
+  TQRect range = element->rect().normalize();
   for (int row = range.bottom(); row >= range.top(); --row)
   {
     RowFormat* rl = m_sheet->nonDefaultRowFormat( row );
-    rl->setDblHeight( QMAX( 2.0, m_reverse ? m_oldSize : m_newSize ) );
+    rl->setDblHeight( TQMAX( 2.0, m_reverse ? m_oldSize : m_newSize ) );
   }
   return true;
 }
@@ -1198,8 +1198,8 @@ bool AdjustColumnRowManipulator::process(Element* element)
     return true;
   }
 
-  QMap<int,double> heights;
-  QMap<int,double> widths;
+  TQMap<int,double> heights;
+  TQMap<int,double> widths;
   if (m_reverse)
   {
     heights = m_oldHeights;
@@ -1211,7 +1211,7 @@ bool AdjustColumnRowManipulator::process(Element* element)
     widths = m_newWidths;
   }
 
-  QRect range = element->rect().normalize();
+  TQRect range = element->rect().normalize();
   if (m_adjustColumn)
   {
     if (element->isRow())
@@ -1224,12 +1224,12 @@ bool AdjustColumnRowManipulator::process(Element* element)
           int col = cell->column();
           if ( !cell->isEmpty() && !cell->isObscured())
           {
-            if (widths.contains(col) && widths[col] != -1.0)
+            if (widths.tqcontains(col) && widths[col] != -1.0)
             {
               ColumnFormat* format = sheet->nonDefaultColumnFormat(col);
               if ( kAbs(format->dblWidth() - widths[col] ) > DBL_EPSILON )
               {
-                format->setDblWidth( QMAX( 2.0, widths[col] ) );
+                format->setDblWidth( TQMAX( 2.0, widths[col] ) );
               }
             }
           }
@@ -1241,12 +1241,12 @@ bool AdjustColumnRowManipulator::process(Element* element)
     {
       for (int col = range.left(); col <= range.right(); ++col)
       {
-        if (widths.contains(col) && widths[col] != -1.0)
+        if (widths.tqcontains(col) && widths[col] != -1.0)
         {
           ColumnFormat* format = sheet->nonDefaultColumnFormat(col);
           if ( kAbs(format->dblWidth() - widths[col] ) > DBL_EPSILON )
           {
-            format->setDblWidth( QMAX( 2.0, widths[col] ) );
+            format->setDblWidth( TQMAX( 2.0, widths[col] ) );
           }
         }
       }
@@ -1264,12 +1264,12 @@ bool AdjustColumnRowManipulator::process(Element* element)
           int row = cell->row();
           if ( !cell->isEmpty() && !cell->isObscured())
           {
-            if (heights.contains(row) && heights[row] != -1.0)
+            if (heights.tqcontains(row) && heights[row] != -1.0)
             {
               RowFormat* format = sheet->nonDefaultRowFormat(row);
               if ( kAbs(format->dblHeight() - heights[row] ) > DBL_EPSILON )
               {
-                format->setDblHeight( QMAX( 2.0, heights[row] ) );
+                format->setDblHeight( TQMAX( 2.0, heights[row] ) );
               }
             }
           }
@@ -1281,12 +1281,12 @@ bool AdjustColumnRowManipulator::process(Element* element)
     {
       for (int row = range.top(); row <= range.bottom(); ++row)
       {
-        if (heights.contains(row) && heights[row] != -1.0)
+        if (heights.tqcontains(row) && heights[row] != -1.0)
         {
           RowFormat* format = sheet->nonDefaultRowFormat(row);
           if ( kAbs(format->dblHeight() - heights[row] ) > DBL_EPSILON )
           {
-            format->setDblHeight( QMAX( 2.0, heights[row] ) );
+            format->setDblHeight( TQMAX( 2.0, heights[row] ) );
           }
         }
       }
@@ -1312,7 +1312,7 @@ bool AdjustColumnRowManipulator::preProcessing()
     for (ConstIterator it = cells().begin(); it != endOfList; ++it)
     {
       Element* element = *it;
-      QRect range = element->rect().normalize();
+      TQRect range = element->rect().normalize();
       if (element->isColumn())
       {
         for (int col = range.left(); col <= range.right(); ++col)
@@ -1323,7 +1323,7 @@ bool AdjustColumnRowManipulator::preProcessing()
             int row = cell->row();
             if (m_adjustColumn)
             {
-              if (!m_newWidths.contains(col))
+              if (!m_newWidths.tqcontains(col))
               {
                 m_newWidths[col] = -1.0;
                 ColumnFormat* format = m_sheet->columnFormat(col);
@@ -1331,13 +1331,13 @@ bool AdjustColumnRowManipulator::preProcessing()
               }
               if (!cell->isEmpty() && !cell->isObscured())
               {
-                m_newWidths[col] = QMAX(adjustColumnHelper(cell, col, row),
+                m_newWidths[col] = TQMAX(adjustColumnHelper(cell, col, row),
                                         m_newWidths[col] );
               }
             }
             if (m_adjustRow)
             {
-              if (!m_newHeights.contains(row))
+              if (!m_newHeights.tqcontains(row))
               {
                 m_newHeights[row] = -1.0;
                 RowFormat* format = m_sheet->rowFormat(row);
@@ -1345,7 +1345,7 @@ bool AdjustColumnRowManipulator::preProcessing()
               }
               if (!cell->isEmpty() && !cell->isObscured())
               {
-                m_newHeights[row] = QMAX(adjustRowHelper(cell, col, row),
+                m_newHeights[row] = TQMAX(adjustRowHelper(cell, col, row),
                                         m_newHeights[row]);
               }
             }
@@ -1363,7 +1363,7 @@ bool AdjustColumnRowManipulator::preProcessing()
             int col = cell->column();
             if (m_adjustColumn)
             {
-              if (!m_newWidths.contains(col))
+              if (!m_newWidths.tqcontains(col))
               {
                 m_newWidths[col] = -1.0;
                 ColumnFormat* format = m_sheet->columnFormat(col);
@@ -1371,13 +1371,13 @@ bool AdjustColumnRowManipulator::preProcessing()
               }
               if (cell != m_sheet->defaultCell() && !cell->isEmpty() && !cell->isObscured())
               {
-                m_newWidths[col] = QMAX(adjustColumnHelper(cell, col, row),
+                m_newWidths[col] = TQMAX(adjustColumnHelper(cell, col, row),
                                         m_newWidths[col] );
               }
             }
             if (m_adjustRow)
             {
-              if (!m_newHeights.contains(row))
+              if (!m_newHeights.tqcontains(row))
               {
                 m_newHeights[row] = -1.0;
                 RowFormat* format = m_sheet->rowFormat(row);
@@ -1385,7 +1385,7 @@ bool AdjustColumnRowManipulator::preProcessing()
               }
               if (cell != m_sheet->defaultCell() && !cell->isEmpty() && !cell->isObscured())
               {
-                m_newHeights[row] = QMAX(adjustRowHelper(cell, col, row),
+                m_newHeights[row] = TQMAX(adjustRowHelper(cell, col, row),
                                         m_newHeights[row]);
               }
             }
@@ -1403,7 +1403,7 @@ bool AdjustColumnRowManipulator::preProcessing()
             cell = m_sheet->cellAt( col, row );
             if (m_adjustColumn)
             {
-              if (!m_newWidths.contains(col))
+              if (!m_newWidths.tqcontains(col))
               {
                 m_newWidths[col] = -1.0;
                 ColumnFormat* format = m_sheet->columnFormat(col);
@@ -1411,13 +1411,13 @@ bool AdjustColumnRowManipulator::preProcessing()
               }
               if (cell != m_sheet->defaultCell() && !cell->isEmpty() && !cell->isObscured())
               {
-                  m_newWidths[col] = QMAX(adjustColumnHelper(cell, col, row),
+                  m_newWidths[col] = TQMAX(adjustColumnHelper(cell, col, row),
                                           m_newWidths[col] );
               }
             }
             if (m_adjustRow)
             {
-              if (!m_newHeights.contains(row))
+              if (!m_newHeights.tqcontains(row))
               {
                 m_newHeights[row] = -1.0;
                 RowFormat* format = m_sheet->rowFormat(row);
@@ -1425,7 +1425,7 @@ bool AdjustColumnRowManipulator::preProcessing()
               }
               if (cell != m_sheet->defaultCell() && !cell->isEmpty() && !cell->isObscured())
               {
-                m_newHeights[row] = QMAX(adjustRowHelper(cell, col, row),
+                m_newHeights[row] = TQMAX(adjustRowHelper(cell, col, row),
                                         m_newHeights[row]);
               }
             }
@@ -1444,20 +1444,20 @@ double AdjustColumnRowManipulator::adjustColumnHelper(Cell* cell, int col, int r
   if ( cell->textWidth() > long_max )
   {
     double indent = 0.0;
-    Format::Align alignment = cell->format()->align(cell->column(), cell->row());
-    if (alignment == Format::Undefined)
+    Format::Align tqalignment = cell->format()->align(cell->column(), cell->row());
+    if (tqalignment == Format::Undefined)
     {
       if (cell->value().isNumber() || cell->isDate() || cell->isTime())
       {
-        alignment = Format::Right;
+        tqalignment = Format::Right;
       }
       else
       {
-        alignment = Format::Left;
+        tqalignment = Format::Left;
       }
     }
 
-    if (alignment == Format::Left)
+    if (tqalignment == Format::Left)
     {
       indent = cell->format()->getIndent( cell->column(), cell->row() );
     }
@@ -1501,7 +1501,7 @@ double AdjustColumnRowManipulator::adjustRowHelper(Cell* cell, int col, int row)
   }
 }
 
-QString AdjustColumnRowManipulator::name() const
+TQString AdjustColumnRowManipulator::name() const
 {
   if (m_adjustColumn && m_adjustRow)
   {
@@ -1535,7 +1535,7 @@ HideShowManipulator::~HideShowManipulator()
 
 bool HideShowManipulator::process(Element* element)
 {
-  QRect range = element->rect().normalize();
+  TQRect range = element->rect().normalize();
   if (m_manipulateColumns)
   {
     for (int col = range.left(); col <= range.right(); ++col)
@@ -1563,7 +1563,7 @@ bool HideShowManipulator::preProcessing()
   {
     if (m_reverse)
     {
-      QRect range = (*it)->rect().normalize();
+      TQRect range = (*it)->rect().normalize();
       if (m_manipulateColumns)
       {
         if (range.left() > 1)
@@ -1579,7 +1579,7 @@ bool HideShowManipulator::preProcessing()
           }
           if (col == range.left())
           {
-            region.add(QRect(1, 1, range.left()-1, KS_rowMax));
+            region.add(TQRect(1, 1, range.left()-1, KS_rowMax));
           }
         }
         for (int col = range.left(); col <= range.right(); ++col)
@@ -1587,7 +1587,7 @@ bool HideShowManipulator::preProcessing()
           ColumnFormat* format = m_sheet->columnFormat(col);
           if (format->isHide())
           {
-            region.add(QRect(col, 1, 1, KS_rowMax));
+            region.add(TQRect(col, 1, 1, KS_rowMax));
           }
         }
       }
@@ -1606,7 +1606,7 @@ bool HideShowManipulator::preProcessing()
           }
           if (row == range.top())
           {
-            region.add(QRect(1, 1, KS_colMax, range.top()-1));
+            region.add(TQRect(1, 1, KS_colMax, range.top()-1));
           }
         }
         for (int row = range.top(); row <= range.bottom(); ++row)
@@ -1614,7 +1614,7 @@ bool HideShowManipulator::preProcessing()
           RowFormat* format = m_sheet->rowFormat(row);
           if (format->isHide())
           {
-            region.add(QRect(1, row, KS_colMax, 1));
+            region.add(TQRect(1, row, KS_colMax, 1));
           }
         }
       }
@@ -1651,9 +1651,9 @@ bool HideShowManipulator::postProcessing()
   return true;
 }
 
-QString HideShowManipulator::name() const
+TQString HideShowManipulator::name() const
 {
-  QString name;
+  TQString name;
   if (m_reverse)
   {
     name = "Show ";
@@ -1704,7 +1704,7 @@ ManipulatorManager::~ManipulatorManager()
 {
 }
 
-Manipulator* ManipulatorManager::create(const QString& type)
+Manipulator* ManipulatorManager::create(const TQString& type)
 {
   if (type == "bgcolor")
   {