summaryrefslogtreecommitdiffstats
path: root/kspread/kspread_undo.cc
diff options
context:
space:
mode:
Diffstat (limited to 'kspread/kspread_undo.cc')
-rw-r--r--kspread/kspread_undo.cc76
1 files changed, 38 insertions, 38 deletions
diff --git a/kspread/kspread_undo.cc b/kspread/kspread_undo.cc
index ae075fe6..f88c35fc 100644
--- a/kspread/kspread_undo.cc
+++ b/kspread/kspread_undo.cc
@@ -917,12 +917,12 @@ UndoCellFormat::UndoCellFormat( Doc * _doc,
copyFormat( m_lstFormats, m_lstColFormats, m_lstRowFormats, _sheet );
}
-void UndoCellFormat::copyFormat(TQValueList<tqlayoutCell> & list,
- TQValueList<tqlayoutColumn> & listCol,
- TQValueList<tqlayoutRow> & listRow,
+void UndoCellFormat::copyFormat(TQValueList<layoutCell> & list,
+ TQValueList<layoutColumn> & listCol,
+ TQValueList<layoutRow> & listRow,
Sheet * sheet )
{
- TQValueList<tqlayoutCell>::Iterator it2;
+ TQValueList<layoutCell>::Iterator it2;
for ( it2 = list.begin(); it2 != list.end(); ++it2 )
{
delete (*it2).l;
@@ -942,7 +942,7 @@ void UndoCellFormat::copyFormat(TQValueList<tqlayoutCell> & list,
/* Don't need to go through the loop twice...
for (int i = range.left(); i <= right; ++i)
{
- tqlayoutColumn tmptqlayout;
+ layoutColumn tmptqlayout;
tmptqlayout.col = i;
tmptqlayout.l = new ColumnFormat( sheet, i );
tmptqlayout.l->copy( *(sheet->columnFormat( i )) );
@@ -951,7 +951,7 @@ void UndoCellFormat::copyFormat(TQValueList<tqlayoutCell> & list,
*/
for ( int c = range.left(); c <= right; ++c )
{
- tqlayoutColumn tmptqlayout;
+ layoutColumn tmptqlayout;
tmptqlayout.col = c;
tmptqlayout.l = new ColumnFormat( sheet, c );
tmptqlayout.l->copy( *(sheet->columnFormat( c )) );
@@ -966,7 +966,7 @@ void UndoCellFormat::copyFormat(TQValueList<tqlayoutCell> & list,
continue;
}
- tqlayoutCell tmptqlayout;
+ layoutCell tmptqlayout;
tmptqlayout.col = c;
tmptqlayout.row = cell->row();
tmptqlayout.l = new Format( sheet, 0 );
@@ -984,7 +984,7 @@ void UndoCellFormat::copyFormat(TQValueList<tqlayoutCell> & list,
if ( range.left() <= col && right >= col
&& !c->isPartOfMerged())
{
- tqlayoutCell tmptqlayout;
+ layoutCell tmptqlayout;
tmptqlayout.col = c->column();
tmptqlayout.row = c->row();
tmptqlayout.l = new Format( sheet, 0 );
@@ -998,7 +998,7 @@ void UndoCellFormat::copyFormat(TQValueList<tqlayoutCell> & list,
{
for ( int row = range.top(); row <= bottom; ++row )
{
- tqlayoutRow tmptqlayout;
+ layoutRow tmptqlayout;
tmptqlayout.row = row;
tmptqlayout.l = new RowFormat( sheet, row );
tmptqlayout.l->copy( *(sheet->rowFormat( row )) );
@@ -1012,7 +1012,7 @@ void UndoCellFormat::copyFormat(TQValueList<tqlayoutCell> & list,
cell = sheet->getNextCellRight( cell->column(), row );
continue;
}
- tqlayoutCell tmptqlayout;
+ layoutCell tmptqlayout;
tmptqlayout.col = cell->column();
tmptqlayout.row = row;
tmptqlayout.l = new Format( sheet, 0 );
@@ -1030,7 +1030,7 @@ void UndoCellFormat::copyFormat(TQValueList<tqlayoutCell> & list,
if ( range.top() <= row && bottom >= row
&& !c->isPartOfMerged())
{
- tqlayoutCell tmptqlayout;
+ layoutCell tmptqlayout;
tmptqlayout.col = c->column();
tmptqlayout.row = c->row();
tmptqlayout.l = new Format( sheet, 0 );
@@ -1048,7 +1048,7 @@ void UndoCellFormat::copyFormat(TQValueList<tqlayoutCell> & list,
Cell * cell = sheet->nonDefaultCell( x, y );
if ( !cell->isPartOfMerged() )
{
- tqlayoutCell tmptqlayout;
+ layoutCell tmptqlayout;
tmptqlayout.col = x;
tmptqlayout.row = y;
tmptqlayout.l = new Format( sheet, 0 );
@@ -1062,7 +1062,7 @@ void UndoCellFormat::copyFormat(TQValueList<tqlayoutCell> & list,
UndoCellFormat::~UndoCellFormat()
{
- TQValueList<tqlayoutCell>::Iterator it2;
+ TQValueList<layoutCell>::Iterator it2;
for ( it2 = m_lstFormats.begin(); it2 != m_lstFormats.end(); ++it2 )
{
delete (*it2).l;
@@ -1075,7 +1075,7 @@ UndoCellFormat::~UndoCellFormat()
}
m_lstRedoFormats.clear();
- TQValueList<tqlayoutColumn>::Iterator it3;
+ TQValueList<layoutColumn>::Iterator it3;
for ( it3 = m_lstColFormats.begin(); it3 != m_lstColFormats.end(); ++it3 )
{
delete (*it3).l;
@@ -1088,7 +1088,7 @@ UndoCellFormat::~UndoCellFormat()
}
m_lstRedoColFormats.clear();
- TQValueList<tqlayoutRow>::Iterator it4;
+ TQValueList<layoutRow>::Iterator it4;
for ( it4 = m_lstRowFormats.begin(); it4 != m_lstRowFormats.end(); ++it4 )
{
delete (*it4).l;
@@ -1119,7 +1119,7 @@ void UndoCellFormat::undo()
TQRect range = (*it)->rect().normalize();
if( util_isColumnSelected( range ) )
{
- TQValueList<tqlayoutColumn>::Iterator it2;
+ TQValueList<layoutColumn>::Iterator it2;
for ( it2 = m_lstColFormats.begin(); it2 != m_lstColFormats.end(); ++it2 )
{
ColumnFormat * col = sheet->nonDefaultColumnFormat( (*it2).col );
@@ -1128,7 +1128,7 @@ void UndoCellFormat::undo()
}
else if( util_isRowSelected( range ) )
{
- TQValueList<tqlayoutRow>::Iterator it2;
+ TQValueList<layoutRow>::Iterator it2;
for ( it2 = m_lstRowFormats.begin(); it2 != m_lstRowFormats.end(); ++it2 )
{
RowFormat * row = sheet->nonDefaultRowFormat( (*it2).row );
@@ -1136,7 +1136,7 @@ void UndoCellFormat::undo()
}
}
- TQValueList<tqlayoutCell>::Iterator it2;
+ TQValueList<layoutCell>::Iterator it2;
for ( it2 = m_lstFormats.begin(); it2 != m_lstFormats.end(); ++it2 )
{
Cell *cell = sheet->nonDefaultCell( (*it2).col,(*it2).row );
@@ -1167,7 +1167,7 @@ void UndoCellFormat::redo()
TQRect range = (*it)->rect().normalize();
if ( util_isColumnSelected( range ) )
{
- TQValueList<tqlayoutColumn>::Iterator it2;
+ TQValueList<layoutColumn>::Iterator it2;
for ( it2 = m_lstRedoColFormats.begin(); it2 != m_lstRedoColFormats.end(); ++it2 )
{
ColumnFormat * col = sheet->nonDefaultColumnFormat( (*it2).col );
@@ -1176,7 +1176,7 @@ void UndoCellFormat::redo()
}
else if( util_isRowSelected( range ) )
{
- TQValueList<tqlayoutRow>::Iterator it2;
+ TQValueList<layoutRow>::Iterator it2;
for ( it2 = m_lstRedoRowFormats.begin(); it2 != m_lstRedoRowFormats.end(); ++it2 )
{
RowFormat * row = sheet->nonDefaultRowFormat( (*it2).row );
@@ -1184,7 +1184,7 @@ void UndoCellFormat::redo()
}
}
- TQValueList<tqlayoutCell>::Iterator it2;
+ TQValueList<layoutCell>::Iterator it2;
for ( it2 = m_lstRedoFormats.begin(); it2 != m_lstRedoFormats.end(); ++it2 )
{
Cell * cell = sheet->nonDefaultCell( (*it2).col,(*it2).row );
@@ -1250,10 +1250,10 @@ UndoSort::UndoSort( Doc * _doc, Sheet * _sheet, const TQRect & _selection ) :
copyAll( m_lstFormats, m_lstColFormats, m_lstRowFormats, _sheet );
}
-void UndoSort::copyAll(TQValueList<tqlayoutTextCell> & list, TQValueList<tqlayoutColumn> & listCol,
- TQValueList<tqlayoutRow> & listRow, Sheet * sheet )
+void UndoSort::copyAll(TQValueList<layoutTextCell> & list, TQValueList<layoutColumn> & listCol,
+ TQValueList<layoutRow> & listRow, Sheet * sheet )
{
- TQValueList<tqlayoutTextCell>::Iterator it2;
+ TQValueList<layoutTextCell>::Iterator it2;
for ( it2 = list.begin(); it2 != list.end(); ++it2 )
{
delete (*it2).l;
@@ -1265,7 +1265,7 @@ void UndoSort::copyAll(TQValueList<tqlayoutTextCell> & list, TQValueList<tqlayou
Cell * c;
for (int col = m_rctRect.left(); col <= m_rctRect.right(); ++col)
{
- tqlayoutColumn tmptqlayout;
+ layoutColumn tmptqlayout;
tmptqlayout.col = col;
tmptqlayout.l = new ColumnFormat( sheet, col );
tmptqlayout.l->copy( *(sheet->columnFormat( col )) );
@@ -1276,7 +1276,7 @@ void UndoSort::copyAll(TQValueList<tqlayoutTextCell> & list, TQValueList<tqlayou
{
if ( !c->isPartOfMerged() )
{
- tqlayoutTextCell tmptqlayout;
+ layoutTextCell tmptqlayout;
tmptqlayout.col = col;
tmptqlayout.row = c->row();
tmptqlayout.l = new Format( sheet, 0 );
@@ -1294,7 +1294,7 @@ void UndoSort::copyAll(TQValueList<tqlayoutTextCell> & list, TQValueList<tqlayou
Cell * c;
for ( int row = m_rctRect.top(); row <= m_rctRect.bottom(); ++row)
{
- tqlayoutRow tmptqlayout;
+ layoutRow tmptqlayout;
tmptqlayout.row = row;
tmptqlayout.l = new RowFormat( sheet, row );
tmptqlayout.l->copy( *(sheet->rowFormat( row )) );
@@ -1305,7 +1305,7 @@ void UndoSort::copyAll(TQValueList<tqlayoutTextCell> & list, TQValueList<tqlayou
{
if ( !c->isPartOfMerged() )
{
- tqlayoutTextCell tmptqlayout;
+ layoutTextCell tmptqlayout;
tmptqlayout.col = c->column();
tmptqlayout.row = row;
tmptqlayout.l = new Format( sheet, 0 );
@@ -1328,7 +1328,7 @@ void UndoSort::copyAll(TQValueList<tqlayoutTextCell> & list, TQValueList<tqlayou
cell = sheet->nonDefaultCell( x, y );
if (!cell->isPartOfMerged())
{
- tqlayoutTextCell tmptqlayout;
+ layoutTextCell tmptqlayout;
tmptqlayout.col = x;
tmptqlayout.row = y;
tmptqlayout.l = new Format( sheet, 0 );
@@ -1342,7 +1342,7 @@ void UndoSort::copyAll(TQValueList<tqlayoutTextCell> & list, TQValueList<tqlayou
UndoSort::~UndoSort()
{
- TQValueList<tqlayoutTextCell>::Iterator it2;
+ TQValueList<layoutTextCell>::Iterator it2;
for ( it2 = m_lstFormats.begin(); it2 != m_lstFormats.end(); ++it2 )
{
delete (*it2).l;
@@ -1355,7 +1355,7 @@ UndoSort::~UndoSort()
}
m_lstRedoFormats.clear();
- TQValueList<tqlayoutColumn>::Iterator it3;
+ TQValueList<layoutColumn>::Iterator it3;
for ( it3 = m_lstColFormats.begin(); it3 != m_lstColFormats.end(); ++it3 )
{
delete (*it3).l;
@@ -1368,7 +1368,7 @@ UndoSort::~UndoSort()
}
m_lstRedoColFormats.clear();
- TQValueList<tqlayoutRow>::Iterator it4;
+ TQValueList<layoutRow>::Iterator it4;
for ( it4 = m_lstRowFormats.begin(); it4 != m_lstRowFormats.end(); ++it4 )
{
delete (*it4).l;
@@ -1397,7 +1397,7 @@ void UndoSort::undo()
if ( util_isColumnSelected( m_rctRect ) )
{
- TQValueList<tqlayoutColumn>::Iterator it2;
+ TQValueList<layoutColumn>::Iterator it2;
for ( it2 = m_lstColFormats.begin(); it2 != m_lstColFormats.end(); ++it2 )
{
ColumnFormat * col = sheet->nonDefaultColumnFormat( (*it2).col );
@@ -1406,7 +1406,7 @@ void UndoSort::undo()
}
else if( util_isRowSelected( m_rctRect ) )
{
- TQValueList<tqlayoutRow>::Iterator it2;
+ TQValueList<layoutRow>::Iterator it2;
for ( it2 = m_lstRowFormats.begin(); it2 != m_lstRowFormats.end(); ++it2 )
{
RowFormat *row= sheet->nonDefaultRowFormat( (*it2).row );
@@ -1414,7 +1414,7 @@ void UndoSort::undo()
}
}
- TQValueList<tqlayoutTextCell>::Iterator it2;
+ TQValueList<layoutTextCell>::Iterator it2;
for ( it2 = m_lstFormats.begin(); it2 != m_lstFormats.end(); ++it2 )
{
Cell *cell = sheet->nonDefaultCell( (*it2).col,(*it2).row );
@@ -1449,7 +1449,7 @@ void UndoSort::redo()
if( util_isColumnSelected( m_rctRect ) )
{
- TQValueList<tqlayoutColumn>::Iterator it2;
+ TQValueList<layoutColumn>::Iterator it2;
for ( it2 = m_lstRedoColFormats.begin(); it2 != m_lstRedoColFormats.end(); ++it2 )
{
ColumnFormat *col= sheet->nonDefaultColumnFormat( (*it2).col );
@@ -1458,7 +1458,7 @@ void UndoSort::redo()
}
else if( util_isRowSelected( m_rctRect ) )
{
- TQValueList<tqlayoutRow>::Iterator it2;
+ TQValueList<layoutRow>::Iterator it2;
for ( it2 = m_lstRedoRowFormats.begin(); it2 != m_lstRedoRowFormats.end(); ++it2 )
{
RowFormat *row= sheet->nonDefaultRowFormat( (*it2).row );
@@ -1466,7 +1466,7 @@ void UndoSort::redo()
}
}
- TQValueList<tqlayoutTextCell>::Iterator it2;
+ TQValueList<layoutTextCell>::Iterator it2;
for ( it2 = m_lstRedoFormats.begin(); it2 != m_lstRedoFormats.end(); ++it2 )
{
Cell *cell = sheet->nonDefaultCell( (*it2).col,(*it2).row );
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-15 22:33:13 +0000