rename the following methods:

tqparent parent
tqmask mask


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

64 files changed, 173 insertions, 173 deletions

diff --git a/kitchensync/src/aboutpage.cpp b/kitchensync/src/aboutpage.cpp
index 1590338c2..6055864a2 100644
--- a/kitchensync/src/aboutpage.cpp
+++ b/kitchensync/src/aboutpage.cpp
@@ -48,8 +48,8 @@ static TQString readFile( const TQString &fileName )
   return content;
 }
 
-AboutPage::AboutPage( TQWidget *tqparent )
-  : TQWidget( tqparent, "AboutPage" )
+AboutPage::AboutPage( TQWidget *parent )
+  : TQWidget( parent, "AboutPage" )
 {
   TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
 
diff --git a/kitchensync/src/aboutpage.h b/kitchensync/src/aboutpage.h
index 9da3a72b9..ce813c206 100644
--- a/kitchensync/src/aboutpage.h
+++ b/kitchensync/src/aboutpage.h
@@ -31,7 +31,7 @@ class AboutPage : public TQWidget
   TQ_OBJECT
 
   public:
-    AboutPage( TQWidget *tqparent );
+    AboutPage( TQWidget *parent );
 
   signals:
     void addGroup();
diff --git a/kitchensync/src/configgui.cpp b/kitchensync/src/configgui.cpp
index 2fb7ef18d..6e2aa5d70 100644
--- a/kitchensync/src/configgui.cpp
+++ b/kitchensync/src/configgui.cpp
@@ -49,8 +49,8 @@
 #include <tqlabel.h>
 #include <tqtextedit.h>
 
-ConfigGui::ConfigGui( const QSync::Member &member, TQWidget *tqparent )
-  : TQWidget( tqparent ), mMember( member )
+ConfigGui::ConfigGui( const QSync::Member &member, TQWidget *parent )
+  : TQWidget( parent ), mMember( member )
 {
   mTopLayout = new TQVBoxLayout( this );
   mTopLayout->setSpacing( KDialog::spacingHint() );
@@ -76,49 +76,49 @@ TQString ConfigGui::instanceName() const
 }
 
 ConfigGui *ConfigGui::Factory::create( const QSync::Member &member,
-  TQWidget *tqparent )
+  TQWidget *parent )
 {
   TQString name = member.pluginName();
   if ( name == "file-sync" ) {
-    return new ConfigGuiFile( member, tqparent );
+    return new ConfigGuiFile( member, parent );
   } else if ( name == "palm-sync" ) {
-    return new ConfigGuiPalm( member, tqparent );
+    return new ConfigGuiPalm( member, parent );
   } else if ( name == "irmc-sync" ) {
-    return new ConfigGuiIRMC( member, tqparent );
+    return new ConfigGuiIRMC( member, parent );
   } else if ( name == "syncml-obex-client" ) {
-    return new ConfigGuiSyncmlObex( member, tqparent );
+    return new ConfigGuiSyncmlObex( member, parent );
   } else if ( name == "syncml-http-server" ) {
-    return new ConfigGuiSyncmlHttp( member, tqparent );
+    return new ConfigGuiSyncmlHttp( member, parent );
   } else if ( name == "opie-sync" ) {
-    return new ConfigGuiOpie( member, tqparent );
+    return new ConfigGuiOpie( member, parent );
   } else if ( name == "gnokii-sync" ) {
-    return new ConfigGuiGnokii( member, tqparent );
+    return new ConfigGuiGnokii( member, parent );
   } else if ( name == "gpe-sync" ) {
-    return new ConfigGuiGpe( member, tqparent );
+    return new ConfigGuiGpe( member, parent );
   } else if ( name == "google-calendar" ) {
-    return new ConfigGuiGoogleCalendar( member, tqparent );
+    return new ConfigGuiGoogleCalendar( member, parent );
   } else if ( name == "ldap-sync" ) {
-    return new ConfigGuiLdap( member, tqparent );
+    return new ConfigGuiLdap( member, parent );
   } else if ( name == "kdepim-sync" ) {
-    return new ConfigGuiBlank( member, tqparent ); 
+    return new ConfigGuiBlank( member, parent ); 
   } else if ( name == "jescs-sync" ) {
-    return new ConfigGuiJescs( member, tqparent );
+    return new ConfigGuiJescs( member, parent );
   } else if ( name == "evo2-sync" ) {
-    return new ConfigGuiEvo2( member, tqparent );
+    return new ConfigGuiEvo2( member, parent );
   } else if ( name == "moto-sync" ) {
-    return new ConfigGuiMoto( member, tqparent );
+    return new ConfigGuiMoto( member, parent );
   } else if ( name == "synce-plugin" ) {
-    return new ConfigGuiSynce( member, tqparent );
+    return new ConfigGuiSynce( member, parent );
   } else if ( name == "sunbird-sync" ) {
-    return new ConfigGuiSunbird( member, tqparent );
+    return new ConfigGuiSunbird( member, parent );
   } else {
-    return new ConfigGuiXml( member, tqparent );
+    return new ConfigGuiXml( member, parent );
   }
 }
 
 
-ConfigGuiXml::ConfigGuiXml( const QSync::Member &member, TQWidget *tqparent )
-  : ConfigGui( member, tqparent )
+ConfigGuiXml::ConfigGuiXml( const QSync::Member &member, TQWidget *parent )
+  : ConfigGui( member, parent )
 {
   mTextEdit = new TQTextEdit( this );
   topLayout()->addWidget( mTextEdit );  
diff --git a/kitchensync/src/configgui.h b/kitchensync/src/configgui.h
index 9f784dc2b..6b7b1b105 100644
--- a/kitchensync/src/configgui.h
+++ b/kitchensync/src/configgui.h
@@ -32,12 +32,12 @@ class TQTextEdit;
 class ConfigGui : public TQWidget
 {
   public:
-    ConfigGui( const QSync::Member &, TQWidget *tqparent );
+    ConfigGui( const QSync::Member &, TQWidget *parent );
 
     class Factory
     {
       public:
-        static ConfigGui *create( const QSync::Member &, TQWidget *tqparent );
+        static ConfigGui *create( const QSync::Member &, TQWidget *parent );
     };
 
     void setInstanceName( const TQString & );
@@ -60,7 +60,7 @@ class ConfigGui : public TQWidget
 class ConfigGuiXml : public ConfigGui
 {
   public:
-    ConfigGuiXml( const QSync::Member &, TQWidget *tqparent );
+    ConfigGuiXml( const QSync::Member &, TQWidget *parent );
 
     void load( const TQString & );
     TQString save() const;
diff --git a/kitchensync/src/configguiblank.cpp b/kitchensync/src/configguiblank.cpp
index e5e60f201..3e9d47b65 100644
--- a/kitchensync/src/configguiblank.cpp
+++ b/kitchensync/src/configguiblank.cpp
@@ -26,8 +26,8 @@
 #include <tqlabel.h>
 #include <tqlayout.h>
 
-ConfigGuiBlank::ConfigGuiBlank( const QSync::Member &member, TQWidget *tqparent )
-  : ConfigGui( member, tqparent )
+ConfigGuiBlank::ConfigGuiBlank( const QSync::Member &member, TQWidget *parent )
+  : ConfigGui( member, parent )
 {
   TQLabel *label = new TQLabel( i18n( "This member/plugin needs no configuration." ), this );
   topLayout()->addWidget( label );
diff --git a/kitchensync/src/configguiblank.h b/kitchensync/src/configguiblank.h
index 738c5adb8..e2048ac79 100644
--- a/kitchensync/src/configguiblank.h
+++ b/kitchensync/src/configguiblank.h
@@ -26,7 +26,7 @@
 class ConfigGuiBlank : public ConfigGui
 {
   public:
-    ConfigGuiBlank( const QSync::Member &member, TQWidget *tqparent = 0 );
+    ConfigGuiBlank( const QSync::Member &member, TQWidget *parent = 0 );
 
     void load( const TQString &xml );
     TQString save() const;
diff --git a/kitchensync/src/configguievo2.cpp b/kitchensync/src/configguievo2.cpp
index 3a6db784e..0c79fedf0 100644
--- a/kitchensync/src/configguievo2.cpp
+++ b/kitchensync/src/configguievo2.cpp
@@ -32,8 +32,8 @@
 #include <kdialog.h>
 #include <klocale.h>
 
-ConfigGuiEvo2::ConfigGuiEvo2( const QSync::Member &member, TQWidget *tqparent )
-  : ConfigGui( member, tqparent )
+ConfigGuiEvo2::ConfigGuiEvo2( const QSync::Member &member, TQWidget *parent )
+  : ConfigGui( member, parent )
 {
   initGUI();
 }
diff --git a/kitchensync/src/configguievo2.h b/kitchensync/src/configguievo2.h
index 5e030aa97..7e3a17679 100644
--- a/kitchensync/src/configguievo2.h
+++ b/kitchensync/src/configguievo2.h
@@ -29,7 +29,7 @@ class KURLRequester;
 class ConfigGuiEvo2 : public ConfigGui
 {
   public:
-    ConfigGuiEvo2( const QSync::Member &, TQWidget *tqparent );
+    ConfigGuiEvo2( const QSync::Member &, TQWidget *parent );
 
     void load( const TQString &xml );
 
diff --git a/kitchensync/src/configguifile.cpp b/kitchensync/src/configguifile.cpp
index fdf4c8ce8..6a8b0402c 100644
--- a/kitchensync/src/configguifile.cpp
+++ b/kitchensync/src/configguifile.cpp
@@ -30,8 +30,8 @@
 #include <tqlabel.h>
 #include <tqdom.h>
 
-ConfigGuiFile::ConfigGuiFile( const QSync::Member &member, TQWidget *tqparent )
-  : ConfigGui( member, tqparent )
+ConfigGuiFile::ConfigGuiFile( const QSync::Member &member, TQWidget *parent )
+  : ConfigGui( member, parent )
 {
   TQBoxLayout *filenameLayout = new TQHBoxLayout( topLayout() );
 
diff --git a/kitchensync/src/configguifile.h b/kitchensync/src/configguifile.h
index 7859fbeee..db9385223 100644
--- a/kitchensync/src/configguifile.h
+++ b/kitchensync/src/configguifile.h
@@ -29,7 +29,7 @@ class TQCheckBox;
 class ConfigGuiFile : public ConfigGui
 {
   public:
-    ConfigGuiFile( const QSync::Member &, TQWidget *tqparent );
+    ConfigGuiFile( const QSync::Member &, TQWidget *parent );
 
     void load( const TQString &xml );
     TQString save() const;
diff --git a/kitchensync/src/configguigcalendar.cpp b/kitchensync/src/configguigcalendar.cpp
index d832157e7..8e8006764 100644
--- a/kitchensync/src/configguigcalendar.cpp
+++ b/kitchensync/src/configguigcalendar.cpp
@@ -29,8 +29,8 @@
 #include <tqdom.h>
 #include <tqlineedit.h>
 
-ConfigGuiGoogleCalendar::ConfigGuiGoogleCalendar( const QSync::Member &member, TQWidget *tqparent )
-  : ConfigGui( member, tqparent )
+ConfigGuiGoogleCalendar::ConfigGuiGoogleCalendar( const QSync::Member &member, TQWidget *parent )
+  : ConfigGui( member, parent )
 {
   TQBoxLayout *userLayout = new TQHBoxLayout( topLayout() );
 
diff --git a/kitchensync/src/configguigcalendar.h b/kitchensync/src/configguigcalendar.h
index 458e948d8..198cf77ca 100644
--- a/kitchensync/src/configguigcalendar.h
+++ b/kitchensync/src/configguigcalendar.h
@@ -29,7 +29,7 @@ class TQLineEdit;
 class ConfigGuiGoogleCalendar : public ConfigGui
 {
   public:
-    ConfigGuiGoogleCalendar( const QSync::Member &, TQWidget *tqparent );
+    ConfigGuiGoogleCalendar( const QSync::Member &, TQWidget *parent );
 
     void load( const TQString &xml );
     TQString save() const;
diff --git a/kitchensync/src/configguignokii.cpp b/kitchensync/src/configguignokii.cpp
index dfc7413e7..84db02752 100644
--- a/kitchensync/src/configguignokii.cpp
+++ b/kitchensync/src/configguignokii.cpp
@@ -34,8 +34,8 @@
 #include <tqdom.h>
 #include <tqvbox.h>
 
-ConfigGuiGnokii::ConfigGuiGnokii( const QSync::Member &member, TQWidget *tqparent )
-  : ConfigGui( member, tqparent )
+ConfigGuiGnokii::ConfigGuiGnokii( const QSync::Member &member, TQWidget *parent )
+  : ConfigGui( member, parent )
 {
   TQGridLayout *tqlayout = new TQGridLayout( topLayout() );
 
diff --git a/kitchensync/src/configguignokii.h b/kitchensync/src/configguignokii.h
index 673dce0a0..d99e19f8b 100644
--- a/kitchensync/src/configguignokii.h
+++ b/kitchensync/src/configguignokii.h
@@ -37,7 +37,7 @@ class ConfigGuiGnokii : public ConfigGui
   TQ_OBJECT
 
   public:
-    ConfigGuiGnokii( const QSync::Member &, TQWidget *tqparent );
+    ConfigGuiGnokii( const QSync::Member &, TQWidget *parent );
 
     void load( const TQString &xml );
     TQString save() const;
diff --git a/kitchensync/src/configguigpe.cpp b/kitchensync/src/configguigpe.cpp
index 260552642..118aed14a 100644
--- a/kitchensync/src/configguigpe.cpp
+++ b/kitchensync/src/configguigpe.cpp
@@ -32,8 +32,8 @@
 #include <klineedit.h>
 #include <klocale.h>
 
-ConfigGuiGpe::ConfigGuiGpe( const QSync::Member &member, TQWidget *tqparent )
-  : ConfigGui( member, tqparent )
+ConfigGuiGpe::ConfigGuiGpe( const QSync::Member &member, TQWidget *parent )
+  : ConfigGui( member, parent )
 {
   initGUI();
 
diff --git a/kitchensync/src/configguigpe.h b/kitchensync/src/configguigpe.h
index 0d4888f60..e1fc10c6e 100644
--- a/kitchensync/src/configguigpe.h
+++ b/kitchensync/src/configguigpe.h
@@ -32,7 +32,7 @@ class KLineEdit;
 class ConfigGuiGpe : public ConfigGui
 {
   public:
-    ConfigGuiGpe( const QSync::Member &, TQWidget *tqparent );
+    ConfigGuiGpe( const QSync::Member &, TQWidget *parent );
 
     void load( const TQString &xml );
     TQString save() const;
diff --git a/kitchensync/src/configguiirmc.cpp b/kitchensync/src/configguiirmc.cpp
index 8bff86fea..721c82d70 100644
--- a/kitchensync/src/configguiirmc.cpp
+++ b/kitchensync/src/configguiirmc.cpp
@@ -42,8 +42,8 @@
 
 #include "configguiirmc.h"
 
-ConfigGuiIRMC::ConfigGuiIRMC( const QSync::Member &member, TQWidget *tqparent )
-  : ConfigGui( member, tqparent )
+ConfigGuiIRMC::ConfigGuiIRMC( const QSync::Member &member, TQWidget *parent )
+  : ConfigGui( member, parent )
 {
   initGUI();
 
diff --git a/kitchensync/src/configguiirmc.h b/kitchensync/src/configguiirmc.h
index 5fe5b454a..572b714cc 100644
--- a/kitchensync/src/configguiirmc.h
+++ b/kitchensync/src/configguiirmc.h
@@ -40,7 +40,7 @@ class ConfigGuiIRMC : public ConfigGui
   TQ_OBJECT
 
   public:
-    ConfigGuiIRMC( const QSync::Member &, TQWidget *tqparent );
+    ConfigGuiIRMC( const QSync::Member &, TQWidget *parent );
 
     void load( const TQString &xml );
     TQString save() const;
diff --git a/kitchensync/src/configguijescs.cpp b/kitchensync/src/configguijescs.cpp
index e284c3e76..b7a94c447 100644
--- a/kitchensync/src/configguijescs.cpp
+++ b/kitchensync/src/configguijescs.cpp
@@ -30,8 +30,8 @@
 #include <kdialog.h>
 #include <klocale.h>
 
-ConfigGuiJescs::ConfigGuiJescs( const QSync::Member &member, TQWidget *tqparent )
-  : ConfigGui( member, tqparent )
+ConfigGuiJescs::ConfigGuiJescs( const QSync::Member &member, TQWidget *parent )
+  : ConfigGui( member, parent )
 {
   initGUI();
 }
diff --git a/kitchensync/src/configguijescs.h b/kitchensync/src/configguijescs.h
index 6884bbbd7..1667900c9 100644
--- a/kitchensync/src/configguijescs.h
+++ b/kitchensync/src/configguijescs.h
@@ -30,7 +30,7 @@ class TQCheckBox;
 class ConfigGuiJescs : public ConfigGui
 {
   public:
-    ConfigGuiJescs( const QSync::Member &, TQWidget *tqparent );
+    ConfigGuiJescs( const QSync::Member &, TQWidget *parent );
 
     void load( const TQString &xml );
 
diff --git a/kitchensync/src/configguildap.cpp b/kitchensync/src/configguildap.cpp
index b5ebd02ea..fd9dad4b6 100644
--- a/kitchensync/src/configguildap.cpp
+++ b/kitchensync/src/configguildap.cpp
@@ -32,8 +32,8 @@
 #include <klineedit.h>
 #include <klocale.h>
 
-ConfigGuiLdap::ConfigGuiLdap( const QSync::Member &member, TQWidget *tqparent )
-  : ConfigGui( member, tqparent )
+ConfigGuiLdap::ConfigGuiLdap( const QSync::Member &member, TQWidget *parent )
+  : ConfigGui( member, parent )
 {
   initGUI();
 
diff --git a/kitchensync/src/configguildap.h b/kitchensync/src/configguildap.h
index 1db94357f..07d97f09d 100644
--- a/kitchensync/src/configguildap.h
+++ b/kitchensync/src/configguildap.h
@@ -39,7 +39,7 @@ class ConfigGuiLdap : public ConfigGui
   TQ_OBJECT
 
   public:
-    ConfigGuiLdap( const QSync::Member &, TQWidget *tqparent );
+    ConfigGuiLdap( const QSync::Member &, TQWidget *parent );
 
     void load( const TQString &xml );
     TQString save() const;
diff --git a/kitchensync/src/configguimoto.cpp b/kitchensync/src/configguimoto.cpp
index b9ec2342c..e461a808f 100644
--- a/kitchensync/src/configguimoto.cpp
+++ b/kitchensync/src/configguimoto.cpp
@@ -29,8 +29,8 @@
 #include <kdialog.h>
 #include <klocale.h>
 
-ConfigGuiMoto::ConfigGuiMoto( const QSync::Member &member, TQWidget *tqparent )
-  : ConfigGui( member, tqparent )
+ConfigGuiMoto::ConfigGuiMoto( const QSync::Member &member, TQWidget *parent )
+  : ConfigGui( member, parent )
 {
   initGUI();
 }
diff --git a/kitchensync/src/configguimoto.h b/kitchensync/src/configguimoto.h
index 1c5cd0f0e..cd588facf 100644
--- a/kitchensync/src/configguimoto.h
+++ b/kitchensync/src/configguimoto.h
@@ -29,7 +29,7 @@ class KLineEdit;
 class ConfigGuiMoto : public ConfigGui
 {
   public:
-    ConfigGuiMoto( const QSync::Member &, TQWidget *tqparent );
+    ConfigGuiMoto( const QSync::Member &, TQWidget *parent );
 
     void load( const TQString &xml );
     TQString save() const;
diff --git a/kitchensync/src/configguiopie.cpp b/kitchensync/src/configguiopie.cpp
index c2b3be2ec..c74623345 100644
--- a/kitchensync/src/configguiopie.cpp
+++ b/kitchensync/src/configguiopie.cpp
@@ -30,8 +30,8 @@
 #include <tqlineedit.h>
 #include <tqspinbox.h>
 
-ConfigGuiOpie::ConfigGuiOpie( const QSync::Member &member, TQWidget *tqparent )
-  : ConfigGui( member, tqparent )
+ConfigGuiOpie::ConfigGuiOpie( const QSync::Member &member, TQWidget *parent )
+  : ConfigGui( member, parent )
 {
   TQGridLayout *tqlayout = new TQGridLayout( topLayout() );
 
diff --git a/kitchensync/src/configguiopie.h b/kitchensync/src/configguiopie.h
index b798de93c..e90f4acfe 100644
--- a/kitchensync/src/configguiopie.h
+++ b/kitchensync/src/configguiopie.h
@@ -30,7 +30,7 @@ class TQSpinBox;
 class ConfigGuiOpie : public ConfigGui
 {
   public:
-    ConfigGuiOpie( const QSync::Member &, TQWidget *tqparent );
+    ConfigGuiOpie( const QSync::Member &, TQWidget *parent );
 
     void load( const TQString &xml );
     TQString save() const;
diff --git a/kitchensync/src/configguipalm.cpp b/kitchensync/src/configguipalm.cpp
index 688e0cc0d..03d87cdb4 100644
--- a/kitchensync/src/configguipalm.cpp
+++ b/kitchensync/src/configguipalm.cpp
@@ -35,8 +35,8 @@
 
 #include "configguipalm.h"
 
-ConfigGuiPalm::ConfigGuiPalm( const QSync::Member &member, TQWidget *tqparent )
-  : ConfigGui( member, tqparent )
+ConfigGuiPalm::ConfigGuiPalm( const QSync::Member &member, TQWidget *parent )
+  : ConfigGui( member, parent )
 {
   initGUI();
 
diff --git a/kitchensync/src/configguipalm.h b/kitchensync/src/configguipalm.h
index 86c797a07..354e5a29f 100644
--- a/kitchensync/src/configguipalm.h
+++ b/kitchensync/src/configguipalm.h
@@ -33,7 +33,7 @@ class TQSpinBox;
 class ConfigGuiPalm : public ConfigGui
 {
   public:
-    ConfigGuiPalm( const QSync::Member &, TQWidget *tqparent );
+    ConfigGuiPalm( const QSync::Member &, TQWidget *parent );
 
     void load( const TQString &xml );
     TQString save() const;
diff --git a/kitchensync/src/configguisunbird.cpp b/kitchensync/src/configguisunbird.cpp
index b77ce93ba..d51101aeb 100644
--- a/kitchensync/src/configguisunbird.cpp
+++ b/kitchensync/src/configguisunbird.cpp
@@ -40,8 +40,8 @@
 #include <klocale.h>
 #include <kfile.h>
 
-ConfigGuiSunbird::ConfigGuiSunbird( const QSync::Member &member, TQWidget *tqparent )
-  : ConfigGui( member, tqparent )
+ConfigGuiSunbird::ConfigGuiSunbird( const QSync::Member &member, TQWidget *parent )
+  : ConfigGui( member, parent )
 {
   TQTabWidget *tabWidget = new TQTabWidget( this );
   topLayout()->addWidget( tabWidget );
@@ -209,14 +209,14 @@ void ConfigGuiSunbird::delWebdavCalendar( WebdavCalendar *calendar )
   calendar->deleteLater();
 }
 
-LocalCalendar::LocalCalendar( TQWidget *tqparent )
-  : TQWidget( tqparent )
+LocalCalendar::LocalCalendar( TQWidget *parent )
+  : TQWidget( parent )
 {
   initGui();
 }
 
-LocalCalendar::LocalCalendar( const TQString &path, const TQString &defaultcal, const TQString &days, TQWidget *tqparent )
-  : TQWidget( tqparent )
+LocalCalendar::LocalCalendar( const TQString &path, const TQString &defaultcal, const TQString &days, TQWidget *parent )
+  : TQWidget( parent )
 {
   initGui();
 
@@ -275,15 +275,15 @@ void LocalCalendar::deleteWidget()
   emit deleteRequest( this );
 }
 
-WebdavCalendar::WebdavCalendar( TQWidget *tqparent )
-  : TQWidget( tqparent )
+WebdavCalendar::WebdavCalendar( TQWidget *parent )
+  : TQWidget( parent )
 {
   initGui();
 };
 
 WebdavCalendar::WebdavCalendar( const TQString &username, const TQString &password, const TQString &url,
-                                const TQString &defaultcal, const TQString &days, TQWidget *tqparent )
-  : TQWidget( tqparent )
+                                const TQString &defaultcal, const TQString &days, TQWidget *parent )
+  : TQWidget( parent )
 {
   initGui();
 
diff --git a/kitchensync/src/configguisunbird.h b/kitchensync/src/configguisunbird.h
index 25ac78a9f..5095a4e02 100644
--- a/kitchensync/src/configguisunbird.h
+++ b/kitchensync/src/configguisunbird.h
@@ -42,10 +42,10 @@ class LocalCalendar : public TQWidget
   TQ_OBJECT
 
   public:
-    LocalCalendar( TQWidget *tqparent = 0 );
+    LocalCalendar( TQWidget *parent = 0 );
     LocalCalendar( const TQString &path,
                    const TQString &defaultcal,
-                   const TQString &days, TQWidget *tqparent = 0 );
+                   const TQString &days, TQWidget *parent = 0 );
 
     KURLRequester *mPathRequester;
     TQCheckBox *mDaysCheckBox;
@@ -69,12 +69,12 @@ class WebdavCalendar : public TQWidget
   TQ_OBJECT
 
   public:
-    WebdavCalendar( TQWidget *tqparent = 0 );
+    WebdavCalendar( TQWidget *parent = 0 );
     WebdavCalendar( const TQString &username,
                     const TQString &password,
                     const TQString &url,
                     const TQString &defaultcal,
-                    const TQString &days, TQWidget *tqparent = 0 );
+                    const TQString &days, TQWidget *parent = 0 );
 
     KLineEdit *mUrl;
     TQCheckBox *mDaysCheckBox;
@@ -100,7 +100,7 @@ class ConfigGuiSunbird : public ConfigGui
   TQ_OBJECT
 
   public:
-    ConfigGuiSunbird( const QSync::Member &, TQWidget *tqparent );
+    ConfigGuiSunbird( const QSync::Member &, TQWidget *parent );
 
     void load( const TQString &xml );
 
diff --git a/kitchensync/src/configguisynce.cpp b/kitchensync/src/configguisynce.cpp
index 5ff5aeacc..898300769 100644
--- a/kitchensync/src/configguisynce.cpp
+++ b/kitchensync/src/configguisynce.cpp
@@ -30,8 +30,8 @@
 #include <kdialog.h>
 #include <klocale.h>
 
-ConfigGuiSynce::ConfigGuiSynce( const QSync::Member &member, TQWidget *tqparent )
-  : ConfigGui( member, tqparent )
+ConfigGuiSynce::ConfigGuiSynce( const QSync::Member &member, TQWidget *parent )
+  : ConfigGui( member, parent )
 {
   initGUI();
 }
diff --git a/kitchensync/src/configguisynce.h b/kitchensync/src/configguisynce.h
index fb318f9d0..680b1b128 100644
--- a/kitchensync/src/configguisynce.h
+++ b/kitchensync/src/configguisynce.h
@@ -31,7 +31,7 @@ class KLineEdit;
 class ConfigGuiSynce : public ConfigGui
 {
   public:
-    ConfigGuiSynce( const QSync::Member &, TQWidget *tqparent );
+    ConfigGuiSynce( const QSync::Member &, TQWidget *parent );
 
     void load( const TQString &xml );
 
diff --git a/kitchensync/src/configguisyncmlhttp.cpp b/kitchensync/src/configguisyncmlhttp.cpp
index 3e1dac1aa..26a8c2241 100644
--- a/kitchensync/src/configguisyncmlhttp.cpp
+++ b/kitchensync/src/configguisyncmlhttp.cpp
@@ -35,8 +35,8 @@
 #include <tqtabwidget.h>
 #include <tqvbox.h>
 
-ConfigGuiSyncmlHttp::ConfigGuiSyncmlHttp( const QSync::Member &member, TQWidget *tqparent )
-  : ConfigGui( member, tqparent ), mUrl( 0 ), mPort( 0 )
+ConfigGuiSyncmlHttp::ConfigGuiSyncmlHttp( const QSync::Member &member, TQWidget *parent )
+  : ConfigGui( member, parent ), mUrl( 0 ), mPort( 0 )
 {
 
   TQTabWidget *tabWidget = new TQTabWidget( this );
@@ -137,12 +137,12 @@ ConfigGuiSyncmlHttp::ConfigGuiSyncmlHttp( const QSync::Member &member, TQWidget
   topLayout()->addStretch( 1 );
 }
 
-void ConfigGuiSyncmlHttp::addLineEdit( TQWidget *tqparent, const TQString &text, KComboBox **edit, int row )
+void ConfigGuiSyncmlHttp::addLineEdit( TQWidget *parent, const TQString &text, KComboBox **edit, int row )
 {
-  TQLabel *label = new TQLabel( text, tqparent);
+  TQLabel *label = new TQLabel( text, parent);
   mGridLayout->addWidget( label, row, 0 );
 
-  *edit = new KComboBox( true, tqparent );
+  *edit = new KComboBox( true, parent );
   mGridLayout->addWidget( *edit, row, 1 );
 }
 
diff --git a/kitchensync/src/configguisyncmlhttp.h b/kitchensync/src/configguisyncmlhttp.h
index de71586d5..accff70e8 100644
--- a/kitchensync/src/configguisyncmlhttp.h
+++ b/kitchensync/src/configguisyncmlhttp.h
@@ -39,7 +39,7 @@ class ConfigGuiSyncmlHttp : public ConfigGui
   TQ_OBJECT
 
   public:
-    ConfigGuiSyncmlHttp( const QSync::Member &, TQWidget *tqparent );
+    ConfigGuiSyncmlHttp( const QSync::Member &, TQWidget *parent );
 
     void load( const TQString &xml );
     TQString save() const;
@@ -62,7 +62,7 @@ class ConfigGuiSyncmlHttp : public ConfigGui
     KComboBox *mNoteDb;
 
   protected slots:
-    void addLineEdit( TQWidget *tqparent, const TQString &text, KComboBox **edit, int row );
+    void addLineEdit( TQWidget *parent, const TQString &text, KComboBox **edit, int row );
 };
 
 #endif
diff --git a/kitchensync/src/configguisyncmlobex.cpp b/kitchensync/src/configguisyncmlobex.cpp
index 1bb4bdaf1..61833b4eb 100644
--- a/kitchensync/src/configguisyncmlobex.cpp
+++ b/kitchensync/src/configguisyncmlobex.cpp
@@ -37,8 +37,8 @@
 #include <tqtabwidget.h>
 #include <tqvbox.h>
 
-ConfigGuiSyncmlObex::ConfigGuiSyncmlObex( const QSync::Member &member, TQWidget *tqparent )
-  : ConfigGui( member, tqparent )
+ConfigGuiSyncmlObex::ConfigGuiSyncmlObex( const QSync::Member &member, TQWidget *parent )
+  : ConfigGui( member, parent )
 {
   TQTabWidget *tabWidget = new TQTabWidget( this );
   topLayout()->addWidget( tabWidget );
@@ -308,12 +308,12 @@ TQString ConfigGuiSyncmlObex::save() const
   return xml;
 }
 
-void ConfigGuiSyncmlObex::addLineEdit( TQWidget *tqparent, const TQString &text, KComboBox **edit, int row )
+void ConfigGuiSyncmlObex::addLineEdit( TQWidget *parent, const TQString &text, KComboBox **edit, int row )
 {
-  TQLabel *label = new TQLabel( text, tqparent );
+  TQLabel *label = new TQLabel( text, parent );
   mGridLayout->addWidget( label, row, 0 );
 
-  *edit = new KComboBox( true, tqparent );
+  *edit = new KComboBox( true, parent );
   mGridLayout->addWidget( *edit, row, 1 );
 }
 
diff --git a/kitchensync/src/configguisyncmlobex.h b/kitchensync/src/configguisyncmlobex.h
index a4e427474..7ee4d3f30 100644
--- a/kitchensync/src/configguisyncmlobex.h
+++ b/kitchensync/src/configguisyncmlobex.h
@@ -41,7 +41,7 @@ class ConfigGuiSyncmlObex : public ConfigGui
   TQ_OBJECT
 
   public:
-    ConfigGuiSyncmlObex( const QSync::Member &, TQWidget *tqparent = 0 );
+    ConfigGuiSyncmlObex( const QSync::Member &, TQWidget *parent = 0 );
 
     void load( const TQString &xml );
     TQString save() const;
@@ -82,7 +82,7 @@ class ConfigGuiSyncmlObex : public ConfigGui
     KComboBox *mNoteDb;
 
   protected slots:
-    void addLineEdit( TQWidget *tqparent, const TQString &text, KComboBox **edit, int row );
+    void addLineEdit( TQWidget *parent, const TQString &text, KComboBox **edit, int row );
 };
 
 #endif
diff --git a/kitchensync/src/conflictdialog.cpp b/kitchensync/src/conflictdialog.cpp
index c3e236ccc..39943ffe4 100644
--- a/kitchensync/src/conflictdialog.cpp
+++ b/kitchensync/src/conflictdialog.cpp
@@ -20,7 +20,7 @@
 
 #include "conflictdialog.h"
 
-ConflictDialog::ConflictDialog( QSync::SyncMapping &mapping, TQWidget *tqparent )
-  : TQDialog( tqparent ), mMapping( mapping )
+ConflictDialog::ConflictDialog( QSync::SyncMapping &mapping, TQWidget *parent )
+  : TQDialog( parent ), mMapping( mapping )
 {
 }
diff --git a/kitchensync/src/conflictdialog.h b/kitchensync/src/conflictdialog.h
index 81c91138b..2e48c0390 100644
--- a/kitchensync/src/conflictdialog.h
+++ b/kitchensync/src/conflictdialog.h
@@ -31,7 +31,7 @@
 class ConflictDialog : public TQDialog
 {
   public:
-    ConflictDialog( QSync::SyncMapping &mapping, TQWidget *tqparent );
+    ConflictDialog( QSync::SyncMapping &mapping, TQWidget *parent );
 
   protected:
     QSync::SyncMapping mMapping;
diff --git a/kitchensync/src/connectionwidgets.cpp b/kitchensync/src/connectionwidgets.cpp
index f6157b6fa..bb25c271d 100644
--- a/kitchensync/src/connectionwidgets.cpp
+++ b/kitchensync/src/connectionwidgets.cpp
@@ -40,8 +40,8 @@
 
 #include "connectionwidgets.h"
 
-BluetoothWidget::BluetoothWidget( TQWidget *tqparent )
-  : TQWidget( tqparent )
+BluetoothWidget::BluetoothWidget( TQWidget *parent )
+  : TQWidget( parent )
 {
   TQGridLayout *tqlayout = new TQGridLayout( this );
 
@@ -100,8 +100,8 @@ TQString BluetoothWidget::channel() const
 }
 
 // FIXME - Only IrMC specific
-IRWidget::IRWidget( TQWidget *tqparent )
-  : TQWidget( tqparent )
+IRWidget::IRWidget( TQWidget *parent )
+  : TQWidget( parent )
 {
   TQGridLayout *tqlayout = new TQGridLayout( this, 3, 3, 11, 3 );
 
@@ -122,10 +122,10 @@ IRWidget::IRWidget( TQWidget *tqparent )
   tqlayout->setRowStretch( 2, 1 );
 }
 
-void IRWidget::load( const TQDomElement &tqparent )
+void IRWidget::load( const TQDomElement &parent )
 {
   TQDomNode node;
-  for ( node = tqparent.firstChild(); !node.isNull(); node = node.nextSibling() ) {
+  for ( node = parent.firstChild(); !node.isNull(); node = node.nextSibling() ) {
     TQDomElement element = node.toElement();
     if ( element.tagName() == "irname" )
       mDevice->setText( element.text() );
@@ -134,20 +134,20 @@ void IRWidget::load( const TQDomElement &tqparent )
   }
 }
 
-void IRWidget::save( TQDomDocument &doc, TQDomElement &tqparent )
+void IRWidget::save( TQDomDocument &doc, TQDomElement &parent )
 {
   TQDomElement element = doc.createElement( "irname" );
   element.appendChild( doc.createTextNode( mDevice->text() ) );
-  tqparent.appendChild( element );
+  parent.appendChild( element );
 
   element = doc.createElement( "irserial" );
   element.appendChild( doc.createTextNode( mSerialNumber->text() ) );
-  tqparent.appendChild( element );
+  parent.appendChild( element );
 }
 
 // FIXME - Only IrMC specific
-CableWidget::CableWidget( TQWidget *tqparent )
-  : TQWidget( tqparent )
+CableWidget::CableWidget( TQWidget *parent )
+  : TQWidget( parent )
 {
   TQGridLayout *tqlayout = new TQGridLayout( this, 3, 2, 11, 3 );
 
@@ -176,10 +176,10 @@ CableWidget::CableWidget( TQWidget *tqparent )
   mDevice->insertItem( "/dev/ttyUSB1" );
 }
 
-void CableWidget::load( const TQDomElement &tqparent )
+void CableWidget::load( const TQDomElement &parent )
 {
   TQDomNode node;
-  for ( node = tqparent.firstChild(); !node.isNull(); node = node.nextSibling() ) {
+  for ( node = parent.firstChild(); !node.isNull(); node = node.nextSibling() ) {
     TQDomElement element = node.toElement();
     if ( element.tagName() == "cabletype" )
       mManufacturer->setCurrentItem( element.text().toInt() );
@@ -188,19 +188,19 @@ void CableWidget::load( const TQDomElement &tqparent )
   }
 }
 
-void CableWidget::save( TQDomDocument &doc, TQDomElement &tqparent )
+void CableWidget::save( TQDomDocument &doc, TQDomElement &parent )
 {
   TQDomElement element = doc.createElement( "cabletype" );
   element.appendChild( doc.createTextNode( TQString::number( mManufacturer->currentItem() ) ) );
-  tqparent.appendChild( element );
+  parent.appendChild( element );
 
   element = doc.createElement( "cabledev" );
   element.appendChild( doc.createTextNode( mDevice->currentText() ) );
-  tqparent.appendChild( element );
+  parent.appendChild( element );
 }
 
-UsbWidget::UsbWidget( TQWidget *tqparent )
-  : TQWidget( tqparent )
+UsbWidget::UsbWidget( TQWidget *parent )
+  : TQWidget( parent )
 {
   TQGridLayout *tqlayout = new TQGridLayout( this, 3, 2, 11, 3);
 
diff --git a/kitchensync/src/connectionwidgets.h b/kitchensync/src/connectionwidgets.h
index 5ffc9bc5e..ec514cb44 100644
--- a/kitchensync/src/connectionwidgets.h
+++ b/kitchensync/src/connectionwidgets.h
@@ -41,7 +41,7 @@ class BluetoothWidget : public TQWidget
   TQ_OBJECT
 
   public:
-    BluetoothWidget( TQWidget *tqparent );
+    BluetoothWidget( TQWidget *parent );
 
     void hideChannel();
     void showChannel();
@@ -63,7 +63,7 @@ class IRWidget : public TQWidget
   TQ_OBJECT
 
   public:
-    IRWidget( TQWidget *tqparent );
+    IRWidget( TQWidget *parent );
 
     void load( const TQDomElement& );
     void save( TQDomDocument&, TQDomElement& );
@@ -76,7 +76,7 @@ class IRWidget : public TQWidget
 class CableWidget : public TQWidget
 {
   public:
-    CableWidget( TQWidget *tqparent );
+    CableWidget( TQWidget *parent );
 
     void load( const TQDomElement& );
     void save( TQDomDocument&, TQDomElement& );
@@ -89,7 +89,7 @@ class CableWidget : public TQWidget
 class UsbWidget : public TQWidget
 {
   public:
-    UsbWidget( TQWidget *tqparent );
+    UsbWidget( TQWidget *parent );
 
     int interface() const;
     void setInterface( int interface );
diff --git a/kitchensync/src/groupconfig.cpp b/kitchensync/src/groupconfig.cpp
index f8f16988c..99ff35fdb 100644
--- a/kitchensync/src/groupconfig.cpp
+++ b/kitchensync/src/groupconfig.cpp
@@ -41,8 +41,8 @@
 #include <tqlayout.h>
 #include <tqpushbutton.h>
 
-GroupConfig::GroupConfig( TQWidget *tqparent )
-  : TQWidget( tqparent )
+GroupConfig::GroupConfig( TQWidget *parent )
+  : TQWidget( parent )
 {
   TQBoxLayout *topLayout = new TQVBoxLayout( this );
   topLayout->setSpacing( KDialog::spacingHint() );
diff --git a/kitchensync/src/groupconfig.h b/kitchensync/src/groupconfig.h
index be19641dc..151fe7948 100644
--- a/kitchensync/src/groupconfig.h
+++ b/kitchensync/src/groupconfig.h
@@ -37,7 +37,7 @@ class GroupConfig : public TQWidget
   TQ_OBJECT
 
   public:
-    GroupConfig( TQWidget *tqparent );
+    GroupConfig( TQWidget *parent );
 
     void setSyncProcess( SyncProcess *process );
 
diff --git a/kitchensync/src/groupconfigcommon.cpp b/kitchensync/src/groupconfigcommon.cpp
index cda75c8cf..5a0cf49d8 100644
--- a/kitchensync/src/groupconfigcommon.cpp
+++ b/kitchensync/src/groupconfigcommon.cpp
@@ -38,8 +38,8 @@
 
 #include "groupconfigcommon.h"
 
-ObjectTypeSelector::ObjectTypeSelector( TQWidget *tqparent )
-  : TQWidget( tqparent )
+ObjectTypeSelector::ObjectTypeSelector( TQWidget *parent )
+  : TQWidget( parent )
 {
   TQGridLayout *tqlayout = new TQGridLayout( this );
   tqlayout->setMargin( 0 );
@@ -125,8 +125,8 @@ void ObjectTypeSelector::save( QSync::Group group )
   config.setActiveObjectTypes( objectTypes );
 }
 
-GroupConfigCommon::GroupConfigCommon( TQWidget *tqparent )
-  : TQWidget( tqparent )
+GroupConfigCommon::GroupConfigCommon( TQWidget *parent )
+  : TQWidget( parent )
 {
   TQGridLayout *tqlayout = new TQGridLayout( this, 2, 2, KDialog::marginHint(), KDialog::spacingHint() );
 
diff --git a/kitchensync/src/groupconfigcommon.h b/kitchensync/src/groupconfigcommon.h
index b406d4519..8b298316f 100644
--- a/kitchensync/src/groupconfigcommon.h
+++ b/kitchensync/src/groupconfigcommon.h
@@ -33,7 +33,7 @@ class TQCheckBox;
 class ObjectTypeSelector : public TQWidget
 {
   public:
-    ObjectTypeSelector( TQWidget *tqparent );
+    ObjectTypeSelector( TQWidget *parent );
 
     void load( const QSync::Group &group );
     void save( QSync::Group group );
@@ -45,7 +45,7 @@ class ObjectTypeSelector : public TQWidget
 class GroupConfigCommon : public TQWidget
 {
   public:
-    GroupConfigCommon( TQWidget *tqparent );
+    GroupConfigCommon( TQWidget *parent );
 
     void setSyncProcess( SyncProcess *syncProcess );
     void save();
diff --git a/kitchensync/src/groupconfigdialog.cpp b/kitchensync/src/groupconfigdialog.cpp
index bf48ce210..4d8be65d0 100644
--- a/kitchensync/src/groupconfigdialog.cpp
+++ b/kitchensync/src/groupconfigdialog.cpp
@@ -26,8 +26,8 @@
 
 #include <tqlayout.h>
 
-GroupConfigDialog::GroupConfigDialog( TQWidget *tqparent, SyncProcess *process )
-  : KDialogBase( tqparent, 0, true, i18n("Configure Synchronization Group"),
+GroupConfigDialog::GroupConfigDialog( TQWidget *parent, SyncProcess *process )
+  : KDialogBase( parent, 0, true, i18n("Configure Synchronization Group"),
      Ok )
 {
   TQFrame *topFrame = makeMainWidget();
diff --git a/kitchensync/src/groupconfigdialog.h b/kitchensync/src/groupconfigdialog.h
index 712f627ae..2871853c6 100644
--- a/kitchensync/src/groupconfigdialog.h
+++ b/kitchensync/src/groupconfigdialog.h
@@ -31,7 +31,7 @@ class GroupConfigDialog : public KDialogBase
   TQ_OBJECT
 
   public:
-    GroupConfigDialog( TQWidget *tqparent, SyncProcess * );
+    GroupConfigDialog( TQWidget *parent, SyncProcess * );
     ~GroupConfigDialog();
 
   protected slots:
diff --git a/kitchensync/src/groupitem.cpp b/kitchensync/src/groupitem.cpp
index 71a8deff9..3a294f5ba 100644
--- a/kitchensync/src/groupitem.cpp
+++ b/kitchensync/src/groupitem.cpp
@@ -40,8 +40,8 @@
 
 #include "groupitem.h"
 
-GroupItem::GroupItem( KWidgetList *tqparent, SyncProcess *process )
-  : KWidgetListItem( tqparent ), mSyncProcess( process ),
+GroupItem::GroupItem( KWidgetList *parent, SyncProcess *process )
+  : KWidgetListItem( parent ), mSyncProcess( process ),
     mCallbackHandler( new QSync::CallbackHandler ),
     mProcessedItems( 0 ), mMaxProcessedItems( 0 ),
     mSynchronizing( false )
@@ -345,9 +345,9 @@ void GroupItem::engineChanged( QSync::Engine *engine )
   this->update();
 }
 
-MemberItem::MemberItem( TQWidget *tqparent, SyncProcess *process,
+MemberItem::MemberItem( TQWidget *parent, SyncProcess *process,
                         const QSync::Member &member )
-  : TQWidget( tqparent ), mSyncProcess( process ), mMember( member )
+  : TQWidget( parent ), mSyncProcess( process ), mMember( member )
 {
   TQFont boldFont;
   boldFont.setBold( true );
diff --git a/kitchensync/src/groupitem.h b/kitchensync/src/groupitem.h
index 0202f13d9..524fa0369 100644
--- a/kitchensync/src/groupitem.h
+++ b/kitchensync/src/groupitem.h
@@ -91,7 +91,7 @@ class GroupItem : public KWidgetListItem
 class MemberItem : public TQWidget
 {
   public:
-    MemberItem( TQWidget *tqparent, SyncProcess *syncProcess,
+    MemberItem( TQWidget *parent, SyncProcess *syncProcess,
                 const QSync::Member &member );
 
     SyncProcess* syncProcess() const { return mSyncProcess; }
diff --git a/kitchensync/src/groupview.cpp b/kitchensync/src/groupview.cpp
index d7afdf10d..8e1adf87e 100644
--- a/kitchensync/src/groupview.cpp
+++ b/kitchensync/src/groupview.cpp
@@ -26,8 +26,8 @@
 
 #include "groupview.h"
 
-GroupView::GroupView( TQWidget *tqparent )
-  : TQWidget( tqparent ), mAboutPage( 0 )
+GroupView::GroupView( TQWidget *parent )
+  : TQWidget( parent ), mAboutPage( 0 )
 {
   mLayout = new TQVBoxLayout( this );
 
diff --git a/kitchensync/src/groupview.h b/kitchensync/src/groupview.h
index 88f8da21f..b3891f675 100644
--- a/kitchensync/src/groupview.h
+++ b/kitchensync/src/groupview.h
@@ -32,7 +32,7 @@ class GroupView : public TQWidget
   TQ_OBJECT
 
   public:
-    GroupView( TQWidget *tqparent );
+    GroupView( TQWidget *parent );
 
     SyncProcess* selectedSyncProcess() const;
 
diff --git a/kitchensync/src/htmldiffalgodisplay.cpp b/kitchensync/src/htmldiffalgodisplay.cpp
index 9094216ee..3a05641dd 100644
--- a/kitchensync/src/htmldiffalgodisplay.cpp
+++ b/kitchensync/src/htmldiffalgodisplay.cpp
@@ -30,8 +30,8 @@ static TQString textToHTML( const TQString &text )
   return TQStyleSheet::convertFromPlainText( text );
 }
 
-HTMLDiffAlgoDisplay::HTMLDiffAlgoDisplay( TQWidget *tqparent )
-  : KTextBrowser( tqparent )
+HTMLDiffAlgoDisplay::HTMLDiffAlgoDisplay( TQWidget *parent )
+  : KTextBrowser( parent )
 {
   setWrapPolicy( TQTextEdit::AtWordBoundary );
   setVScrollBarMode( TQScrollView::AlwaysOff );
diff --git a/kitchensync/src/htmldiffalgodisplay.h b/kitchensync/src/htmldiffalgodisplay.h
index f7964e18c..b3d52259f 100644
--- a/kitchensync/src/htmldiffalgodisplay.h
+++ b/kitchensync/src/htmldiffalgodisplay.h
@@ -32,7 +32,7 @@ namespace KSync {
 class HTMLDiffAlgoDisplay : virtual public DiffAlgoDisplay, public KTextBrowser
 {
   public:
-    HTMLDiffAlgoDisplay( TQWidget *tqparent );
+    HTMLDiffAlgoDisplay( TQWidget *parent );
 
     void begin();
     void end();
diff --git a/kitchensync/src/kwidgetlist.cpp b/kitchensync/src/kwidgetlist.cpp
index 89008f06f..396e144f6 100644
--- a/kitchensync/src/kwidgetlist.cpp
+++ b/kitchensync/src/kwidgetlist.cpp
@@ -38,8 +38,8 @@ class KWidgetList::Private
     TQVBox *mBox;
 };
 
-KWidgetList::KWidgetList( TQWidget *tqparent, const char *name )
-  : TQScrollView( tqparent, name ),
+KWidgetList::KWidgetList( TQWidget *parent, const char *name )
+  : TQScrollView( parent, name ),
     d( new Private )
 {
   d->mBox = new TQVBox( viewport() );
@@ -256,8 +256,8 @@ bool KWidgetList::eventFilter( TQObject *object, TQEvent *event )
   return TQScrollView::eventFilter( object, event );
 }
 
-KWidgetListItem::KWidgetListItem( KWidgetList *tqparent, const char *name )
-  : TQWidget( tqparent, name )
+KWidgetListItem::KWidgetListItem( KWidgetList *parent, const char *name )
+  : TQWidget( parent, name )
 {
   mForegroundColor = KGlobalSettings::textColor();
   mBackgroundColor = KGlobalSettings::baseColor();
diff --git a/kitchensync/src/kwidgetlist.h b/kitchensync/src/kwidgetlist.h
index 89586b891..9fb4915c7 100644
--- a/kitchensync/src/kwidgetlist.h
+++ b/kitchensync/src/kwidgetlist.h
@@ -32,7 +32,7 @@ class KWidgetList : public TQScrollView
   TQ_OBJECT
 
   public:
-    KWidgetList( TQWidget *tqparent = 0, const char *name = 0 );
+    KWidgetList( TQWidget *parent = 0, const char *name = 0 );
     ~KWidgetList();
 
     uint count() const;
@@ -70,7 +70,7 @@ class KWidgetList : public TQScrollView
 class KWidgetListItem : public TQWidget
 {
   public:
-    KWidgetListItem( KWidgetList *tqparent, const char *name = 0 );
+    KWidgetListItem( KWidgetList *parent, const char *name = 0 );
     ~KWidgetListItem();
 
     void setSelected( bool selected );
diff --git a/kitchensync/src/memberconfig.cpp b/kitchensync/src/memberconfig.cpp
index c6da7a3ab..c2216546c 100644
--- a/kitchensync/src/memberconfig.cpp
+++ b/kitchensync/src/memberconfig.cpp
@@ -30,8 +30,8 @@
 #include <tqlayout.h>
 #include <tqtabwidget.h>
 
-MemberConfig::MemberConfig( TQWidget *tqparent, const QSync::Member &member )
-  : TQWidget( tqparent ), mMember( member )
+MemberConfig::MemberConfig( TQWidget *parent, const QSync::Member &member )
+  : TQWidget( parent ), mMember( member )
 {
   TQBoxLayout *topLayout = new TQVBoxLayout( this );
 
diff --git a/kitchensync/src/memberconfig.h b/kitchensync/src/memberconfig.h
index 2e20e63ee..2abc4f4c2 100644
--- a/kitchensync/src/memberconfig.h
+++ b/kitchensync/src/memberconfig.h
@@ -33,7 +33,7 @@ class MemberConfig : public TQWidget
   TQ_OBJECT
 
   public:
-    MemberConfig( TQWidget *tqparent, const QSync::Member & );
+    MemberConfig( TQWidget *parent, const QSync::Member & );
     ~MemberConfig();
 
     void loadData();
diff --git a/kitchensync/src/multiconflictdialog.cpp b/kitchensync/src/multiconflictdialog.cpp
index 35679392d..e7c037610 100644
--- a/kitchensync/src/multiconflictdialog.cpp
+++ b/kitchensync/src/multiconflictdialog.cpp
@@ -33,8 +33,8 @@
 class ChangeItem : public KWidgetListItem
 {
   public:
-    ChangeItem( KWidgetList *tqparent, const QSync::SyncChange &change )
-      : KWidgetListItem( tqparent ),
+    ChangeItem( KWidgetList *parent, const QSync::SyncChange &change )
+      : KWidgetListItem( parent ),
         mChange( change )
     {
       TQGridLayout *tqlayout = new TQGridLayout( this, 2, 1, KDialog::marginHint(), KDialog::spacingHint() );
@@ -71,8 +71,8 @@ class ChangeItem : public KWidgetListItem
     QSync::SyncChange mChange;
 };
 
-MultiConflictDialog::MultiConflictDialog( QSync::SyncMapping &mapping, TQWidget *tqparent )
-  : ConflictDialog( mapping, tqparent )
+MultiConflictDialog::MultiConflictDialog( QSync::SyncMapping &mapping, TQWidget *parent )
+  : ConflictDialog( mapping, parent )
 {
   initGUI();
 
diff --git a/kitchensync/src/multiconflictdialog.h b/kitchensync/src/multiconflictdialog.h
index fd0cdef53..8709ee63a 100644
--- a/kitchensync/src/multiconflictdialog.h
+++ b/kitchensync/src/multiconflictdialog.h
@@ -31,7 +31,7 @@ class MultiConflictDialog : public ConflictDialog
   TQ_OBJECT
 
   public:
-    MultiConflictDialog( QSync::SyncMapping &mapping, TQWidget *tqparent );
+    MultiConflictDialog( QSync::SyncMapping &mapping, TQWidget *parent );
     ~MultiConflictDialog();
 
   private slots:
diff --git a/kitchensync/src/part.cpp b/kitchensync/src/part.cpp
index 70163b421..f66eece63 100644
--- a/kitchensync/src/part.cpp
+++ b/kitchensync/src/part.cpp
@@ -37,9 +37,9 @@ typedef KParts::GenericFactory< KitchenSyncPart > KitchenSyncFactory;
 K_EXPORT_COMPONENT_FACTORY( libkitchensyncpart, KitchenSyncFactory )
 
 KitchenSyncPart::KitchenSyncPart( TQWidget *parentWidget, const char *widgetName,
-                                  TQObject *tqparent, const char *name,
+                                  TQObject *parent, const char *name,
                                   const TQStringList& )
-  : KParts::ReadOnlyPart( tqparent, name )
+  : KParts::ReadOnlyPart( parent, name )
 {
   setInstance( KitchenSyncFactory::instance() );
 
diff --git a/kitchensync/src/part.h b/kitchensync/src/part.h
index 14d612610..eeb113c98 100644
--- a/kitchensync/src/part.h
+++ b/kitchensync/src/part.h
@@ -34,7 +34,7 @@ class KitchenSyncPart: public KParts::ReadOnlyPart
 
   public:
     KitchenSyncPart( TQWidget *parentWidget, const char *widgetName,
-                     TQObject *tqparent, const char *name, const TQStringList& );
+                     TQObject *parent, const char *name, const TQStringList& );
     virtual ~KitchenSyncPart();
 
     static KAboutData *createAboutData();
diff --git a/kitchensync/src/pluginpicker.cpp b/kitchensync/src/pluginpicker.cpp
index 10f311f9d..d8d6c46d5 100644
--- a/kitchensync/src/pluginpicker.cpp
+++ b/kitchensync/src/pluginpicker.cpp
@@ -57,8 +57,8 @@ PluginItem::PluginItem( KWidgetList *list, const QSync::Plugin &plugin )
 }
 
 
-PluginPicker::PluginPicker( TQWidget *tqparent )
-  : TQWidget( tqparent )
+PluginPicker::PluginPicker( TQWidget *parent )
+  : TQWidget( parent )
 {
   TQBoxLayout *tqlayout = new TQVBoxLayout( this );
 
@@ -94,8 +94,8 @@ QSync::Plugin PluginPicker::selectedPlugin() const
 }
 
 
-PluginPickerDialog::PluginPickerDialog( TQWidget *tqparent )
-  : KDialogBase( tqparent, 0, true, i18n("Select Member Type"), Ok | Cancel )
+PluginPickerDialog::PluginPickerDialog( TQWidget *parent )
+  : KDialogBase( parent, 0, true, i18n("Select Member Type"), Ok | Cancel )
 {
   TQFrame *topFrame = makeMainWidget();
 
@@ -114,9 +114,9 @@ QSync::Plugin PluginPickerDialog::selectedPlugin() const
   return mPicker->selectedPlugin();
 }
 
-QSync::Plugin PluginPickerDialog::getPlugin( TQWidget *tqparent )
+QSync::Plugin PluginPickerDialog::getPlugin( TQWidget *parent )
 {
-  PluginPickerDialog dlg( tqparent );
+  PluginPickerDialog dlg( parent );
   if ( dlg.exec() )
     return dlg.selectedPlugin();
   else
diff --git a/kitchensync/src/pluginpicker.h b/kitchensync/src/pluginpicker.h
index fbaed3f26..44564ddb6 100644
--- a/kitchensync/src/pluginpicker.h
+++ b/kitchensync/src/pluginpicker.h
@@ -45,7 +45,7 @@ class PluginPicker : public TQWidget
   TQ_OBJECT
 
   public:
-    PluginPicker( TQWidget *tqparent );
+    PluginPicker( TQWidget *parent );
 
     QSync::Plugin selectedPlugin() const;
 
@@ -65,11 +65,11 @@ class PluginPickerDialog : public KDialogBase
   TQ_OBJECT
 
   public:
-    PluginPickerDialog( TQWidget *tqparent );
+    PluginPickerDialog( TQWidget *parent );
 
     QSync::Plugin selectedPlugin() const;
 
-    static QSync::Plugin getPlugin( TQWidget *tqparent );
+    static QSync::Plugin getPlugin( TQWidget *parent );
 
   protected slots:
     void slotOk();
diff --git a/kitchensync/src/singleconflictdialog.cpp b/kitchensync/src/singleconflictdialog.cpp
index c70402795..f9228e174 100644
--- a/kitchensync/src/singleconflictdialog.cpp
+++ b/kitchensync/src/singleconflictdialog.cpp
@@ -32,8 +32,8 @@
 
 #include "singleconflictdialog.h"
 
-SingleConflictDialog::SingleConflictDialog( QSync::SyncMapping &mapping, TQWidget *tqparent )
-  : ConflictDialog( mapping, tqparent ), mDiffAlgo( 0 )
+SingleConflictDialog::SingleConflictDialog( QSync::SyncMapping &mapping, TQWidget *parent )
+  : ConflictDialog( mapping, parent ), mDiffAlgo( 0 )
 {
   initGUI();
 
diff --git a/kitchensync/src/singleconflictdialog.h b/kitchensync/src/singleconflictdialog.h
index 9c80f7fc6..249620c2d 100644
--- a/kitchensync/src/singleconflictdialog.h
+++ b/kitchensync/src/singleconflictdialog.h
@@ -36,7 +36,7 @@ class SingleConflictDialog : public ConflictDialog
   TQ_OBJECT
 
   public:
-    SingleConflictDialog( QSync::SyncMapping &mapping, TQWidget *tqparent );
+    SingleConflictDialog( QSync::SyncMapping &mapping, TQWidget *parent );
     ~SingleConflictDialog();
 
   private slots: