From da4be7880ff1de6415ab6256afd2514e64f5fa2e 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/kdegraphics@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kpdf/ui/pagepainter.cpp | 2 +- kpdf/ui/pageview.cpp | 10 +++++----- kpdf/ui/presentationwidget.cpp | 8 ++++---- kpdf/ui/searchwidget.h | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) (limited to 'kpdf/ui') diff --git a/kpdf/ui/pagepainter.cpp b/kpdf/ui/pagepainter.cpp index 96fb1edf..21e9c37f 100644 --- a/kpdf/ui/pagepainter.cpp +++ b/kpdf/ui/pagepainter.cpp @@ -26,7 +26,7 @@ void PagePainter::paintPageOnPainter( const KPDFPage * page, int id, int flags, TQPixmap * pixmap = 0; // if a pixmap is present for given id, use it - if ( page->m_pixmaps.tqcontains( id ) ) + if ( page->m_pixmaps.contains( id ) ) pixmap = page->m_pixmaps[ id ]; // else find the closest match using pixmaps of other IDs (great optim!) diff --git a/kpdf/ui/pageview.cpp b/kpdf/ui/pageview.cpp index 27fe3fcb..42024f55 100644 --- a/kpdf/ui/pageview.cpp +++ b/kpdf/ui/pageview.cpp @@ -80,7 +80,7 @@ public: TQRect mouseSelectionRect; TQColor selectionRectColor; - // type ahead tqfind + // type ahead find bool typeAheadActive; TQString typeAheadString; TQTimer * findTimeoutTimer; @@ -577,7 +577,7 @@ void PageView::viewportPaintEvent( TQPaintEvent * pe ) // 2) Layer 1: pixmap manipulated areas // 3) Layer 2: paint (blend) transparent selection if ( !selectionRect.isNull() && selectionRect.intersects( contentsRect ) && - !selectionRectInternal.tqcontains( contentsRect ) ) + !selectionRectInternal.contains( contentsRect ) ) { TQRect blendRect = selectionRectInternal.intersect( contentsRect ); // skip rectangles covered by the selection's border @@ -616,7 +616,7 @@ void PageView::viewportPaintEvent( TQPaintEvent * pe ) // 2) Layer 1: opaque manipulated ares (filled / contours) // 3) Layer 2: paint opaque selection if ( !selectionRect.isNull() && selectionRect.intersects( contentsRect ) && - !selectionRectInternal.tqcontains( contentsRect ) ) + !selectionRectInternal.contains( contentsRect ) ) { screenPainter.setPen( tqpalette().active().highlight().dark(110) ); screenPainter.drawRect( selectionRect ); @@ -1338,7 +1338,7 @@ void PageView::paintItems( TQPainter * p, const TQRect & contentsRect ) outlineGeometry.addCoords( -1, -1, 3, 3 ); // draw the page outline (little black border and 2px shadow) - if ( !pixmapGeometry.tqcontains( contentsRect ) ) + if ( !pixmapGeometry.contains( contentsRect ) ) { int pixmapWidth = pixmapGeometry.width(), pixmapHeight = pixmapGeometry.height(); @@ -1513,7 +1513,7 @@ void PageView::updateZoom( ZoomMode newZoomMode ) { case ZoomFixed:{ //ZoomFixed case TQString z = d->aZoom->currentText(); - newFactor = KGlobal::locale()->readNumber( z.remove( z.tqfind( '%' ), 1 ) ) / 100.0; + newFactor = KGlobal::locale()->readNumber( z.remove( z.find( '%' ), 1 ) ) / 100.0; }break; case ZoomIn: newFactor += (newFactor > 0.99) ? ( newFactor > 1.99 ? 0.5 : 0.2 ) : 0.1; diff --git a/kpdf/ui/presentationwidget.cpp b/kpdf/ui/presentationwidget.cpp index 6767db2c..cc882f7a 100644 --- a/kpdf/ui/presentationwidget.cpp +++ b/kpdf/ui/presentationwidget.cpp @@ -242,7 +242,7 @@ void PresentationWidget::mousePressEvent( TQMouseEvent * e ) return; // handle clicking on top-right overlay - if ( m_overlayGeometry.tqcontains( e->pos() ) ) + if ( m_overlayGeometry.contains( e->pos() ) ) { overlayClick( e->pos() ); return; @@ -290,7 +290,7 @@ void PresentationWidget::mouseMoveEvent( TQMouseEvent * e ) if ( e->y() <= (tqgeometry().top() + 1) ) m_topBar->show(); // handle "dragging the wheel" if clicking on its tqgeometry - else if ( e->state() == Qt::LeftButton && m_overlayGeometry.tqcontains( e->pos() ) ) + else if ( e->state() == Qt::LeftButton && m_overlayGeometry.contains( e->pos() ) ) overlayClick( e->pos() ); } } @@ -963,7 +963,7 @@ const KPDFPageTransition PresentationWidget::defaultTransition( int type ) const /** ONLY the TRANSITIONS GENERATION function from here on **/ void PresentationWidget::initTransition( const KPDFPageTransition *transition ) { - // if it's just a 'tqreplace' transition, tqrepaint the screen + // if it's just a 'replace' transition, tqrepaint the screen if ( transition->type() == KPDFPageTransition::Replace ) { update(); @@ -1175,7 +1175,7 @@ void PresentationWidget::initTransition( const KPDFPageTransition *transition ) m_transitionDelay = (int)( (totalTime * 1000) / steps ); } break; - // dissolve: tqreplace 'random' rects + // dissolve: replace 'random' rects case KPDFPageTransition::Dissolve: { const int gridXsteps = 50; diff --git a/kpdf/ui/searchwidget.h b/kpdf/ui/searchwidget.h index 45ecae99..a39e01ad 100644 --- a/kpdf/ui/searchwidget.h +++ b/kpdf/ui/searchwidget.h @@ -20,7 +20,7 @@ class m_inputDelayTimer; #define SW_SEARCH_ID 3 /** - * @short A widget for tqfind-as-you-type search. Outputs to the Document. + * @short A widget for find-as-you-type search. Outputs to the Document. * * This widget accepts keyboard input and performs a call to findTextAll(..) * in the KPDFDocument class when there are 3 or more chars to search for. -- cgit v1.2.3