Revert "Rename a number of old tq methods that are no longer tq specific"

This reverts commit 94844816550ad672ccfcdc25659c625546239998.

1 files changed, 50 insertions, 50 deletions

diff --git a/kspread/manipulator.cc b/kspread/manipulator.cc
index f1a5838b..bed111ba 100644
--- a/kspread/manipulator.cc
+++ b/kspread/manipulator.cc
@@ -445,20 +445,20 @@ void FormatManipulator::copyFormat(TQValueList<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);
+        layoutColumn 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);
+        layoutColumn 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(TQValueList<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);
+          layoutCell 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(TQValueList<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);
+          layoutCell 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(TQValueList<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);
+        layoutRow 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(TQValueList<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);
+          layoutCell 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(TQValueList<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);
+          layoutCell 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(TQValueList<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);
+            layoutCell 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);
           }
         }
     }
@@ -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() );
     }