rename the following methods:

tqfind find
tqreplace replace
tqcontains contains


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/krename@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 15 insertions, 15 deletions

diff --git a/krename/krenameimpl.cpp b/krename/krenameimpl.cpp
index 7618734..befaa79 100644
--- a/krename/krenameimpl.cpp
+++ b/krename/krenameimpl.cpp
@@ -143,8 +143,8 @@ void KRenameImpl::setup( bool wizardmode )
     connect( buttonDown, TQT_SIGNAL( clicked()), this, TQT_SLOT( updatePreview() ));
     connect( buttonUp2, TQT_SIGNAL( clicked()), this, TQT_SLOT( moveUp() ));
     connect( buttonDown2, TQT_SIGNAL( clicked()), this, TQT_SLOT( moveDown() ));
-    connect( buttonReplace, TQT_SIGNAL( clicked()), this, TQT_SLOT( tqreplace() ));
-    connect( buttonEasyReplace, TQT_SIGNAL( clicked()), this, TQT_SLOT( tqreplace() ));
+    connect( buttonReplace, TQT_SIGNAL( clicked()), this, TQT_SLOT( replace() ));
+    connect( buttonEasyReplace, TQT_SIGNAL( clicked()), this, TQT_SLOT( replace() ));
     connect( buttonCoord, TQT_SIGNAL( clicked()), this, TQT_SLOT( getCoordinates() ));
     connect( comboSort, TQT_SIGNAL( activated(int)), fileList, TQT_SLOT( setSorting(int) ));
     
@@ -250,7 +250,7 @@ void KRenameImpl::parseCommandline()
         TQPtrListIterator<PluginLoader::PluginLibrary> it( plugin->libs );
         while ( it.current() ) 
         {
-            if( uselist.tqcontains( (*it)->plugin->getName().lower().utf8() ) )
+            if( uselist.contains( (*it)->plugin->getName().lower().utf8() ) )
                 (*it)->check->setChecked( true );
                 
             ++it;
@@ -567,7 +567,7 @@ void KRenameImpl::setupFileTab1()
     comboExtension = new KComboBox( false, tab );
 
     buttonReplace = new KPushButton( i18n("Find &and Replace..."), tab );
-    buttonReplace->setIconSet( SmallIconSet("tqfind") );
+    buttonReplace->setIconSet( SmallIconSet("find") );
 
     buttonNumber = new KPushButton( i18n("&Numbering..."), tab );
     buttonCoord = new KPushButton( i18n("&Insert Part of Filename..."), tab );
@@ -706,7 +706,7 @@ void KRenameImpl::setupFileTab2()
     spinNull->setRange( 1, 100, 1, false );
     
     buttonEasyReplace = new KPushButton( i18n("&Find and Replace..."), rightBox );
-    buttonEasyReplace->setIconSet( SmallIconSet("tqfind") );
+    buttonEasyReplace->setIconSet( SmallIconSet("find") );
     
     tqlayout->addWidget( vgroup1 );
     tqlayout->addWidget( rightBox );
@@ -818,7 +818,7 @@ void KRenameImpl::parseWizardMode()
       */
     TQString t = filename->text();
     
-    spinNull->setValue( t.tqcontains( "#" ) );
+    spinNull->setValue( t.contains( "#" ) );
     
     if( t.startsWith( "[date]") ) 
     {
@@ -846,13 +846,13 @@ void KRenameImpl::parseWizardMode()
     }
     
     int pos = -1;
-    if( (pos = t.tqfind( "$" )) > -1 )
+    if( (pos = t.find( "$" )) > -1 )
         comboKRenameFilename->setCurrentItem( 0 );
-    else if( (pos = t.tqfind( "%" )) > -1 )
+    else if( (pos = t.find( "%" )) > -1 )
         comboKRenameFilename->setCurrentItem( 1 );
-    else if( (pos = t.tqfind( "&" )) > -1 )
+    else if( (pos = t.find( "&" )) > -1 )
         comboKRenameFilename->setCurrentItem( 2 );
-    else if( (pos = t.tqfind( "*" )) > -1 ) 
+    else if( (pos = t.find( "*" )) > -1 ) 
         comboKRenameFilename->setCurrentItem( 3 );
     else
     {
@@ -1225,7 +1225,7 @@ void KRenameImpl::updatePluginPreview( Plugin* p )
 void KRenameImpl::updatePreview()
 {
     // is there a number in the filename or extension
-    if( filename->text().tqcontains( "#" ) || extemplate->text().tqcontains( "#" ) )
+    if( filename->text().contains( "#" ) || extemplate->text().contains( "#" ) )
         buttonNumber->setEnabled( true );
     else
         buttonNumber->setEnabled( false );
@@ -1347,7 +1347,7 @@ void KRenameImpl::saveConfig()
     config->sync();
 }
 
-void KRenameImpl::tqreplace()
+void KRenameImpl::replace()
 {
     ReplaceDialog* r = new ReplaceDialog( rep, tqparent );
     if( r->exec() == TQDialog::Accepted )
@@ -1554,14 +1554,14 @@ void KRenameImpl::splitFilename( TQFileInfo* fi, TQString* base, TQString* exten
         TQString file = FileOperation::getName( fi->filePath() );
         int p = 0;
 
-        if( !file.tqcontains( "." ) || !dot || dot > file.tqcontains( "." ) ) {
+        if( !file.contains( "." ) || !dot || dot > file.contains( "." ) ) {
             *base = file;
             *extension = "";
             return;
         }
 
         for( int i = 0; i < dot; i++ )
-            p = file.tqfind( ".", p + 1 );
+            p = file.find( ".", p + 1 );
 
         *base = file.left( p );
         *extension = file.right( file.length() - p - 1 );
@@ -1716,7 +1716,7 @@ void KRenameImpl::updateDots()
     unsigned int max = 0;
     for( unsigned int i = 0; i < fileList->count(); i++ ) {
         TQString name = fileList->url( i ).fileName();
-        int c = name.tqcontains( "." );
+        int c = name.contains( "." );
         max = ( c > (int)max ? c : (int)max);
     }