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

11 files changed, 37 insertions, 37 deletions

diff --git a/kpdf/core/document.cpp b/kpdf/core/document.cpp
index 6c918a4d..9062f976 100644
--- a/kpdf/core/document.cpp
+++ b/kpdf/core/document.cpp
@@ -145,7 +145,7 @@ bool KPDFDocument::openDocument( const TQString & docFile, const KURL & url, con
     // determine the related "xml document-info" filename
     d->url = url;
     d->docFileName = docFile;
-    TQString fn = docFile.tqcontains('/') ? docFile.section('/', -1, -1) : docFile;
+    TQString fn = docFile.contains('/') ? docFile.section('/', -1, -1) : docFile;
     fn = "kpdf/" + TQString::number(fileReadTest.size()) + "." + fn + ".xml";
     fileReadTest.close();
     d->xmlFileName = locateLocal( "data", fn );
@@ -298,7 +298,7 @@ void KPDFDocument::addObserver( DocumentObserver * pObserver )
 void KPDFDocument::removeObserver( DocumentObserver * pObserver )
 {
     // remove observer from the map. it won't receive notifications anymore
-    if ( d->observers.tqcontains( pObserver->observerId() ) )
+    if ( d->observers.contains( pObserver->observerId() ) )
     {
         // free observer's pixmap data
         int observerId = pObserver->observerId();
@@ -633,7 +633,7 @@ bool KPDFDocument::searchText( int searchID, const TQString & text, bool fromSta
         return false;
 
     // if searchID search not recorded, create new descriptor and init params
-    if ( !d->searches.tqcontains( searchID ) )
+    if ( !d->searches.contains( searchID ) )
     {
         RunningSearch * search = new RunningSearch();
         search->continueOnPage = -1;
@@ -707,7 +707,7 @@ bool KPDFDocument::searchText( int searchID, const TQString & text, bool fromSta
             {
                 foundAMatch = true;
                 s->highlightedPages.append( pageNumber );
-                if ( !pagesToNotify.tqcontains( pageNumber ) )
+                if ( !pagesToNotify.contains( pageNumber ) )
                     pagesToNotify.append( pageNumber );
             }
         }
@@ -779,7 +779,7 @@ bool KPDFDocument::searchText( int searchID, const TQString & text, bool fromSta
             pages_vector[ currentPage ]->setHighlight( searchID, match, color );
 
             // ..queue page for notifying changes..
-            if ( !pagesToNotify.tqcontains( currentPage ) )
+            if ( !pagesToNotify.contains( currentPage ) )
                 pagesToNotify.append( currentPage );
 
             // ..move the viewport to show the searched word centered
@@ -860,7 +860,7 @@ bool KPDFDocument::searchText( int searchID, const TQString & text, bool fromSta
             {
                 foundAMatch = true;
                 s->highlightedPages.append( pageNumber );
-                if ( !pagesToNotify.tqcontains( pageNumber ) )
+                if ( !pagesToNotify.contains( pageNumber ) )
                     pagesToNotify.append( pageNumber );
             }
         }
@@ -884,7 +884,7 @@ bool KPDFDocument::searchText( int searchID, const TQString & text, bool fromSta
 bool KPDFDocument::continueSearch( int searchID )
 {
     // check if searchID is present in runningSearches
-    if ( !d->searches.tqcontains( searchID ) )
+    if ( !d->searches.contains( searchID ) )
         return false;
 
     // start search with cached parameters from last search by searchID
@@ -897,7 +897,7 @@ bool KPDFDocument::continueSearch( int searchID )
 void KPDFDocument::resetSearch( int searchID )
 {
     // check if searchID is present in runningSearches
-    if ( !d->searches.tqcontains( searchID ) )
+    if ( !d->searches.contains( searchID ) )
         return;
 
     // get previous parameters for search
@@ -1074,7 +1074,7 @@ void KPDFDocument::processLink( const KPDFLink * link )
                 TQString url = browse->url();
 
                 // fix for #100366, documents with relative links that are the form of http:foo.pdf
-                if (url.tqfind("http:") == 0 && url.tqfind("http://") == -1 && url.right(4) == ".pdf")
+                if (url.find("http:") == 0 && url.find("http://") == -1 && url.right(4) == ".pdf")
                 {
                     openRelativeFile(url.mid(5));
                     return;
@@ -1117,7 +1117,7 @@ void KPDFDocument::requestDone( PixmapRequest * req )
             break;
         }
 
-    if ( d->observers.tqcontains( req->id ) )
+    if ( d->observers.contains( req->id ) )
     {
         // [MEM] 1.2 append memory allocation descriptor to the FIFO
         int memoryBytes = 4 * req->width * req->height;
diff --git a/kpdf/core/generator_pdf/generator_pdf.cpp b/kpdf/core/generator_pdf/generator_pdf.cpp
index 8ad34900..0a445a37 100644
--- a/kpdf/core/generator_pdf/generator_pdf.cpp
+++ b/kpdf/core/generator_pdf/generator_pdf.cpp
@@ -423,12 +423,12 @@ bool PDFGenerator::print( KPrinter& printer )
     marginBottom = (int)printer.option("kde-margin-bottom").toDouble();
     bool forceRasterize = printer.option("kde-kpdf-forceRaster").toInt();
 
-    if (ps.tqfind(TQRegExp("w\\d+h\\d+")) == 0)
+    if (ps.find(TQRegExp("w\\d+h\\d+")) == 0)
     {
         // size not supported by TQt, CUPS gives us the size as wWIDTHhHEIGHT, at least on the printers i tester
         // remove the w
         ps = ps.mid(1);
-        int hPos = ps.tqfind("h");
+        int hPos = ps.find("h");
         paperWidth = ps.left(hPos).toInt();
         paperHeight = ps.mid(hPos+1).toInt();
     }
diff --git a/kpdf/core/page.cpp b/kpdf/core/page.cpp
index 630c9480..269cab2e 100644
--- a/kpdf/core/page.cpp
+++ b/kpdf/core/page.cpp
@@ -74,7 +74,7 @@ void KPDFPage::setRotation( int r )
 
 bool KPDFPage::hasPixmap( int id, int width, int height ) const
 {
-    if ( !m_pixmaps.tqcontains( id ) )
+    if ( !m_pixmaps.contains( id ) )
         return false;
     if ( width == -1 || height == -1 )
         return true;
@@ -98,7 +98,7 @@ bool KPDFPage::hasObjectRect( double x, double y ) const
         return false;
     TQValueList< ObjectRect * >::const_iterator it = m_rects.begin(), end = m_rects.end();
     for ( ; it != end; ++it )
-        if ( (*it)->tqcontains( x, y ) )
+        if ( (*it)->contains( x, y ) )
             return true;
     return false;
 }
@@ -190,7 +190,7 @@ const ObjectRect * KPDFPage::hasObject( ObjectRect::ObjectType type, double x, d
 {
     TQValueList< ObjectRect * >::const_iterator it = m_rects.begin(), end = m_rects.end();
     for ( ; it != end; ++it )
-        if ( (*it)->tqcontains( x, y ) )
+        if ( (*it)->contains( x, y ) )
             if ((*it)->objectType() == type) return *it;
     return 0;
 }
@@ -203,7 +203,7 @@ const KPDFPageTransition * KPDFPage::getTransition() const
 
 void KPDFPage::setPixmap( int id, TQPixmap * pixmap )
 {
-    if ( m_pixmaps.tqcontains( id ) )
+    if ( m_pixmaps.contains( id ) )
         delete m_pixmaps[id];
     m_pixmaps[id] = pixmap;
 }
@@ -252,7 +252,7 @@ void KPDFPage::setTransition( KPDFPageTransition * transition )
 
 void KPDFPage::deletePixmap( int id )
 {
-    if ( m_pixmaps.tqcontains( id ) )
+    if ( m_pixmaps.contains( id ) )
     {
         delete m_pixmaps[ id ];
         m_pixmaps.remove( id );
@@ -304,7 +304,7 @@ NormalizedRect::NormalizedRect( const TQRect & r, double xScale, double yScale )
     : left( (double)r.left() / xScale ), top( (double)r.top() / yScale ),
     right( (double)r.right() / xScale ), bottom( (double)r.bottom() / yScale ) {}
 
-bool NormalizedRect::tqcontains( double x, double y ) const
+bool NormalizedRect::contains( double x, double y ) const
 {
     return x >= left && x <= right && y >= top && y <= bottom;
 }
diff --git a/kpdf/core/page.h b/kpdf/core/page.h
index 51d7781c..1ec5add0 100644
--- a/kpdf/core/page.h
+++ b/kpdf/core/page.h
@@ -32,7 +32,7 @@ class NormalizedRect
         NormalizedRect( double l, double t, double r, double b );
         NormalizedRect( const TQRect & r, double xScale, double yScale );
 
-        bool tqcontains( double x, double y ) const;
+        bool contains( double x, double y ) const;
         bool intersects( const NormalizedRect & normRect ) const;
         bool intersects( double l, double t, double r, double b ) const;
 
diff --git a/kpdf/part.cpp b/kpdf/part.cpp
index 76b1aa82..81756ff5 100644
--- a/kpdf/part.cpp
+++ b/kpdf/part.cpp
@@ -151,7 +151,7 @@ Part::Part(TQWidget *parentWidget, const char *widgetName,
 	connect( m_document, TQT_SIGNAL( openURL(const KURL &) ), this, TQT_SLOT( openURLFromDocument(const KURL &) ) );
 	connect( m_document, TQT_SIGNAL( close() ), this, TQT_SLOT( close() ) );
 	
-	if (tqparent && tqparent->tqmetaObject()->slotNames(true).tqcontains("slotQuit()"))
+	if (tqparent && tqparent->tqmetaObject()->slotNames(true).contains("slotQuit()"))
 		connect( m_document, TQT_SIGNAL( quit() ), tqparent, TQT_SLOT( slotQuit() ) );
 	else
 		connect( m_document, TQT_SIGNAL( quit() ), this, TQT_SLOT( cannotQuit() ) );
@@ -278,8 +278,8 @@ Part::Part(TQWidget *parentWidget, const char *widgetName,
 	m_historyNext->setWhatsThis( i18n( "Go to the place you were after" ) );
 
 	// Find and other actions
-	m_tqfind = KStdAction::find( this, TQT_SLOT( slotFind() ), ac, "tqfind" );
-	m_tqfind->setEnabled( false );
+	m_find = KStdAction::find( this, TQT_SLOT( slotFind() ), ac, "find" );
+	m_find->setEnabled( false );
 
 	m_findNext = KStdAction::findNext( this, TQT_SLOT( slotFindNext() ), ac, "find_next" );
 	m_findNext->setEnabled( false );
@@ -452,7 +452,7 @@ bool Part::openFile()
     bool ok = m_document->openDocument( m_file, url(), mime );
 
     // update one-time actions
-    m_tqfind->setEnabled( ok && m_document-> supportsSearching());
+    m_find->setEnabled( ok && m_document-> supportsSearching());
     m_findNext->setEnabled( ok && m_document-> supportsSearching());
     m_saveAs->setEnabled( ok );
     m_printPreview->setEnabled( ok );
@@ -552,7 +552,7 @@ bool Part::closeURL()
     }
 
     slotHidePresentation();
-    m_tqfind->setEnabled( false );
+    m_find->setEnabled( false );
     m_findNext->setEnabled( false );
     m_saveAs->setEnabled( false );
     m_printPreview->setEnabled( false );
diff --git a/kpdf/part.h b/kpdf/part.h
index 791c3d2d..48e11bb8 100644
--- a/kpdf/part.h
+++ b/kpdf/part.h
@@ -179,7 +179,7 @@ private:
 	KAction *m_lastPage;
 	KAction *m_historyBack;
 	KAction *m_historyNext;
-	KAction *m_tqfind;
+	KAction *m_find;
 	KAction *m_findNext;
 	KAction *m_saveAs;
 	KAction *m_printPreview;
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.
diff --git a/kpdf/xpdf/xpdf/GlobalParams.cc b/kpdf/xpdf/xpdf/GlobalParams.cc
index 24552664..519e81a4 100644
--- a/kpdf/xpdf/xpdf/GlobalParams.cc
+++ b/kpdf/xpdf/xpdf/GlobalParams.cc
@@ -2057,7 +2057,7 @@ FILE *GlobalParams::findToUnicodeFile(GString *name) {
 
 void parseStyle(TQString& name, int& weight, int& slant, int& width)
 {
-  if (name.tqfind("MS-") == 0) name = "MS " + name.remove(0,3);
+  if (name.find("MS-") == 0) name = "MS " + name.remove(0,3);
 
   if (!name.contains('-') && !name.contains(',')) return;
   TQString type = name.section(TQRegExp("[-,]"),-1);