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

1 files changed, 16 insertions, 16 deletions

diff --git a/kpresenter/KPrCanvas.cpp b/kpresenter/KPrCanvas.cpp
index 9e8d1815..2ada2d93 100644
--- a/kpresenter/KPrCanvas.cpp
+++ b/kpresenter/KPrCanvas.cpp
@@ -602,7 +602,7 @@ void KPrCanvas::drawEditPage( TQPainter *painter, const TQRect &_rect,
 {
     KoRect rect = m_view->zoomHandler()->unzoomRect(_rect);
 
-    int pageNum = m_view->kPresenterDoc()->pageList().tqfindRef( page );
+    int pageNum = m_view->kPresenterDoc()->pageList().findRef( page );
     //objects on master page
     if ( page->masterPage() && page->displayObjectFromMasterPage() )
         drawObjectsEdit( painter, rect, page->masterPage()->objectList(), selectionMode, pageNum );
@@ -641,7 +641,7 @@ void KPrCanvas::drawGrid(TQPainter *painter, const TQRect &rect2) const
 
     for ( double i = offsetX; ( zoomedX = m_view->zoomHandler()->zoomItX( i )+pageRect.left() ) < pageRect.right(); i += offsetX )
         for ( double j = offsetY; ( zoomedY = m_view->zoomHandler()->zoomItY( j )+pageRect.top() ) < pageRect.bottom(); j += offsetY )
-            if( rect2.tqcontains( zoomedX, zoomedY ) )
+            if( rect2.contains( zoomedX, zoomedY ) )
                 painter->drawPoint( zoomedX, zoomedY );
 
     painter->restore();
@@ -691,7 +691,7 @@ void KPrCanvas::mousePressEvent( TQMouseEvent *e )
     {
         KPrTextObject *txtObj=m_currentTextObjectView->kpTextObject();
         Q_ASSERT(txtObj);
-        if(txtObj->tqcontains( docPoint ))
+        if(txtObj->contains( docPoint ))
         {
             KoPoint pos = docPoint - txtObj->innerRect().topLeft(); // in pt, but now translated into the object's coordinate system
             // This is common to all mouse buttons, so that RMB and MMB place the cursor too
@@ -1406,7 +1406,7 @@ void KPrCanvas::mouseMoveEvent( TQMouseEvent *e )
 
         KPrTextObject *txtObj=m_currentTextObjectView->kpTextObject();
         Q_ASSERT(txtObj);
-        if(txtObj->tqcontains( docPoint )&&mousePressed)
+        if(txtObj->contains( docPoint )&&mousePressed)
         {
             KoPoint pos = docPoint - txtObj->innerRect().topLeft();
             m_currentTextObjectView->mouseMoveEvent( e, m_view->zoomHandler()->ptToLayoutUnitPix( pos ) ); // in LU pixels
@@ -1824,7 +1824,7 @@ void KPrCanvas::mouseDoubleClickEvent( TQMouseEvent *e )
     {
         KPrTextObject *txtObj=m_currentTextObjectView->kpTextObject();
         Q_ASSERT(txtObj);
-        if(txtObj->tqcontains( docPoint ))
+        if(txtObj->contains( docPoint ))
         {
             KoPoint pos = docPoint - txtObj->getOrig();
             //pos=m_view->zoomHandler()->pixelToLayoutUnit(TQPoint(pos.x(),pos.y()));
@@ -1834,7 +1834,7 @@ void KPrCanvas::mouseDoubleClickEvent( TQMouseEvent *e )
     }
 
     //disallow activating objects outside the "page"
-    if ( !m_activePage->getPageRect().tqcontains(docPoint))
+    if ( !m_activePage->getPageRect().contains(docPoint))
         return;
 
 
@@ -3034,7 +3034,7 @@ bool KPrCanvas::pNext( bool gotoNextPage )
         // Then try to see if there is still one step to do in the current page
         if ( m_step.m_step < *( --m_pageEffectSteps.end() ) )
         {
-            TQValueList<int>::ConstIterator it = m_pageEffectSteps.tqfind( m_step.m_step );
+            TQValueList<int>::ConstIterator it = m_pageEffectSteps.find( m_step.m_step );
             m_step.m_step = *( ++it );
             m_step.m_subStep = 0;
             //kdDebug(33001) << "Page::pNext setting currentEffectStep to " << m_step.m_step << endl;
@@ -3169,7 +3169,7 @@ bool KPrCanvas::pPrev( bool gotoPreviousPage )
     m_drawModeLines.clear();
 
     if ( !gotoPreviousPage && m_step.m_step > *m_pageEffectSteps.begin() ) {
-        TQValueList<int>::ConstIterator it = m_pageEffectSteps.tqfind( m_step.m_step );
+        TQValueList<int>::ConstIterator it = m_pageEffectSteps.find( m_step.m_step );
         m_step.m_step = *( --it );
         //hopefully there are never more than 1000 sub steps :-)
         m_step.m_subStep = 1000;
@@ -3898,7 +3898,7 @@ void KPrCanvas::selectNext()
     if ( m_activePage->numSelected() == 0 )
         objectList().at( 0 )->setSelected( true );
     else {
-        int i = objectList().tqfindRef( m_activePage->getSelectedObj() );
+        int i = objectList().findRef( m_activePage->getSelectedObj() );
         if ( i < static_cast<int>( objectList().count() ) - 1 ) {
             m_view->kPresenterDoc()->deSelectAllObj();
             objectList().at( ++i )->setSelected( true );
@@ -3917,7 +3917,7 @@ void KPrCanvas::selectPrev()
     if ( m_activePage->numSelected() == 0 )
         objectList().at( objectList().count() - 1 )->setSelected( true );
     else {
-        int i = objectList().tqfindRef( m_activePage->getSelectedObj() );
+        int i = objectList().findRef( m_activePage->getSelectedObj() );
         if ( i > 0 ) {
             m_view->kPresenterDoc()->deSelectAllObj();
             objectList().at( --i )->setSelected( true );
@@ -4001,7 +4001,7 @@ void KPrCanvas::dropEvent( TQDropEvent *e )
 {
     //disallow dropping objects outside the "page"
     KoPoint docPoint = m_view->zoomHandler()->unzoomPoint( e->pos()+TQPoint(diffx(),diffy()) );
-    if ( !m_activePage->getZoomPageRect().tqcontains(e->pos()))
+    if ( !m_activePage->getZoomPageRect().contains(e->pos()))
         return;
 
     if ( TQImageDrag::canDecode( e ) ) {
@@ -4030,12 +4030,12 @@ void KPrCanvas::dropEvent( TQDropEvent *e )
 
             if ( res && res->isValid() ) {
                 TQString mimetype = res->mimeType();
-                if ( mimetype.tqcontains( "image" ) ) {
+                if ( mimetype.contains( "image" ) ) {
                     TQCursor c = cursor();
                     setCursor( waitCursor );
                     m_activePage->insertPicture( filename, docPoint );
                     setCursor( c );
-                } else if ( mimetype.tqcontains( "text" ) ) {
+                } else if ( mimetype.contains( "text" ) ) {
                     TQCursor c = cursor();
                     setCursor( waitCursor );
                     TQFile f( filename );
@@ -4106,7 +4106,7 @@ void KPrCanvas::gotoPage( int pg )
 
         m_step.m_pageNumber = page;
         kdDebug(33001) << "Page::gotoPage m_step.m_pageNumber =" << m_step.m_pageNumber << endl;
-        m_presentationSlidesIterator = m_presentationSlides.tqfind( m_step.m_pageNumber + 1 );
+        m_presentationSlidesIterator = m_presentationSlides.find( m_step.m_pageNumber + 1 );
         editMode = false;
         m_drawMode = false;
         m_pageEffectSteps = m_view->kPresenterDoc()->getPageEffectSteps( m_step.m_pageNumber );
@@ -4996,7 +4996,7 @@ const TQPtrList<KPrObject> KPrCanvas::displayObjectList() const
     {
         // it can happen that the object is no longer there e.g. when 
         // the insert of the object is undone
-        int pos = objectList().tqfindRef( m_objectDisplayAbove );
+        int pos = objectList().findRef( m_objectDisplayAbove );
         if ( pos != -1 && m_objectDisplayAbove->isSelected() )
         {
             list.take( pos );
@@ -5416,7 +5416,7 @@ KPrTextObject* KPrCanvas::textUnderMouse( const TQPoint & point )
     TQPtrListIterator<KPrTextObject> it2(obj );
     for ( ; it2.current() ; ++it2 ) {
         TQRect outerRect( m_view->kPresenterDoc()->zoomHandler()->zoomRect( it2.current()->getRect()) );
-        if ( !it2.current()->isProtectContent() && outerRect.tqcontains( point) )
+        if ( !it2.current()->isProtectContent() && outerRect.contains( point) )
             return it2.current();
     }
     return 0L;