From 4c6f8d69e2d1501837affb472c4eb8fec4462240 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/kdepim@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kaddressbook/views/cardview.cpp | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'kaddressbook/views') diff --git a/kaddressbook/views/cardview.cpp b/kaddressbook/views/cardview.cpp index 9b0784d89..b790b0c3f 100644 --- a/kaddressbook/views/cardview.cpp +++ b/kaddressbook/views/cardview.cpp @@ -61,7 +61,7 @@ class CardViewTip : public TQLabel }; // -// Warning: make sure you use tqfindRef() instead of tqfind() to find an +// Warning: make sure you use findRef() instead of find() to find an // item! Only the pointer value is unique in the list. // class CardViewItemList : public TQPtrList @@ -355,7 +355,7 @@ int CardViewItem::height( bool allowCache ) const for ( iter.toFirst(); iter.current(); ++iter ) { if ( !sef && (*iter)->second.isEmpty() ) continue; - lines = TQMIN( (*iter)->second.tqcontains( '\n' ) + 1, maxLines ); + lines = TQMIN( (*iter)->second.contains( '\n' ) + 1, maxLines ); fieldHeight += ( lines * fh ) + 2; } @@ -507,7 +507,7 @@ void CardViewItem::showFullString( const TQPoint &itempos, CardViewTip *tip ) Field *_f; for ( _f = d->mFieldList.first(); _f != f; _f = d->mFieldList.next() ) if ( se || ! _f->second.isEmpty() ) - y += ( TQMIN( _f->second.tqcontains( '\n' ) + 1, maxLines ) * fh ) + 2; + y += ( TQMIN( _f->second.contains( '\n' ) + 1, maxLines ) * fh ) + 2; if ( isLabel && itempos.y() > y + fh ) return; @@ -521,7 +521,7 @@ void CardViewItem::showFullString( const TQPoint &itempos, CardViewTip *tip ) trimmed = mView->d->mFm->width( s ) > mw - colonWidth; } else { TQRect r( mView->d->mFm->boundingRect( 0, 0, INT_MAX, INT_MAX, TQt::AlignTop|TQt::AlignLeft, s ) ); - trimmed = r.width() > mw || r.height() / fh > TQMIN( s.tqcontains( '\n' ) + 1, maxLines ); + trimmed = r.width() > mw || r.height() / fh > TQMIN( s.contains( '\n' ) + 1, maxLines ); } } @@ -560,7 +560,7 @@ CardViewItem::Field *CardViewItem::fieldAt( const TQPoint & itempos ) const Field *f; for ( f = d->mFieldList.first(); f; f = d->mFieldList.next() ) { if ( showEmpty || !f->second.isEmpty() ) - ypos += (TQMIN( f->second.tqcontains( '\n' )+1, maxLines ) * fh) + 2; + ypos += (TQMIN( f->second.contains( '\n' )+1, maxLines ) * fh) + 2; if ( iy <= ypos ) break; } @@ -616,7 +616,7 @@ void CardView::takeItem( CardViewItem *item ) { if ( d->mCurrentItem == item ) d->mCurrentItem = item->nextItem(); - d->mItemList.take( d->mItemList.tqfindRef( item ) ); + d->mItemList.take( d->mItemList.findRef( item ) ); setLayoutDirty( true ); } @@ -671,7 +671,7 @@ CardViewItem *CardView::itemAt( const TQPoint &viewPos ) const bool found = false; for ( iter.toFirst(); iter.current() && !found; ++iter ) { item = *iter; - if ( TQRect( item->d->x, item->d->y, d->mItemWidth, item->height() ).tqcontains( viewPos ) ) + if ( TQRect( item->d->x, item->d->y, d->mItemWidth, item->height() ).contains( viewPos ) ) found = true; } @@ -860,7 +860,7 @@ void CardView::drawContents( TQPainter *p, int clipx, int clipy, item = *iter; cardRect.setRect( item->d->x, item->d->y, d->mItemWidth, item->height() ); - if ( clipRect.intersects( cardRect ) || clipRect.tqcontains( cardRect ) ) { + if ( clipRect.intersects( cardRect ) || clipRect.contains( cardRect ) ) { // Tell the card to paint p->save(); p->translate( cardRect.x(), cardRect.y() ); @@ -875,7 +875,7 @@ void CardView::drawContents( TQPainter *p, int clipx, int clipy, sep = *sepIter; sepRect = sep->mRect; - if ( clipRect.intersects( sepRect ) || clipRect.tqcontains( sepRect ) ) { + if ( clipRect.intersects( sepRect ) || clipRect.contains( sepRect ) ) { p->save(); p->translate( sepRect.x(), sepRect.y() ); sep->paintSeparator( p, cg ); @@ -953,7 +953,7 @@ void CardView::calcLayout() CardViewItem *CardView::itemAfter( const CardViewItem *item ) const { - d->mItemList.tqfindRef( item ); + d->mItemList.findRef( item ); return d->mItemList.next(); } @@ -1070,8 +1070,8 @@ void CardView::contentsMousePressEvent( TQMouseEvent *e ) } int from, to, a, b; - a = d->mItemList.tqfindRef( item ); - b = d->mItemList.tqfindRef( other ); + a = d->mItemList.findRef( item ); + b = d->mItemList.findRef( other ); from = a < b ? a : b; to = a > b ? a : b; @@ -1218,7 +1218,7 @@ void CardView::keyPressEvent( TQKeyEvent *e ) return; } - uint pos = d->mItemList.tqfindRef( d->mCurrentItem ); + uint pos = d->mItemList.findRef( d->mCurrentItem ); CardViewItem *aItem = 0; CardViewItem *old = d->mCurrentItem; @@ -1347,8 +1347,8 @@ void CardView::keyPressEvent( TQKeyEvent *e ) // otherwise, ?????? bool s = ! aItem->isSelected(); int from, to, a, b; - a = d->mItemList.tqfindRef( aItem ); - b = d->mItemList.tqfindRef( old ); + a = d->mItemList.findRef( aItem ); + b = d->mItemList.findRef( old ); from = a < b ? a : b; to = a > b ? a : b; -- cgit v1.2.1