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

4 files changed, 16 insertions, 16 deletions

diff --git a/kword/mailmerge/kabc/KWMailMergeKABCConfig.cpp b/kword/mailmerge/kabc/KWMailMergeKABCConfig.cpp
index 1e54d0b9..508eb74f 100644
--- a/kword/mailmerge/kabc/KWMailMergeKABCConfig.cpp
+++ b/kword/mailmerge/kabc/KWMailMergeKABCConfig.cpp
@@ -98,9 +98,9 @@ void KWMailMergeKABCConfig::acceptSelection()
 void KWMailMergeKABCConfig::addSelectedContacts()
 {
     TQListViewItemIterator it( _ui->mAvailableView, TQListViewItemIterator::Selected  );
-    TQListViewItem* selected = _ui->mSelectedView->tqfindItem(
+    TQListViewItem* selected = _ui->mSelectedView->findItem(
                                   i18n("Single Entries"), 0, TQt::ExactMatch );
-    TQListViewItem* selectedLists = _ui->mSelectedView->tqfindItem(
+    TQListViewItem* selectedLists = _ui->mSelectedView->findItem(
                                        i18n("Distribution Lists"), 0, TQt::ExactMatch );
     while ( it.current() )
     {
@@ -175,7 +175,7 @@ void KWMailMergeKABCConfig::filterChanged( const TQString& txt )
                 }
                 else
                 {
-                    item->setVisible( item->text(0).tqcontains( txt, false ) );
+                    item->setVisible( item->text(0).contains( txt, false ) );
                 }
                 item = item->nextSibling();
             }
@@ -195,7 +195,7 @@ void KWMailMergeKABCConfig::initSelectedAddressees()
     TQStringList records = _db->singleRecords();
 
     TQListViewItem* category = _ui->mAvailableView->firstChild();
-    TQListViewItem* selected = _ui->mSelectedView->tqfindItem(
+    TQListViewItem* selected = _ui->mSelectedView->findItem(
                                   i18n("Single Entries"), 0, TQt::ExactMatch );
     while ( category && (records.count()>0) )
     {
@@ -239,9 +239,9 @@ void KWMailMergeKABCConfig::initSelectedLists()
 
     kdDebug() << "::initSelectedLists()" << lists.join(",") << endl;
 
-    TQListViewItem* l = _ui->mAvailableView->tqfindItem(
+    TQListViewItem* l = _ui->mAvailableView->findItem(
                            i18n("Distribution Lists"), 0, TQt::ExactMatch );
-    TQListViewItem* selected = _ui->mSelectedView->tqfindItem(
+    TQListViewItem* selected = _ui->mSelectedView->findItem(
                                   i18n("Distribution Lists"), 0, TQt::ExactMatch );
 
     TQListViewItem* item = ( l->firstChild() );
@@ -293,7 +293,7 @@ void KWMailMergeKABCConfig::launchAddressbook() const
 void KWMailMergeKABCConfig::removeContact( TQListViewItem* item )
 {
     TQStringList& categories = _usedCategories;
-    TQListViewItem* availableLists = _ui->mAvailableView->tqfindItem(
+    TQListViewItem* availableLists = _ui->mAvailableView->findItem(
                                         i18n("Distribution Lists"), 0, TQt::ExactMatch );
     if( item->depth() > 0 )
     {
@@ -306,7 +306,7 @@ void KWMailMergeKABCConfig::removeContact( TQListViewItem* item )
             for ( TQStringList::Iterator itEntryCat = entryCategories.begin();
                     itEntryCat != entryCategories.end(); ++itEntryCat )
             {
-                int i = categories.tqfindIndex(*itEntryCat);
+                int i = categories.findIndex(*itEntryCat);
                 if(  i == -1 )
                 {
                     TQListViewItem* category = new TQListViewItem( _ui->mAvailableView,
@@ -320,7 +320,7 @@ void KWMailMergeKABCConfig::removeContact( TQListViewItem* item )
                 {
                     KWMailMergeKABCConfigListItem* leftItem = new
                             KWMailMergeKABCConfigListItem(
-                                _ui->mAvailableView->tqfindItem(
+                                _ui->mAvailableView->findItem(
                                     *itEntryCat, 0,
                                     TQt::ExactMatch),
                                 rightItem->addressee() );
@@ -330,7 +330,7 @@ void KWMailMergeKABCConfig::removeContact( TQListViewItem* item )
             {
                 TQString noCat = i18n("no category");
                 KWMailMergeKABCConfigListItem* leftItem = new KWMailMergeKABCConfigListItem(
-                            _ui->mAvailableView->tqfindItem(
+                            _ui->mAvailableView->findItem(
                                 noCat, 0, TQt::ExactMatch),
                             rightItem->addressee() );
             }
@@ -381,7 +381,7 @@ void KWMailMergeKABCConfig::saveDistributionList()
     }
     KABC::DistributionList *distList = new KABC::DistributionList( &dlm, listName );
 
-    TQListViewItem* newListItem = new TQListViewItem( _ui->mSelectedView->tqfindItem(
+    TQListViewItem* newListItem = new TQListViewItem( _ui->mSelectedView->findItem(
                                      i18n("Distribution Lists"),0 , TQt::ExactMatch), listName );
 
     TQListViewItem* category = _ui->mSelectedView->firstChild();
@@ -443,7 +443,7 @@ void KWMailMergeKABCConfig::updateAvailable()
         for ( TQStringList::Iterator itCat = entryCategories.begin();
                 itCat != entryCategories.end(); ++itCat )
         {
-            int i = categories.tqfindIndex(*itCat);
+            int i = categories.findIndex(*itCat);
 
             // Create category, if not yet in listview and append item to it.
             if(  i == -1 )
@@ -458,7 +458,7 @@ void KWMailMergeKABCConfig::updateAvailable()
             else
             {
                 KWMailMergeKABCConfigListItem* item = new KWMailMergeKABCConfigListItem(
-                                                          _ui->mAvailableView->tqfindItem(
+                                                          _ui->mAvailableView->findItem(
                                                               *itCat, 0, TQt::ExactMatch),
                                                           *itAddr );
             }
diff --git a/kword/mailmerge/sql/KWQtSqlEasyFilter.cpp b/kword/mailmerge/sql/KWQtSqlEasyFilter.cpp
index 8444b65c..aec361a3 100644
--- a/kword/mailmerge/sql/KWQtSqlEasyFilter.cpp
+++ b/kword/mailmerge/sql/KWQtSqlEasyFilter.cpp
@@ -11,7 +11,7 @@ KWQtSqlEasyFilter::KWQtSqlEasyFilter( TQWidget *tqparent)
 {
        m_fieldList << "" <<"one" << "two" << "three" << "four";
        m_sortingList << ""<<i18n("ascending")<<i18n("descending");
-       m_operationList <<"="<<i18n("tqcontains")<< "<" << ">";
+       m_operationList <<"="<<i18n("contains")<< "<" << ">";
 
 	m_table=new TQTable(6,3,this);
 	setMainWidget(m_table);
diff --git a/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.cpp b/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.cpp
index f3129420..c091184e 100644
--- a/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.cpp
+++ b/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.cpp
@@ -79,7 +79,7 @@ TQString KWQtSqlPowerSerialDataSource::getValue( const TQString &name, int recor
 	if ( num < 0 || num > (int)myquery->size() )
 		return name;
 	if (!myquery->seek(num,false)) return i18n(">>>Illegal position within datasource<<<");
-	if (!myquery->tqcontains(name)) return i18n(">>>Field %1 is unknown in the current database query<<<").tqarg(name);
+	if (!myquery->contains(name)) return i18n(">>>Field %1 is unknown in the current database query<<<").tqarg(name);
 	return (myquery->value(name)).toString();
 }
 
diff --git a/kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp b/kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp
index 47ce94cf..45ff85bc 100644
--- a/kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp
+++ b/kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp
@@ -59,7 +59,7 @@ TQString KWQtSqlSerialDataSource::getValue( const TQString &name, int record ) c
         if ( num < 0 || num > (int)myquery->size() )
                 return name;
         if (!myquery->seek(num,false)) return i18n(">>>Illegal position within datasource<<<");
-        if (!myquery->tqcontains(name)) return i18n(">>>Field %1 is unknown in the current database query<<<").tqarg(name);
+        if (!myquery->contains(name)) return i18n(">>>Field %1 is unknown in the current database query<<<").tqarg(name);
         return (myquery->value(name)).toString();
 }