From b6edfe41c9395f2e20784cbf0e630af6426950a3 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 10 Aug 2011 06:08:18 +0000 Subject: rename the following methods: tqfind find tqreplace replace tqcontains contains git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/koffice@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kspread/kspread_sheetprint.cc | 62 +++++++++++++++++++++---------------------- 1 file changed, 31 insertions(+), 31 deletions(-) (limited to 'kspread/kspread_sheetprint.cc') diff --git a/kspread/kspread_sheetprint.cc b/kspread/kspread_sheetprint.cc index 6bb577f6..c3c12117 100644 --- a/kspread/kspread_sheetprint.cc +++ b/kspread/kspread_sheetprint.cc @@ -705,7 +705,7 @@ bool SheetPrint::isOnNewPageX( int _column ) } //Now check if we find the column already in the list - if ( m_lnewPageListX.tqfindIndex( _column ) != -1 ) + if ( m_lnewPageListX.findIndex( _column ) != -1 ) { if( _column > m_maxCheckedNewPageX ) m_maxCheckedNewPageX = _column; @@ -820,7 +820,7 @@ bool SheetPrint::isOnNewPageY( int _row ) } //Now check if we find the row already in the list - if ( m_lnewPageListY.tqfindIndex( _row ) != -1 ) + if ( m_lnewPageListY.findIndex( _row ) != -1 ) { if( _row > m_maxCheckedNewPageY ) m_maxCheckedNewPageY = _row; @@ -934,11 +934,11 @@ void SheetPrint::updateNewPageListX( int _col ) { //Find the page entry for this column TQValueList::iterator it; - it = m_lnewPageListX.tqfind( _col ); + it = m_lnewPageListX.find( _col ); while ( ( it == m_lnewPageListX.end() ) && _col > 0 ) { _col--; - it = m_lnewPageListX.tqfind( _col ); + it = m_lnewPageListX.find( _col ); } //Remove later pages @@ -969,11 +969,11 @@ void SheetPrint::updateNewPageListY( int _row ) { //Find the page entry for this row TQValueList::iterator it; - it = m_lnewPageListY.tqfind( _row ); + it = m_lnewPageListY.find( _row ); while ( ( it == m_lnewPageListY.end() ) && _row > 0 ) { _row--; - it = m_lnewPageListY.tqfind( _row ); + it = m_lnewPageListY.find( _row ); } //Remove later pages @@ -1005,10 +1005,10 @@ void SheetPrint::resetPrintRange () setPrintRange( TQRect( TQPoint( 1, 1 ), TQPoint( KS_colMax, KS_rowMax ) ) ); } -void SheetPrint::replaceHeadFootLineMacro ( TQString &_text, const TQString &_search, const TQString &_tqreplace ) +void SheetPrint::replaceHeadFootLineMacro ( TQString &_text, const TQString &_search, const TQString &_replace ) { - if ( _search != _tqreplace ) - _text.tqreplace ( TQString( "<" + _search + ">" ), "<" + _tqreplace + ">" ); + if ( _search != _replace ) + _text.replace ( TQString( "<" + _search + ">" ), "<" + _replace + ">" ); } TQString SheetPrint::localizeHeadFootLine ( const TQString &_text ) @@ -1172,7 +1172,7 @@ void SheetPrint::setPaperLayout( float _leftBorder, float _topBorder, TQString paper( _paper ); if ( paper[0].isDigit() ) // Custom format { - const int i = paper.tqfind( 'x' ); + const int i = paper.find( 'x' ); if ( i < 0 ) { // We have nothing useful, so assume ISO A4 @@ -1218,7 +1218,7 @@ TQValueList::iterator SheetPrint::findNewPageColumn( int col } return it; // TQValueList::iterator it; -// it = m_lnewPageListX.tqfind( startCol ); +// it = m_lnewPageListX.find( startCol ); } TQValueList::iterator SheetPrint::findNewPageRow( int row ) @@ -1307,35 +1307,35 @@ TQString SheetPrint::completeHeading( const TQString &_data, int _page, const TQ tmp = _data; int pos = 0; - while ( ( pos = tmp.tqfind( "", pos ) ) != -1 ) - tmp.tqreplace( pos, 6, page ); + while ( ( pos = tmp.find( "", pos ) ) != -1 ) + tmp.replace( pos, 6, page ); pos = 0; - while ( ( pos = tmp.tqfind( "", pos ) ) != -1 ) - tmp.tqreplace( pos, 7, pages ); + while ( ( pos = tmp.find( "", pos ) ) != -1 ) + tmp.replace( pos, 7, pages ); pos = 0; - while ( ( pos = tmp.tqfind( "", pos ) ) != -1 ) - tmp.tqreplace( pos, 6, pathFileName ); + while ( ( pos = tmp.find( "", pos ) ) != -1 ) + tmp.replace( pos, 6, pathFileName ); pos = 0; - while ( ( pos = tmp.tqfind( "", pos ) ) != -1 ) - tmp.tqreplace( pos, 6, fileName ); + while ( ( pos = tmp.find( "", pos ) ) != -1 ) + tmp.replace( pos, 6, fileName ); pos = 0; - while ( ( pos = tmp.tqfind( "