From 716a5de8870d7c02bb4d0aed72f30291b17b763a Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Mon, 19 Dec 2011 11:59:01 -0600
Subject: Remove additional unneeded tq method conversions

---
 kitchensync/src/aboutpage.cpp           | 56 ++++++++++++++++-----------------
 kitchensync/src/configguievo2.cpp       |  6 ++--
 kitchensync/src/configguigpe.cpp        | 10 +++---
 kitchensync/src/configguijescs.cpp      |  8 ++---
 kitchensync/src/configguildap.cpp       | 26 +++++++--------
 kitchensync/src/configguimoto.cpp       |  4 +--
 kitchensync/src/configguiopie.cpp       |  4 +--
 kitchensync/src/configguisunbird.cpp    | 12 +++----
 kitchensync/src/configguisynce.cpp      |  8 ++---
 kitchensync/src/configguisyncmlobex.cpp |  4 +--
 kitchensync/src/genericdiffalgo.cpp     |  6 ++--
 kitchensync/src/groupconfig.cpp         |  4 +--
 kitchensync/src/groupitem.cpp           | 30 +++++++++---------
 kitchensync/src/groupitem.h             |  2 +-
 kitchensync/src/htmldiffalgodisplay.cpp | 22 ++++++-------
 kitchensync/src/mainwidget.cpp          |  2 +-
 kitchensync/src/memberconfig.cpp        |  4 +--
 kitchensync/src/syncprocessmanager.cpp  |  2 +-
 18 files changed, 105 insertions(+), 105 deletions(-)

(limited to 'kitchensync/src')

diff --git a/kitchensync/src/aboutpage.cpp b/kitchensync/src/aboutpage.cpp
index 97ee86c0b..723f29743 100644
--- a/kitchensync/src/aboutpage.cpp
+++ b/kitchensync/src/aboutpage.cpp
@@ -55,11 +55,11 @@ AboutPage::AboutPage( TQWidget *parent )
 
   TQString location = locate( "data", "kitchensync/about/main.html" );
   TQString content = readFile( location );
-  content = content.tqarg( locate( "data", "libtdepim/about/kde_infopage.css" ) );
+  content = content.arg( locate( "data", "libtdepim/about/kde_infopage.css" ) );
   if ( kapp->reverseLayout() )
-    content = content.tqarg( "@import \"%1\";" ).tqarg( locate( "data", "libtdepim/about/kde_infopage_rtl.css" ) );
+    content = content.arg( "@import \"%1\";" ).arg( locate( "data", "libtdepim/about/kde_infopage_rtl.css" ) );
   else
-    content = content.tqarg( "" );
+    content = content.arg( "" );
 
   KHTMLPart *part = new KHTMLPart( this );
   tqlayout->addWidget( part->view() );
@@ -70,8 +70,8 @@ AboutPage::AboutPage( TQWidget *parent )
   TQString catchPhrase( i18n( "Get Synchronized!" ) );
   TQString quickDescription( i18n( "The KDE Synchronization Tool" ) );
 
-  part->write( content.tqarg( TQFont().pointSize() + 2 ).tqarg( appName )
-              .tqarg( catchPhrase ).tqarg( quickDescription ).tqarg( htmlText() ) );
+  part->write( content.arg( TQFont().pointSize() + 2 ).arg( appName )
+              .arg( catchPhrase ).arg( quickDescription ).arg( htmlText() ) );
   part->end();
 
   connect( part->browserExtension(),
@@ -111,29 +111,29 @@ TQString AboutPage::htmlText() const
       "<tr><td><a href=\"%1\"><img width=\"%1\" height=\"%1\" src=\"%1\" /></a></td>"
       "<td><a href=\"%1\">%1</a><br><span id=\"subtext\"><nobr>%1</td></tr>"
       "</table>" )
-      .tqarg( kapp->aboutData()->version() )
-      .tqarg( i18n( "KitchenSync synchronizes your e-mail, addressbook, calendar, to-do list and more." ) )
-      .tqarg( "help:/kitchensync" )
-      .tqarg( iconSize )
-      .tqarg( iconSize )
-      .tqarg( handbook_icon_path )
-      .tqarg( "help:/kitchensync" )
-      .tqarg( i18n( "Read Manual" ) )
-      .tqarg( i18n( "Learn more about KitchenSync and its components" ) )
-      .tqarg( "http://pim.kde.org" )
-      .tqarg( iconSize )
-      .tqarg( iconSize )
-      .tqarg( html_icon_path )
-      .tqarg( "http://pim.kde.org" )
-      .tqarg( i18n( "Visit KitchenSync Website" ) )
-      .tqarg( i18n( "Access online resources and tutorials" ) )
-      .tqarg( "exec:/addGroup" )
-      .tqarg( iconSize )
-      .tqarg( iconSize )
-      .tqarg( wizard_icon_path )
-      .tqarg( "exec:/addGroup" )
-      .tqarg( i18n( "Add Synchronization Group" ) )
-      .tqarg( i18n( "Create group of tqdevices for synchronization" ) );
+      .arg( kapp->aboutData()->version() )
+      .arg( i18n( "KitchenSync synchronizes your e-mail, addressbook, calendar, to-do list and more." ) )
+      .arg( "help:/kitchensync" )
+      .arg( iconSize )
+      .arg( iconSize )
+      .arg( handbook_icon_path )
+      .arg( "help:/kitchensync" )
+      .arg( i18n( "Read Manual" ) )
+      .arg( i18n( "Learn more about KitchenSync and its components" ) )
+      .arg( "http://pim.kde.org" )
+      .arg( iconSize )
+      .arg( iconSize )
+      .arg( html_icon_path )
+      .arg( "http://pim.kde.org" )
+      .arg( i18n( "Visit KitchenSync Website" ) )
+      .arg( i18n( "Access online resources and tutorials" ) )
+      .arg( "exec:/addGroup" )
+      .arg( iconSize )
+      .arg( iconSize )
+      .arg( wizard_icon_path )
+      .arg( "exec:/addGroup" )
+      .arg( i18n( "Add Synchronization Group" ) )
+      .arg( i18n( "Create group of devices for synchronization" ) );
 
   return info;
 }
diff --git a/kitchensync/src/configguievo2.cpp b/kitchensync/src/configguievo2.cpp
index 0c79fedf0..716bce78a 100644
--- a/kitchensync/src/configguievo2.cpp
+++ b/kitchensync/src/configguievo2.cpp
@@ -60,9 +60,9 @@ TQString ConfigGuiEvo2::save() const
 {
   TQString config = "<config>\n";
 
-  config += TQString( "<address_path>%1</address_path>\n" ).tqarg( mAddressPath->url() );
-  config += TQString( "<calendar_path>%1</calendar_path>\n" ).tqarg( mCalendarPath->url() );
-  config += TQString( "<tasks_path>%1</tasks_path>\n" ).tqarg( mTasksPath->url() );
+  config += TQString( "<address_path>%1</address_path>\n" ).arg( mAddressPath->url() );
+  config += TQString( "<calendar_path>%1</calendar_path>\n" ).arg( mCalendarPath->url() );
+  config += TQString( "<tasks_path>%1</tasks_path>\n" ).arg( mTasksPath->url() );
 
   config += "</config>";
 
diff --git a/kitchensync/src/configguigpe.cpp b/kitchensync/src/configguigpe.cpp
index 118aed14a..c6e6627f8 100644
--- a/kitchensync/src/configguigpe.cpp
+++ b/kitchensync/src/configguigpe.cpp
@@ -68,11 +68,11 @@ TQString ConfigGuiGpe::save() const
 {
   TQString config = "<config>";
 
-  config += TQString( "<use_local>%1</use_local>" ).tqarg( mConnectionMode->currentItem() == 0 );
-  config += TQString( "<use_ssh>%1</use_ssh>" ).tqarg( mConnectionMode->currentItem() == 1 );
-  config += TQString( "<handheld_ip>%1</handheld_ip>" ).tqarg( mIP->text() );
-  config += TQString( "<handheld_port>%1</handheld_port>" ).tqarg( mPort->value() );
-  config += TQString( "<handheld_user>%1</handheld_user>" ).tqarg( mUser->text() );
+  config += TQString( "<use_local>%1</use_local>" ).arg( mConnectionMode->currentItem() == 0 );
+  config += TQString( "<use_ssh>%1</use_ssh>" ).arg( mConnectionMode->currentItem() == 1 );
+  config += TQString( "<handheld_ip>%1</handheld_ip>" ).arg( mIP->text() );
+  config += TQString( "<handheld_port>%1</handheld_port>" ).arg( mPort->value() );
+  config += TQString( "<handheld_user>%1</handheld_user>" ).arg( mUser->text() );
 
   config += "</config>";
 
diff --git a/kitchensync/src/configguijescs.cpp b/kitchensync/src/configguijescs.cpp
index b7a94c447..158eb2253 100644
--- a/kitchensync/src/configguijescs.cpp
+++ b/kitchensync/src/configguijescs.cpp
@@ -61,13 +61,13 @@ TQString ConfigGuiJescs::save() const
   int delNotifyState;
   TQString config = "<config>\n";
 
-  config += TQString( "<url>%1</url>\n" ).tqarg( mUrl->text() );
-  config += TQString( "<username>%1</username>\n" ).tqarg( mUsername->text() );
-  config += TQString( "<password>%1</password>\n" ).tqarg( mPassword->text() );
+  config += TQString( "<url>%1</url>\n" ).arg( mUrl->text() );
+  config += TQString( "<username>%1</username>\n" ).arg( mUsername->text() );
+  config += TQString( "<password>%1</password>\n" ).arg( mPassword->text() );
   if ( mDelNotify->isChecked() ) { delNotifyState = 1;
   }  else { delNotifyState = 0;
   }
-  config += TQString( "<del_notify>%1</del_notify>\n" ).tqarg( delNotifyState );
+  config += TQString( "<del_notify>%1</del_notify>\n" ).arg( delNotifyState );
 
   config += "</config>";
 
diff --git a/kitchensync/src/configguildap.cpp b/kitchensync/src/configguildap.cpp
index fd9dad4b6..417e58d0b 100644
--- a/kitchensync/src/configguildap.cpp
+++ b/kitchensync/src/configguildap.cpp
@@ -93,26 +93,26 @@ TQString ConfigGuiLdap::save() const
 {
   TQString config = "<config>\n";
 
-  config += TQString( "<servername>%1</servername>\n" ).tqarg( mLdapWidget->host() );
-  config += TQString( "<serverport>%1</serverport>\n" ).tqarg( mLdapWidget->port() );
-  config += TQString( "<binddn>%1</binddn>\n" ).tqarg( mLdapWidget->bindDN() );
-  config += TQString( "<password>%1</password>\n" ).tqarg( mLdapWidget->password() );
-  config += TQString( "<anonymous>%1</anonymous>\n" ).tqarg( mLdapWidget->isAuthAnon() ? "1" : "0" );
-  config += TQString( "<searchbase>%1</searchbase>\n" ).tqarg( mLdapWidget->dn() );
-  config += TQString( "<searchfilter>%1</searchfilter>\n" ).tqarg( mLdapWidget->filter() );
-  config += TQString( "<storebase>%1</storebase>\n" ).tqarg( mLdapWidget->dn() );
-  config += TQString( "<keyattr>%1</keyattr>\n" ).tqarg( mKeyAttribute->text() );
+  config += TQString( "<servername>%1</servername>\n" ).arg( mLdapWidget->host() );
+  config += TQString( "<serverport>%1</serverport>\n" ).arg( mLdapWidget->port() );
+  config += TQString( "<binddn>%1</binddn>\n" ).arg( mLdapWidget->bindDN() );
+  config += TQString( "<password>%1</password>\n" ).arg( mLdapWidget->password() );
+  config += TQString( "<anonymous>%1</anonymous>\n" ).arg( mLdapWidget->isAuthAnon() ? "1" : "0" );
+  config += TQString( "<searchbase>%1</searchbase>\n" ).arg( mLdapWidget->dn() );
+  config += TQString( "<searchfilter>%1</searchfilter>\n" ).arg( mLdapWidget->filter() );
+  config += TQString( "<storebase>%1</storebase>\n" ).arg( mLdapWidget->dn() );
+  config += TQString( "<keyattr>%1</keyattr>\n" ).arg( mKeyAttribute->text() );
 
   TQStringList scopes;
   scopes << "base" << "one" << "sub";
 
-  config += TQString( "<scope>%1</scope>\n" ).tqarg( scopes[ mSearchScope->currentItem() ] );
+  config += TQString( "<scope>%1</scope>\n" ).arg( scopes[ mSearchScope->currentItem() ] );
 
   config += TQString( "<authmech>SIMPLE</authmech>\n" );
-  config += TQString( "<encryption>%1</encryption>\n" ).tqarg( mEncryption->isChecked() ? "1" : "0" );
+  config += TQString( "<encryption>%1</encryption>\n" ).arg( mEncryption->isChecked() ? "1" : "0" );
 
-  config += TQString( "<ldap_read>%1</ldap_read>\n" ).tqarg( mReadLdap->isChecked() ? "1" : "0" );
-  config += TQString( "<ldap_write>%1</ldap_write>\n" ).tqarg( mWriteLdap->isChecked() ? "1" : "0" );
+  config += TQString( "<ldap_read>%1</ldap_read>\n" ).arg( mReadLdap->isChecked() ? "1" : "0" );
+  config += TQString( "<ldap_write>%1</ldap_write>\n" ).arg( mWriteLdap->isChecked() ? "1" : "0" );
 
   config += "</config>";
 
diff --git a/kitchensync/src/configguimoto.cpp b/kitchensync/src/configguimoto.cpp
index e461a808f..c44a2b406 100644
--- a/kitchensync/src/configguimoto.cpp
+++ b/kitchensync/src/configguimoto.cpp
@@ -43,7 +43,7 @@ void ConfigGuiMoto::load( const TQString &xml )
   TQDomNode node;
   for( node = docElement.firstChild(); !node.isNull(); node = node.nextSibling() ) {
     TQDomElement element = node.toElement();
-    if ( element.tagName() == "tqdevice" ) {
+    if ( element.tagName() == "device" ) {
       mDeviceString->setText( element.text() );
     }
   }
@@ -53,7 +53,7 @@ TQString ConfigGuiMoto::save() const
 {
   TQString config = "<config>\n";
 
-  config += TQString( "<tqdevice>%1</tqdevice>\n" ).tqarg( mDeviceString->text() );
+  config += TQString( "<device>%1</device>\n" ).arg( mDeviceString->text() );
 
   config += "</config>";
 
diff --git a/kitchensync/src/configguiopie.cpp b/kitchensync/src/configguiopie.cpp
index c74623345..64bd816f2 100644
--- a/kitchensync/src/configguiopie.cpp
+++ b/kitchensync/src/configguiopie.cpp
@@ -105,7 +105,7 @@ void ConfigGuiOpie::load( const TQString &xml )
       mDeviceIP->setText( e.text() );
     } else if ( e.tagName() == "port" ) {
       mPort->setValue( e.text().toInt() );
-    } else if ( e.tagName() == "tqdevice" ) {
+    } else if ( e.tagName() == "device" ) {
       if ( e.text() == "opie" )
         mDeviceType->setCurrentItem( 0 );
       else
@@ -126,7 +126,7 @@ TQString ConfigGuiOpie::save() const
   xml += "<username>" + mUserName->text() + "</username>";
   xml += "<password>" + mPassword->text() + "</password>";
   xml += "<url>" + mDeviceIP->text() + "</url>";
-  xml += "<tqdevice>" + TQString( mDeviceType->currentItem() == 0 ? "opie" : "qtopia2" ) + "</tqdevice>";
+  xml += "<device>" + TQString( mDeviceType->currentItem() == 0 ? "opie" : "qtopia2" ) + "</device>";
   xml += "<port>" + TQString::number( mPort->value() ) + "</port>";
   xml += "<conntype>" + TQString( mConnectionType->currentItem() == 0 ? "scp" : "ftp" ) + "</conntype>";
   xml += "</config>";
diff --git a/kitchensync/src/configguisunbird.cpp b/kitchensync/src/configguisunbird.cpp
index 041a8d1c0..99e86f3c7 100644
--- a/kitchensync/src/configguisunbird.cpp
+++ b/kitchensync/src/configguisunbird.cpp
@@ -140,10 +140,10 @@ TQString ConfigGuiSunbird::save() const
   for ( uint i = 0; i < mLocalList.count(); ++i ) {
     LocalCalendar *lcal = mLocalList[ i ];
     config += TQString( "<file " );
-    config += TQString( "path=\"%1\" " ).tqarg( lcal->mPathRequester->url() );
+    config += TQString( "path=\"%1\" " ).arg( lcal->mPathRequester->url() );
 
     if ( lcal->mDaysCheckBox->isChecked() ) {
-      config += TQString( "deletedaysold=\"%1\" " ).tqarg( lcal->mDaysSpinBox->value() );
+      config += TQString( "deletedaysold=\"%1\" " ).arg( lcal->mDaysSpinBox->value() );
     }
     if ( lcal->mDefaultCheckBox->isChecked() ) {
       config += TQString( "default=\"1\" " );
@@ -154,12 +154,12 @@ TQString ConfigGuiSunbird::save() const
   for ( uint i = 0; i < mWebdavList.count(); ++i ) {
     WebdavCalendar *wcal = mWebdavList[ i ];
     config += TQString( "<webdav " );
-    config += TQString( "username=\"%1\" " ).tqarg( wcal->mUsername->text() );
-    config += TQString( "password=\"%1\" " ).tqarg( wcal->mPassword->text() );
-    config += TQString( "url=\"%1\" " ).tqarg( wcal->mUrl->text() );
+    config += TQString( "username=\"%1\" " ).arg( wcal->mUsername->text() );
+    config += TQString( "password=\"%1\" " ).arg( wcal->mPassword->text() );
+    config += TQString( "url=\"%1\" " ).arg( wcal->mUrl->text() );
 
     if ( wcal->mDaysCheckBox->isChecked() ) {
-      config += TQString( "deletedaysold=\"%1\" " ).tqarg( wcal->mDaysSpinBox->value() );
+      config += TQString( "deletedaysold=\"%1\" " ).arg( wcal->mDaysSpinBox->value() );
     }
     if ( wcal->mDefaultCheckBox->isChecked() ) {
       config += TQString( "default=\"1\" " );
diff --git a/kitchensync/src/configguisynce.cpp b/kitchensync/src/configguisynce.cpp
index 898300769..b83e85683 100644
--- a/kitchensync/src/configguisynce.cpp
+++ b/kitchensync/src/configguisynce.cpp
@@ -60,10 +60,10 @@ TQString ConfigGuiSynce::save() const
 {
   TQString config = "<config>\n";
 
-  config += TQString( "<contact>%1</contact>\n" ).tqarg( mContacts->isChecked() ? "1" : "0" );
-  config += TQString( "<todos>%1</todos>\n" ).tqarg( mTodos->isChecked() ? "1" : "0" );
-  config += TQString( "<calendar>%1</calendar>\n" ).tqarg( mCalendar->isChecked() ? "1" : "0" );
-  config += TQString( "<file>%1</file>\n" ).tqarg( mFile->text() );
+  config += TQString( "<contact>%1</contact>\n" ).arg( mContacts->isChecked() ? "1" : "0" );
+  config += TQString( "<todos>%1</todos>\n" ).arg( mTodos->isChecked() ? "1" : "0" );
+  config += TQString( "<calendar>%1</calendar>\n" ).arg( mCalendar->isChecked() ? "1" : "0" );
+  config += TQString( "<file>%1</file>\n" ).arg( mFile->text() );
 
   config += "</config>";
 
diff --git a/kitchensync/src/configguisyncmlobex.cpp b/kitchensync/src/configguisyncmlobex.cpp
index 61833b4eb..372cf9261 100644
--- a/kitchensync/src/configguisyncmlobex.cpp
+++ b/kitchensync/src/configguisyncmlobex.cpp
@@ -246,7 +246,7 @@ TQString ConfigGuiSyncmlObex::save() const
   ConnectionTypeList::ConstIterator it;
   for ( it = mConnectionTypes.begin(); it != mConnectionTypes.end(); it++ ) {
     if ( mConnection->currentText() == (*it).second ) {
-      xml += "<type>" + TQString("%1").tqarg((*it).first) + "</type>\n";
+      xml += "<type>" + TQString("%1").arg((*it).first) + "</type>\n";
       break;
     }
   }
@@ -264,7 +264,7 @@ TQString ConfigGuiSyncmlObex::save() const
   SyncmlVersionList::ConstIterator itVersion;
   for ( itVersion = mSyncmlVersions.begin(); itVersion != mSyncmlVersions.end(); itVersion++ ) {
     if ( mSyncmlVersion->currentText() == (*itVersion).second ) {
-      xml += "<version>" + TQString("%1").tqarg((*itVersion).first) + "</version>\n";
+      xml += "<version>" + TQString("%1").arg((*itVersion).first) + "</version>\n";
       break;
     }
   }
diff --git a/kitchensync/src/genericdiffalgo.cpp b/kitchensync/src/genericdiffalgo.cpp
index 209382ed7..21b83f454 100644
--- a/kitchensync/src/genericdiffalgo.cpp
+++ b/kitchensync/src/genericdiffalgo.cpp
@@ -57,11 +57,11 @@ void GenericDiffAlgo::run()
   for ( uint i = 0; i < lines; ++i ) {
     if ( i < leftList.count() && i < rightList.count() ) {
       if ( !compareString( leftList[ i ], rightList[ i ] ) )
-        conflictField( i18n( "Line %1" ).tqarg( i ), leftList[ i ], rightList[ i ] );
+        conflictField( i18n( "Line %1" ).arg( i ), leftList[ i ], rightList[ i ] );
     } else if ( i < leftList.count() && i >= rightList.count() ) {
-      additionalLeftField( i18n( "Line %1" ).tqarg( i ), leftList[ i ] );
+      additionalLeftField( i18n( "Line %1" ).arg( i ), leftList[ i ] );
     } else if ( i >= leftList.count() && i < rightList.count() ) {
-      additionalRightField( i18n( "Line %1" ).tqarg( i ), rightList[ i ] );
+      additionalRightField( i18n( "Line %1" ).arg( i ), rightList[ i ] );
     }
   }
 
diff --git a/kitchensync/src/groupconfig.cpp b/kitchensync/src/groupconfig.cpp
index 1cb95ebd2..cfedcbfad 100644
--- a/kitchensync/src/groupconfig.cpp
+++ b/kitchensync/src/groupconfig.cpp
@@ -131,7 +131,7 @@ void GroupConfig::updateMembers()
     QSync::Member member = *it;
     MemberInfo mi( member );
     TQFrame *page = mMemberView->addPage( mi.name(), 
-      TQString( "%1 (%2)" ).tqarg( mi.name() ).tqarg(member.pluginName()), mi.desktopIcon() );
+      TQString( "%1 (%2)" ).arg( mi.name() ).arg(member.pluginName()), mi.desktopIcon() );
 
     TQBoxLayout *pageLayout = new TQVBoxLayout( page );
     mConfigPages.append( page );
@@ -165,7 +165,7 @@ void GroupConfig::addMember()
     QSync::Result result = SyncProcessManager::self()->addMember( mProcess, plugin );
     if ( result.isError() ) {
       KMessageBox::error( this, i18n("Error adding member %1\n%2\nType: %3")
-        .tqarg( plugin.name() ).tqarg( result.message() ).tqarg( result.type() ) );
+        .arg( plugin.name() ).arg( result.message() ).arg( result.type() ) );
     } else {
       updateMembers();
 
diff --git a/kitchensync/src/groupitem.cpp b/kitchensync/src/groupitem.cpp
index acfd73e5f..5409fc171 100644
--- a/kitchensync/src/groupitem.cpp
+++ b/kitchensync/src/groupitem.cpp
@@ -139,11 +139,11 @@ void GroupItem::update()
 {
   clear();
 
-  mGroupName->setText( i18n( "Group: %1" ).tqarg( mSyncProcess->group().name() ) );
+  mGroupName->setText( i18n( "Group: %1" ).arg( mSyncProcess->group().name() ) );
 
   TQDateTime dateTime = mSyncProcess->group().lastSynchronization();
   if ( dateTime.isValid() )
-    mTime->setText( i18n( "Last synchronized on: %1" ).tqarg( KGlobal::locale()->formatDateTime( dateTime ) ) );
+    mTime->setText( i18n( "Last synchronized on: %1" ).arg( KGlobal::locale()->formatDateTime( dateTime ) ) );
   else
     mTime->setText( i18n( "Not synchronized yet" ) );
 
@@ -157,7 +157,7 @@ void GroupItem::update()
   for ( ; memberIt != memberEndIt; ++memberIt ) {
     MemberItem *item = new MemberItem( mBox, mSyncProcess, *memberIt );
     item->show();
-    item->seStatusMessage( i18n( "Ready" ) );
+    item->setStatusMessage( i18n( "Ready" ) );
     mMemberItems.append( item );
   }
 }
@@ -189,14 +189,14 @@ void GroupItem::change( const QSync::SyncChangeUpdate &update )
   switch ( update.type() ) {
     case QSync::SyncChangeUpdate::Received:
       mProcessedItems++;
-      mStatus->setText( i18n( "%1 entries read" ).tqarg( mProcessedItems ) );
+      mStatus->setText( i18n( "%1 entries read" ).arg( mProcessedItems ) );
       break;
     case QSync::SyncChangeUpdate::ReceivedInfo:
       mStatus->setText( i18n( "Receive information" ) );
       break;
     case QSync::SyncChangeUpdate::Sent:
       mProcessedItems--;
-      mStatus->setText( i18n( "%1 entries written" ).tqarg( mMaxProcessedItems - mProcessedItems ) );
+      mStatus->setText( i18n( "%1 entries written" ).arg( mMaxProcessedItems - mProcessedItems ) );
 
       mProgressBar->show();
 
@@ -286,31 +286,31 @@ void GroupItem::member( const QSync::SyncMemberUpdate &update )
     if ( (*it)->member() == update.member() ) {
       switch ( update.type() ) {
         case QSync::SyncMemberUpdate::Connected:
-          (*it)->seStatusMessage( i18n( "Connected" ) );
+          (*it)->setStatusMessage( i18n( "Connected" ) );
           break;
         case QSync::SyncMemberUpdate::SentChanges:
-          (*it)->seStatusMessage( i18n( "Changes read" ) );
+          (*it)->setStatusMessage( i18n( "Changes read" ) );
           break;
         case QSync::SyncMemberUpdate::CommittedAll:
-          (*it)->seStatusMessage( i18n( "Changes written" ) );
+          (*it)->setStatusMessage( i18n( "Changes written" ) );
           break;
         case QSync::SyncMemberUpdate::Disconnected:
-          (*it)->seStatusMessage( i18n( "Disconnected" ) );
+          (*it)->setStatusMessage( i18n( "Disconnected" ) );
           break;
         case QSync::SyncMemberUpdate::ConnectError:
-          (*it)->seStatusMessage( i18n( "Error: %1" ).tqarg( update.result().message() ) );
+          (*it)->setStatusMessage( i18n( "Error: %1" ).arg( update.result().message() ) );
           break;
         case QSync::SyncMemberUpdate::GetChangesError:
-          (*it)->seStatusMessage( i18n( "Error: %1" ).tqarg( update.result().message() ) );
+          (*it)->setStatusMessage( i18n( "Error: %1" ).arg( update.result().message() ) );
           break;
         case QSync::SyncMemberUpdate::CommittedAllError:
-          (*it)->seStatusMessage( i18n( "Error: %1" ).tqarg( update.result().message() ) );
+          (*it)->setStatusMessage( i18n( "Error: %1" ).arg( update.result().message() ) );
           break;
         case QSync::SyncMemberUpdate::SyncDoneError:
-          (*it)->seStatusMessage( i18n( "Error: %1" ).tqarg( update.result().message() ) );
+          (*it)->setStatusMessage( i18n( "Error: %1" ).arg( update.result().message() ) );
           break;
         case QSync::SyncMemberUpdate::DisconnectedError:
-          (*it)->seStatusMessage( i18n( "Error: %1" ).tqarg( update.result().message() ) );
+          (*it)->setStatusMessage( i18n( "Error: %1" ).arg( update.result().message() ) );
           break;
         default:
           break;
@@ -381,7 +381,7 @@ MemberItem::MemberItem( TQWidget *parent, SyncProcess *process,
   mDescription->setText( plugin.longName() );
 }
 
-void MemberItem::seStatusMessage( const TQString &msg )
+void MemberItem::setStatusMessage( const TQString &msg )
 {
   mStatus->setText( msg );
 }
diff --git a/kitchensync/src/groupitem.h b/kitchensync/src/groupitem.h
index 338c733df..94eb0fc35 100644
--- a/kitchensync/src/groupitem.h
+++ b/kitchensync/src/groupitem.h
@@ -97,7 +97,7 @@ class MemberItem : public TQWidget
     SyncProcess* syncProcess() const { return mSyncProcess; }
     QSync::Member member() const { return mMember; }
 
-    void seStatusMessage( const TQString &msg );
+    void setStatusMessage( const TQString &msg );
 
   private:
     SyncProcess *mSyncProcess;
diff --git a/kitchensync/src/htmldiffalgodisplay.cpp b/kitchensync/src/htmldiffalgodisplay.cpp
index 9558eaecd..1b4c2fe1b 100644
--- a/kitchensync/src/htmldiffalgodisplay.cpp
+++ b/kitchensync/src/htmldiffalgodisplay.cpp
@@ -45,13 +45,13 @@ void HTMLDiffAlgoDisplay::begin()
 
   mText.append( "<html>" );
   mText.append( TQString( "<body text=\"%1\" bgcolor=\"%2\">" )
-               .tqarg( KGlobalSettings::textColor().name() )
-               .tqarg( KGlobalSettings::baseColor().name() ) );
+               .arg( KGlobalSettings::textColor().name() )
+               .arg( KGlobalSettings::baseColor().name() ) );
 
   mText.append( "<center><table>" );
   mText.append( TQString( "<tr><th></th><th align=\"center\">%1</th><td>         </td><th align=\"center\">%2</th></tr>" )
-               .tqarg( mLeftTitle )
-               .tqarg( mRightTitle ) );
+               .arg( mLeftTitle )
+               .arg( mRightTitle ) );
 }
 
 void HTMLDiffAlgoDisplay::end()
@@ -76,22 +76,22 @@ void HTMLDiffAlgoDisplay::setRightSourceTitle( const TQString &title )
 void HTMLDiffAlgoDisplay::additionalLeftField( const TQString &id, const TQString &value )
 {
   mText.append( TQString( "<tr><td align=\"right\"><b>%1:</b></td><td bgcolor=\"#9cff83\">%2</td><td></td><td></td></tr>" )
-               .tqarg( id )
-               .tqarg( textToHTML( value ) ) );
+               .arg( id )
+               .arg( textToHTML( value ) ) );
 }
 
 void HTMLDiffAlgoDisplay::additionalRightField( const TQString &id, const TQString &value )
 {
   mText.append( TQString( "<tr><td align=\"right\"><b>%1:</b></td><td></td><td></td><td bgcolor=\"#9cff83\">%2</td></tr>" )
-               .tqarg( id )
-               .tqarg( textToHTML( value ) ) );
+               .arg( id )
+               .arg( textToHTML( value ) ) );
 }
 
 void HTMLDiffAlgoDisplay::conflictField( const TQString &id, const TQString &leftValue,
                                           const TQString &rightValue )
 {
   mText.append( TQString( "<tr><td align=\"right\"><b>%1:</b></td><td bgcolor=\"#ff8686\">%2</td><td></td><td bgcolor=\"#ff8686\">%3</td></tr>" )
-               .tqarg( id )
-               .tqarg( textToHTML( leftValue ) )
-               .tqarg( textToHTML( rightValue ) ) );
+               .arg( id )
+               .arg( textToHTML( leftValue ) )
+               .arg( textToHTML( rightValue ) ) );
 }
diff --git a/kitchensync/src/mainwidget.cpp b/kitchensync/src/mainwidget.cpp
index 8dbef8cab..51543c059 100644
--- a/kitchensync/src/mainwidget.cpp
+++ b/kitchensync/src/mainwidget.cpp
@@ -141,7 +141,7 @@ void MainWidget::deleteGroup()
   SyncProcess *syncProcess = mGroupView->selectedSyncProcess();
   if ( syncProcess ) {
     int result = KMessageBox::warningContinueCancel( this,
-      i18n("Delete synchronization group '%1'?").tqarg( syncProcess->group().name() ) );
+      i18n("Delete synchronization group '%1'?").arg( syncProcess->group().name() ) );
     if ( result == KMessageBox::Continue ) {
       SyncProcessManager::self()->remove( syncProcess );
       enableActions();
diff --git a/kitchensync/src/memberconfig.cpp b/kitchensync/src/memberconfig.cpp
index c2216546c..37755a504 100644
--- a/kitchensync/src/memberconfig.cpp
+++ b/kitchensync/src/memberconfig.cpp
@@ -51,7 +51,7 @@ void MemberConfig::loadData()
   if ( error ) {
     KMessageBox::error( this,
       i18n("Unable to read config from plugin '%1':\n%2")
-      .tqarg( mMember.pluginName() ).tqarg( error.message() ) );
+      .arg( mMember.pluginName() ).arg( error.message() ) );
   } else {
     TQString txt = TQString::fromUtf8( cfg.data(), cfg.size() );
     mGui->load( txt );
@@ -65,7 +65,7 @@ void MemberConfig::saveData()
   TQString txt = mGui->save();
 
   if ( txt.isEmpty() ) {
-    KMessageBox::sorry( this, i18n("Configuration of %1 is empty.").tqarg( mMember.pluginName() ) );
+    KMessageBox::sorry( this, i18n("Configuration of %1 is empty.").arg( mMember.pluginName() ) );
   } else {
     TQByteArray cfg = txt.utf8();
     cfg.truncate(cfg.size() - 1); /* discard NUL terminator */
diff --git a/kitchensync/src/syncprocessmanager.cpp b/kitchensync/src/syncprocessmanager.cpp
index 67fe3095c..fda111efd 100644
--- a/kitchensync/src/syncprocessmanager.cpp
+++ b/kitchensync/src/syncprocessmanager.cpp
@@ -47,7 +47,7 @@ SyncProcessManager::SyncProcessManager()
   QSync::Result result = mEnvironment->initialize();
   if ( result.isError() ) {
     KMessageBox::error( 0, i18n("Error initializing OpenSync.\n%1")
-      .tqarg( result.message() ) );
+      .arg( result.message() ) );
   } else {
     init( mEnvironment );
   }
-- 
cgit v1.2.1