Moved kpilot from kdepim to applications, as the core Trinity libraries should not contain hardware-dependent software

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

29 files changed, 197 insertions, 196 deletions

diff --git a/kitchensync/libqopensync/group.cpp b/kitchensync/libqopensync/group.cpp
index bc94e220..a3fd4f2a 100644
--- a/kitchensync/libqopensync/group.cpp
+++ b/kitchensync/libqopensync/group.cpp
@@ -146,7 +146,7 @@ TQString Group::name() const
 {
   Q_ASSERT( mGroup );
 
-  return TQString::fromLatin1( osync_group_get_name( mGroup ) );
+  return TQString::tqfromLatin1( osync_group_get_name( mGroup ) );
 }
 
 void Group::setLastSynchronization( const TQDateTime &dateTime )
diff --git a/kitchensync/libqopensync/member.cpp b/kitchensync/libqopensync/member.cpp
index 35cb0463..5ed40986 100644
--- a/kitchensync/libqopensync/member.cpp
+++ b/kitchensync/libqopensync/member.cpp
@@ -55,14 +55,14 @@ TQString Member::configurationDirectory() const
 {
   Q_ASSERT( mMember );
 
-  return TQString::fromLatin1( osync_member_get_configdir( mMember ) );
+  return TQString::tqfromLatin1( osync_member_get_configdir( mMember ) );
 }
 
 TQString Member::pluginName() const
 {
   Q_ASSERT( mMember );
 
-  return TQString::fromLatin1( osync_member_get_pluginname( mMember ) );
+  return TQString::tqfromLatin1( osync_member_get_pluginname( mMember ) );
 }
 
 Plugin Member::plugin() const
diff --git a/kitchensync/libqopensync/plugin.cpp b/kitchensync/libqopensync/plugin.cpp
index acd54447..fd760049 100644
--- a/kitchensync/libqopensync/plugin.cpp
+++ b/kitchensync/libqopensync/plugin.cpp
@@ -43,20 +43,20 @@ TQString Plugin::name() const
 {
   Q_ASSERT( mPlugin );
 
-  return TQString::fromLatin1( osync_plugin_get_name( mPlugin ) );
+  return TQString::tqfromLatin1( osync_plugin_get_name( mPlugin ) );
 }
 
 TQString Plugin::longName() const
 {
   Q_ASSERT( mPlugin );
 
-  return TQString::fromLatin1( osync_plugin_get_longname( mPlugin ) );
+  return TQString::tqfromLatin1( osync_plugin_get_longname( mPlugin ) );
 }
 
 TQString Plugin::description() const
 {
   Q_ASSERT( mPlugin );
 
-  return TQString::fromLatin1( osync_plugin_get_description( mPlugin ) );
+  return TQString::tqfromLatin1( osync_plugin_get_description( mPlugin ) );
 }
 
diff --git a/kitchensync/libqopensync/syncchange.h b/kitchensync/libqopensync/syncchange.h
index 53d9c440..27ff6b22 100644
--- a/kitchensync/libqopensync/syncchange.h
+++ b/kitchensync/libqopensync/syncchange.h
@@ -82,7 +82,7 @@ class SyncChange
     TQString data() const;
 
     /**
-      Returns whether the change contains data.
+      Returns whether the change tqcontains data.
      */
     bool hasData() const;
 
diff --git a/kitchensync/src/Makefile.am b/kitchensync/src/Makefile.am
index 7f94fc17..429e5425 100644
--- a/kitchensync/src/Makefile.am
+++ b/kitchensync/src/Makefile.am
@@ -33,14 +33,15 @@ libkitchensync_la_SOURCES = aboutpage.cpp mainwidget.cpp groupconfigdialog.cpp \
                             configguisunbird.cpp
 libkitchensync_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined
 libkitchensync_la_LIBADD = $(LIB_KIO) $(LIB_KHTML) $(top_builddir)/kitchensync/libqopensync/libqopensync.la \
-                           $(LIB_KABC) $(top_builddir)/libkdepim/libkdepim.la $(top_builddir)/libkcal/libkcal.la
+                           $(LIB_KABC) $(top_builddir)/libkdepim/libkdepim.la $(top_builddir)/libkcal/libkcal.la \
+                           $(LIB_QT)
 
 # KPart
 kde_module_LTLIBRARIES = libkitchensyncpart.la
 
 libkitchensyncpart_la_SOURCES = part.cpp
 libkitchensyncpart_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined
-libkitchensyncpart_la_LIBADD = $(LIB_KPARTS) libkitchensync.la
+libkitchensyncpart_la_LIBADD = $(LIB_KPARTS) libkitchensync.la $(LIB_QT) $(LIB_KIO) $(LIB_KHTML) $(LIB_KABC) $(LIB_KDECORE) $(LIB_KDEUI)
 
 # Resources
 kitchensyncdatadir = $(kde_datadir)/kitchensync
diff --git a/kitchensync/src/aboutpage.cpp b/kitchensync/src/aboutpage.cpp
index 0909fa0f..3d5b1f04 100644
--- a/kitchensync/src/aboutpage.cpp
+++ b/kitchensync/src/aboutpage.cpp
@@ -51,7 +51,7 @@ static TQString readFile( const TQString &fileName )
 AboutPage::AboutPage( TQWidget *parent )
   : TQWidget( parent, "AboutPage" )
 {
-  TQVBoxLayout *layout = new TQVBoxLayout( this );
+  TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
 
   TQString location = locate( "data", "kitchensync/about/main.html" );
   TQString content = readFile( location );
@@ -62,7 +62,7 @@ AboutPage::AboutPage( TQWidget *parent )
     content = content.arg( "" );
 
   KHTMLPart *part = new KHTMLPart( this );
-  layout->addWidget( part->view() );
+  tqlayout->addWidget( part->view() );
 
   part->begin( KURL( location ) );
 
diff --git a/kitchensync/src/configguievo2.cpp b/kitchensync/src/configguievo2.cpp
index c313ce3a..716bce78 100644
--- a/kitchensync/src/configguievo2.cpp
+++ b/kitchensync/src/configguievo2.cpp
@@ -71,21 +71,21 @@ TQString ConfigGuiEvo2::save() const
 
 void ConfigGuiEvo2::initGUI()
 {
-  TQGridLayout *layout = new TQGridLayout( topLayout(), 12, 3, KDialog::spacingHint() );
-  layout->setMargin( KDialog::marginHint() );
+  TQGridLayout *tqlayout = new TQGridLayout( topLayout(), 12, 3, KDialog::spacingHint() );
+  tqlayout->setMargin( KDialog::marginHint() );
 
-  layout->addWidget( new TQLabel( i18n( "Address Book location:" ), this ), 0, 0 );
+  tqlayout->addWidget( new TQLabel( i18n( "Address Book location:" ), this ), 0, 0 );
   mAddressPath = new KURLRequester( this );
   mAddressPath->setMode( KFile::Directory );
-  layout->addMultiCellWidget( mAddressPath, 0, 0, 1, 2 );
+  tqlayout->addMultiCellWidget( mAddressPath, 0, 0, 1, 2 );
 
-  layout->addWidget( new TQLabel( i18n( "Calendar location:" ), this ), 1, 0 );
+  tqlayout->addWidget( new TQLabel( i18n( "Calendar location:" ), this ), 1, 0 );
   mCalendarPath = new KURLRequester( this );
   mCalendarPath->setMode( KFile::Directory );
-  layout->addMultiCellWidget( mCalendarPath, 1, 1, 1, 2 );
+  tqlayout->addMultiCellWidget( mCalendarPath, 1, 1, 1, 2 );
 
-  layout->addWidget( new TQLabel( i18n( "Task list location:" ), this ), 2, 0 );
+  tqlayout->addWidget( new TQLabel( i18n( "Task list location:" ), this ), 2, 0 );
   mTasksPath = new KURLRequester( this );
   mTasksPath->setMode( KFile::Directory );
-  layout->addMultiCellWidget( mTasksPath, 2, 2, 1, 2 );
+  tqlayout->addMultiCellWidget( mTasksPath, 2, 2, 1, 2 );
 }
diff --git a/kitchensync/src/configguignokii.cpp b/kitchensync/src/configguignokii.cpp
index 38f2fbf3..84db0275 100644
--- a/kitchensync/src/configguignokii.cpp
+++ b/kitchensync/src/configguignokii.cpp
@@ -37,14 +37,14 @@
 ConfigGuiGnokii::ConfigGuiGnokii( const QSync::Member &member, TQWidget *parent )
   : ConfigGui( member, parent )
 {
-  TQGridLayout *layout = new TQGridLayout( topLayout() );
+  TQGridLayout *tqlayout = new TQGridLayout( topLayout() );
 
   // Model
   TQLabel *label = new TQLabel( i18n("Model:"), this );
-  layout->addWidget( label, 0, 0 );
+  tqlayout->addWidget( label, 0, 0 );
 
   mModel = new KComboBox( true, this );
-  layout->addWidget( mModel, 0, 1 );
+  tqlayout->addWidget( mModel, 0, 1 );
   mModel->insertItem( "2110" ); 
   mModel->insertItem( "3110" ); 
   mModel->insertItem( "6110" ); 
@@ -67,10 +67,10 @@ ConfigGuiGnokii::ConfigGuiGnokii( const QSync::Member &member, TQWidget *parent
 
   // Connection
   label = new TQLabel( i18n("Connection:"), this );
-  layout->addWidget( label, 1, 0 );
+  tqlayout->addWidget( label, 1, 0 );
 
   mConnection = new TQComboBox( this );
-  layout->addWidget( mConnection, 1, 1 );
+  tqlayout->addWidget( mConnection, 1, 1 );
 
   connect( mConnection, TQT_SIGNAL (activated( int ) ),
       	    this, TQT_SLOT( slotConnectionChanged ( int ) ) );
@@ -100,15 +100,15 @@ ConfigGuiGnokii::ConfigGuiGnokii( const QSync::Member &member, TQWidget *parent
   mBluetooth = new BluetoothWidget( connectionWidget ); 
   mBluetooth->hide();
 
-  layout->addMultiCellWidget( connectionWidget, 2, 2, 0, 1 );
+  tqlayout->addMultiCellWidget( connectionWidget, 2, 2, 0, 1 );
 
   // Port
   mPortLabel = new TQLabel( i18n("Port:"), this );
-  layout->addWidget( mPortLabel, 2, 0 );
+  tqlayout->addWidget( mPortLabel, 2, 0 );
   mPortLabel->hide();
 
   mPort = new KComboBox( true, this );
-  layout->addWidget( mPort, 2, 1 );
+  tqlayout->addWidget( mPort, 2, 1 );
   mPort->hide();
 
   mPort->insertItem( "/dev/ircomm0" );
@@ -118,7 +118,7 @@ ConfigGuiGnokii::ConfigGuiGnokii( const QSync::Member &member, TQWidget *parent
   mPort->insertItem( "/dev/ttyUSB0" );
   mPort->insertItem( "/dev/ttyUSB1" );
 
-  layout->setColStretch( 1, 1 );
+  tqlayout->setColStretch( 1, 1 );
 
   topLayout()->addStretch( 1 );
 }
diff --git a/kitchensync/src/configguigpe.cpp b/kitchensync/src/configguigpe.cpp
index b3bff63a..94108d30 100644
--- a/kitchensync/src/configguigpe.cpp
+++ b/kitchensync/src/configguigpe.cpp
@@ -81,23 +81,23 @@ TQString ConfigGuiGpe::save() const
 
 void ConfigGuiGpe::initGUI()
 {
-  TQGridLayout *layout = new TQGridLayout( topLayout(), 12, 4, KDialog::spacingHint() );
-  layout->setMargin( KDialog::marginHint() );
+  TQGridLayout *tqlayout = new TQGridLayout( topLayout(), 12, 4, KDialog::spacingHint() );
+  tqlayout->setMargin( KDialog::marginHint() );
 
-  layout->addWidget( new TQLabel( i18n( "Connection Mode:" ), this ), 0, 0 );
+  tqlayout->addWidget( new TQLabel( i18n( "Connection Mode:" ), this ), 0, 0 );
   mConnectionMode = new KComboBox( this );
-  layout->addMultiCellWidget( mConnectionMode, 0, 0, 0, 3 );
+  tqlayout->addMultiCellWidget( mConnectionMode, 0, 0, 0, 3 );
 
-  layout->addWidget( new TQLabel( i18n( "IP Address:" ), this ), 1, 0 );
+  tqlayout->addWidget( new TQLabel( i18n( "IP Address:" ), this ), 1, 0 );
   mIP = new KLineEdit( this );
   mIP->setInputMask( "000.000.000.000" );
-  layout->addWidget( mIP, 1, 1 );
+  tqlayout->addWidget( mIP, 1, 1 );
 
-  layout->addWidget( new TQLabel( i18n( "Port:" ), this ), 1, 2, Qt::AlignRight );
+  tqlayout->addWidget( new TQLabel( i18n( "Port:" ), this ), 1, 2, Qt::AlignRight );
   mPort = new TQSpinBox( 1, 65536, 1, this );
-  layout->addWidget( mPort, 1, 3 );
+  tqlayout->addWidget( mPort, 1, 3 );
 
-  layout->addWidget( new TQLabel( i18n( "User:" ), this ), 2, 0 );
+  tqlayout->addWidget( new TQLabel( i18n( "User:" ), this ), 2, 0 );
   mUser = new KLineEdit( this );
-  layout->addMultiCellWidget( mUser, 2, 2, 1, 3 );
+  tqlayout->addMultiCellWidget( mUser, 2, 2, 1, 3 );
 }
diff --git a/kitchensync/src/configguijescs.cpp b/kitchensync/src/configguijescs.cpp
index 2b37ad42..158eb225 100644
--- a/kitchensync/src/configguijescs.cpp
+++ b/kitchensync/src/configguijescs.cpp
@@ -76,23 +76,23 @@ TQString ConfigGuiJescs::save() const
 
 void ConfigGuiJescs::initGUI()
 {
-  TQGridLayout *layout = new TQGridLayout( topLayout(), 12, 3, KDialog::spacingHint() );
-  layout->setMargin( KDialog::marginHint() );
+  TQGridLayout *tqlayout = new TQGridLayout( topLayout(), 12, 3, KDialog::spacingHint() );
+  tqlayout->setMargin( KDialog::marginHint() );
 
-  layout->addWidget( new TQLabel( i18n( "URL:" ), this ), 0, 0 );
+  tqlayout->addWidget( new TQLabel( i18n( "URL:" ), this ), 0, 0 );
   mUrl = new KLineEdit( this );
-  layout->addMultiCellWidget( mUrl, 0, 0, 1, 2 );
+  tqlayout->addMultiCellWidget( mUrl, 0, 0, 1, 2 );
 
-  layout->addWidget( new TQLabel( i18n( "Username:" ), this ), 1, 0 );
+  tqlayout->addWidget( new TQLabel( i18n( "Username:" ), this ), 1, 0 );
   mUsername = new KLineEdit( this );
-  layout->addMultiCellWidget( mUsername, 1, 1, 1, 2 );
+  tqlayout->addMultiCellWidget( mUsername, 1, 1, 1, 2 );
 
-  layout->addWidget( new TQLabel( i18n( "Password:" ), this ), 2, 0 );
+  tqlayout->addWidget( new TQLabel( i18n( "Password:" ), this ), 2, 0 );
   mPassword = new KLineEdit( this );
   mPassword->setEchoMode( KLineEdit::Password );
-  layout->addMultiCellWidget( mPassword, 2, 2, 1, 2 );
+  tqlayout->addMultiCellWidget( mPassword, 2, 2, 1, 2 );
 
   mDelNotify = new TQCheckBox( this );
   mDelNotify->setText( "Notify attendees about event/task deletion" );
-  layout->addMultiCellWidget( mDelNotify, 3, 3, 0, 2 );
+  tqlayout->addMultiCellWidget( mDelNotify, 3, 3, 0, 2 );
 }
diff --git a/kitchensync/src/configguildap.cpp b/kitchensync/src/configguildap.cpp
index 3ef451c3..417e58d0 100644
--- a/kitchensync/src/configguildap.cpp
+++ b/kitchensync/src/configguildap.cpp
@@ -121,8 +121,8 @@ TQString ConfigGuiLdap::save() const
 
 void ConfigGuiLdap::initGUI()
 {
-  TQGridLayout *layout = new TQGridLayout( topLayout(), 12, 4, KDialog::spacingHint() );
-  layout->setMargin( KDialog::marginHint() );
+  TQGridLayout *tqlayout = new TQGridLayout( topLayout(), 12, 4, KDialog::spacingHint() );
+  tqlayout->setMargin( KDialog::marginHint() );
 
   mLdapWidget = new KABC::LdapConfigWidget( KABC::LdapConfigWidget::W_HOST |
                                             KABC::LdapConfigWidget::W_PORT |
@@ -139,14 +139,14 @@ void ConfigGuiLdap::initGUI()
   mReadLdap = new TQCheckBox( i18n( "Load data from LDAP" ), this );
   mWriteLdap = new TQCheckBox( i18n( "Save data to LDAP" ), this );
 
-  layout->addMultiCellWidget( mLdapWidget, 0, 9, 0, 3 );
-  layout->addWidget( new TQLabel( i18n( "Key Attribute:" ), this ), 10, 0 );
-  layout->addMultiCellWidget( mKeyAttribute, 10, 10, 1, 2 );
-  layout->addWidget( new TQLabel( i18n( "Search Scope:" ), this ), 11, 0 );
-  layout->addMultiCellWidget( mSearchScope, 11, 11, 1, 2 );
-  layout->addWidget( mEncryption, 12, 0 );
-  layout->addWidget( mReadLdap, 13, 0 );
-  layout->addWidget( mWriteLdap, 13, 3 );
+  tqlayout->addMultiCellWidget( mLdapWidget, 0, 9, 0, 3 );
+  tqlayout->addWidget( new TQLabel( i18n( "Key Attribute:" ), this ), 10, 0 );
+  tqlayout->addMultiCellWidget( mKeyAttribute, 10, 10, 1, 2 );
+  tqlayout->addWidget( new TQLabel( i18n( "Search Scope:" ), this ), 11, 0 );
+  tqlayout->addMultiCellWidget( mSearchScope, 11, 11, 1, 2 );
+  tqlayout->addWidget( mEncryption, 12, 0 );
+  tqlayout->addWidget( mReadLdap, 13, 0 );
+  tqlayout->addWidget( mWriteLdap, 13, 3 );
 
 }
 
diff --git a/kitchensync/src/configguimoto.cpp b/kitchensync/src/configguimoto.cpp
index a310692f..c44a2b40 100644
--- a/kitchensync/src/configguimoto.cpp
+++ b/kitchensync/src/configguimoto.cpp
@@ -62,10 +62,10 @@ TQString ConfigGuiMoto::save() const
 
 void ConfigGuiMoto::initGUI()
 {
-  TQGridLayout *layout = new TQGridLayout( topLayout(), 12, 3, KDialog::spacingHint() );
-  layout->setMargin( KDialog::marginHint() );
+  TQGridLayout *tqlayout = new TQGridLayout( topLayout(), 12, 3, KDialog::spacingHint() );
+  tqlayout->setMargin( KDialog::marginHint() );
 
-  layout->addWidget( new TQLabel( i18n( "Device String:" ), this ), 0, 0 );
+  tqlayout->addWidget( new TQLabel( i18n( "Device String:" ), this ), 0, 0 );
   mDeviceString = new KLineEdit( this );
-  layout->addMultiCellWidget( mDeviceString, 0, 0, 1, 2 );
+  tqlayout->addMultiCellWidget( mDeviceString, 0, 0, 1, 2 );
 }
diff --git a/kitchensync/src/configguiopie.cpp b/kitchensync/src/configguiopie.cpp
index e823ffe3..ed8aa15f 100644
--- a/kitchensync/src/configguiopie.cpp
+++ b/kitchensync/src/configguiopie.cpp
@@ -33,52 +33,52 @@
 ConfigGuiOpie::ConfigGuiOpie( const QSync::Member &member, TQWidget *parent )
   : ConfigGui( member, parent )
 {
-  TQGridLayout *layout = new TQGridLayout( topLayout() );
+  TQGridLayout *tqlayout = new TQGridLayout( topLayout() );
 
   TQLabel *label = new TQLabel( i18n("Device IP:"), this );
-  layout->addWidget( label, 0, 0 );
+  tqlayout->addWidget( label, 0, 0 );
 
   mDeviceIP = new TQLineEdit( this );
   mDeviceIP->setInputMask( "000.000.000.000" );
   label->setBuddy( mDeviceIP );
-  layout->addWidget( mDeviceIP, 0, 1 );
+  tqlayout->addWidget( mDeviceIP, 0, 1 );
 
   label = new TQLabel( i18n("Device Type:"), this );
-  layout->addWidget( label, 1, 0 );
+  tqlayout->addWidget( label, 1, 0 );
 
   mDeviceType = new TQComboBox( this );
   label->setBuddy( mDeviceType );
-  layout->addWidget( mDeviceType, 1, 1 );
+  tqlayout->addWidget( mDeviceType, 1, 1 );
 
   label = new TQLabel( i18n("Username:"), this );
-  layout->addWidget( label, 2, 0 );
+  tqlayout->addWidget( label, 2, 0 );
 
   mUserName = new TQLineEdit( this );
   label->setBuddy( mUserName );
-  layout->addWidget( mUserName, 2, 1 );
+  tqlayout->addWidget( mUserName, 2, 1 );
 
   label = new TQLabel( i18n("Password:"), this );
-  layout->addWidget( label, 3, 0 );
+  tqlayout->addWidget( label, 3, 0 );
 
   mPassword = new TQLineEdit( this );
   mPassword->setEchoMode( TQLineEdit::Password );
   label->setBuddy( mPassword );
-  layout->addWidget( mPassword, 3, 1 );
+  tqlayout->addWidget( mPassword, 3, 1 );
 
   label = new TQLabel( i18n("Protocol:"), this );
-  layout->addWidget( label, 4, 0 );
+  tqlayout->addWidget( label, 4, 0 );
 
   mConnectionType = new TQComboBox( this );
   label->setBuddy( mConnectionType );
-  layout->addWidget( mConnectionType, 4, 1 );
+  tqlayout->addWidget( mConnectionType, 4, 1 );
 
   label = new TQLabel( i18n("Port:"), this );
-  layout->addWidget( label, 5, 0 );
+  tqlayout->addWidget( label, 5, 0 );
 
   mPort = new TQSpinBox( this );
   mPort->setRange( 0, 65335 );
   label->setBuddy( mPort );
-  layout->addWidget( mPort, 5, 1 );
+  tqlayout->addWidget( mPort, 5, 1 );
 
   mDeviceType->insertItem( i18n("Opie/OpenZaurus") );
   mDeviceType->insertItem( i18n("Qtopia2") );
diff --git a/kitchensync/src/configguisunbird.cpp b/kitchensync/src/configguisunbird.cpp
index 99e86f3c..b0da28ca 100644
--- a/kitchensync/src/configguisunbird.cpp
+++ b/kitchensync/src/configguisunbird.cpp
@@ -57,14 +57,14 @@ ConfigGuiSunbird::ConfigGuiSunbird( const QSync::Member &member, TQWidget *paren
 
   KPushButton *mLocalAddButton = new KPushButton( mLocalWidget );
   mLocalAddButton->setText( i18n( "Add new calendar" ) );
-  mLocalAddButton->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
+  mLocalAddButton->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
   mLocalLayout->addWidget( mLocalAddButton );
   connect( mLocalAddButton, TQT_SIGNAL( clicked() ),
            this, TQT_SLOT( addLocalCalendar() ) );
 
   KPushButton *mWebdavAddButton = new KPushButton( mWebdavWidget );
   mWebdavAddButton->setText( i18n( "Add new calendar" ) );
-  mWebdavAddButton->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
+  mWebdavAddButton->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
   mWebdavLayout->addWidget( mWebdavAddButton );
   connect( mWebdavAddButton, TQT_SIGNAL( clicked() ),
            this, TQT_SLOT( addWebdavCalendar() ) );
@@ -100,7 +100,7 @@ void ConfigGuiSunbird::load( const TQString &xml )
 
       LocalCalendar *cal = new LocalCalendar( path, defaultcal, days, mLocalWidget );
       mLocalLayout->removeItem( mLocalSpacer );
-      cal->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ) );
+      cal->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ) );
       mLocalLayout->addWidget( cal );
       mLocalLayout->addItem( mLocalSpacer );
       mLocalList.append( cal );
@@ -122,7 +122,7 @@ void ConfigGuiSunbird::load( const TQString &xml )
       WebdavCalendar *cal = new WebdavCalendar( username, password,
                                                 url, defaultcal, days, mWebdavWidget );
       mWebdavLayout->removeItem( mWebdavSpacer );
-      cal->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ) );
+      cal->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ) );
       mWebdavLayout->addWidget( cal );
       mWebdavLayout->addItem( mWebdavSpacer );
       mWebdavList.append( cal );
@@ -175,7 +175,7 @@ void ConfigGuiSunbird::addLocalCalendar()
 {
   LocalCalendar *cal = new LocalCalendar( mLocalWidget );
   mLocalLayout->removeItem( mLocalSpacer );
-  cal->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ) );
+  cal->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ) );
   mLocalLayout->addWidget( cal );
   mLocalLayout->addItem( mLocalSpacer );
   mLocalList.append( cal );
@@ -194,7 +194,7 @@ void ConfigGuiSunbird::addWebdavCalendar()
 {
   WebdavCalendar *cal = new WebdavCalendar( mWebdavWidget );
   mWebdavLayout->removeItem( mWebdavSpacer );
-  cal->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ) );
+  cal->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ) );
   mWebdavLayout->addWidget( cal );
   mWebdavLayout->addItem( mWebdavSpacer );
   mWebdavList.append( cal );
@@ -239,7 +239,7 @@ void LocalCalendar::initGui()
 
   mDaysSpinBox = new TQSpinBox( this );
   mDaysSpinBox->setDisabled( true );
-  mDaysSpinBox->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
+  mDaysSpinBox->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
 
   connect( mDaysCheckBox, TQT_SIGNAL( toggled( bool ) ),
            this, TQT_SLOT( toggleDays( bool ) ) );
@@ -253,7 +253,7 @@ void LocalCalendar::initGui()
   mPathRequester = new KURLRequester( this );
 
   KPushButton *removeButton = new KPushButton( this );
-  removeButton->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
+  removeButton->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
   removeButton->setText( i18n( "Remove" ) );
   connect( removeButton, TQT_SIGNAL( clicked() ),
            this, TQT_SLOT( deleteWidget() ) );
@@ -308,7 +308,7 @@ void WebdavCalendar::initGui()
 
   mDaysSpinBox = new TQSpinBox( this );
   mDaysSpinBox->setDisabled( true );
-  mDaysSpinBox->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
+  mDaysSpinBox->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
 
   connect( mDaysCheckBox, TQT_SIGNAL( toggled( bool ) ),
            this, TQT_SLOT( toggleDays( bool ) ) );
diff --git a/kitchensync/src/configguisynce.cpp b/kitchensync/src/configguisynce.cpp
index 6e521bee..b83e8568 100644
--- a/kitchensync/src/configguisynce.cpp
+++ b/kitchensync/src/configguisynce.cpp
@@ -72,22 +72,22 @@ TQString ConfigGuiSynce::save() const
 
 void ConfigGuiSynce::initGUI()
 {
-  TQGridLayout *layout = new TQGridLayout( topLayout(), 12, 2, KDialog::spacingHint() );
-  layout->setMargin( KDialog::marginHint() );
+  TQGridLayout *tqlayout = new TQGridLayout( topLayout(), 12, 2, KDialog::spacingHint() );
+  tqlayout->setMargin( KDialog::marginHint() );
 
   mContacts = new TQCheckBox( this );
   mContacts->setText( "Sync Contacts" );
-  layout->addMultiCellWidget( mContacts, 0, 0, 0, 1 );
+  tqlayout->addMultiCellWidget( mContacts, 0, 0, 0, 1 );
 
   mTodos = new TQCheckBox( this );
   mTodos->setText( "Sync \'Todo\' items" );
-  layout->addMultiCellWidget( mTodos, 1, 1, 0, 1 );
+  tqlayout->addMultiCellWidget( mTodos, 1, 1, 0, 1 );
 
   mCalendar = new TQCheckBox( this );
   mCalendar->setText( "Sync Calendar" );
-  layout->addMultiCellWidget( mCalendar, 2, 2, 0, 1 );
+  tqlayout->addMultiCellWidget( mCalendar, 2, 2, 0, 1 );
 
-  layout->addWidget( new TQLabel( i18n( "File:" ), this ), 3, 0 );
+  tqlayout->addWidget( new TQLabel( i18n( "File:" ), this ), 3, 0 );
   mFile = new KLineEdit( this );
-  layout->addWidget( mFile, 3, 1 );
+  tqlayout->addWidget( mFile, 3, 1 );
 }
diff --git a/kitchensync/src/configguisyncmlhttp.cpp b/kitchensync/src/configguisyncmlhttp.cpp
index 26a8c224..08c596bc 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() == "onlyreplace" ) {
+    } else if ( element.tagName() == "onlytqreplace" ) {
       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 += "<onlyreplace>";
+  xml += "<onlytqreplace>";
   if ( mOnlyReplace->isChecked() )
     xml += "1";
   else
     xml += "0";
-  xml += "</onlyreplace>\n";
+  xml += "</onlytqreplace>\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 372cf926..fe7354ed 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() == "onlyreplace" ) {
+    } else if ( element.tagName() == "onlytqreplace" ) {
       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 += "<onlyreplace>";
+  xml += "<onlytqreplace>";
   if ( mOnlyReplace->isChecked() )
     xml += "1";
   else
     xml += "0";
-  xml += "</onlyreplace>\n";
+  xml += "</onlytqreplace>\n";
 
   xml += "<contact_db>" + mContactDb->currentText() + "</contact_db>\n";
   xml += "<calendar_db>" + mCalendarDb->currentText() + "</calendar_db>\n";
diff --git a/kitchensync/src/connectionwidgets.cpp b/kitchensync/src/connectionwidgets.cpp
index ac5277fb..bb25c271 100644
--- a/kitchensync/src/connectionwidgets.cpp
+++ b/kitchensync/src/connectionwidgets.cpp
@@ -43,24 +43,24 @@
 BluetoothWidget::BluetoothWidget( TQWidget *parent )
   : TQWidget( parent )
 {
-  TQGridLayout *layout = new TQGridLayout( this );
+  TQGridLayout *tqlayout = new TQGridLayout( this );
 
   mAddress = new KLineEdit( this );
   mAddress->setInputMask( ">NN:NN:NN:NN:NN:NN;" );
-  layout->addWidget( mAddress, 1, 0 );
+  tqlayout->addWidget( mAddress, 1, 0 );
 
   TQLabel *label = new TQLabel( i18n( "Bluetooth address:" ), this );
   label->setBuddy( mAddress );
-  layout->addWidget( label, 0, 0 );
+  tqlayout->addWidget( label, 0, 0 );
 
   mChannel = new KLineEdit( this );
-  layout->addWidget( mChannel, 1, 1 );
+  tqlayout->addWidget( mChannel, 1, 1 );
 
   mChannelLabel = new TQLabel( i18n( "Channel:" ), this );
   mChannelLabel->setBuddy( mChannel );
-  layout->addWidget( mChannelLabel, 0, 1 );
+  tqlayout->addWidget( mChannelLabel, 0, 1 );
 
-  layout->setRowStretch( 2, 1 );
+  tqlayout->setRowStretch( 2, 1 );
 }
 
 void BluetoothWidget::hideChannel()
@@ -103,23 +103,23 @@ TQString BluetoothWidget::channel() const
 IRWidget::IRWidget( TQWidget *parent )
   : TQWidget( parent )
 {
-  TQGridLayout *layout = new TQGridLayout( this, 3, 3, 11, 3 );
+  TQGridLayout *tqlayout = new TQGridLayout( this, 3, 3, 11, 3 );
 
   mDevice = new KLineEdit( this );
   mSerialNumber = new KLineEdit( this );
 
-  layout->addWidget( mDevice, 1, 0 );
-  layout->addWidget( mSerialNumber, 1, 1 );
+  tqlayout->addWidget( mDevice, 1, 0 );
+  tqlayout->addWidget( mSerialNumber, 1, 1 );
 
   TQLabel *label = new TQLabel( i18n( "Device Name:" ), this );
   label->setBuddy( mDevice );
-  layout->addWidget( label, 0, 0 );
+  tqlayout->addWidget( label, 0, 0 );
 
   label = new TQLabel( i18n( "Serial Number:" ), this );
   label->setBuddy( mSerialNumber );
-  layout->addWidget( label, 0, 1 );
+  tqlayout->addWidget( label, 0, 1 );
 
-  layout->setRowStretch( 2, 1 );
+  tqlayout->setRowStretch( 2, 1 );
 }
 
 void IRWidget::load( const TQDomElement &parent )
@@ -149,23 +149,23 @@ void IRWidget::save( TQDomDocument &doc, TQDomElement &parent )
 CableWidget::CableWidget( TQWidget *parent )
   : TQWidget( parent )
 {
-  TQGridLayout *layout = new TQGridLayout( this, 3, 2, 11, 3 );
+  TQGridLayout *tqlayout = new TQGridLayout( this, 3, 2, 11, 3 );
 
   mManufacturer = new KComboBox( this );
   mDevice = new KComboBox( true, this );
 
-  layout->addWidget( mManufacturer, 0, 1 );
-  layout->addWidget( mDevice, 1, 1 );
+  tqlayout->addWidget( mManufacturer, 0, 1 );
+  tqlayout->addWidget( mDevice, 1, 1 );
 
   TQLabel *label = new TQLabel( i18n( "Device Manufacturer:" ), this );
   label->setBuddy( mManufacturer );
-  layout->addWidget( label, 0, 0 );
+  tqlayout->addWidget( label, 0, 0 );
 
   label = new TQLabel( i18n( "Device:" ), this );
   label->setBuddy( mDevice );
-  layout->addWidget( label, 1, 0 );
+  tqlayout->addWidget( label, 1, 0 );
 
-  layout->setRowStretch( 2, 1 );
+  tqlayout->setRowStretch( 2, 1 );
 
   mManufacturer->insertItem( i18n( "SonyEricsson/Ericsson" ) );
   mManufacturer->insertItem( i18n( "Siemens" ) );
@@ -202,16 +202,16 @@ void CableWidget::save( TQDomDocument &doc, TQDomElement &parent )
 UsbWidget::UsbWidget( TQWidget *parent )
   : TQWidget( parent )
 {
-  TQGridLayout *layout = new TQGridLayout( this, 3, 2, 11, 3);
+  TQGridLayout *tqlayout = new TQGridLayout( this, 3, 2, 11, 3);
 
   mInterface = new TQSpinBox( this );
-  layout->addWidget( mInterface, 0, 1 );
+  tqlayout->addWidget( mInterface, 0, 1 );
 
   TQLabel *label = new TQLabel( i18n( "USB Interface:" ), this );
   label->setBuddy( mInterface );
-  layout->addWidget( label, 0, 0 );
+  tqlayout->addWidget( label, 0, 0 );
 
-  layout->setRowStretch( 2, 1 );
+  tqlayout->setRowStretch( 2, 1 );
 }
 
 void UsbWidget::setInterface( int interface )
diff --git a/kitchensync/src/groupconfig.cpp b/kitchensync/src/groupconfig.cpp
index cfedcbfa..2d1ccbc5 100644
--- a/kitchensync/src/groupconfig.cpp
+++ b/kitchensync/src/groupconfig.cpp
@@ -50,8 +50,8 @@ GroupConfig::GroupConfig( TQWidget *parent )
   TQFrame *titleFrame = new TQFrame( this );
   topLayout->addWidget( titleFrame );
 
-  titleFrame->setPaletteForegroundColor( colorGroup().light() );
-  titleFrame->setPaletteBackgroundColor( colorGroup().mid() );
+  titleFrame->setPaletteForegroundColor( tqcolorGroup().light() );
+  titleFrame->setPaletteBackgroundColor( tqcolorGroup().mid() );
 
   TQBoxLayout *nameLayout = new TQHBoxLayout( titleFrame );
   nameLayout->setMargin( 4 );
diff --git a/kitchensync/src/groupconfigcommon.cpp b/kitchensync/src/groupconfigcommon.cpp
index 9f629c4d..d5c89bc8 100644
--- a/kitchensync/src/groupconfigcommon.cpp
+++ b/kitchensync/src/groupconfigcommon.cpp
@@ -41,8 +41,8 @@
 ObjectTypeSelector::ObjectTypeSelector( TQWidget *parent )
   : TQWidget( parent )
 {
-  TQGridLayout *layout = new TQGridLayout( this );
-  layout->setMargin( 0 );
+  TQGridLayout *tqlayout = new TQGridLayout( this );
+  tqlayout->setMargin( 0 );
 
   const QSync::Conversion conversion = SyncProcessManager::self()->environment()->conversion();
 
@@ -78,7 +78,7 @@ ObjectTypeSelector::ObjectTypeSelector( TQWidget *parent )
       continue;
 
     TQCheckBox *objectCheckBox = new TQCheckBox( objectTypeMap[ objectType ], this );
-    layout->addWidget( objectCheckBox, row, col );
+    tqlayout->addWidget( objectCheckBox, row, col );
     mObjectTypeChecks.insert( objectType, objectCheckBox );
 
     col++;
@@ -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.contains( it.key() ) || initialLoad );
+    check->setChecked( objectTypes.tqcontains( it.key() ) || initialLoad );
   }
 }
 
@@ -128,19 +128,19 @@ void ObjectTypeSelector::save( QSync::Group group )
 GroupConfigCommon::GroupConfigCommon( TQWidget *parent )
   : TQWidget( parent )
 {
-  TQGridLayout *layout = new TQGridLayout( this, 2, 2, KDialog::marginHint(), KDialog::spacingHint() );
+  TQGridLayout *tqlayout = new TQGridLayout( this, 2, 2, KDialog::marginHint(), KDialog::spacingHint() );
 
-  layout->addWidget( new TQLabel( i18n( "Name:" ), this ), 0, 0 );
+  tqlayout->addWidget( new TQLabel( i18n( "Name:" ), this ), 0, 0 );
 
   mGroupName = new KLineEdit( this );
-  layout->addWidget( mGroupName, 0, 1 );
+  tqlayout->addWidget( mGroupName, 0, 1 );
 
-  layout->addWidget( new TQLabel( i18n( "Object Types to be Synchronized:"), this ), 1, 0, Qt::AlignTop );
+  tqlayout->addWidget( new TQLabel( i18n( "Object Types to be Synchronized:"), this ), 1, 0, Qt::AlignTop );
 
   mObjectTypeSelector = new ObjectTypeSelector( this );
-  layout->addWidget( mObjectTypeSelector, 1, 1 );
+  tqlayout->addWidget( mObjectTypeSelector, 1, 1 );
 
-  layout->setRowStretch( 2, 1 );
+  tqlayout->setRowStretch( 2, 1 );
 }
 
 void GroupConfigCommon::setSyncProcess( SyncProcess *syncProcess )
diff --git a/kitchensync/src/groupitem.cpp b/kitchensync/src/groupitem.cpp
index 784991c6..0a27fb9e 100644
--- a/kitchensync/src/groupitem.cpp
+++ b/kitchensync/src/groupitem.cpp
@@ -50,7 +50,7 @@ GroupItem::GroupItem( KWidgetList *parent, SyncProcess *process )
   boldFont.setBold( true );
   boldFont.setPointSize( boldFont.pointSize() + 2 );
 
-  TQGridLayout *layout = new TQGridLayout( this, 4, 4, KDialog::marginHint(), KDialog::spacingHint() );
+  TQGridLayout *tqlayout = new TQGridLayout( this, 4, 4, KDialog::marginHint(), KDialog::spacingHint() );
 
   mBox = new TQVBox( this );
   mBox->setMargin( 5 );
@@ -71,36 +71,36 @@ GroupItem::GroupItem( KWidgetList *parent, SyncProcess *process )
 
   mIcon = new TQLabel( hbox );
   mIcon->setPixmap( icon );
-  mIcon->setFixedSize( mIcon->sizeHint() );
-  mIcon->setPaletteBackgroundColor( colorGroup().mid() );
+  mIcon->setFixedSize( mIcon->tqsizeHint() );
+  mIcon->setPaletteBackgroundColor( tqcolorGroup().mid() );
 
   mGroupName = new TQLabel( hbox );
-  mGroupName->setAlignment( AlignLeft | AlignVCenter );
+  mGroupName->tqsetAlignment( AlignLeft | AlignVCenter );
   mGroupName->setIndent( KDialog::spacingHint() );
   mGroupName->setFont( boldFont );
-  mGroupName->setPaletteForegroundColor( colorGroup().light() );
-  mGroupName->setPaletteBackgroundColor( colorGroup().mid() );
+  mGroupName->setPaletteForegroundColor( tqcolorGroup().light() );
+  mGroupName->setPaletteBackgroundColor( tqcolorGroup().mid() );
 
   mStatus = new TQLabel( hbox );
-  mStatus->setAlignment( Qt::AlignRight );
-  mStatus->setAlignment( AlignRight | AlignVCenter );
+  mStatus->tqsetAlignment( Qt::AlignRight );
+  mStatus->tqsetAlignment( AlignRight | AlignVCenter );
   mStatus->setIndent( KDialog::spacingHint() );
   mStatus->setFont( boldFont );
-  mStatus->setPaletteForegroundColor( colorGroup().light() );
-  mStatus->setPaletteBackgroundColor( colorGroup().mid() );
+  mStatus->setPaletteForegroundColor( tqcolorGroup().light() );
+  mStatus->setPaletteBackgroundColor( tqcolorGroup().mid() );
   mStatus->setText( i18n( "Ready" ) );
 
-  hbox->setPaletteBackgroundColor( colorGroup().mid() );
-  hbox->setMaximumHeight( hbox->minimumSizeHint().height() );
+  hbox->setPaletteBackgroundColor( tqcolorGroup().mid() );
+  hbox->setMaximumHeight( hbox->tqminimumSizeHint().height() );
 
-  layout->addMultiCellWidget( hbox, 0, 0, 0, 3 );
-  layout->addMultiCellWidget( mBox, 1, 1, 0, 3 );
-  layout->addWidget( mTime, 2, 0 );
-  layout->addWidget( mSyncAction, 2, 1 );
-  layout->addWidget( mConfigureAction, 2, 2 );
-  layout->addWidget( mProgressBar, 2, 3 );
-  layout->setColStretch( 0, 1 );
-  layout->setRowStretch( 3, 1 );
+  tqlayout->addMultiCellWidget( hbox, 0, 0, 0, 3 );
+  tqlayout->addMultiCellWidget( mBox, 1, 1, 0, 3 );
+  tqlayout->addWidget( mTime, 2, 0 );
+  tqlayout->addWidget( mSyncAction, 2, 1 );
+  tqlayout->addWidget( mConfigureAction, 2, 2 );
+  tqlayout->addWidget( mProgressBar, 2, 3 );
+  tqlayout->setColStretch( 0, 1 );
+  tqlayout->setRowStretch( 3, 1 );
 
   setPaletteBackgroundColor( kapp->palette().active().base() );
 
@@ -157,7 +157,7 @@ void GroupItem::update()
   for ( ; memberIt != memberEndIt; ++memberIt ) {
     MemberItem *item = new MemberItem( mBox, mSyncProcess, *memberIt );
     item->show();
-    item->setStatusMessage( i18n( "Ready" ) );
+    item->seStatusMessage( i18n( "Ready" ) );
     mMemberItems.append( item );
   }
 }
@@ -259,7 +259,7 @@ void GroupItem::engine( const QSync::SyncEngineUpdate &update )
       break;
     case QSync::SyncEngineUpdate::SyncSuccessfull:
       mStatus->setText( i18n( "Successfully synchronized" ) );
-      mSyncProcess->group().setLastSynchronization( TQDateTime::currentDateTime() );
+      mSyncProcess->group().setLastSynchronization( TQDateTime::tqcurrentDateTime() );
       mSyncProcess->group().save();
       this->update();
 
@@ -286,31 +286,31 @@ void GroupItem::member( const QSync::SyncMemberUpdate &update )
     if ( (*it)->member() == update.member() ) {
       switch ( update.type() ) {
         case QSync::SyncMemberUpdate::Connected:
-          (*it)->setStatusMessage( i18n( "Connected" ) );
+          (*it)->seStatusMessage( i18n( "Connected" ) );
           break;
         case QSync::SyncMemberUpdate::SentChanges:
-          (*it)->setStatusMessage( i18n( "Changes read" ) );
+          (*it)->seStatusMessage( i18n( "Changes read" ) );
           break;
         case QSync::SyncMemberUpdate::CommittedAll:
-          (*it)->setStatusMessage( i18n( "Changes written" ) );
+          (*it)->seStatusMessage( i18n( "Changes written" ) );
           break;
         case QSync::SyncMemberUpdate::Disconnected:
-          (*it)->setStatusMessage( i18n( "Disconnected" ) );
+          (*it)->seStatusMessage( i18n( "Disconnected" ) );
           break;
         case QSync::SyncMemberUpdate::ConnectError:
-          (*it)->setStatusMessage( i18n( "Error: %1" ).arg( update.result().message() ) );
+          (*it)->seStatusMessage( i18n( "Error: %1" ).arg( update.result().message() ) );
           break;
         case QSync::SyncMemberUpdate::GetChangesError:
-          (*it)->setStatusMessage( i18n( "Error: %1" ).arg( update.result().message() ) );
+          (*it)->seStatusMessage( i18n( "Error: %1" ).arg( update.result().message() ) );
           break;
         case QSync::SyncMemberUpdate::CommittedAllError:
-          (*it)->setStatusMessage( i18n( "Error: %1" ).arg( update.result().message() ) );
+          (*it)->seStatusMessage( i18n( "Error: %1" ).arg( update.result().message() ) );
           break;
         case QSync::SyncMemberUpdate::SyncDoneError:
-          (*it)->setStatusMessage( i18n( "Error: %1" ).arg( update.result().message() ) );
+          (*it)->seStatusMessage( i18n( "Error: %1" ).arg( update.result().message() ) );
           break;
         case QSync::SyncMemberUpdate::DisconnectedError:
-          (*it)->setStatusMessage( i18n( "Error: %1" ).arg( update.result().message() ) );
+          (*it)->seStatusMessage( i18n( "Error: %1" ).arg( update.result().message() ) );
           break;
         default:
           break;
@@ -358,17 +358,17 @@ MemberItem::MemberItem( TQWidget *parent, SyncProcess *process,
 
   QSync::Plugin plugin = member.plugin();
 
-  TQVBoxLayout *layout = new TQVBoxLayout( this );
+  TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
 
   TQHBox* box = new TQHBox( this );
   box->setMargin( 5 );
   box->setSpacing( 6 );
-  layout->addWidget( box );
+  tqlayout->addWidget( box );
 
   mIcon = new TQLabel( box );
   mIcon->setPixmap( icon );
-  mIcon->setAlignment( Qt::AlignTop );
-  mIcon->setFixedWidth( mIcon->sizeHint().width() );
+  mIcon->tqsetAlignment( Qt::AlignTop );
+  mIcon->setFixedWidth( mIcon->tqsizeHint().width() );
 
   TQVBox *nameBox = new TQVBox( box );
   mMemberName = new TQLabel( nameBox );
@@ -381,7 +381,7 @@ MemberItem::MemberItem( TQWidget *parent, SyncProcess *process,
   mDescription->setText( plugin.longName() );
 }
 
-void MemberItem::setStatusMessage( const TQString &msg )
+void MemberItem::seStatusMessage( const TQString &msg )
 {
   mStatus->setText( msg );
 }
diff --git a/kitchensync/src/groupitem.h b/kitchensync/src/groupitem.h
index 5f2543a7..dc724890 100644
--- a/kitchensync/src/groupitem.h
+++ b/kitchensync/src/groupitem.h
@@ -96,7 +96,7 @@ class MemberItem : public QWidget
     SyncProcess* syncProcess() const { return mSyncProcess; }
     QSync::Member member() const { return mMember; }
 
-    void setStatusMessage( const TQString &msg );
+    void seStatusMessage( const TQString &msg );
 
   private:
     SyncProcess *mSyncProcess;
diff --git a/kitchensync/src/kwidgetlist.cpp b/kitchensync/src/kwidgetlist.cpp
index d34fcb2b..e8c1b791 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.contains( item ) ) {
+  if ( !d->mItems.tqcontains( 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.contains( item ) == 0 )
+  if ( d->mItems.tqcontains( item ) == 0 )
     return;
 
   if ( d->mSelectedItem )
diff --git a/kitchensync/src/multiconflictdialog.cpp b/kitchensync/src/multiconflictdialog.cpp
index 7d7805c4..e7c03761 100644
--- a/kitchensync/src/multiconflictdialog.cpp
+++ b/kitchensync/src/multiconflictdialog.cpp
@@ -37,10 +37,10 @@ class ChangeItem : public KWidgetListItem
       : KWidgetListItem( parent ),
         mChange( change )
     {
-      TQGridLayout *layout = new TQGridLayout( this, 2, 1, KDialog::marginHint(), KDialog::spacingHint() );
+      TQGridLayout *tqlayout = new TQGridLayout( this, 2, 1, KDialog::marginHint(), KDialog::spacingHint() );
 
       MemberInfo mi( change.member() );
-      layout->addWidget( new TQLabel( mi.name(), this ), 0, 0 );
+      tqlayout->addWidget( new TQLabel( mi.name(), this ), 0, 0 );
 
       TQString type;
       switch ( change.changeType() ) {
@@ -62,7 +62,7 @@ class ChangeItem : public KWidgetListItem
           break;
       }
 
-      layout->addWidget( new TQLabel( type, this ), 1, 0 );
+      tqlayout->addWidget( new TQLabel( type, this ), 1, 0 );
     }
 
     QSync::SyncChange change() const { return mChange; }
@@ -118,24 +118,24 @@ void MultiConflictDialog::ignoreChange()
 
 void MultiConflictDialog::initGUI()
 {
-  TQGridLayout *layout = new TQGridLayout( this, 3, 3, KDialog::marginHint(), KDialog::spacingHint() );
+  TQGridLayout *tqlayout = new TQGridLayout( this, 3, 3, KDialog::marginHint(), KDialog::spacingHint() );
 
-  layout->addMultiCellWidget( new TQLabel( i18n( "A conflict has appeared, please solve it manually." ), this ), 0, 0, 0, 2 );
+  tqlayout->addMultiCellWidget( new TQLabel( i18n( "A conflict has appeared, please solve it manually." ), this ), 0, 0, 0, 2 );
 
   mWidgetList = new KWidgetList( this );
-  layout->addMultiCellWidget( mWidgetList, 1, 1, 0, 2 );
+  tqlayout->addMultiCellWidget( mWidgetList, 1, 1, 0, 2 );
 
   TQPushButton *button = new TQPushButton( i18n( "Use Selected Item" ), this );
   connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( useSelectedChange() ) );
-  layout->addWidget( button, 2, 0 );
+  tqlayout->addWidget( button, 2, 0 );
 
   button = new TQPushButton( i18n( "Duplicate Items" ), this );
   connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( duplicateChange() ) );
-  layout->addWidget( button, 2, 1 );
+  tqlayout->addWidget( button, 2, 1 );
 
   button = new TQPushButton( i18n( "Ignore Conflict" ), this );
   connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( ignoreChange() ) );
-  layout->addWidget( button, 2, 2 );
+  tqlayout->addWidget( button, 2, 2 );
 }
 
 #include "multiconflictdialog.moc"
diff --git a/kitchensync/src/part.cpp b/kitchensync/src/part.cpp
index f66eece6..0e5c5c0c 100644
--- a/kitchensync/src/part.cpp
+++ b/kitchensync/src/part.cpp
@@ -36,14 +36,14 @@
 typedef KParts::GenericFactory< KitchenSyncPart > KitchenSyncFactory;
 K_EXPORT_COMPONENT_FACTORY( libkitchensyncpart, KitchenSyncFactory )
 
-KitchenSyncPart::KitchenSyncPart( TQWidget *parentWidget, const char *widgetName,
+KitchenSyncPart::KitchenSyncPart( TQWidget *tqparentWidget, const char *widgetName,
                                   TQObject *parent, const char *name,
                                   const TQStringList& )
   : KParts::ReadOnlyPart( parent, name )
 {
   setInstance( KitchenSyncFactory::instance() );
 
-  TQVBox *canvas = new TQVBox( parentWidget, widgetName );
+  TQVBox *canvas = new TQVBox( tqparentWidget, widgetName );
   setWidget( canvas );
 
   new MainWidget( this, canvas );
diff --git a/kitchensync/src/part.h b/kitchensync/src/part.h
index 3e053bbd..d9e03a3f 100644
--- a/kitchensync/src/part.h
+++ b/kitchensync/src/part.h
@@ -32,7 +32,7 @@ class KitchenSyncPart: public KParts::ReadOnlyPart
   Q_OBJECT
 
   public:
-    KitchenSyncPart( TQWidget *parentWidget, const char *widgetName,
+    KitchenSyncPart( TQWidget *tqparentWidget, const char *widgetName,
                      TQObject *parent, const char *name, const TQStringList& );
     virtual ~KitchenSyncPart();
 
diff --git a/kitchensync/src/pluginpicker.cpp b/kitchensync/src/pluginpicker.cpp
index d981599b..d8d6c46d 100644
--- a/kitchensync/src/pluginpicker.cpp
+++ b/kitchensync/src/pluginpicker.cpp
@@ -38,11 +38,11 @@ PluginItem::PluginItem( KWidgetList *list, const QSync::Plugin &plugin )
   : KWidgetListItem( list ), mPlugin( plugin )
 {
   TQString iconName = MemberInfo::pluginIconName( mPlugin.name() );
-  TQGridLayout *layout = new TQGridLayout( this, 2, 2, KDialog::marginHint(), KDialog::spacingHint() );
+  TQGridLayout *tqlayout = new TQGridLayout( this, 2, 2, KDialog::marginHint(), KDialog::spacingHint() );
 
   TQLabel *icon = new TQLabel( this );
   icon->setPixmap( KGlobal::iconLoader()->loadIcon( iconName, KIcon::Desktop ) );
-  icon->setFixedSize( icon->sizeHint() );
+  icon->setFixedSize( icon->tqsizeHint() );
 
   TQLabel *name = new TQLabel( plugin.longName(), this );
   TQLabel *description = new TQLabel( plugin.description(), this );
@@ -51,19 +51,19 @@ PluginItem::PluginItem( KWidgetList *list, const QSync::Plugin &plugin )
   font.setBold( true );
   name->setFont( font );
 
-  layout->addWidget( icon, 0, 0 );
-  layout->addWidget( name, 0, 1 );
-  layout->addWidget( description, 1, 1 );
+  tqlayout->addWidget( icon, 0, 0 );
+  tqlayout->addWidget( name, 0, 1 );
+  tqlayout->addWidget( description, 1, 1 );
 }
 
 
 PluginPicker::PluginPicker( TQWidget *parent )
   : TQWidget( parent )
 {
-  TQBoxLayout *layout = new TQVBoxLayout( this );
+  TQBoxLayout *tqlayout = new TQVBoxLayout( this );
 
   mPluginList = new KWidgetList( this );
-  layout->addWidget( mPluginList );
+  tqlayout->addWidget( mPluginList );
 
   connect( mPluginList, TQT_SIGNAL( doubleClicked( KWidgetListItem* ) ),
            TQT_SIGNAL( selected() ) );
diff --git a/kitchensync/src/singleconflictdialog.cpp b/kitchensync/src/singleconflictdialog.cpp
index 8975b6f9..f9228e17 100644
--- a/kitchensync/src/singleconflictdialog.cpp
+++ b/kitchensync/src/singleconflictdialog.cpp
@@ -96,28 +96,28 @@ void SingleConflictDialog::ignoreChange()
 
 void SingleConflictDialog::initGUI()
 {
-  TQGridLayout *layout = new TQGridLayout( this, 3, 4, KDialog::marginHint(), KDialog::spacingHint() );
+  TQGridLayout *tqlayout = new TQGridLayout( this, 3, 4, KDialog::marginHint(), KDialog::spacingHint() );
 
-  layout->addMultiCellWidget( new TQLabel( i18n( "A conflict has appeared, please solve it manually." ), this ), 0, 0, 0, 3 );
+  tqlayout->addMultiCellWidget( new TQLabel( i18n( "A conflict has appeared, please solve it manually." ), this ), 0, 0, 0, 3 );
   mDiffAlgoDisplay = new KSync::HTMLDiffAlgoDisplay( this );
 
-  layout->addMultiCellWidget( mDiffAlgoDisplay, 1, 1, 0, 3 );
+  tqlayout->addMultiCellWidget( mDiffAlgoDisplay, 1, 1, 0, 3 );
 
   TQPushButton *button = new TQPushButton( i18n( "Use Item" ), this );
   connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( useFirstChange() ) );
-  layout->addWidget( button, 2, 0 );
+  tqlayout->addWidget( button, 2, 0 );
 
   button = new TQPushButton( i18n( "Duplicate Items" ), this );
   connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( duplicateChange() ) );
-  layout->addWidget( button, 2, 1 );
+  tqlayout->addWidget( button, 2, 1 );
 
   button = new TQPushButton( i18n( "Ignore Conflict" ), this );
   connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( ignoreChange() ) );
-  layout->addWidget( button, 2, 2 );
+  tqlayout->addWidget( button, 2, 2 );
 
   button = new TQPushButton( i18n( "Use Item" ), this );
   connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( useSecondChange() ) );
-  layout->addWidget( button, 2, 3 );
+  tqlayout->addWidget( button, 2, 3 );
 }
 
 #include "singleconflictdialog.moc"
diff --git a/kitchensync/src/syncprocess.cpp b/kitchensync/src/syncprocess.cpp
index 60310b80..924151bd 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.contains( objectTypes[ i ] ) ) {
+    if ( activeObjectTypes.tqcontains( objectTypes[ i ] ) ) {
       kdDebug() << "Enabled object type: " <<  objectTypes[ i ] << endl;
       /*
        * This is not required. Also this lead to filtering problems when sync with "file-sync".