7 files changed, 15 insertions, 15 deletions
diff --git a/kitchensync/src/addresseediffalgo.cpp b/kitchensync/src/addresseediffalgo.cpp
index cba16ec84..fc73c3677 100644
--- a/kitchensync/src/addresseediffalgo.cpp
+++ b/kitchensync/src/addresseediffalgo.cpp
@@ -146,12 +146,12 @@ void AddresseeDiffAlgo::diffList( const TQString &id,
                                   const TQValueList<L> &left, const TQValueList<L> &right )
 {
   for ( uint i = 0; i < left.count(); ++i ) {
-    if ( right.tqfind( left[ i ] ) == right.end() )
+    if ( right.find( left[ i ] ) == right.end() )
       additionalLeftField( id, toString( left[ i ] ) );
   }
 
   for ( uint i = 0; i < right.count(); ++i ) {
-    if ( left.tqfind( right[ i ] ) == left.end() )
+    if ( left.find( right[ i ] ) == left.end() )
       additionalRightField( id, toString( right[ i ] ) );
   }
 }
diff --git a/kitchensync/src/calendardiffalgo.cpp b/kitchensync/src/calendardiffalgo.cpp
index fe376428e..3c9ef292d 100644
--- a/kitchensync/src/calendardiffalgo.cpp
+++ b/kitchensync/src/calendardiffalgo.cpp
@@ -206,12 +206,12 @@ void CalendarDiffAlgo::diffList( const TQString &id,
                                  const TQValueList<L> &left, const TQValueList<L> &right )
 {
   for ( uint i = 0; i < left.count(); ++i ) {
-    if ( right.tqfind( left[ i ] ) == right.end() )
+    if ( right.find( left[ i ] ) == right.end() )
       additionalLeftField( id, toString( left[ i ] ) );
   }
 
   for ( uint i = 0; i < right.count(); ++i ) {
-    if ( left.tqfind( right[ i ] ) == left.end() )
+    if ( left.find( right[ i ] ) == left.end() )
       additionalRightField( id, toString( right[ i ] ) );
   }
 }
diff --git a/kitchensync/src/configguisyncmlhttp.cpp b/kitchensync/src/configguisyncmlhttp.cpp
index e81e92d46..3e1dac1aa 100644
--- a/kitchensync/src/configguisyncmlhttp.cpp
+++ b/kitchensync/src/configguisyncmlhttp.cpp
@@ -174,7 +174,7 @@ void ConfigGuiSyncmlHttp::load( const TQString &xml )
         mMaxObjSize->setValue( element.text().toInt() );
     } else if ( element.tagName() == "usestringtable" ) {
       mUseStringTable->setChecked( element.text() == "1" );
-    } else if ( element.tagName() == "onlytqreplace" ) {
+    } else if ( element.tagName() == "onlyreplace" ) {
       mOnlyReplace->setChecked( element.text() == "1" );
     } else if ( element.tagName() == "contact_db" ) {
       mContactDb->setCurrentText( element.text() );
@@ -208,12 +208,12 @@ TQString ConfigGuiSyncmlHttp::save() const
     xml += "0";
   xml += "</usestringtable>\n";
 
-  xml += "<onlytqreplace>";
+  xml += "<onlyreplace>";
   if ( mOnlyReplace->isChecked() )
     xml += "1";
   else
     xml += "0";
-  xml += "</onlytqreplace>\n";
+  xml += "</onlyreplace>\n";
 
   xml += "<contact_db>" + mContactDb->currentText() + "</contact_db>\n";
   xml += "<calendar_db>" + mCalendarDb->currentText() + "</calendar_db>\n";
diff --git a/kitchensync/src/configguisyncmlobex.cpp b/kitchensync/src/configguisyncmlobex.cpp
index 024e72ede..1bb4bdaf1 100644
--- a/kitchensync/src/configguisyncmlobex.cpp
+++ b/kitchensync/src/configguisyncmlobex.cpp
@@ -225,7 +225,7 @@ void ConfigGuiSyncmlObex::load( const TQString &xml )
       if ( mMaxObjSize ) mMaxObjSize->setValue( element.text().toInt() );
     } else if ( element.tagName() == "usestringtable" ) {
       mUseStringTable->setChecked( element.text() == "1" );
-    } else if ( element.tagName() == "onlytqreplace" ) {
+    } else if ( element.tagName() == "onlyreplace" ) {
       mOnlyReplace->setChecked( element.text() == "1" );
     } else if ( element.tagName() == "contact_db" ) {
       mContactDb->setCurrentText( element.text() );
@@ -293,12 +293,12 @@ TQString ConfigGuiSyncmlObex::save() const
     xml += "0";
   xml += "</usestringtable>\n";
 
-  xml += "<onlytqreplace>";
+  xml += "<onlyreplace>";
   if ( mOnlyReplace->isChecked() )
     xml += "1";
   else
     xml += "0";
-  xml += "</onlytqreplace>\n";
+  xml += "</onlyreplace>\n";
 
   xml += "<contact_db>" + mContactDb->currentText() + "</contact_db>\n";
   xml += "<calendar_db>" + mCalendarDb->currentText() + "</calendar_db>\n";
diff --git a/kitchensync/src/groupconfigcommon.cpp b/kitchensync/src/groupconfigcommon.cpp
index f2afe3c46..cda75c8cf 100644
--- a/kitchensync/src/groupconfigcommon.cpp
+++ b/kitchensync/src/groupconfigcommon.cpp
@@ -103,7 +103,7 @@ void ObjectTypeSelector::load( const QSync::Group &group )
   TQMap<TQString, TQCheckBox*>::ConstIterator it;
   for( it = mObjectTypeChecks.begin(); it != mObjectTypeChecks.end(); ++it ) {
     TQCheckBox *check = it.data();
-    check->setChecked( objectTypes.tqcontains( it.key() ) || initialLoad );
+    check->setChecked( objectTypes.contains( it.key() ) || initialLoad );
   }
 }
 
diff --git a/kitchensync/src/kwidgetlist.cpp b/kitchensync/src/kwidgetlist.cpp
index a5f5a81e4..89008f06f 100644
--- a/kitchensync/src/kwidgetlist.cpp
+++ b/kitchensync/src/kwidgetlist.cpp
@@ -69,7 +69,7 @@ void KWidgetList::appendItem( KWidgetListItem *item )
   if ( !item )
     return;
 
-  if ( !d->mItems.tqcontains( item ) ) {
+  if ( !d->mItems.contains( item ) ) {
     d->mItems.append( item );
     item->reparent( d->mBox, 0, TQPoint( 0, 0 ), true );
     item->setSelected( false );
@@ -129,7 +129,7 @@ void KWidgetList::setSelected( KWidgetListItem *item )
   if ( !item )
     return;
 
-  if ( d->mItems.tqcontains( item ) == 0 )
+  if ( d->mItems.contains( item ) == 0 )
     return;
 
   if ( d->mSelectedItem )
@@ -169,7 +169,7 @@ KWidgetListItem *KWidgetList::item( int index ) const
 
 int KWidgetList::index( KWidgetListItem *item ) const
 {
-  return d->mItems.tqfindIndex( item );
+  return d->mItems.findIndex( item );
 }
 
 void KWidgetList::clear()
diff --git a/kitchensync/src/syncprocess.cpp b/kitchensync/src/syncprocess.cpp
index 1a70f877d..672c789c3 100644
--- a/kitchensync/src/syncprocess.cpp
+++ b/kitchensync/src/syncprocess.cpp
@@ -90,7 +90,7 @@ void SyncProcess::applyObjectTypeFilter()
   const TQStringList activeObjectTypes = mGroup.config().activeObjectTypes();
 
   for ( uint i = 0; i < objectTypes.count(); ++i ) {
-    if ( activeObjectTypes.tqcontains( objectTypes[ i ] ) ) {
+    if ( activeObjectTypes.contains( objectTypes[ i ] ) ) {
       kdDebug() << "Enabled object type: " <<  objectTypes[ i ] << endl;
       /*
        * This is not required. Also this lead to filtering problems when sync with "file-sync".