summaryrefslogtreecommitdiffstats
path: root/kspread/kspread_sheet.cc
diff options
context:
space:
mode:
Diffstat (limited to 'kspread/kspread_sheet.cc')
-rw-r--r--kspread/kspread_sheet.cc66
1 files changed, 33 insertions, 33 deletions
diff --git a/kspread/kspread_sheet.cc b/kspread/kspread_sheet.cc
index 43e4bbec..6c27757c 100644
--- a/kspread/kspread_sheet.cc
+++ b/kspread/kspread_sheet.cc
@@ -122,9 +122,9 @@ void CellBinding::cellChanged( Cell *_cell )
emit changed( _cell );
}
-bool CellBinding::tqcontains( int _x, int _y )
+bool CellBinding::contains( int _x, int _y )
{
- return m_rctDataArea.tqcontains( TQPoint( _x, _y ) );
+ return m_rctDataArea.contains( TQPoint( _x, _y ) );
}
/*****************************************************************************
@@ -344,7 +344,7 @@ public:
int Sheet::s_id = 0L;
TQIntDict<Sheet>* Sheet::s_mapSheets;
-Sheet* Sheet::tqfind( int _id )
+Sheet* Sheet::find( int _id )
{
if ( !s_mapSheets )
return 0L;
@@ -2331,7 +2331,7 @@ void Sheet::refreshRemoveAreaName(const TQString & _areaName)
{
if ( c->isFormula() )
{
- if (c->text().tqfind(tmp) != -1)
+ if (c->text().find(tmp) != -1)
{
if ( !c->makeFormula() )
kdError(36001) << "ERROR: Syntax ERROR" << endl;
@@ -2348,7 +2348,7 @@ void Sheet::refreshChangeAreaName(const TQString & _areaName)
{
if ( c->isFormula() )
{
- if (c->text().tqfind(tmp) != -1)
+ if (c->text().find(tmp) != -1)
{
if ( !c->makeFormula() )
kdError(36001) << "ERROR: Syntax ERROR" << endl;
@@ -2369,17 +2369,17 @@ void Sheet::changeCellTabName( TQString const & old_name, TQString const & new_n
{
if( c->isFormula() )
{
- if(c->text().tqfind(old_name)!=-1)
+ if(c->text().find(old_name)!=-1)
{
- int nb = c->text().tqcontains(old_name+"!");
+ int nb = c->text().contains(old_name+"!");
TQString tmp=old_name+"!";
int len = tmp.length();
tmp=c->text();
for( int i=0; i<nb; i++ )
{
- int pos = tmp.tqfind( old_name+"!" );
- tmp.tqreplace( pos, len, new_name+"!" );
+ int pos = tmp.find( old_name+"!" );
+ tmp.replace( pos, len, new_name+"!" );
}
c->setCellText(tmp);
}
@@ -2958,7 +2958,7 @@ void Sheet::changeNameCellRef( const TQPoint & pos, bool fullRowOrColumn,
}
#if 0
-void Sheet::tqreplace( const TQString &_tqfind, const TQString &_tqreplace, long options,
+void Sheet::replace( const TQString &_find, const TQString &_replace, long options,
Canvas *canvas )
{
Selection* selectionInfo = canvas->view()->selectionInfo();
@@ -2987,13 +2987,13 @@ void Sheet::tqreplace( const TQString &_tqfind, const TQString &_tqreplace, long
// Create the class that handles all the actual replace stuff, and connect it to its
// local slots.
- KReplace dialog( _tqfind, _tqreplace, options );
+ KReplace dialog( _find, _replace, options );
TQObject::connect(
&dialog, TQT_SIGNAL( highlight( const TQString &, int, int, const TQRect & ) ),
canvas, TQT_SLOT( highlight( const TQString &, int, int, const TQRect & ) ) );
TQObject::connect(
- &dialog, TQT_SIGNAL( tqreplace( const TQString &, int, int,int, const TQRect & ) ),
- canvas, TQT_SLOT( tqreplace( const TQString &, int, int,int, const TQRect & ) ) );
+ &dialog, TQT_SIGNAL( replace( const TQString &, int, int,int, const TQRect & ) ),
+ canvas, TQT_SLOT( replace( const TQString &, int, int,int, const TQRect & ) ) );
// Now do the replacing...
if ( !doc()->undoLocked() )
@@ -3024,7 +3024,7 @@ void Sheet::tqreplace( const TQString &_tqfind, const TQString &_tqreplace, long
TQString text = cell->text();
cellRegion.setTop( row );
cellRegion.setLeft( col );
- if (!dialog.tqreplace( text, cellRegion ))
+ if (!dialog.replace( text, cellRegion ))
return;
}
}
@@ -3276,8 +3276,8 @@ void Sheet::sortByRow( const TQRect &area, int key1, int key2, int key3,
if ( firstKey )
{
- int i1 = firstKey->tqfindIndex( cell2->text() );
- int i2 = firstKey->tqfindIndex( bestCell->text() );
+ int i1 = firstKey->findIndex( cell2->text() );
+ int i2 = firstKey->findIndex( bestCell->text() );
if ( i1 != -1 && i2 != -1 )
{
@@ -3632,8 +3632,8 @@ void Sheet::sortByColumn( const TQRect &area, int key1, int key2, int key3,
if ( firstKey )
{
- int i1 = firstKey->tqfindIndex( cell2->text() );
- int i2 = firstKey->tqfindIndex( bestCell->text() );
+ int i1 = firstKey->findIndex( cell2->text() );
+ int i2 = firstKey->findIndex( bestCell->text() );
if ( i1 != -1 && i2 != -1 )
{
@@ -5043,7 +5043,7 @@ TQString Sheet::copyAsText( Selection* selectionInfo )
if ( !c->isDefault() )
{
TQPoint p( c->column(), c->row() );
- if ( selection.tqcontains( p ) )
+ if ( selection.contains( p ) )
{
top = TQMIN( top, (unsigned) c->row() );
left = TQMIN( left, (unsigned) c->column() );
@@ -5193,7 +5193,7 @@ void Sheet::pasteTextPlain( TQString &_text, TQRect pasteArea)
{
int p = 0;
- p = tmp.tqfind('\n');
+ p = tmp.find('\n');
if (p < 0)
p = tmp.length();
@@ -5816,7 +5816,7 @@ TQDomDocument Sheet::saveCellRegion(const Region& region, bool copy, bool era)
if (!cell->isDefault() && !cell->isPartOfMerged())
{
TQPoint point(cell->column(), cell->row());
- if (range.tqcontains(point))
+ if (range.contains(point))
{
root.appendChild(cell->save( dd, 0, top - 1, copy, copy, era));
}
@@ -5857,7 +5857,7 @@ TQDomDocument Sheet::saveCellRegion(const Region& region, bool copy, bool era)
if (!cell->isDefault() && !cell->isPartOfMerged())
{
TQPoint point(cell->column(), cell->row());
- if (range.tqcontains(point))
+ if (range.contains(point))
{
root.appendChild(cell->save( dd, left - 1, 0, copy, copy, era));
}
@@ -6334,9 +6334,9 @@ bool Sheet::loadSheetStyleFormat( TQDomElement *style )
void Sheet::replaceMacro( TQString & text, const TQString & old, const TQString & newS )
{
- int n = text.tqfind( old );
+ int n = text.find( old );
if ( n != -1 )
- text = text.tqreplace( n, old.length(), newS );
+ text = text.replace( n, old.length(), newS );
}
@@ -6630,35 +6630,35 @@ void Sheet::loadOasisMasterLayoutPage( KoStyleStack &styleStack )
TQString str = styleStack.attributeNS( KoXmlNS::style, "print" );
kdDebug()<<" style:print :"<<str<<endl;
- if (str.tqcontains( "headers" ) )
+ if (str.contains( "headers" ) )
{
//TODO implement it into kspread
}
- if ( str.tqcontains( "grid" ) )
+ if ( str.contains( "grid" ) )
{
d->print->setPrintGrid( true );
}
- if ( str.tqcontains( "annotations" ) )
+ if ( str.contains( "annotations" ) )
{
//TODO it's not implemented
}
- if ( str.tqcontains( "objects" ) )
+ if ( str.contains( "objects" ) )
{
//TODO it's not implemented
}
- if ( str.tqcontains( "charts" ) )
+ if ( str.contains( "charts" ) )
{
//TODO it's not implemented
}
- if ( str.tqcontains( "drawings" ) )
+ if ( str.contains( "drawings" ) )
{
//TODO it's not implemented
}
- if ( str.tqcontains( "formulas" ) )
+ if ( str.contains( "formulas" ) )
{
d->showFormula = true;
}
- if ( str.tqcontains( "zero-values" ) )
+ if ( str.contains( "zero-values" ) )
{
//TODO it's not implemented
}
@@ -8537,7 +8537,7 @@ void Sheet::clearPaintDirtyData()
bool Sheet::cellIsPaintDirty( TQPoint const & cell ) const
{
- return d->paintDirtyList.tqcontains(cell);
+ return d->paintDirtyList.contains(cell);
}
#ifndef NDEBUG