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

106 files changed, 320 insertions, 320 deletions

diff --git a/kresources/birthdays/resourcekabcconfig.cpp b/kresources/birthdays/resourcekabcconfig.cpp
index 1f55138f..2f7671dc 100644
--- a/kresources/birthdays/resourcekabcconfig.cpp
+++ b/kresources/birthdays/resourcekabcconfig.cpp
@@ -33,8 +33,8 @@
 
 using namespace KCal;
 
-ResourceKABCConfig::ResourceKABCConfig( TQWidget* tqparent,  const char* name )
-    : KRES::ConfigWidget( tqparent, name )
+ResourceKABCConfig::ResourceKABCConfig( TQWidget* parent,  const char* name )
+    : KRES::ConfigWidget( parent, name )
 {
   TQGridLayout *topLayout = new TQGridLayout( this, 5, 1, 11, 6 );
 
diff --git a/kresources/birthdays/resourcekabcconfig.h b/kresources/birthdays/resourcekabcconfig.h
index 81fbdf10..b2e1fb7e 100644
--- a/kresources/birthdays/resourcekabcconfig.h
+++ b/kresources/birthdays/resourcekabcconfig.h
@@ -43,7 +43,7 @@ class ResourceKABCConfig : public KRES::ConfigWidget
     Q_OBJECT
   TQ_OBJECT
   public:
-    ResourceKABCConfig( TQWidget* tqparent = 0, const char* name = 0 );
+    ResourceKABCConfig( TQWidget* parent = 0, const char* name = 0 );
 
   public slots:
     virtual void loadSettings( KRES::Resource *resource);
diff --git a/kresources/blogging/API_Blog.cpp b/kresources/blogging/API_Blog.cpp
index 2ad11c1d..981390fa 100644
--- a/kresources/blogging/API_Blog.cpp
+++ b/kresources/blogging/API_Blog.cpp
@@ -12,8 +12,8 @@
 
 using namespace KBlog;
 
-APIBlog::APIBlog( const KURL &url, TQObject *tqparent, const char *name ) :
-    TQObject( tqparent, name ),
+APIBlog::APIBlog( const KURL &url, TQObject *parent, const char *name ) :
+    TQObject( parent, name ),
     mServerURL( url ), mAppID( TQString() ), mDownloadCount( 20 )
 {}
 
diff --git a/kresources/blogging/API_Blog.h b/kresources/blogging/API_Blog.h
index c3ed7d07..b8229cf8 100644
--- a/kresources/blogging/API_Blog.h
+++ b/kresources/blogging/API_Blog.h
@@ -86,7 +86,7 @@ class APIBlog : public TQObject
     Q_OBJECT
   TQ_OBJECT
   public:
-    APIBlog( const KURL &server, TQObject *tqparent = 0L, const char *name = 0L );
+    APIBlog( const KURL &server, TQObject *parent = 0L, const char *name = 0L );
     virtual ~APIBlog();
     virtual TQString interfaceName() const = 0;
 
diff --git a/kresources/blogging/API_Blogger.h b/kresources/blogging/API_Blogger.h
index 5255e19f..32610bf6 100644
--- a/kresources/blogging/API_Blogger.h
+++ b/kresources/blogging/API_Blogger.h
@@ -32,7 +32,7 @@ namespace KBlog {
 class APIBlogger : public APIBlog
 {
   public:
-    APIBlogger( const KURL &server, TQObject *tqparent = 0L, const char *name = 0L ) : APIBlog( server, tqparent, name ) {}
+    APIBlogger( const KURL &server, TQObject *parent = 0L, const char *name = 0L ) : APIBlog( server, parent, name ) {}
     TQString getFunctionName( blogFunctions type );
     TQString interfaceName() const { return "Blogger API 1.0"; }
 
diff --git a/kresources/blogging/kcal_resourcebloggingconfig.cpp b/kresources/blogging/kcal_resourcebloggingconfig.cpp
index 04f62cf9..d68584a2 100644
--- a/kresources/blogging/kcal_resourcebloggingconfig.cpp
+++ b/kresources/blogging/kcal_resourcebloggingconfig.cpp
@@ -25,7 +25,7 @@
 
 using namespace KCal;
 
-ResourceBloggingConfig::ResourceBloggingConfig( TQWidget *tqparent, const char *name ) : ResourceGroupwareBaseConfig( tqparent, name )
+ResourceBloggingConfig::ResourceBloggingConfig( TQWidget *parent, const char *name ) : ResourceGroupwareBaseConfig( parent, name )
 {
 }
 
diff --git a/kresources/blogging/kcal_resourcebloggingconfig.h b/kresources/blogging/kcal_resourcebloggingconfig.h
index d15c8975..c8ff2aa6 100644
--- a/kresources/blogging/kcal_resourcebloggingconfig.h
+++ b/kresources/blogging/kcal_resourcebloggingconfig.h
@@ -30,7 +30,7 @@ class KDE_EXPORT ResourceBloggingConfig : public ResourceGroupwareBaseConfig
   Q_OBJECT
   TQ_OBJECT
   public:
-    ResourceBloggingConfig( TQWidget *tqparent = 0, const char *name = 0 );
+    ResourceBloggingConfig( TQWidget *parent = 0, const char *name = 0 );
 
   public slots:
     virtual void saveSettings( KRES::Resource *resource );
diff --git a/kresources/blogging/xmlrpcjob.cpp b/kresources/blogging/xmlrpcjob.cpp
index 9a89cf5a..ae2b1b80 100644
--- a/kresources/blogging/xmlrpcjob.cpp
+++ b/kresources/blogging/xmlrpcjob.cpp
@@ -72,7 +72,7 @@ XmlrpcJob::XmlrpcJob( const KURL& url, const TQString& method,
                  showProgressInfo )
 {
   d = new XmlrpcJobPrivate;
-  // We couldn't set the args when calling the tqparent constructor,
+  // We couldn't set the args when calling the parent constructor,
   // so do it now.
   TQDataStream stream( m_packedArgs, IO_WriteOnly );
    stream << (int)1 << url;
diff --git a/kresources/caldav/config.cpp b/kresources/caldav/config.cpp
index dbab62d7..f3cf57fd 100644
--- a/kresources/caldav/config.cpp
+++ b/kresources/caldav/config.cpp
@@ -70,8 +70,8 @@ CalDavPrefs* ResourceCalDavConfig::getPrefs(ResourceCalDav* res) {
 | CONSTRUCTOR / DESTRUCTOR
  ========================================================================*/
 
-ResourceCalDavConfig::ResourceCalDavConfig( TQWidget *tqparent )
-    : KRES::ConfigWidget( tqparent )
+ResourceCalDavConfig::ResourceCalDavConfig( TQWidget *parent )
+    : KRES::ConfigWidget( parent )
 {
     setupUI();
 }
diff --git a/kresources/caldav/config.h b/kresources/caldav/config.h
index ccda9234..cfa612d3 100644
--- a/kresources/caldav/config.h
+++ b/kresources/caldav/config.h
@@ -44,7 +44,7 @@ class KDE_EXPORT ResourceCalDavConfig : public KRES::ConfigWidget
 
 public:
 
-    ResourceCalDavConfig(TQWidget *tqparent = 0);
+    ResourceCalDavConfig(TQWidget *parent = 0);
 
 public slots:
 
diff --git a/kresources/caldav/configwidgets.cpp b/kresources/caldav/configwidgets.cpp
index e84eb2eb..4a7072b5 100644
--- a/kresources/caldav/configwidgets.cpp
+++ b/kresources/caldav/configwidgets.cpp
@@ -74,8 +74,8 @@ class CalDavSaveConfig::Private
 };
 //@endcond
 
-CalDavReloadConfig::CalDavReloadConfig( TQWidget *tqparent )
-  : TQWidget( tqparent ), d( new KCal::CalDavReloadConfig::Private() )
+CalDavReloadConfig::CalDavReloadConfig( TQWidget *parent )
+  : TQWidget( parent ), d( new KCal::CalDavReloadConfig::Private() )
 {
   TQBoxLayout *topLayout = new TQVBoxLayout( this );
 
@@ -148,8 +148,8 @@ void CalDavReloadConfig::slotIntervalToggled( bool checked )
   }
 }
 
-CalDavSaveConfig::CalDavSaveConfig( TQWidget *tqparent )
-  : TQWidget( tqparent ), d( new KCal::CalDavSaveConfig::Private() )
+CalDavSaveConfig::CalDavSaveConfig( TQWidget *parent )
+  : TQWidget( parent ), d( new KCal::CalDavSaveConfig::Private() )
 {
   TQBoxLayout *topLayout = new TQVBoxLayout( this );
 
diff --git a/kresources/caldav/configwidgets.h b/kresources/caldav/configwidgets.h
index 2c9dcb6d..6ceb0c71 100644
--- a/kresources/caldav/configwidgets.h
+++ b/kresources/caldav/configwidgets.h
@@ -52,7 +52,7 @@ class KDE_EXPORT CalDavReloadConfig : public TQWidget
   Q_OBJECT
   TQ_OBJECT
   public:
-    explicit CalDavReloadConfig( TQWidget *tqparent = 0 );
+    explicit CalDavReloadConfig( TQWidget *parent = 0 );
     ~CalDavReloadConfig();
   public slots:
     void loadSettings( ResourceCached *resource );
@@ -79,7 +79,7 @@ class KDE_EXPORT CalDavSaveConfig : public TQWidget
     Q_OBJECT
   TQ_OBJECT
   public:
-    explicit CalDavSaveConfig( TQWidget *tqparent = 0 );
+    explicit CalDavSaveConfig( TQWidget *parent = 0 );
     ~CalDavSaveConfig();
 
   public slots:
diff --git a/kresources/caldav/job.cpp b/kresources/caldav/job.cpp
index a7a4af54..c79ef06a 100644
--- a/kresources/caldav/job.cpp
+++ b/kresources/caldav/job.cpp
@@ -166,8 +166,8 @@ void CalDavJob::run() {
 
     // Signal done
     // 1000 is read, 1001 is write
-    if (type() == 0) TQApplication::postEvent ( tqparent(), new TQEvent( static_cast<TQEvent::Type>(1000) ) );
-    if (type() == 1) TQApplication::postEvent ( tqparent(), new TQEvent( static_cast<TQEvent::Type>(1001) ) );
+    if (type() == 0) TQApplication::postEvent ( parent(), new TQEvent( static_cast<TQEvent::Type>(1000) ) );
+    if (type() == 1) TQApplication::postEvent ( parent(), new TQEvent( static_cast<TQEvent::Type>(1001) ) );
 }
 
 // EOF ========================================================================
diff --git a/kresources/caldav/job.h b/kresources/caldav/job.h
index c19f2bf2..7d312d90 100644
--- a/kresources/caldav/job.h
+++ b/kresources/caldav/job.h
@@ -68,7 +68,7 @@ public:
     }
 
     /**
-     * Sets the tqparent qobject.
+     * Sets the parent qobject.
      */
     virtual void setParent(TQObject *s) {
         mParent = s;
@@ -103,9 +103,9 @@ public:
     }
 
     /**
-     * @return tqparent object
+     * @return parent object
      */
-    virtual TQObject *tqparent() {
+    virtual TQObject *parent() {
         return mParent;
     }
 
diff --git a/kresources/carddav/config.cpp b/kresources/carddav/config.cpp
index 70a3caf1..390e3adc 100644
--- a/kresources/carddav/config.cpp
+++ b/kresources/carddav/config.cpp
@@ -69,8 +69,8 @@ CardDavPrefs* ResourceCardDavConfig::getPrefs(ResourceCardDav* res) {
 | CONSTRUCTOR / DESTRUCTOR
  ========================================================================*/
 
-ResourceCardDavConfig::ResourceCardDavConfig( TQWidget *tqparent )
-    : KRES::ConfigWidget( tqparent )
+ResourceCardDavConfig::ResourceCardDavConfig( TQWidget *parent )
+    : KRES::ConfigWidget( parent )
 {
     setupUI();
 }
diff --git a/kresources/carddav/config.h b/kresources/carddav/config.h
index 4fd95511..8e0a7100 100644
--- a/kresources/carddav/config.h
+++ b/kresources/carddav/config.h
@@ -43,7 +43,7 @@ class KDE_EXPORT ResourceCardDavConfig : public KRES::ConfigWidget
 
 public:
 
-    ResourceCardDavConfig(TQWidget *tqparent = 0);
+    ResourceCardDavConfig(TQWidget *parent = 0);
 
 public slots:
 
diff --git a/kresources/carddav/configwidgets.cpp b/kresources/carddav/configwidgets.cpp
index fbc19c7e..b159a021 100644
--- a/kresources/carddav/configwidgets.cpp
+++ b/kresources/carddav/configwidgets.cpp
@@ -73,8 +73,8 @@ class CardDavSaveConfig::Private
 };
 //@endcond
 
-CardDavReloadConfig::CardDavReloadConfig( TQWidget *tqparent )
-  : TQWidget( tqparent ), d( new KABC::CardDavReloadConfig::Private() )
+CardDavReloadConfig::CardDavReloadConfig( TQWidget *parent )
+  : TQWidget( parent ), d( new KABC::CardDavReloadConfig::Private() )
 {
   TQBoxLayout *topLayout = new TQVBoxLayout( this );
 
@@ -147,8 +147,8 @@ void CardDavReloadConfig::slotIntervalToggled( bool checked )
   }
 }
 
-CardDavSaveConfig::CardDavSaveConfig( TQWidget *tqparent )
-  : TQWidget( tqparent ), d( new KABC::CardDavSaveConfig::Private() )
+CardDavSaveConfig::CardDavSaveConfig( TQWidget *parent )
+  : TQWidget( parent ), d( new KABC::CardDavSaveConfig::Private() )
 {
   TQBoxLayout *topLayout = new TQVBoxLayout( this );
 
diff --git a/kresources/carddav/configwidgets.h b/kresources/carddav/configwidgets.h
index 47b92bfa..9fb84942 100644
--- a/kresources/carddav/configwidgets.h
+++ b/kresources/carddav/configwidgets.h
@@ -51,7 +51,7 @@ class KDE_EXPORT CardDavReloadConfig : public TQWidget
   Q_OBJECT
   TQ_OBJECT
   public:
-    explicit CardDavReloadConfig( TQWidget *tqparent = 0 );
+    explicit CardDavReloadConfig( TQWidget *parent = 0 );
     ~CardDavReloadConfig();
   public slots:
     void loadSettings( ResourceCached *resource );
@@ -78,7 +78,7 @@ class KDE_EXPORT CardDavSaveConfig : public TQWidget
     Q_OBJECT
   TQ_OBJECT
   public:
-    explicit CardDavSaveConfig( TQWidget *tqparent = 0 );
+    explicit CardDavSaveConfig( TQWidget *parent = 0 );
     ~CardDavSaveConfig();
 
   public slots:
diff --git a/kresources/carddav/job.cpp b/kresources/carddav/job.cpp
index 4d3fd3d4..a842b00a 100644
--- a/kresources/carddav/job.cpp
+++ b/kresources/carddav/job.cpp
@@ -103,8 +103,8 @@ void CardDavJob::run() {
 
     // Signal done
     // 1000 is read, 1001 is write
-    if (type() == 0) TQApplication::postEvent ( tqparent(), new TQEvent( static_cast<TQEvent::Type>(1000) ) );
-    if (type() == 1) TQApplication::postEvent ( tqparent(), new TQEvent( static_cast<TQEvent::Type>(1001) ) );
+    if (type() == 0) TQApplication::postEvent ( parent(), new TQEvent( static_cast<TQEvent::Type>(1000) ) );
+    if (type() == 1) TQApplication::postEvent ( parent(), new TQEvent( static_cast<TQEvent::Type>(1001) ) );
 }
 
 // EOF ========================================================================
diff --git a/kresources/carddav/job.h b/kresources/carddav/job.h
index e40604b9..52a04bc7 100644
--- a/kresources/carddav/job.h
+++ b/kresources/carddav/job.h
@@ -60,7 +60,7 @@ public:
     }
 
     /**
-     * Sets the tqparent qobject.
+     * Sets the parent qobject.
      */
     virtual void setParent(TQObject *s) {
         mParent = s;
@@ -88,9 +88,9 @@ public:
     }
 
     /**
-     * @return tqparent object
+     * @return parent object
      */
-    virtual TQObject *tqparent() {
+    virtual TQObject *parent() {
         return mParent;
     }
 
diff --git a/kresources/egroupware/kabc_resourcexmlrpcconfig.cpp b/kresources/egroupware/kabc_resourcexmlrpcconfig.cpp
index 459a6b6f..02a2f1ad 100644
--- a/kresources/egroupware/kabc_resourcexmlrpcconfig.cpp
+++ b/kresources/egroupware/kabc_resourcexmlrpcconfig.cpp
@@ -33,8 +33,8 @@
 
 using namespace KABC;
 
-ResourceXMLRPCConfig::ResourceXMLRPCConfig( TQWidget* tqparent,  const char* name )
-  : KRES::ConfigWidget( tqparent, name )
+ResourceXMLRPCConfig::ResourceXMLRPCConfig( TQWidget* parent,  const char* name )
+  : KRES::ConfigWidget( parent, name )
 {
   TQGridLayout *mainLayout = new TQGridLayout( this, 4, 2, 0, KDialog::spacingHint() );
 
diff --git a/kresources/egroupware/kabc_resourcexmlrpcconfig.h b/kresources/egroupware/kabc_resourcexmlrpcconfig.h
index a680cfb0..084f9210 100644
--- a/kresources/egroupware/kabc_resourcexmlrpcconfig.h
+++ b/kresources/egroupware/kabc_resourcexmlrpcconfig.h
@@ -35,7 +35,7 @@ class KDE_EXPORT ResourceXMLRPCConfig : public KRES::ConfigWidget
   TQ_OBJECT
 
   public:
-    ResourceXMLRPCConfig( TQWidget* tqparent = 0, const char* name = 0 );
+    ResourceXMLRPCConfig( TQWidget* parent = 0, const char* name = 0 );
 
   public slots:
     void loadSettings( KRES::Resource* );
diff --git a/kresources/egroupware/kcal_resourcexmlrpc.cpp b/kresources/egroupware/kcal_resourcexmlrpc.cpp
index 25f4c1f2..3360d18c 100644
--- a/kresources/egroupware/kcal_resourcexmlrpc.cpp
+++ b/kresources/egroupware/kcal_resourcexmlrpc.cpp
@@ -250,7 +250,7 @@ bool ResourceXMLRPC::doLoad()
   columns.insert( "type", "task" );
   args.insert( "filter", "none" );
   args.insert( "col_filter", columns );
-  args.insert( "order", "id_tqparent" );
+  args.insert( "order", "id_parent" );
 
   mServer->call( SearchTodosCommand, args,
                  this, TQT_SLOT( listTodosFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
@@ -1115,7 +1115,7 @@ void ResourceXMLRPC::writeTodo( Todo* todo, TQMap<TQString, TQVariant>& args )
   Incidence *inc = todo->relatedTo();
   if ( inc ) {
     TQString parentUid = idMapper().remoteId( inc->uid() );
-    args.insert( "id_tqparent", parentUid );
+    args.insert( "id_parent", parentUid );
   }
 
   // STATE
@@ -1172,13 +1172,13 @@ void ResourceXMLRPC::readTodo( const TQMap<TQString, TQVariant>& args, Todo *tod
   }
 
   // SUBTODO
-  TQString parentId = args[ "id_tqparent" ].toString();
+  TQString parentId = args[ "id_parent" ].toString();
   if ( parentId != "0" ) { // we are a sub todo
     TQString localParentUid = idMapper().localId( parentId );
-    if ( !localParentUid.isEmpty() ) { // found tqparent todo
-      Todo *tqparent = mCalendar.todo( localParentUid );
-      if ( tqparent )
-        todo->setRelatedTo( tqparent );
+    if ( !localParentUid.isEmpty() ) { // found parent todo
+      Todo *parent = mCalendar.todo( localParentUid );
+      if ( parent )
+        todo->setRelatedTo( parent );
     }
   }
 
diff --git a/kresources/egroupware/kcal_resourcexmlrpcconfig.cpp b/kresources/egroupware/kcal_resourcexmlrpcconfig.cpp
index 740602b5..36e3b948 100644
--- a/kresources/egroupware/kcal_resourcexmlrpcconfig.cpp
+++ b/kresources/egroupware/kcal_resourcexmlrpcconfig.cpp
@@ -34,8 +34,8 @@
 
 using namespace KCal;
 
-ResourceXMLRPCConfig::ResourceXMLRPCConfig( TQWidget* tqparent,  const char* name )
-  : KRES::ConfigWidget( tqparent, name )
+ResourceXMLRPCConfig::ResourceXMLRPCConfig( TQWidget* parent,  const char* name )
+  : KRES::ConfigWidget( parent, name )
 {
   TQGridLayout *mainLayout = new TQGridLayout( this, 4, 2, 0, KDialog::spacingHint() );
 
diff --git a/kresources/egroupware/kcal_resourcexmlrpcconfig.h b/kresources/egroupware/kcal_resourcexmlrpcconfig.h
index d070eebf..13e359b0 100644
--- a/kresources/egroupware/kcal_resourcexmlrpcconfig.h
+++ b/kresources/egroupware/kcal_resourcexmlrpcconfig.h
@@ -36,7 +36,7 @@ class KDE_EXPORT ResourceXMLRPCConfig : public KRES::ConfigWidget
   TQ_OBJECT
 
   public:
-    ResourceXMLRPCConfig( TQWidget* tqparent = 0, const char* name = 0 );
+    ResourceXMLRPCConfig( TQWidget* parent = 0, const char* name = 0 );
 
   public slots:
     void loadSettings( KRES::Resource* );
diff --git a/kresources/egroupware/knotes_resourcexmlrpc.cpp b/kresources/egroupware/knotes_resourcexmlrpc.cpp
index ada19144..6446a833 100644
--- a/kresources/egroupware/knotes_resourcexmlrpc.cpp
+++ b/kresources/egroupware/knotes_resourcexmlrpc.cpp
@@ -132,7 +132,7 @@ bool ResourceXMLRPC::load()
   args.clear();
   args.insert( "filter", "none" );
   args.insert( "col_filter", columns );
-  args.insert( "order", "id_tqparent" );
+  args.insert( "order", "id_parent" );
 
   mServer->call( SearchNotesCommand, args,
                  this, TQT_SLOT( listNotesFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
diff --git a/kresources/egroupware/knotes_resourcexmlrpcconfig.cpp b/kresources/egroupware/knotes_resourcexmlrpcconfig.cpp
index 0e2816b1..224cb991 100644
--- a/kresources/egroupware/knotes_resourcexmlrpcconfig.cpp
+++ b/kresources/egroupware/knotes_resourcexmlrpcconfig.cpp
@@ -34,8 +34,8 @@
 
 using namespace KNotes;
 
-ResourceXMLRPCConfig::ResourceXMLRPCConfig( TQWidget* tqparent,  const char* name )
-  : KRES::ConfigWidget( tqparent, name )
+ResourceXMLRPCConfig::ResourceXMLRPCConfig( TQWidget* parent,  const char* name )
+  : KRES::ConfigWidget( parent, name )
 {
   TQGridLayout *mainLayout = new TQGridLayout( this, 4, 2, 0, KDialog::spacingHint() );
 
diff --git a/kresources/egroupware/knotes_resourcexmlrpcconfig.h b/kresources/egroupware/knotes_resourcexmlrpcconfig.h
index 70201f60..dac45f81 100644
--- a/kresources/egroupware/knotes_resourcexmlrpcconfig.h
+++ b/kresources/egroupware/knotes_resourcexmlrpcconfig.h
@@ -36,7 +36,7 @@ class KDE_EXPORT ResourceXMLRPCConfig : public KRES::ConfigWidget
   TQ_OBJECT
 
   public:
-    ResourceXMLRPCConfig( TQWidget* tqparent = 0, const char* name = 0 );
+    ResourceXMLRPCConfig( TQWidget* parent = 0, const char* name = 0 );
 
   public slots:
     void loadSettings( KRES::Resource* );
diff --git a/kresources/egroupware/xmlrpciface.cpp b/kresources/egroupware/xmlrpciface.cpp
index 59b467bb..09176ae6 100644
--- a/kresources/egroupware/xmlrpciface.cpp
+++ b/kresources/egroupware/xmlrpciface.cpp
@@ -54,9 +54,9 @@ namespace KXMLRPC
   };
 }
 
-Query *Query::create( const TQVariant &id, TQObject *tqparent, const char *name )
+Query *Query::create( const TQVariant &id, TQObject *parent, const char *name )
 {
-  return new Query( id, tqparent, name );
+  return new Query( id, parent, name );
 }
 
 void Query::call( const TQString &server, const TQString &method,
@@ -310,8 +310,8 @@ TQVariant Query::demarshal( const TQDomElement &elem ) const
   return TQVariant();
 }
 
-Query::Query( const TQVariant &id, TQObject *tqparent, const char *name )
-  : TQObject( tqparent, name ), m_id( id )
+Query::Query( const TQVariant &id, TQObject *parent, const char *name )
+  : TQObject( parent, name ), m_id( id )
 {}
 
 Query::~Query()
@@ -321,8 +321,8 @@ Query::~Query()
     (*it)->kill();
 }
 
-Server::Server( const KURL &url, TQObject *tqparent, const char *name )
-    : TQObject( tqparent, name )
+Server::Server( const KURL &url, TQObject *parent, const char *name )
+    : TQObject( parent, name )
 {
   if ( url.isValid() )
     m_url = url;
diff --git a/kresources/egroupware/xmlrpciface.h b/kresources/egroupware/xmlrpciface.h
index 5c49eee8..4e05dc67 100644
--- a/kresources/egroupware/xmlrpciface.h
+++ b/kresources/egroupware/xmlrpciface.h
@@ -38,7 +38,7 @@ namespace KXMLRPC
 
 
       static Query *create( const TQVariant &id = TQVariant(),
-                            TQObject *tqparent = 0, const char *name = 0 );
+                            TQObject *parent = 0, const char *name = 0 );
 
     public slots:
       void call( const TQString &server, const TQString &method,
@@ -66,7 +66,7 @@ namespace KXMLRPC
       TQString marshal( const TQVariant &v ) const;
       TQVariant demarshal( const TQDomElement &e ) const;
 
-      Query( const TQVariant &id, TQObject *tqparent = 0, const char *name = 0 );
+      Query( const TQVariant &id, TQObject *parent = 0, const char *name = 0 );
       ~Query();
 
       TQByteArray m_buffer;
@@ -81,7 +81,7 @@ namespace KXMLRPC
   TQ_OBJECT
     public:
       Server( const KURL &url = KURL(),
-              TQObject *tqparent = 0, const char *name = 0 );
+              TQObject *parent = 0, const char *name = 0 );
       ~Server();
 
       const KURL &url() const { return m_url; }
diff --git a/kresources/exchange/resourceexchangeconfig.cpp b/kresources/exchange/resourceexchangeconfig.cpp
index 5a20dba0..36774901 100644
--- a/kresources/exchange/resourceexchangeconfig.cpp
+++ b/kresources/exchange/resourceexchangeconfig.cpp
@@ -33,8 +33,8 @@
 
 using namespace KCal;
 
-ResourceExchangeConfig::ResourceExchangeConfig( TQWidget* tqparent,  const char* name )
-    : KRES::ConfigWidget( tqparent, name )
+ResourceExchangeConfig::ResourceExchangeConfig( TQWidget* parent,  const char* name )
+    : KRES::ConfigWidget( parent, name )
 {
   resize( 245, 115 );
   TQGridLayout *mainLayout = new TQGridLayout( this, 8, 3 );
diff --git a/kresources/exchange/resourceexchangeconfig.h b/kresources/exchange/resourceexchangeconfig.h
index 9e4af871..b0cf15a1 100644
--- a/kresources/exchange/resourceexchangeconfig.h
+++ b/kresources/exchange/resourceexchangeconfig.h
@@ -40,7 +40,7 @@ class ResourceExchangeConfig : public KRES::ConfigWidget
   TQ_OBJECT
 
 public:
-  ResourceExchangeConfig( TQWidget* tqparent = 0, const char* name = 0 );
+  ResourceExchangeConfig( TQWidget* parent = 0, const char* name = 0 );
 
 public slots:
   virtual void loadSettings( KRES::Resource *resource);
diff --git a/kresources/featureplan/kcal_resourcefeatureplan.cpp b/kresources/featureplan/kcal_resourcefeatureplan.cpp
index e108247f..cce88495 100644
--- a/kresources/featureplan/kcal_resourcefeatureplan.cpp
+++ b/kresources/featureplan/kcal_resourcefeatureplan.cpp
@@ -100,7 +100,7 @@ bool ResourceFeaturePlan::doLoad()
 }
 
 void ResourceFeaturePlan::insertCategories( const Category::List &categories,
-                                            Todo *tqparent )
+                                            Todo *parent )
 {
   Category::List::ConstIterator it;
   for( it = categories.begin(); it != categories.end(); ++it ) {
@@ -108,7 +108,7 @@ void ResourceFeaturePlan::insertCategories( const Category::List &categories,
   
     Todo *categoryTodo = new Todo;
     categoryTodo->setSummary( c->name() );
-    categoryTodo->setRelatedTo( tqparent );
+    categoryTodo->setRelatedTo( parent );
 
     insertCategories( c->categoryList(), categoryTodo );  
   
diff --git a/kresources/featureplan/kcal_resourcefeatureplan.h b/kresources/featureplan/kcal_resourcefeatureplan.h
index 68f719a5..67799044 100644
--- a/kresources/featureplan/kcal_resourcefeatureplan.h
+++ b/kresources/featureplan/kcal_resourcefeatureplan.h
@@ -56,7 +56,7 @@ class KDE_EXPORT ResourceFeaturePlan : public ResourceCached
     KABC::Lock *lock();
 
   protected:
-    void insertCategories( const Category::List &categories, Todo *tqparent );
+    void insertCategories( const Category::List &categories, Todo *parent );
 
   private:
     Prefs *mPrefs;
diff --git a/kresources/featureplan/kcal_resourcefeatureplanconfig.cpp b/kresources/featureplan/kcal_resourcefeatureplanconfig.cpp
index 6478a213..42043a5d 100644
--- a/kresources/featureplan/kcal_resourcefeatureplanconfig.cpp
+++ b/kresources/featureplan/kcal_resourcefeatureplanconfig.cpp
@@ -35,9 +35,9 @@
 
 using namespace KCal;
 
-ResourceFeaturePlanConfig::ResourceFeaturePlanConfig( TQWidget *tqparent,
+ResourceFeaturePlanConfig::ResourceFeaturePlanConfig( TQWidget *parent,
                                                       const char *name )
-  : KRES::ConfigWidget( tqparent, name )
+  : KRES::ConfigWidget( parent, name )
 {
   TQGridLayout *topLayout = new TQGridLayout( this, 3, 2, 0,
                                             KDialog::spacingHint() );
diff --git a/kresources/featureplan/kcal_resourcefeatureplanconfig.h b/kresources/featureplan/kcal_resourcefeatureplanconfig.h
index 97da46be..e27ea94c 100644
--- a/kresources/featureplan/kcal_resourcefeatureplanconfig.h
+++ b/kresources/featureplan/kcal_resourcefeatureplanconfig.h
@@ -37,7 +37,7 @@ class KDE_EXPORT ResourceFeaturePlanConfig : public KRES::ConfigWidget
   TQ_OBJECT
 
   public:
-    ResourceFeaturePlanConfig( TQWidget *tqparent = 0, const char *name = 0 );
+    ResourceFeaturePlanConfig( TQWidget *parent = 0, const char *name = 0 );
 
   public slots:
     void loadSettings( KRES::Resource * );
diff --git a/kresources/groupware/kabc_resourcegroupwareconfig.cpp b/kresources/groupware/kabc_resourcegroupwareconfig.cpp
index efdc7ec4..a930219c 100644
--- a/kresources/groupware/kabc_resourcegroupwareconfig.cpp
+++ b/kresources/groupware/kabc_resourcegroupwareconfig.cpp
@@ -39,8 +39,8 @@ using namespace KABC;
 class AddressBookItem : public TQCheckListItem
 {
   public:
-    AddressBookItem( KListView *tqparent, const TQString &id )
-      : TQCheckListItem( tqparent, "", CheckBox ),
+    AddressBookItem( KListView *parent, const TQString &id )
+      : TQCheckListItem( parent, "", CheckBox ),
         mId( id )
     {
       setText( 0, mId );
@@ -58,8 +58,8 @@ class AddressBookItem : public TQCheckListItem
     TQString mId;
 };
 
-ResourceGroupwareConfig::ResourceGroupwareConfig( TQWidget* tqparent,  const char* name )
-  : KRES::ConfigWidget( tqparent, name )
+ResourceGroupwareConfig::ResourceGroupwareConfig( TQWidget* parent,  const char* name )
+  : KRES::ConfigWidget( parent, name )
 {
   TQGridLayout *mainLayout = new TQGridLayout( this, 7, 2, 0, KDialog::spacingHint() );
 
diff --git a/kresources/groupware/kabc_resourcegroupwareconfig.h b/kresources/groupware/kabc_resourcegroupwareconfig.h
index 220575c2..06ef4186 100644
--- a/kresources/groupware/kabc_resourcegroupwareconfig.h
+++ b/kresources/groupware/kabc_resourcegroupwareconfig.h
@@ -39,7 +39,7 @@ class ResourceGroupwareConfig : public KRES::ConfigWidget
   TQ_OBJECT
 
   public:
-    ResourceGroupwareConfig( TQWidget* tqparent = 0, const char* name = 0 );
+    ResourceGroupwareConfig( TQWidget* parent = 0, const char* name = 0 );
 
   public slots:
     void loadSettings( KRES::Resource* );
diff --git a/kresources/groupware/kcal_resourcegroupwareconfig.cpp b/kresources/groupware/kcal_resourcegroupwareconfig.cpp
index dbb76f33..2d5cffe0 100644
--- a/kresources/groupware/kcal_resourcegroupwareconfig.cpp
+++ b/kresources/groupware/kcal_resourcegroupwareconfig.cpp
@@ -38,8 +38,8 @@
 
 using namespace KCal;
 
-ResourceGroupwareConfig::ResourceGroupwareConfig( TQWidget* tqparent,  const char* name )
-    : KRES::ConfigWidget( tqparent, name )
+ResourceGroupwareConfig::ResourceGroupwareConfig( TQWidget* parent,  const char* name )
+    : KRES::ConfigWidget( parent, name )
 {
   resize( 245, 115 ); 
   TQGridLayout *mainLayout = new TQGridLayout( this, 2, 2 );
diff --git a/kresources/groupware/kcal_resourcegroupwareconfig.h b/kresources/groupware/kcal_resourcegroupwareconfig.h
index 761a6aa0..b55febc8 100644
--- a/kresources/groupware/kcal_resourcegroupwareconfig.h
+++ b/kresources/groupware/kcal_resourcegroupwareconfig.h
@@ -43,7 +43,7 @@ class ResourceGroupwareConfig : public KRES::ConfigWidget
     Q_OBJECT
   TQ_OBJECT
   public:
-    ResourceGroupwareConfig( TQWidget *tqparent = 0, const char *name = 0 );
+    ResourceGroupwareConfig( TQWidget *parent = 0, const char *name = 0 );
 
   public slots:
     virtual void loadSettings( KRES::Resource *resource );
diff --git a/kresources/groupwise/groupwisesettingswidget.cpp b/kresources/groupwise/groupwisesettingswidget.cpp
index 53f3b095..60d04712 100644
--- a/kresources/groupwise/groupwisesettingswidget.cpp
+++ b/kresources/groupwise/groupwisesettingswidget.cpp
@@ -24,8 +24,8 @@
 
 #include "groupwisesettingswidget.h"
 
-GroupWiseSettingsWidget::GroupWiseSettingsWidget( TQWidget * tqparent )
-: GroupWiseSettingsWidgetBase( tqparent )
+GroupWiseSettingsWidget::GroupWiseSettingsWidget( TQWidget * parent )
+: GroupWiseSettingsWidgetBase( parent )
 {
   connect( m_settingsList, TQT_SIGNAL( itemRenamed( TQListViewItem *, int ) ),
           this, TQT_SLOT( slotItemRenamed( TQListViewItem *, int ) ) );
diff --git a/kresources/groupwise/groupwisesettingswidget.h b/kresources/groupwise/groupwisesettingswidget.h
index 37027c64..46c6ca6d 100644
--- a/kresources/groupwise/groupwisesettingswidget.h
+++ b/kresources/groupwise/groupwisesettingswidget.h
@@ -33,7 +33,7 @@ class GroupWiseSettingsWidget : public GroupWiseSettingsWidgetBase
 Q_OBJECT
   TQ_OBJECT
 public:
-  GroupWiseSettingsWidget( TQWidget * tqparent );
+  GroupWiseSettingsWidget( TQWidget * parent );
   TQMap<TQString, TQString> dirtySettings();
   void reset();
 protected slots:
diff --git a/kresources/groupwise/kabc_resourcegroupwiseconfig.cpp b/kresources/groupwise/kabc_resourcegroupwiseconfig.cpp
index 22076907..42896bb0 100644
--- a/kresources/groupwise/kabc_resourcegroupwiseconfig.cpp
+++ b/kresources/groupwise/kabc_resourcegroupwiseconfig.cpp
@@ -39,8 +39,8 @@ using namespace KABC;
 class AddressBookItem : public TQCheckListItem
 {
   public:
-    AddressBookItem( KListView *tqparent, GroupWise::AddressBook ab )
-      : TQCheckListItem( tqparent, "", CheckBox ),
+    AddressBookItem( KListView *parent, GroupWise::AddressBook ab )
+      : TQCheckListItem( parent, "", CheckBox ),
         mId( ab.id )
     {
       setText( 0, ab.name );
@@ -56,8 +56,8 @@ class AddressBookItem : public TQCheckListItem
     TQString mId;
 };
 
-ResourceGroupwiseConfig::ResourceGroupwiseConfig( TQWidget* tqparent,  const char* name )
-  : KRES::ConfigWidget( tqparent, name )
+ResourceGroupwiseConfig::ResourceGroupwiseConfig( TQWidget* parent,  const char* name )
+  : KRES::ConfigWidget( parent, name )
 {
   TQGridLayout *mainLayout = new TQGridLayout( this, 7, 2, 0, KDialog::spacingHint() );
 
diff --git a/kresources/groupwise/kabc_resourcegroupwiseconfig.h b/kresources/groupwise/kabc_resourcegroupwiseconfig.h
index d120f316..06278834 100644
--- a/kresources/groupwise/kabc_resourcegroupwiseconfig.h
+++ b/kresources/groupwise/kabc_resourcegroupwiseconfig.h
@@ -42,7 +42,7 @@ class KDE_EXPORT ResourceGroupwiseConfig : public KRES::ConfigWidget
   TQ_OBJECT
 
   public:
-    ResourceGroupwiseConfig( TQWidget* tqparent = 0, const char* name = 0 );
+    ResourceGroupwiseConfig( TQWidget* parent = 0, const char* name = 0 );
 
   public slots:
     void loadSettings( KRES::Resource* );
diff --git a/kresources/groupwise/kcal_resourcegroupwiseconfig.cpp b/kresources/groupwise/kcal_resourcegroupwiseconfig.cpp
index e02cf2c5..78f049e8 100644
--- a/kresources/groupwise/kcal_resourcegroupwiseconfig.cpp
+++ b/kresources/groupwise/kcal_resourcegroupwiseconfig.cpp
@@ -41,8 +41,8 @@
 
 using namespace KCal;
 
-ResourceGroupwiseConfig::ResourceGroupwiseConfig( TQWidget* tqparent,  const char* name )
-    : KRES::ConfigWidget( tqparent, name )
+ResourceGroupwiseConfig::ResourceGroupwiseConfig( TQWidget* parent,  const char* name )
+    : KRES::ConfigWidget( parent, name )
 {
   resize( 245, 115 ); 
   TQGridLayout *mainLayout = new TQGridLayout( this, 2, 2 );
@@ -123,7 +123,7 @@ void ResourceGroupwiseConfig::slotViewUserSettings()
 
     if ( s )
     {
-      KDialogBase * dialog = new KDialogBase( ::tqqt_cast<TQWidget*>(tqparent() ), "gwsettingswidget", true, i18n( "GroupWise Settings" ) );
+      KDialogBase * dialog = new KDialogBase( ::tqqt_cast<TQWidget*>(parent() ), "gwsettingswidget", true, i18n( "GroupWise Settings" ) );
 //       TQVBoxLayout * tqlayout = new TQVBoxLayout( dialog );
       GroupWiseSettingsWidget * settingsWidget = new GroupWiseSettingsWidget( dialog );
       dialog->setMainWidget( settingsWidget );
diff --git a/kresources/groupwise/kcal_resourcegroupwiseconfig.h b/kresources/groupwise/kcal_resourcegroupwiseconfig.h
index 1687095c..c27ac5db 100644
--- a/kresources/groupwise/kcal_resourcegroupwiseconfig.h
+++ b/kresources/groupwise/kcal_resourcegroupwiseconfig.h
@@ -44,7 +44,7 @@ class KDE_EXPORT ResourceGroupwiseConfig : public KRES::ConfigWidget
     Q_OBJECT
   TQ_OBJECT
   public:
-    ResourceGroupwiseConfig( TQWidget *tqparent = 0, const char *name = 0 );
+    ResourceGroupwiseConfig( TQWidget *parent = 0, const char *name = 0 );
 
   public slots:
     virtual void loadSettings( KRES::Resource *resource );
diff --git a/kresources/groupwise/soap/groupwiseserver.cpp b/kresources/groupwise/soap/groupwiseserver.cpp
index 93a3f0a2..31a89a70 100644
--- a/kresources/groupwise/soap/groupwiseserver.cpp
+++ b/kresources/groupwise/soap/groupwiseserver.cpp
@@ -264,8 +264,8 @@ size_t GroupwiseServer::gSoapReceiveCallback( struct soap *soap, char *s,
 }
 
 GroupwiseServer::GroupwiseServer( const TQString &url, const TQString &user,
-                                  const TQString &password, TQObject *tqparent )
-  : TQObject( tqparent, "GroupwiseServer" ),
+                                  const TQString &password, TQObject *parent )
+  : TQObject( parent, "GroupwiseServer" ),
     mUrl( url ), mUser( user ), mPassword( password ),
     mSSL( url.left(6)=="https:" ), m_sock( 0 ),
     mError( 0 )
@@ -477,7 +477,7 @@ void GroupwiseServer::dumpFolderList()
 {
   mSoap->header->ngwt__session = mSession;
   _ngwm__getFolderListRequest folderListReq;
-  folderListReq.tqparent = "folders";
+  folderListReq.parent = "folders";
   folderListReq.recurse = true;
   _ngwm__getFolderListResponse folderListRes;
   soap_call___ngw__getFolderListRequest( mSoap, mUrl.latin1(), 0,
@@ -589,7 +589,7 @@ void GroupwiseServer::dumpAppointment( ngwt__Appointment *a )
 void GroupwiseServer::dumpFolder( ngwt__Folder *f )
 {
   dumpItem( f );
-  kdDebug() << "  PARENT: " << f->tqparent.c_str() << endl;
+  kdDebug() << "  PARENT: " << f->parent.c_str() << endl;
   if ( f->description ) {
     kdDebug() << "  DESCRIPTION: " << f->description->c_str() << endl;
   }
@@ -763,7 +763,7 @@ std::string GroupwiseServer::getFullIDFor( const TQString & gwRecordIDFromIcal )
   std::string calendarFolderID;
   _ngwm__getFolderListRequest folderListReq;
   _ngwm__getFolderListResponse folderListRes;
-  folderListReq.tqparent = "folders";
+  folderListReq.parent = "folders";
   folderListReq.view = soap_new_std__string( mSoap, -1 );
   folderListReq.view->append( "id type" );
   folderListReq.recurse = false;
diff --git a/kresources/groupwise/soap/groupwiseserver.h b/kresources/groupwise/soap/groupwiseserver.h
index 373c94e4..2c537661 100644
--- a/kresources/groupwise/soap/groupwiseserver.h
+++ b/kresources/groupwise/soap/groupwiseserver.h
@@ -100,7 +100,7 @@ class GroupwiseServer : public TQObject
     bool checkResponse( int result, ngwt__tqStatus *status );
     enum RetractCause { DueToResend, Other };
     GroupwiseServer( const TQString &url, const TQString &user,
-                     const TQString &password, TQObject *tqparent );
+                     const TQString &password, TQObject *parent );
     ~GroupwiseServer();
 
     int error() const { return mError; }
diff --git a/kresources/groupwise/soap/gwjobs.cpp b/kresources/groupwise/soap/gwjobs.cpp
index 6f591859..4610b0e2 100644
--- a/kresources/groupwise/soap/gwjobs.cpp
+++ b/kresources/groupwise/soap/gwjobs.cpp
@@ -351,7 +351,7 @@ void ReadCalendarJob::run()
 
   mSoap->header->ngwt__session = mSession;
   _ngwm__getFolderListRequest folderListReq;
-  folderListReq.tqparent = "folders";
+  folderListReq.parent = "folders";
   folderListReq.view = 0;
   folderListReq.recurse = true;
   _ngwm__getFolderListResponse folderListRes;
diff --git a/kresources/groupwise/soap/ksslsocket.cpp b/kresources/groupwise/soap/ksslsocket.cpp
index 30e8bb64..c6fe2a4f 100644
--- a/kresources/groupwise/soap/ksslsocket.cpp
+++ b/kresources/groupwise/soap/ksslsocket.cpp
@@ -279,7 +279,7 @@ int KSSLSocket::verifyCertificate()
 		setMetaData("ssl_action", "accept");
 	}
 
-	// Since we're the tqparent, we need to teach the child.
+	// Since we're the parent, we need to teach the child.
 	setMetaData("ssl_parent_ip", ourIp );
 	setMetaData("ssl_parent_cert", pc.toString());
 
diff --git a/kresources/groupwise/soap/patches/utf8_entities.diff b/kresources/groupwise/soap/patches/utf8_entities.diff
index 85d7283a..b8600a9d 100644
--- a/kresources/groupwise/soap/patches/utf8_entities.diff
+++ b/kresources/groupwise/soap/patches/utf8_entities.diff
@@ -3,7 +3,7 @@
 @@ -6470,7 +6470,11 @@
        }
  #endif
-       if (c & tqmask)
+       if (c & mask)
 -      { if (soap_send_raw(soap, s, t - s - 1) || soap_pututf8(soap, (unsigned char)c))
 +      {
 +        char S[2];
diff --git a/kresources/groupwise/soap/soapC.cpp b/kresources/groupwise/soap/soapC.cpp
index b446bc4b..13dd8b84 100644
--- a/kresources/groupwise/soap/soapC.cpp
+++ b/kresources/groupwise/soap/soapC.cpp
@@ -32680,8 +32680,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwm__getFolderListResponse(struct soap *s
 void _ngwm__getFolderListRequest::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
-	soap_embedded(soap, &((_ngwm__getFolderListRequest*)this)->tqparent, SOAP_TYPE_ngwt__uid);
-	soap_serialize_ngwt__uid(soap, &((_ngwm__getFolderListRequest*)this)->tqparent);
+	soap_embedded(soap, &((_ngwm__getFolderListRequest*)this)->parent, SOAP_TYPE_ngwt__uid);
+	soap_serialize_ngwt__uid(soap, &((_ngwm__getFolderListRequest*)this)->parent);
 	soap_embedded(soap, &((_ngwm__getFolderListRequest*)this)->view, SOAP_TYPE_PointerTongwt__View);
 	soap_serialize_PointerTongwt__View(soap, &((_ngwm__getFolderListRequest*)this)->view);
 	soap_embedded(soap, &((_ngwm__getFolderListRequest*)this)->recurse, SOAP_TYPE_bool);
@@ -32693,7 +32693,7 @@ void _ngwm__getFolderListRequest::soap_serialize(struct soap *soap) const
 void _ngwm__getFolderListRequest::soap_default(struct soap *soap)
 {
 	this->soap = soap;
-	soap_default_ngwt__uid(soap, &((_ngwm__getFolderListRequest*)this)->tqparent);
+	soap_default_ngwt__uid(soap, &((_ngwm__getFolderListRequest*)this)->parent);
 	((_ngwm__getFolderListRequest*)this)->view = NULL;
 	soap_default_bool(soap, &((_ngwm__getFolderListRequest*)this)->recurse);
 	((_ngwm__getFolderListRequest*)this)->imap = (bool)0;
@@ -32717,7 +32717,7 @@ int _ngwm__getFolderListRequest::soap_out(struct soap *soap, const char *tag, in
 SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__getFolderListRequest(struct soap *soap, const char *tag, int id, const _ngwm__getFolderListRequest *a, const char *type)
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__getFolderListRequest), type);
-	soap_out_ngwt__uid(soap, "ngwm:tqparent", -1, &(((_ngwm__getFolderListRequest*)a)->tqparent), "");
+	soap_out_ngwt__uid(soap, "ngwm:parent", -1, &(((_ngwm__getFolderListRequest*)a)->parent), "");
 	soap_out_PointerTongwt__View(soap, "ngwm:view", -1, &(((_ngwm__getFolderListRequest*)a)->view), "");
 	soap_out_bool(soap, "ngwm:recurse", -1, &(((_ngwm__getFolderListRequest*)a)->recurse), "");
 	soap_out_bool(soap, "ngwm:imap", -1, &(((_ngwm__getFolderListRequest*)a)->imap), "");
@@ -32758,14 +32758,14 @@ SOAP_FMAC3 _ngwm__getFolderListRequest * SOAP_FMAC4 soap_in__ngwm__getFolderList
 			return (_ngwm__getFolderListRequest *)a->soap_in(soap, tag, type);
 		}
 	}
-	short soap_flag_tqparent1 = 1, soap_flag_view1 = 1, soap_flag_recurse1 = 1, soap_flag_imap1 = 1, soap_flag_nntp1 = 1;
+	short soap_flag_parent1 = 1, soap_flag_view1 = 1, soap_flag_recurse1 = 1, soap_flag_imap1 = 1, soap_flag_nntp1 = 1;
 	if (soap->body && !*soap->href)
 	{
 		for (;;)
 		{	soap->error = SOAP_TAG_MISMATCH;
-			if (soap_flag_tqparent1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_ngwt__uid(soap, "ngwm:tqparent", &(((_ngwm__getFolderListRequest*)a)->tqparent), "ngwt:uid"))
-				{	soap_flag_tqparent1 = 0;
+			if (soap_flag_parent1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
+				if (soap_in_ngwt__uid(soap, "ngwm:parent", &(((_ngwm__getFolderListRequest*)a)->parent), "ngwt:uid"))
+				{	soap_flag_parent1 = 0;
 					continue;
 				}
 			if (soap_flag_view1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
@@ -32796,7 +32796,7 @@ SOAP_FMAC3 _ngwm__getFolderListRequest * SOAP_FMAC4 soap_in__ngwm__getFolderList
 			if (soap->error)
 				return NULL;
 		}
-		if ((soap->mode & SOAP_XML_STRICT) && (soap_flag_tqparent1 || soap_flag_recurse1))
+		if ((soap->mode & SOAP_XML_STRICT) && (soap_flag_parent1 || soap_flag_recurse1))
 		{	soap->error = SOAP_OCCURS;
 			return NULL;
 		}
@@ -42744,8 +42744,8 @@ void ngwt__SystemFolder::soap_serialize(struct soap *soap) const
 	soap_serialize_PointerTongwt__FolderACL(soap, &((ngwt__SystemFolder*)this)->acl);
 	soap_embedded(soap, &((ngwt__SystemFolder*)this)->isSharedByMe, SOAP_TYPE_PointerTobool);
 	soap_serialize_PointerTobool(soap, &((ngwt__SystemFolder*)this)->isSharedByMe);
-	soap_embedded(soap, &((ngwt__Folder*)this)->tqparent, SOAP_TYPE_ngwt__uid);
-	soap_serialize_ngwt__uid(soap, &((ngwt__Folder*)this)->tqparent);
+	soap_embedded(soap, &((ngwt__Folder*)this)->parent, SOAP_TYPE_ngwt__uid);
+	soap_serialize_ngwt__uid(soap, &((ngwt__Folder*)this)->parent);
 	soap_embedded(soap, &((ngwt__Folder*)this)->description, SOAP_TYPE_PointerTostd__string);
 	soap_serialize_PointerTostd__string(soap, &((ngwt__Folder*)this)->description);
 	soap_embedded(soap, &((ngwt__Folder*)this)->count, SOAP_TYPE_PointerToint);
@@ -42780,7 +42780,7 @@ void ngwt__SystemFolder::soap_default(struct soap *soap)
 	((ngwt__SystemFolder*)this)->folderType = NULL;
 	((ngwt__SystemFolder*)this)->acl = NULL;
 	((ngwt__SystemFolder*)this)->isSharedByMe = NULL;
-	soap_default_ngwt__uid(soap, &((ngwt__Folder*)this)->tqparent);
+	soap_default_ngwt__uid(soap, &((ngwt__Folder*)this)->parent);
 	((ngwt__Folder*)this)->description = NULL;
 	((ngwt__Folder*)this)->count = NULL;
 	((ngwt__Folder*)this)->hasUnread = NULL;
@@ -42818,7 +42818,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__SystemFolder(struct soap *soap, const c
 	soap_out_string(soap, "ngwt:modified", -1, &(((ngwt__Item*)a)->modified), "");
 	soap_out_PointerTongwt__ItemChanges(soap, "ngwt:changes", -1, &(((ngwt__Item*)a)->changes), "");
 	/* transient soap skipped */
-	soap_out_ngwt__uid(soap, "ngwt:tqparent", -1, &(((ngwt__Folder*)a)->tqparent), "");
+	soap_out_ngwt__uid(soap, "ngwt:parent", -1, &(((ngwt__Folder*)a)->parent), "");
 	soap_out_PointerTostd__string(soap, "ngwt:description", -1, &(((ngwt__Folder*)a)->description), "");
 	soap_out_PointerToint(soap, "ngwt:count", -1, &(((ngwt__Folder*)a)->count), "");
 	soap_out_PointerTobool(soap, "ngwt:hasUnread", -1, &(((ngwt__Folder*)a)->hasUnread), "");
@@ -42865,7 +42865,7 @@ SOAP_FMAC3 ngwt__SystemFolder * SOAP_FMAC4 soap_in_ngwt__SystemFolder(struct soa
 			return (ngwt__SystemFolder *)a->soap_in(soap, tag, type);
 		}
 	}
-	short soap_flag_id3 = 1, soap_flag_name3 = 1, soap_flag_version3 = 1, soap_flag_modified3 = 1, soap_flag_changes3 = 1, soap_flag_tqparent2 = 1, soap_flag_description2 = 1, soap_flag_count2 = 1, soap_flag_hasUnread2 = 1, soap_flag_unreadCount2 = 1, soap_flag_sequence2 = 1, soap_flag_settings2 = 1, soap_flag_calendarAttribute2 = 1, soap_flag_isSystemFolder1 = 1, soap_flag_folderType1 = 1, soap_flag_acl1 = 1, soap_flag_isSharedByMe1 = 1;
+	short soap_flag_id3 = 1, soap_flag_name3 = 1, soap_flag_version3 = 1, soap_flag_modified3 = 1, soap_flag_changes3 = 1, soap_flag_parent2 = 1, soap_flag_description2 = 1, soap_flag_count2 = 1, soap_flag_hasUnread2 = 1, soap_flag_unreadCount2 = 1, soap_flag_sequence2 = 1, soap_flag_settings2 = 1, soap_flag_calendarAttribute2 = 1, soap_flag_isSystemFolder1 = 1, soap_flag_folderType1 = 1, soap_flag_acl1 = 1, soap_flag_isSharedByMe1 = 1;
 	if (soap->body && !*soap->href)
 	{
 		for (;;)
@@ -42896,9 +42896,9 @@ SOAP_FMAC3 ngwt__SystemFolder * SOAP_FMAC4 soap_in_ngwt__SystemFolder(struct soa
 					continue;
 				}
 			/* transient soap skipped */
-			if (soap_flag_tqparent2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_ngwt__uid(soap, "ngwt:tqparent", &(((ngwt__Folder*)a)->tqparent), "ngwt:uid"))
-				{	soap_flag_tqparent2 = 0;
+			if (soap_flag_parent2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
+				if (soap_in_ngwt__uid(soap, "ngwt:parent", &(((ngwt__Folder*)a)->parent), "ngwt:uid"))
+				{	soap_flag_parent2 = 0;
 					continue;
 				}
 			if (soap_flag_description2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
@@ -42963,7 +42963,7 @@ SOAP_FMAC3 ngwt__SystemFolder * SOAP_FMAC4 soap_in_ngwt__SystemFolder(struct soa
 			if (soap->error)
 				return NULL;
 		}
-		if ((soap->mode & SOAP_XML_STRICT) && (soap_flag_tqparent2))
+		if ((soap->mode & SOAP_XML_STRICT) && (soap_flag_parent2))
 		{	soap->error = SOAP_OCCURS;
 			return NULL;
 		}
@@ -44502,8 +44502,8 @@ void ngwt__SharedFolder::soap_serialize(struct soap *soap) const
 	soap_serialize_PointerTobool(soap, &((ngwt__SharedFolder*)this)->isSharedByMe);
 	soap_embedded(soap, &((ngwt__SharedFolder*)this)->isSharedToMe, SOAP_TYPE_PointerTobool);
 	soap_serialize_PointerTobool(soap, &((ngwt__SharedFolder*)this)->isSharedToMe);
-	soap_embedded(soap, &((ngwt__Folder*)this)->tqparent, SOAP_TYPE_ngwt__uid);
-	soap_serialize_ngwt__uid(soap, &((ngwt__Folder*)this)->tqparent);
+	soap_embedded(soap, &((ngwt__Folder*)this)->parent, SOAP_TYPE_ngwt__uid);
+	soap_serialize_ngwt__uid(soap, &((ngwt__Folder*)this)->parent);
 	soap_embedded(soap, &((ngwt__Folder*)this)->description, SOAP_TYPE_PointerTostd__string);
 	soap_serialize_PointerTostd__string(soap, &((ngwt__Folder*)this)->description);
 	soap_embedded(soap, &((ngwt__Folder*)this)->count, SOAP_TYPE_PointerToint);
@@ -44539,7 +44539,7 @@ void ngwt__SharedFolder::soap_default(struct soap *soap)
 	((ngwt__SharedFolder*)this)->owner = NULL;
 	((ngwt__SharedFolder*)this)->isSharedByMe = NULL;
 	((ngwt__SharedFolder*)this)->isSharedToMe = NULL;
-	soap_default_ngwt__uid(soap, &((ngwt__Folder*)this)->tqparent);
+	soap_default_ngwt__uid(soap, &((ngwt__Folder*)this)->parent);
 	((ngwt__Folder*)this)->description = NULL;
 	((ngwt__Folder*)this)->count = NULL;
 	((ngwt__Folder*)this)->hasUnread = NULL;
@@ -44577,7 +44577,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__SharedFolder(struct soap *soap, const c
 	soap_out_string(soap, "ngwt:modified", -1, &(((ngwt__Item*)a)->modified), "");
 	soap_out_PointerTongwt__ItemChanges(soap, "ngwt:changes", -1, &(((ngwt__Item*)a)->changes), "");
 	/* transient soap skipped */
-	soap_out_ngwt__uid(soap, "ngwt:tqparent", -1, &(((ngwt__Folder*)a)->tqparent), "");
+	soap_out_ngwt__uid(soap, "ngwt:parent", -1, &(((ngwt__Folder*)a)->parent), "");
 	soap_out_PointerTostd__string(soap, "ngwt:description", -1, &(((ngwt__Folder*)a)->description), "");
 	soap_out_PointerToint(soap, "ngwt:count", -1, &(((ngwt__Folder*)a)->count), "");
 	soap_out_PointerTobool(soap, "ngwt:hasUnread", -1, &(((ngwt__Folder*)a)->hasUnread), "");
@@ -44625,7 +44625,7 @@ SOAP_FMAC3 ngwt__SharedFolder * SOAP_FMAC4 soap_in_ngwt__SharedFolder(struct soa
 			return (ngwt__SharedFolder *)a->soap_in(soap, tag, type);
 		}
 	}
-	short soap_flag_id3 = 1, soap_flag_name3 = 1, soap_flag_version3 = 1, soap_flag_modified3 = 1, soap_flag_changes3 = 1, soap_flag_tqparent2 = 1, soap_flag_description2 = 1, soap_flag_count2 = 1, soap_flag_hasUnread2 = 1, soap_flag_unreadCount2 = 1, soap_flag_sequence2 = 1, soap_flag_settings2 = 1, soap_flag_calendarAttribute2 = 1, soap_flag_rights1 = 1, soap_flag_acl1 = 1, soap_flag_owner1 = 1, soap_flag_isSharedByMe1 = 1, soap_flag_isSharedToMe1 = 1;
+	short soap_flag_id3 = 1, soap_flag_name3 = 1, soap_flag_version3 = 1, soap_flag_modified3 = 1, soap_flag_changes3 = 1, soap_flag_parent2 = 1, soap_flag_description2 = 1, soap_flag_count2 = 1, soap_flag_hasUnread2 = 1, soap_flag_unreadCount2 = 1, soap_flag_sequence2 = 1, soap_flag_settings2 = 1, soap_flag_calendarAttribute2 = 1, soap_flag_rights1 = 1, soap_flag_acl1 = 1, soap_flag_owner1 = 1, soap_flag_isSharedByMe1 = 1, soap_flag_isSharedToMe1 = 1;
 	if (soap->body && !*soap->href)
 	{
 		for (;;)
@@ -44656,9 +44656,9 @@ SOAP_FMAC3 ngwt__SharedFolder * SOAP_FMAC4 soap_in_ngwt__SharedFolder(struct soa
 					continue;
 				}
 			/* transient soap skipped */
-			if (soap_flag_tqparent2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_ngwt__uid(soap, "ngwt:tqparent", &(((ngwt__Folder*)a)->tqparent), "ngwt:uid"))
-				{	soap_flag_tqparent2 = 0;
+			if (soap_flag_parent2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
+				if (soap_in_ngwt__uid(soap, "ngwt:parent", &(((ngwt__Folder*)a)->parent), "ngwt:uid"))
+				{	soap_flag_parent2 = 0;
 					continue;
 				}
 			if (soap_flag_description2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
@@ -44728,7 +44728,7 @@ SOAP_FMAC3 ngwt__SharedFolder * SOAP_FMAC4 soap_in_ngwt__SharedFolder(struct soa
 			if (soap->error)
 				return NULL;
 		}
-		if ((soap->mode & SOAP_XML_STRICT) && (soap_flag_tqparent2))
+		if ((soap->mode & SOAP_XML_STRICT) && (soap_flag_parent2))
 		{	soap->error = SOAP_OCCURS;
 			return NULL;
 		}
@@ -48314,8 +48314,8 @@ void ngwt__QueryFolder::soap_serialize(struct soap *soap) const
 	soap_serialize_PointerTongwt__FolderType(soap, &((ngwt__QueryFolder*)this)->folderType);
 	soap_embedded(soap, &((ngwt__QueryFolder*)this)->query, SOAP_TYPE_PointerTongwt__Query);
 	soap_serialize_PointerTongwt__Query(soap, &((ngwt__QueryFolder*)this)->query);
-	soap_embedded(soap, &((ngwt__Folder*)this)->tqparent, SOAP_TYPE_ngwt__uid);
-	soap_serialize_ngwt__uid(soap, &((ngwt__Folder*)this)->tqparent);
+	soap_embedded(soap, &((ngwt__Folder*)this)->parent, SOAP_TYPE_ngwt__uid);
+	soap_serialize_ngwt__uid(soap, &((ngwt__Folder*)this)->parent);
 	soap_embedded(soap, &((ngwt__Folder*)this)->description, SOAP_TYPE_PointerTostd__string);
 	soap_serialize_PointerTostd__string(soap, &((ngwt__Folder*)this)->description);
 	soap_embedded(soap, &((ngwt__Folder*)this)->count, SOAP_TYPE_PointerToint);
@@ -48348,7 +48348,7 @@ void ngwt__QueryFolder::soap_default(struct soap *soap)
 	this->soap = soap;
 	((ngwt__QueryFolder*)this)->folderType = NULL;
 	((ngwt__QueryFolder*)this)->query = NULL;
-	soap_default_ngwt__uid(soap, &((ngwt__Folder*)this)->tqparent);
+	soap_default_ngwt__uid(soap, &((ngwt__Folder*)this)->parent);
 	((ngwt__Folder*)this)->description = NULL;
 	((ngwt__Folder*)this)->count = NULL;
 	((ngwt__Folder*)this)->hasUnread = NULL;
@@ -48386,7 +48386,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__QueryFolder(struct soap *soap, const ch
 	soap_out_string(soap, "ngwt:modified", -1, &(((ngwt__Item*)a)->modified), "");
 	soap_out_PointerTongwt__ItemChanges(soap, "ngwt:changes", -1, &(((ngwt__Item*)a)->changes), "");
 	/* transient soap skipped */
-	soap_out_ngwt__uid(soap, "ngwt:tqparent", -1, &(((ngwt__Folder*)a)->tqparent), "");
+	soap_out_ngwt__uid(soap, "ngwt:parent", -1, &(((ngwt__Folder*)a)->parent), "");
 	soap_out_PointerTostd__string(soap, "ngwt:description", -1, &(((ngwt__Folder*)a)->description), "");
 	soap_out_PointerToint(soap, "ngwt:count", -1, &(((ngwt__Folder*)a)->count), "");
 	soap_out_PointerTobool(soap, "ngwt:hasUnread", -1, &(((ngwt__Folder*)a)->hasUnread), "");
@@ -48431,7 +48431,7 @@ SOAP_FMAC3 ngwt__QueryFolder * SOAP_FMAC4 soap_in_ngwt__QueryFolder(struct soap
 			return (ngwt__QueryFolder *)a->soap_in(soap, tag, type);
 		}
 	}
-	short soap_flag_id3 = 1, soap_flag_name3 = 1, soap_flag_version3 = 1, soap_flag_modified3 = 1, soap_flag_changes3 = 1, soap_flag_tqparent2 = 1, soap_flag_description2 = 1, soap_flag_count2 = 1, soap_flag_hasUnread2 = 1, soap_flag_unreadCount2 = 1, soap_flag_sequence2 = 1, soap_flag_settings2 = 1, soap_flag_calendarAttribute2 = 1, soap_flag_folderType1 = 1, soap_flag_query1 = 1;
+	short soap_flag_id3 = 1, soap_flag_name3 = 1, soap_flag_version3 = 1, soap_flag_modified3 = 1, soap_flag_changes3 = 1, soap_flag_parent2 = 1, soap_flag_description2 = 1, soap_flag_count2 = 1, soap_flag_hasUnread2 = 1, soap_flag_unreadCount2 = 1, soap_flag_sequence2 = 1, soap_flag_settings2 = 1, soap_flag_calendarAttribute2 = 1, soap_flag_folderType1 = 1, soap_flag_query1 = 1;
 	if (soap->body && !*soap->href)
 	{
 		for (;;)
@@ -48462,9 +48462,9 @@ SOAP_FMAC3 ngwt__QueryFolder * SOAP_FMAC4 soap_in_ngwt__QueryFolder(struct soap
 					continue;
 				}
 			/* transient soap skipped */
-			if (soap_flag_tqparent2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_ngwt__uid(soap, "ngwt:tqparent", &(((ngwt__Folder*)a)->tqparent), "ngwt:uid"))
-				{	soap_flag_tqparent2 = 0;
+			if (soap_flag_parent2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
+				if (soap_in_ngwt__uid(soap, "ngwt:parent", &(((ngwt__Folder*)a)->parent), "ngwt:uid"))
+				{	soap_flag_parent2 = 0;
 					continue;
 				}
 			if (soap_flag_description2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
@@ -48519,7 +48519,7 @@ SOAP_FMAC3 ngwt__QueryFolder * SOAP_FMAC4 soap_in_ngwt__QueryFolder(struct soap
 			if (soap->error)
 				return NULL;
 		}
-		if ((soap->mode & SOAP_XML_STRICT) && (soap_flag_tqparent2))
+		if ((soap->mode & SOAP_XML_STRICT) && (soap_flag_parent2))
 		{	soap->error = SOAP_OCCURS;
 			return NULL;
 		}
@@ -58496,8 +58496,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__FolderACL(struct soap *soap, int st,
 void ngwt__Folder::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
-	soap_embedded(soap, &((ngwt__Folder*)this)->tqparent, SOAP_TYPE_ngwt__uid);
-	soap_serialize_ngwt__uid(soap, &((ngwt__Folder*)this)->tqparent);
+	soap_embedded(soap, &((ngwt__Folder*)this)->parent, SOAP_TYPE_ngwt__uid);
+	soap_serialize_ngwt__uid(soap, &((ngwt__Folder*)this)->parent);
 	soap_embedded(soap, &((ngwt__Folder*)this)->description, SOAP_TYPE_PointerTostd__string);
 	soap_serialize_PointerTostd__string(soap, &((ngwt__Folder*)this)->description);
 	soap_embedded(soap, &((ngwt__Folder*)this)->count, SOAP_TYPE_PointerToint);
@@ -58528,7 +58528,7 @@ void ngwt__Folder::soap_serialize(struct soap *soap) const
 void ngwt__Folder::soap_default(struct soap *soap)
 {
 	this->soap = soap;
-	soap_default_ngwt__uid(soap, &((ngwt__Folder*)this)->tqparent);
+	soap_default_ngwt__uid(soap, &((ngwt__Folder*)this)->parent);
 	((ngwt__Folder*)this)->description = NULL;
 	((ngwt__Folder*)this)->count = NULL;
 	((ngwt__Folder*)this)->hasUnread = NULL;
@@ -58566,7 +58566,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__Folder(struct soap *soap, const char *t
 	soap_out_string(soap, "ngwt:modified", -1, &(((ngwt__Item*)a)->modified), "");
 	soap_out_PointerTongwt__ItemChanges(soap, "ngwt:changes", -1, &(((ngwt__Item*)a)->changes), "");
 	/* transient soap skipped */
-	soap_out_ngwt__uid(soap, "ngwt:tqparent", -1, &(((ngwt__Folder*)a)->tqparent), "");
+	soap_out_ngwt__uid(soap, "ngwt:parent", -1, &(((ngwt__Folder*)a)->parent), "");
 	soap_out_PointerTostd__string(soap, "ngwt:description", -1, &(((ngwt__Folder*)a)->description), "");
 	soap_out_PointerToint(soap, "ngwt:count", -1, &(((ngwt__Folder*)a)->count), "");
 	soap_out_PointerTobool(soap, "ngwt:hasUnread", -1, &(((ngwt__Folder*)a)->hasUnread), "");
@@ -58609,7 +58609,7 @@ SOAP_FMAC3 ngwt__Folder * SOAP_FMAC4 soap_in_ngwt__Folder(struct soap *soap, con
 			return (ngwt__Folder *)a->soap_in(soap, tag, type);
 		}
 	}
-	short soap_flag_id2 = 1, soap_flag_name2 = 1, soap_flag_version2 = 1, soap_flag_modified2 = 1, soap_flag_changes2 = 1, soap_flag_tqparent1 = 1, soap_flag_description1 = 1, soap_flag_count1 = 1, soap_flag_hasUnread1 = 1, soap_flag_unreadCount1 = 1, soap_flag_sequence1 = 1, soap_flag_settings1 = 1, soap_flag_calendarAttribute1 = 1;
+	short soap_flag_id2 = 1, soap_flag_name2 = 1, soap_flag_version2 = 1, soap_flag_modified2 = 1, soap_flag_changes2 = 1, soap_flag_parent1 = 1, soap_flag_description1 = 1, soap_flag_count1 = 1, soap_flag_hasUnread1 = 1, soap_flag_unreadCount1 = 1, soap_flag_sequence1 = 1, soap_flag_settings1 = 1, soap_flag_calendarAttribute1 = 1;
 	if (soap->body && !*soap->href)
 	{
 		for (;;)
@@ -58640,9 +58640,9 @@ SOAP_FMAC3 ngwt__Folder * SOAP_FMAC4 soap_in_ngwt__Folder(struct soap *soap, con
 					continue;
 				}
 			/* transient soap skipped */
-			if (soap_flag_tqparent1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_ngwt__uid(soap, "ngwt:tqparent", &(((ngwt__Folder*)a)->tqparent), "ngwt:uid"))
-				{	soap_flag_tqparent1 = 0;
+			if (soap_flag_parent1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
+				if (soap_in_ngwt__uid(soap, "ngwt:parent", &(((ngwt__Folder*)a)->parent), "ngwt:uid"))
+				{	soap_flag_parent1 = 0;
 					continue;
 				}
 			if (soap_flag_description1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
@@ -58687,7 +58687,7 @@ SOAP_FMAC3 ngwt__Folder * SOAP_FMAC4 soap_in_ngwt__Folder(struct soap *soap, con
 			if (soap->error)
 				return NULL;
 		}
-		if ((soap->mode & SOAP_XML_STRICT) && (soap_flag_tqparent1))
+		if ((soap->mode & SOAP_XML_STRICT) && (soap_flag_parent1))
 		{	soap->error = SOAP_OCCURS;
 			return NULL;
 		}
@@ -63087,8 +63087,8 @@ void ngwt__ContactFolder::soap_serialize(struct soap *soap) const
 	soap_serialize_PointerTongwt__FolderACL(soap, &((ngwt__SystemFolder*)this)->acl);
 	soap_embedded(soap, &((ngwt__SystemFolder*)this)->isSharedByMe, SOAP_TYPE_PointerTobool);
 	soap_serialize_PointerTobool(soap, &((ngwt__SystemFolder*)this)->isSharedByMe);
-	soap_embedded(soap, &((ngwt__Folder*)this)->tqparent, SOAP_TYPE_ngwt__uid);
-	soap_serialize_ngwt__uid(soap, &((ngwt__Folder*)this)->tqparent);
+	soap_embedded(soap, &((ngwt__Folder*)this)->parent, SOAP_TYPE_ngwt__uid);
+	soap_serialize_ngwt__uid(soap, &((ngwt__Folder*)this)->parent);
 	soap_embedded(soap, &((ngwt__Folder*)this)->description, SOAP_TYPE_PointerTostd__string);
 	soap_serialize_PointerTostd__string(soap, &((ngwt__Folder*)this)->description);
 	soap_embedded(soap, &((ngwt__Folder*)this)->count, SOAP_TYPE_PointerToint);
@@ -63124,7 +63124,7 @@ void ngwt__ContactFolder::soap_default(struct soap *soap)
 	((ngwt__SystemFolder*)this)->folderType = NULL;
 	((ngwt__SystemFolder*)this)->acl = NULL;
 	((ngwt__SystemFolder*)this)->isSharedByMe = NULL;
-	soap_default_ngwt__uid(soap, &((ngwt__Folder*)this)->tqparent);
+	soap_default_ngwt__uid(soap, &((ngwt__Folder*)this)->parent);
 	((ngwt__Folder*)this)->description = NULL;
 	((ngwt__Folder*)this)->count = NULL;
 	((ngwt__Folder*)this)->hasUnread = NULL;
@@ -63162,7 +63162,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__ContactFolder(struct soap *soap, const
 	soap_out_string(soap, "ngwt:modified", -1, &(((ngwt__Item*)a)->modified), "");
 	soap_out_PointerTongwt__ItemChanges(soap, "ngwt:changes", -1, &(((ngwt__Item*)a)->changes), "");
 	/* transient soap skipped */
-	soap_out_ngwt__uid(soap, "ngwt:tqparent", -1, &(((ngwt__Folder*)a)->tqparent), "");
+	soap_out_ngwt__uid(soap, "ngwt:parent", -1, &(((ngwt__Folder*)a)->parent), "");
 	soap_out_PointerTostd__string(soap, "ngwt:description", -1, &(((ngwt__Folder*)a)->description), "");
 	soap_out_PointerToint(soap, "ngwt:count", -1, &(((ngwt__Folder*)a)->count), "");
 	soap_out_PointerTobool(soap, "ngwt:hasUnread", -1, &(((ngwt__Folder*)a)->hasUnread), "");
@@ -63210,7 +63210,7 @@ SOAP_FMAC3 ngwt__ContactFolder * SOAP_FMAC4 soap_in_ngwt__ContactFolder(struct s
 			return (ngwt__ContactFolder *)a->soap_in(soap, tag, type);
 		}
 	}
-	short soap_flag_id4 = 1, soap_flag_name4 = 1, soap_flag_version4 = 1, soap_flag_modified4 = 1, soap_flag_changes4 = 1, soap_flag_tqparent3 = 1, soap_flag_description3 = 1, soap_flag_count3 = 1, soap_flag_hasUnread3 = 1, soap_flag_unreadCount3 = 1, soap_flag_sequence3 = 1, soap_flag_settings3 = 1, soap_flag_calendarAttribute3 = 1, soap_flag_isSystemFolder2 = 1, soap_flag_folderType2 = 1, soap_flag_acl2 = 1, soap_flag_isSharedByMe2 = 1, soap_flag_addressBook1 = 1;
+	short soap_flag_id4 = 1, soap_flag_name4 = 1, soap_flag_version4 = 1, soap_flag_modified4 = 1, soap_flag_changes4 = 1, soap_flag_parent3 = 1, soap_flag_description3 = 1, soap_flag_count3 = 1, soap_flag_hasUnread3 = 1, soap_flag_unreadCount3 = 1, soap_flag_sequence3 = 1, soap_flag_settings3 = 1, soap_flag_calendarAttribute3 = 1, soap_flag_isSystemFolder2 = 1, soap_flag_folderType2 = 1, soap_flag_acl2 = 1, soap_flag_isSharedByMe2 = 1, soap_flag_addressBook1 = 1;
 	if (soap->body && !*soap->href)
 	{
 		for (;;)
@@ -63241,9 +63241,9 @@ SOAP_FMAC3 ngwt__ContactFolder * SOAP_FMAC4 soap_in_ngwt__ContactFolder(struct s
 					continue;
 				}
 			/* transient soap skipped */
-			if (soap_flag_tqparent3 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_ngwt__uid(soap, "ngwt:tqparent", &(((ngwt__Folder*)a)->tqparent), "ngwt:uid"))
-				{	soap_flag_tqparent3 = 0;
+			if (soap_flag_parent3 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
+				if (soap_in_ngwt__uid(soap, "ngwt:parent", &(((ngwt__Folder*)a)->parent), "ngwt:uid"))
+				{	soap_flag_parent3 = 0;
 					continue;
 				}
 			if (soap_flag_description3 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
@@ -63313,7 +63313,7 @@ SOAP_FMAC3 ngwt__ContactFolder * SOAP_FMAC4 soap_in_ngwt__ContactFolder(struct s
 			if (soap->error)
 				return NULL;
 		}
-		if ((soap->mode & SOAP_XML_STRICT) && (soap_flag_tqparent3))
+		if ((soap->mode & SOAP_XML_STRICT) && (soap_flag_parent3))
 		{	soap->error = SOAP_OCCURS;
 			return NULL;
 		}
diff --git a/kresources/groupwise/soap/soapStub.h b/kresources/groupwise/soap/soapStub.h
index 829237fd..46461d08 100644
--- a/kresources/groupwise/soap/soapStub.h
+++ b/kresources/groupwise/soap/soapStub.h
@@ -18,25 +18,25 @@
 
 #ifndef SOAP_TYPE_ngwt__ItemSourceList
 #define SOAP_TYPE_ngwt__ItemSourceList (336)
-/* Bitqmask ngwt:ItemSourceList */
+/* Bimask ngwt:ItemSourceList */
 enum ngwt__ItemSourceList {received = 1, sent = 2, draft = 4, personal = 8};
 #endif
 
 #ifndef SOAP_TYPE_ngwt__MessageTypeList
 #define SOAP_TYPE_ngwt__MessageTypeList (337)
-/* Bitqmask ngwt:MessageTypeList */
+/* Bimask ngwt:MessageTypeList */
 enum ngwt__MessageTypeList {Appointment = 1, CalendarItem = 2, DocumentReference = 4, Mail = 8, Note = 16, PhoneMessage = 32, Task = 64};
 #endif
 
 #ifndef SOAP_TYPE_ngwe__FieldList
 #define SOAP_TYPE_ngwe__FieldList (339)
-/* Bitqmask ngwe:FieldList */
+/* Bimask ngwe:FieldList */
 enum ngwe__FieldList {AcceptLevel = 1, Alarm = 2, AllDayEvent = 4, Attachment = 8, Category = 16, Classification = 32, Contact = 64, DueDate = 128, Duration = 256, EmailAddress = 512, ExpirationDate = 1024, Hidden = 2048, IMAddress = 4096, MessageBody = 8192, Name = 16384, Organization = 32768, Owner = 65536, PersonalSubject = 131072, PhoneNumber = 262144, Place = 524288, PostalAddress = 1048576, RecipientqStatus = 2097152, Rights = 4194304, Security = 8388608, SendPriority = 16777216, StartDate = 33554432, Subject = 67108864, TaskCategory = 134217728, TaskPriority = 268435456};
 #endif
 
 #ifndef SOAP_TYPE_ngwe__ItemTypeList
 #define SOAP_TYPE_ngwe__ItemTypeList (340)
-/* Bitqmask ngwe:ItemTypeList */
+/* Bimask ngwe:ItemTypeList */
 enum ngwe__ItemTypeList {AddressBookItem = 1, Appointment_ = 2, CalendarItem_ = 4, Contact_ = 8, Group = 16, Mail_ = 32, Note_ = 64, Organization_ = 128, PhoneMessage_ = 256, Resource = 512, Task_ = 1024, DocumentRef = 2048};
 #endif
 
@@ -3541,7 +3541,7 @@ public:
 class SOAP_CMAC _ngwm__getFolderListRequest
 {
 public:
-	std::string tqparent;	/* required element of type ngwt:uid */
+	std::string parent;	/* required element of type ngwt:uid */
 public:
 	std::string *view;	/* optional element of type ngwt:View */
 	bool recurse;	/* required element of type xsd:boolean */
@@ -6545,7 +6545,7 @@ public:
 class SOAP_CMAC ngwt__Folder : public ngwt__Item
 {
 public:
-	std::string tqparent;	/* required element of type ngwt:uid */
+	std::string parent;	/* required element of type ngwt:uid */
 public:
 	std::string *description;	/* optional element of type xsd:string */
 	int *count;	/* optional element of type xsd:int */
diff --git a/kresources/groupwise/soap/stdsoap2.cpp b/kresources/groupwise/soap/stdsoap2.cpp
index dd43419b..dd2ac010 100644
--- a/kresources/groupwise/soap/stdsoap2.cpp
+++ b/kresources/groupwise/soap/stdsoap2.cpp
@@ -3316,7 +3316,7 @@ again:
     { short v;
       unsigned int k = soap->omode; /* make sure we only parse HTTP */
       size_t n = soap->count; /* save the content length */
-      soap->omode &= ~SOAP_ENC; /* tqmask IO and ENC */
+      soap->omode &= ~SOAP_ENC; /* mask IO and ENC */
       soap->omode |= SOAP_IO_BUFFER;
       soap_begin_send(soap);
       DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Connecting to proxy server\n"));
@@ -3337,7 +3337,7 @@ again:
         return SOAP_INVALID_SOCKET;
       soap->omode = k;
       k = soap->imode;
-      soap->imode &= ~SOAP_ENC; /* tqmask IO and ENC */
+      soap->imode &= ~SOAP_ENC; /* mask IO and ENC */
       v = soap->version; /* preserve */
       if (soap_begin_recv(soap))
         return SOAP_INVALID_SOCKET;
@@ -6957,7 +6957,7 @@ SOAP_FMAC2
 soap_string_out(struct soap *soap, const char *s, int flag)
 { register const char *t;
   register soap_wchar c;
-  register soap_wchar tqmask = 0xFFFFFF80UL;
+  register soap_wchar mask = 0xFFFFFF80UL;
 #ifdef WITH_DOM
   if ((soap->mode & SOAP_XML_DOM) && soap->dom)
   { soap->dom->data = soap_strdup(soap, s); /* check EOM */
@@ -6965,7 +6965,7 @@ soap_string_out(struct soap *soap, const char *s, int flag)
   }
 #endif
   if (soap->mode & SOAP_C_UTFSTRING)
-    tqmask = 0;
+    mask = 0;
   t = s;
   while ((c = *t++))
   { switch (c)
@@ -7028,7 +7028,7 @@ soap_string_out(struct soap *soap, const char *s, int flag)
       }
 #endif
 #endif
-      if (c & tqmask)
+      if (c & mask)
       { if (soap_send_raw(soap, s, t - s - 1) || soap_pututf8(soap, (unsigned char)c))
           return soap->error;
         s = t;
diff --git a/kresources/groupwise/soap/stdsoap2.h b/kresources/groupwise/soap/stdsoap2.h
index 603d4def..7dee722a 100644
--- a/kresources/groupwise/soap/stdsoap2.h
+++ b/kresources/groupwise/soap/stdsoap2.h
@@ -896,7 +896,7 @@ extern const struct soap_double_nan { unsigned int n1, n2; } soap_double_nan;
 
 typedef soap_int32 soap_mode;
 
-#define SOAP_IO			0x00000003	/* IO tqmask */
+#define SOAP_IO			0x00000003	/* IO mask */
 #define SOAP_IO_FLUSH		0x00000000	/* flush output immediately, no buffering */
 #define SOAP_IO_BUFFER		0x00000001	/* buffer output in packets of size SOAP_BUFLEN */
 #define SOAP_IO_STORE		0x00000002	/* store entire output to determine length for transport */
@@ -914,7 +914,7 @@ typedef soap_int32 soap_mode;
 #define SOAP_ENC_ZLIB		0x00000400
 #define SOAP_ENC_SSL		0x00000800
 
-#define SOAP_ENC		0x00000FFF	/* IO and ENC tqmask */
+#define SOAP_ENC		0x00000FFF	/* IO and ENC mask */
 
 #define SOAP_XML_STRICT		0x00001000	/* strict validation */
 #define SOAP_XML_CANONICAL	0x00002000	/* C14N canonical XML */
@@ -1236,7 +1236,7 @@ class soap_dom_iterator
 #ifndef WITH_LEANER
 struct soap_dom_element
 { struct soap_dom_element *next;	/* next sibling */
-  struct soap_dom_element *prnt;	/* tqparent */
+  struct soap_dom_element *prnt;	/* parent */
   struct soap_dom_element *elts;	/* first child element */
   struct soap_dom_attribute *atts;	/* first child attribute */
   const char *nstr;			/* namespace string */
diff --git a/kresources/kolab/kabc/resourcekolab.cpp b/kresources/kolab/kabc/resourcekolab.cpp
index ff19fb50..43869641 100644
--- a/kresources/kolab/kabc/resourcekolab.cpp
+++ b/kresources/kolab/kabc/resourcekolab.cpp
@@ -668,9 +668,9 @@ void KABC::ResourceKolab::setSubresourceActive( const TQString &subresource, boo
 
 
 /*virtual*/
-bool KABC::ResourceKolab::addSubresource( const TQString& label, const TQString& tqparent )
+bool KABC::ResourceKolab::addSubresource( const TQString& label, const TQString& parent )
 {
-  return kmailAddSubresource( label, tqparent, s_kmailContentsType );
+  return kmailAddSubresource( label, parent, s_kmailContentsType );
 }
 
 /*virtual*/
diff --git a/kresources/kolab/kcal/resourcekolab.cpp b/kresources/kolab/kcal/resourcekolab.cpp
index 2107642b..04db68a6 100644
--- a/kresources/kolab/kcal/resourcekolab.cpp
+++ b/kresources/kolab/kcal/resourcekolab.cpp
@@ -920,7 +920,7 @@ KCal::Alarm::List ResourceKolab::relevantAlarms( const KCal::Alarm::List &alarms
   while ( it != alarms.end() ) {
     KCal::Alarm *a = (*it);
     ++it;
-    const TQString &uid = a->tqparent()->uid();
+    const TQString &uid = a->parent()->uid();
      if ( mUidMap.contains( uid ) ) {
        const TQString &sr = mUidMap[ uid ].resource();
        Kolab::SubResource *subResource = 0;
@@ -1231,16 +1231,16 @@ Kolab::ResourceMap* ResourceKolab::subResourceMap( const TQString& contentsType
 
 
 /*virtual*/
-bool ResourceKolab::addSubresource( const TQString& resource, const TQString& tqparent )
+bool ResourceKolab::addSubresource( const TQString& resource, const TQString& parent )
 {
    kdDebug(5650) << "KCal Kolab resource - adding subresource: " << resource << endl;
    TQString contentsType = kmailCalendarContentsType;
-   if ( !tqparent.isEmpty() ) {
-     if ( mEventSubResources.contains( tqparent ) )
+   if ( !parent.isEmpty() ) {
+     if ( mEventSubResources.contains( parent ) )
        contentsType = kmailCalendarContentsType;
-     else if ( mTodoSubResources.contains( tqparent ) )
+     else if ( mTodoSubResources.contains( parent ) )
        contentsType = kmailTodoContentsType;
-     else if ( mJournalSubResources.contains( tqparent ) )
+     else if ( mJournalSubResources.contains( parent ) )
        contentsType = kmailJournalContentsType;
    } else {
      TQStringList contentTypeChoices;
@@ -1255,7 +1255,7 @@ bool ResourceKolab::addSubresource( const TQString& resource, const TQString& tq
        contentsType = kmailJournalContentsType;
    }
 
-   return kmailAddSubresource( resource, tqparent, contentsType );
+   return kmailAddSubresource( resource, parent, contentsType );
 }
 
 /*virtual*/
diff --git a/kresources/kolab/kcal/resourcekolab.h b/kresources/kolab/kcal/resourcekolab.h
index 1535403a..872fbda4 100644
--- a/kresources/kolab/kcal/resourcekolab.h
+++ b/kresources/kolab/kcal/resourcekolab.h
@@ -140,7 +140,7 @@ public:
 
   virtual TQString subresourceIdentifier( Incidence *incidence );
 
-  virtual bool addSubresource( const TQString& resource, const TQString& tqparent );
+  virtual bool addSubresource( const TQString& resource, const TQString& parent );
   virtual bool removeSubresource( const TQString& resource );
 
   virtual TQString subresourceType( const TQString &resource );
diff --git a/kresources/kolab/kcal/task.cpp b/kresources/kolab/kcal/task.cpp
index 7bf5a601..570bb47b 100644
--- a/kresources/kolab/kcal/task.cpp
+++ b/kresources/kolab/kcal/task.cpp
@@ -141,7 +141,7 @@ void Task::setParent( const TQString& parentUid )
   mParent = parentUid;
 }
 
-TQString Task::tqparent() const
+TQString Task::parent() const
 {
   return mParent;
 }
@@ -247,7 +247,7 @@ bool Task::loadAttribute( TQDomElement& element )
       setqStatus( KCal::Incidence::StatusNone );
   } else if ( tagName == "due-date" ) {
     setDueDate( element.text() );
-  } else if ( tagName == "tqparent" ) {
+  } else if ( tagName == "parent" ) {
     setParent( element.text() );
   } else if ( tagName == "x-completed-date" ) {
     setCompletedDate( stringToDateTime( element.text() ) );
@@ -307,8 +307,8 @@ bool Task::saveAttributes( TQDomElement& element ) const
     }
   }
 
-  if ( !tqparent().isNull() ) {
-    writeString( element, "tqparent", tqparent() );
+  if ( !parent().isNull() ) {
+    writeString( element, "parent", parent() );
   }
 
   if ( hasCompletedDate() && percentCompleted() == 100 ) {
@@ -453,8 +453,8 @@ void Task::saveTo( KCal::Todo* task )
   if ( hasDueDate() )
     task->setDtDue( utcToLocal( dueDate() ) );
 
-  if ( !tqparent().isNull() )
-    task->setRelatedToUid( tqparent() );
+  if ( !parent().isNull() )
+    task->setRelatedToUid( parent() );
 
   if ( hasCompletedDate() && task->percentComplete() == 100 )
     task->setCompleted( utcToLocal( mCompletedDate ) );
diff --git a/kresources/kolab/kcal/task.h b/kresources/kolab/kcal/task.h
index 5990192b..43780c00 100644
--- a/kresources/kolab/kcal/task.h
+++ b/kresources/kolab/kcal/task.h
@@ -81,7 +81,7 @@ public:
   virtual KCal::Incidence::tqStatus status() const;
 
   virtual void setParent( const TQString& parentUid );
-  virtual TQString tqparent() const;
+  virtual TQString parent() const;
 
   virtual void setHasStartDate( bool );
   virtual bool hasStartDate() const;
diff --git a/kresources/kolab/shared/kmailconnection.cpp b/kresources/kolab/shared/kmailconnection.cpp
index 8e584fb2..e82102a3 100644
--- a/kresources/kolab/shared/kmailconnection.cpp
+++ b/kresources/kolab/shared/kmailconnection.cpp
@@ -295,11 +295,11 @@ bool KMailConnection::kmailUpdate( const TQString& resource,
 }
 
 bool KMailConnection::kmailAddSubresource( const TQString& resource,
-                                           const TQString& tqparent,
+                                           const TQString& parent,
                                            const TQString& contentsType )
 {
   return connectToKMail()
-      && mKMailIcalIfaceStub->addSubresource( resource, tqparent, contentsType )
+      && mKMailIcalIfaceStub->addSubresource( resource, parent, contentsType )
       && mKMailIcalIfaceStub->ok();
 }
 
diff --git a/kresources/kolab/shared/kmailconnection.h b/kresources/kolab/shared/kmailconnection.h
index b7befb4d..ec49bfd1 100644
--- a/kresources/kolab/shared/kmailconnection.h
+++ b/kresources/kolab/shared/kmailconnection.h
@@ -108,7 +108,7 @@ public:
 
   bool kmailTriggerSync( const TQString& contentsType );
   bool kmailAddSubresource( const TQString& resource,
-                            const TQString& tqparent,
+                            const TQString& parent,
                             const TQString& contentsType );
   bool kmailRemoveSubresource( const TQString& resource );
 
diff --git a/kresources/kolab/shared/resourcekolabbase.cpp b/kresources/kolab/shared/resourcekolabbase.cpp
index 90464b6b..a357b0d6 100644
--- a/kresources/kolab/shared/resourcekolabbase.cpp
+++ b/kresources/kolab/shared/resourcekolabbase.cpp
@@ -199,10 +199,10 @@ bool ResourceKolabBase::connectToKMail() const
 }
 
 bool ResourceKolabBase::kmailAddSubresource( const TQString& resource,
-                                             const TQString& tqparent,
+                                             const TQString& parent,
                                              const TQString& contentsType )
 {
-  return mConnection->kmailAddSubresource( resource, tqparent, contentsType );
+  return mConnection->kmailAddSubresource( resource, parent, contentsType );
 }
 
 bool ResourceKolabBase::kmailRemoveSubresource( const TQString& resource )
diff --git a/kresources/kolab/shared/resourcekolabbase.h b/kresources/kolab/shared/resourcekolabbase.h
index d16f2a57..f32c151f 100644
--- a/kresources/kolab/shared/resourcekolabbase.h
+++ b/kresources/kolab/shared/resourcekolabbase.h
@@ -162,7 +162,7 @@ protected:
                     const TQStringList& attachmentNames = TQStringList(),
                     const TQStringList& deletedAttachments = TQStringList() );
 
-  bool kmailAddSubresource( const TQString& resource, const TQString& tqparent,
+  bool kmailAddSubresource( const TQString& resource, const TQString& parent,
                             const TQString& contentsType );
   bool kmailRemoveSubresource( const TQString& resource );
 
diff --git a/kresources/lib/folderconfig.cpp b/kresources/lib/folderconfig.cpp
index f5af726a..20fa6fa1 100644
--- a/kresources/lib/folderconfig.cpp
+++ b/kresources/lib/folderconfig.cpp
@@ -41,8 +41,8 @@
 
 using namespace KPIM;
 
-FolderConfig::FolderConfig( TQWidget *tqparent )
-  : TQWidget( tqparent ), mFolderLister( 0 )
+FolderConfig::FolderConfig( TQWidget *parent )
+  : TQWidget( parent ), mFolderLister( 0 )
 {
   TQBoxLayout *topLayout = new TQVBoxLayout( this );
   topLayout->addSpacing( KDialog::spacingHint() );
diff --git a/kresources/lib/folderconfig.h b/kresources/lib/folderconfig.h
index 538c1b47..6ed2ae59 100644
--- a/kresources/lib/folderconfig.h
+++ b/kresources/lib/folderconfig.h
@@ -40,7 +40,7 @@ class KDE_EXPORT FolderConfig : public TQWidget
     Q_OBJECT
   TQ_OBJECT
   public:
-    FolderConfig( TQWidget *tqparent );
+    FolderConfig( TQWidget *parent );
     ~FolderConfig();
 
     void setFolderLister( FolderLister * );
diff --git a/kresources/lib/folderlistview.cpp b/kresources/lib/folderlistview.cpp
index d8ae7ec1..8cbdffd5 100644
--- a/kresources/lib/folderlistview.cpp
+++ b/kresources/lib/folderlistview.cpp
@@ -38,8 +38,8 @@ static const int BoxSize = 16;
 
 
 //BEGIN FolderListView
-FolderListView::FolderListView( TQWidget *tqparent, const TQValueList<Property> &types )
-    : KListView( tqparent )
+FolderListView::FolderListView( TQWidget *parent, const TQValueList<Property> &types )
+    : KListView( parent )
 {
   setEnabledTypes( types );
 
diff --git a/kresources/lib/folderlistview.h b/kresources/lib/folderlistview.h
index 0c99d913..1992f8bf 100644
--- a/kresources/lib/folderlistview.h
+++ b/kresources/lib/folderlistview.h
@@ -46,7 +46,7 @@ class FolderListView : public KListView
     /* mainly for readability */
     enum Property { FolderName, Event, Todo, Journal, Contact, All, Unknown, PROP_MAX };
     
-    FolderListView( TQWidget *tqparent, const TQValueList<Property> &types = TQValueList<Property>() );
+    FolderListView( TQWidget *parent, const TQValueList<Property> &types = TQValueList<Property>() );
     ~FolderListView() {};
 
     /* Display a popupmenu for item i at the specified global position, eventually with a title,
@@ -82,9 +82,9 @@ class FolderListItem : public TQCheckListItem
 {
   typedef TQCheckListItem super;
   public:
-    FolderListItem( FolderListItem *tqparent, const KPIM::FolderLister::Entry &folder )
-      : TQCheckListItem( tqparent, folder.name, TQCheckListItem::CheckBoxController ), 
-        mFolder( folder ), mFolderListView( tqparent?(tqparent->folderListView()):0 )
+    FolderListItem( FolderListItem *parent, const KPIM::FolderLister::Entry &folder )
+      : TQCheckListItem( parent, folder.name, TQCheckListItem::CheckBoxController ), 
+        mFolder( folder ), mFolderListView( parent?(parent->folderListView()):0 )
     {
       setOn( mFolder.active );
     }
diff --git a/kresources/lib/kabc_resourcegroupwarebaseconfig.cpp b/kresources/lib/kabc_resourcegroupwarebaseconfig.cpp
index ba16ccae..80303734 100644
--- a/kresources/lib/kabc_resourcegroupwarebaseconfig.cpp
+++ b/kresources/lib/kabc_resourcegroupwarebaseconfig.cpp
@@ -37,8 +37,8 @@
 
 using namespace KABC;
 
-ResourceGroupwareBaseConfig::ResourceGroupwareBaseConfig( TQWidget* tqparent,  const char* name )
-  : KRES::ConfigWidget( tqparent, name )
+ResourceGroupwareBaseConfig::ResourceGroupwareBaseConfig( TQWidget* parent,  const char* name )
+  : KRES::ConfigWidget( parent, name )
 {
   TQGridLayout *mainLayout = new TQGridLayout( this, 7, 2, 0, KDialog::spacingHint() );
 
diff --git a/kresources/lib/kabc_resourcegroupwarebaseconfig.h b/kresources/lib/kabc_resourcegroupwarebaseconfig.h
index 59c99f48..dbb57ed6 100644
--- a/kresources/lib/kabc_resourcegroupwarebaseconfig.h
+++ b/kresources/lib/kabc_resourcegroupwarebaseconfig.h
@@ -42,7 +42,7 @@ class KDE_EXPORT ResourceGroupwareBaseConfig : public KRES::ConfigWidget
   TQ_OBJECT
 
   public:
-    ResourceGroupwareBaseConfig( TQWidget* tqparent = 0, const char* name = 0 );
+    ResourceGroupwareBaseConfig( TQWidget* parent = 0, const char* name = 0 );
 
   public slots:
     void loadSettings( KRES::Resource* );
diff --git a/kresources/lib/kcal_cachesettingsdlg.cpp b/kresources/lib/kcal_cachesettingsdlg.cpp
index 0d7e4248..808a1673 100644
--- a/kresources/lib/kcal_cachesettingsdlg.cpp
+++ b/kresources/lib/kcal_cachesettingsdlg.cpp
@@ -38,8 +38,8 @@
 
 using namespace KCal;
 
-CacheSettingsDialog::CacheSettingsDialog( TQWidget* tqparent, const char* name )
-    : KDialogBase( tqparent, name, true, i18n("Resource Cache Settings"), KDialogBase::Close )
+CacheSettingsDialog::CacheSettingsDialog( TQWidget* parent, const char* name )
+    : KDialogBase( parent, name, true, i18n("Resource Cache Settings"), KDialogBase::Close )
 {
   TQWidget *mainWidget = new TQWidget( this );
   setMainWidget( mainWidget );
diff --git a/kresources/lib/kcal_cachesettingsdlg.h b/kresources/lib/kcal_cachesettingsdlg.h
index 07e8337f..3de47e9a 100644
--- a/kresources/lib/kcal_cachesettingsdlg.h
+++ b/kresources/lib/kcal_cachesettingsdlg.h
@@ -44,7 +44,7 @@ class KDE_EXPORT CacheSettingsDialog : public KDialogBase
     Q_OBJECT
   TQ_OBJECT
   public:
-    CacheSettingsDialog( TQWidget *tqparent = 0, const char *name = 0 );
+    CacheSettingsDialog( TQWidget *parent = 0, const char *name = 0 );
 
   public slots:
     virtual void loadSettings( KRES::Resource *resource );
diff --git a/kresources/lib/kcal_resourcegroupwarebaseconfig.cpp b/kresources/lib/kcal_resourcegroupwarebaseconfig.cpp
index e3fc3f93..9ae91a0d 100644
--- a/kresources/lib/kcal_resourcegroupwarebaseconfig.cpp
+++ b/kresources/lib/kcal_resourcegroupwarebaseconfig.cpp
@@ -42,9 +42,9 @@
 
 using namespace KCal;
 
-ResourceGroupwareBaseConfig::ResourceGroupwareBaseConfig( TQWidget* tqparent,
+ResourceGroupwareBaseConfig::ResourceGroupwareBaseConfig( TQWidget* parent,
                                                           const char* name )
-    : KRES::ConfigWidget( tqparent, name )
+    : KRES::ConfigWidget( parent, name )
 {
   resize( 245, 115 );
 
diff --git a/kresources/lib/kcal_resourcegroupwarebaseconfig.h b/kresources/lib/kcal_resourcegroupwarebaseconfig.h
index ee10fa5c..eb2522ec 100644
--- a/kresources/lib/kcal_resourcegroupwarebaseconfig.h
+++ b/kresources/lib/kcal_resourcegroupwarebaseconfig.h
@@ -49,7 +49,7 @@ class KDE_EXPORT ResourceGroupwareBaseConfig : public KRES::ConfigWidget
     Q_OBJECT
   TQ_OBJECT
   public:
-    ResourceGroupwareBaseConfig( TQWidget *tqparent = 0, const char *name = 0 );
+    ResourceGroupwareBaseConfig( TQWidget *parent = 0, const char *name = 0 );
 
   public slots:
     virtual void loadSettings( KRES::Resource *resource );
diff --git a/kresources/remote/resourceremoteconfig.cpp b/kresources/remote/resourceremoteconfig.cpp
index 7ecb0983..67d7f4b9 100644
--- a/kresources/remote/resourceremoteconfig.cpp
+++ b/kresources/remote/resourceremoteconfig.cpp
@@ -38,8 +38,8 @@
 
 using namespace KCal;
 
-ResourceRemoteConfig::ResourceRemoteConfig( TQWidget* tqparent,  const char* name )
-    : KRES::ConfigWidget( tqparent, name )
+ResourceRemoteConfig::ResourceRemoteConfig( TQWidget* parent,  const char* name )
+    : KRES::ConfigWidget( parent, name )
 {
   resize( 245, 115 ); 
   TQGridLayout *mainLayout = new TQGridLayout( this, 2, 2 );
diff --git a/kresources/remote/resourceremoteconfig.h b/kresources/remote/resourceremoteconfig.h
index 7fe6e862..7c7d5124 100644
--- a/kresources/remote/resourceremoteconfig.h
+++ b/kresources/remote/resourceremoteconfig.h
@@ -47,7 +47,7 @@ class KDE_EXPORT ResourceRemoteConfig : public KRES::ConfigWidget
     Q_OBJECT
   TQ_OBJECT
   public:
-    ResourceRemoteConfig( TQWidget *tqparent = 0, const char *name = 0 );
+    ResourceRemoteConfig( TQWidget *parent = 0, const char *name = 0 );
 
   public slots:
     virtual void loadSettings( KRES::Resource *resource );
diff --git a/kresources/scalix/scalixadmin/delegatedialog.cpp b/kresources/scalix/scalixadmin/delegatedialog.cpp
index 70ab3734..d0a9644e 100644
--- a/kresources/scalix/scalixadmin/delegatedialog.cpp
+++ b/kresources/scalix/scalixadmin/delegatedialog.cpp
@@ -31,8 +31,8 @@
 
 #include "delegatedialog.h"
 
-DelegateDialog::DelegateDialog( TQWidget *tqparent )
-  : KDialogBase( tqparent, "", true, "", Ok | Cancel, Ok, true )
+DelegateDialog::DelegateDialog( TQWidget *parent )
+  : KDialogBase( parent, "", true, "", Ok | Cancel, Ok, true )
 {
   TQWidget *page = new TQWidget( this );
   TQGridLayout *tqlayout = new TQGridLayout( page, 5, 3, 11, 6 );
diff --git a/kresources/scalix/scalixadmin/delegatedialog.h b/kresources/scalix/scalixadmin/delegatedialog.h
index a515fe89..6b3d7851 100644
--- a/kresources/scalix/scalixadmin/delegatedialog.h
+++ b/kresources/scalix/scalixadmin/delegatedialog.h
@@ -38,7 +38,7 @@ class DelegateDialog : public KDialogBase
   TQ_OBJECT
 
   public:
-    DelegateDialog( TQWidget *tqparent = 0 );
+    DelegateDialog( TQWidget *parent = 0 );
 
     void setDelegate( const Scalix::Delegate &delegate );
     Scalix::Delegate delegate() const;
diff --git a/kresources/scalix/scalixadmin/delegatepage.cpp b/kresources/scalix/scalixadmin/delegatepage.cpp
index cdfef591..32b29d46 100644
--- a/kresources/scalix/scalixadmin/delegatepage.cpp
+++ b/kresources/scalix/scalixadmin/delegatepage.cpp
@@ -34,8 +34,8 @@
 
 #include "delegatepage.h"
 
-DelegatePage::DelegatePage( TQWidget *tqparent )
-  : TQWidget( tqparent )
+DelegatePage::DelegatePage( TQWidget *parent )
+  : TQWidget( parent )
 {
   TQGridLayout *tqlayout = new TQGridLayout( this, 2, 3, 11, 6 );
 
diff --git a/kresources/scalix/scalixadmin/delegatepage.h b/kresources/scalix/scalixadmin/delegatepage.h
index 3d266580..26afbad8 100644
--- a/kresources/scalix/scalixadmin/delegatepage.h
+++ b/kresources/scalix/scalixadmin/delegatepage.h
@@ -34,7 +34,7 @@ class DelegatePage : public TQWidget
   TQ_OBJECT
 
   public:
-    DelegatePage( TQWidget *tqparent = 0 );
+    DelegatePage( TQWidget *parent = 0 );
     ~DelegatePage();
 
   private slots:
diff --git a/kresources/scalix/scalixadmin/delegateview.cpp b/kresources/scalix/scalixadmin/delegateview.cpp
index 12f27b77..1031f460 100644
--- a/kresources/scalix/scalixadmin/delegateview.cpp
+++ b/kresources/scalix/scalixadmin/delegateview.cpp
@@ -27,8 +27,8 @@
 class DelegateItem : public TQListViewItem
 {
   public:
-    DelegateItem( TQListView *tqparent, const Scalix::Delegate &delegate )
-      : TQListViewItem( tqparent ), mDelegate( delegate )
+    DelegateItem( TQListView *parent, const Scalix::Delegate &delegate )
+      : TQListViewItem( parent ), mDelegate( delegate )
     {
       setText( 0, mDelegate.email() );
       setText( 1, Scalix::Delegate::rightsAsString( mDelegate.rights() ) );
@@ -40,8 +40,8 @@ class DelegateItem : public TQListViewItem
     Scalix::Delegate mDelegate;
 };
 
-DelegateView::DelegateView( DelegateManager *manager, TQWidget *tqparent )
-  : KListView( tqparent ), mManager( manager )
+DelegateView::DelegateView( DelegateManager *manager, TQWidget *parent )
+  : KListView( parent ), mManager( manager )
 {
   addColumn( i18n( "Delegate" ) );
   addColumn( i18n( "Rights" ) );
diff --git a/kresources/scalix/scalixadmin/delegateview.h b/kresources/scalix/scalixadmin/delegateview.h
index 243d3c8d..ec8f1fe2 100644
--- a/kresources/scalix/scalixadmin/delegateview.h
+++ b/kresources/scalix/scalixadmin/delegateview.h
@@ -35,7 +35,7 @@ class DelegateView : public KListView
   TQ_OBJECT
 
   public:
-    DelegateView( DelegateManager *manager, TQWidget *tqparent = 0 );
+    DelegateView( DelegateManager *manager, TQWidget *parent = 0 );
 
     Scalix::Delegate selectedDelegate() const;
 
diff --git a/kresources/scalix/scalixadmin/ldapdialog.cpp b/kresources/scalix/scalixadmin/ldapdialog.cpp
index 35f5d1c0..6af08c4d 100644
--- a/kresources/scalix/scalixadmin/ldapdialog.cpp
+++ b/kresources/scalix/scalixadmin/ldapdialog.cpp
@@ -24,8 +24,8 @@
 
 #include "ldapdialog.h"
 
-LdapDialog::LdapDialog( TQWidget *tqparent )
-  : KDialogBase( tqparent, "", true, "", Ok | Cancel, Ok, true )
+LdapDialog::LdapDialog( TQWidget *parent )
+  : KDialogBase( parent, "", true, "", Ok | Cancel, Ok, true )
 {
   setCaption( i18n( "User Account Selection" ) );
 
diff --git a/kresources/scalix/scalixadmin/ldapdialog.h b/kresources/scalix/scalixadmin/ldapdialog.h
index bcccd280..9d822af1 100644
--- a/kresources/scalix/scalixadmin/ldapdialog.h
+++ b/kresources/scalix/scalixadmin/ldapdialog.h
@@ -27,7 +27,7 @@ class LdapView;
 class LdapDialog : public KDialogBase
 {
   public:
-    LdapDialog( TQWidget *tqparent = 0 );
+    LdapDialog( TQWidget *parent = 0 );
 
     TQString selectedUser() const;
 
diff --git a/kresources/scalix/scalixadmin/ldapview.cpp b/kresources/scalix/scalixadmin/ldapview.cpp
index bade9e16..b52c0aad 100644
--- a/kresources/scalix/scalixadmin/ldapview.cpp
+++ b/kresources/scalix/scalixadmin/ldapview.cpp
@@ -29,8 +29,8 @@
 class LdapItem : public TQListViewItem
 {
   public:
-    LdapItem( TQListView *tqparent, const TQString &text, const TQString &email )
-      : TQListViewItem( tqparent )
+    LdapItem( TQListView *parent, const TQString &text, const TQString &email )
+      : TQListViewItem( parent )
     {
       setText( 0, text );
       setText( 1, email );
@@ -38,8 +38,8 @@ class LdapItem : public TQListViewItem
 };
 
 
-LdapView::LdapView( TQWidget *tqparent )
-  : KListView( tqparent )
+LdapView::LdapView( TQWidget *parent )
+  : KListView( parent )
 {
   addColumn( i18n( "User" ) );
   setFullWidth( true );
diff --git a/kresources/scalix/scalixadmin/ldapview.h b/kresources/scalix/scalixadmin/ldapview.h
index 8d7375da..d666726a 100644
--- a/kresources/scalix/scalixadmin/ldapview.h
+++ b/kresources/scalix/scalixadmin/ldapview.h
@@ -33,7 +33,7 @@ class LdapView : public KListView
   TQ_OBJECT
 
   public:
-    LdapView( TQWidget *tqparent = 0 );
+    LdapView( TQWidget *parent = 0 );
     ~LdapView();
 
     TQString selectedUser() const;
diff --git a/kresources/scalix/scalixadmin/otheruserpage.cpp b/kresources/scalix/scalixadmin/otheruserpage.cpp
index 6aba51c7..ab5a417a 100644
--- a/kresources/scalix/scalixadmin/otheruserpage.cpp
+++ b/kresources/scalix/scalixadmin/otheruserpage.cpp
@@ -37,8 +37,8 @@
 
 #include "otheruserpage.h"
 
-OtherUserPage::OtherUserPage( TQWidget *tqparent )
-  : TQWidget( tqparent )
+OtherUserPage::OtherUserPage( TQWidget *parent )
+  : TQWidget( parent )
 {
   TQGridLayout *tqlayout = new TQGridLayout( this, 2, 2, 11, 6 );
 
diff --git a/kresources/scalix/scalixadmin/otheruserpage.h b/kresources/scalix/scalixadmin/otheruserpage.h
index f547c078..b3333197 100644
--- a/kresources/scalix/scalixadmin/otheruserpage.h
+++ b/kresources/scalix/scalixadmin/otheruserpage.h
@@ -34,7 +34,7 @@ class OtherUserPage : public TQWidget
   TQ_OBJECT
 
   public:
-    OtherUserPage( TQWidget *tqparent = 0 );
+    OtherUserPage( TQWidget *parent = 0 );
     ~OtherUserPage();
 
   private slots:
diff --git a/kresources/scalix/scalixadmin/otheruserview.cpp b/kresources/scalix/scalixadmin/otheruserview.cpp
index 7b07612c..25a69428 100644
--- a/kresources/scalix/scalixadmin/otheruserview.cpp
+++ b/kresources/scalix/scalixadmin/otheruserview.cpp
@@ -27,8 +27,8 @@
 class OtherUserItem : public TQListViewItem
 {
   public:
-    OtherUserItem( TQListView *tqparent, const TQString &user )
-      : TQListViewItem( tqparent ), mUser( user )
+    OtherUserItem( TQListView *parent, const TQString &user )
+      : TQListViewItem( parent ), mUser( user )
     {
       setText( 0, mUser );
     }
@@ -39,8 +39,8 @@ class OtherUserItem : public TQListViewItem
     TQString mUser;
 };
 
-OtherUserView::OtherUserView( OtherUserManager *manager, TQWidget *tqparent )
-  : KListView( tqparent ), mManager( manager )
+OtherUserView::OtherUserView( OtherUserManager *manager, TQWidget *parent )
+  : KListView( parent ), mManager( manager )
 {
   addColumn( i18n( "Registered Accounts" ) );
   setFullWidth( true );
diff --git a/kresources/scalix/scalixadmin/otheruserview.h b/kresources/scalix/scalixadmin/otheruserview.h
index 36f5923b..4f0170eb 100644
--- a/kresources/scalix/scalixadmin/otheruserview.h
+++ b/kresources/scalix/scalixadmin/otheruserview.h
@@ -31,7 +31,7 @@ class OtherUserView : public KListView
   TQ_OBJECT
 
   public:
-    OtherUserView( OtherUserManager *manager, TQWidget *tqparent = 0 );
+    OtherUserView( OtherUserManager *manager, TQWidget *parent = 0 );
 
     TQString selectedUser() const;
 
diff --git a/kresources/scalix/scalixadmin/outofofficepage.cpp b/kresources/scalix/scalixadmin/outofofficepage.cpp
index 7b2f2ac6..401d4de1 100644
--- a/kresources/scalix/scalixadmin/outofofficepage.cpp
+++ b/kresources/scalix/scalixadmin/outofofficepage.cpp
@@ -33,8 +33,8 @@
 
 #include "outofofficepage.h"
 
-OutOfOfficePage::OutOfOfficePage( TQWidget *tqparent )
-  : TQWidget( tqparent )
+OutOfOfficePage::OutOfOfficePage( TQWidget *parent )
+  : TQWidget( parent )
 {
   TQGridLayout *tqlayout = new TQGridLayout( this, 4, 2, 11, 6 );
 
diff --git a/kresources/scalix/scalixadmin/outofofficepage.h b/kresources/scalix/scalixadmin/outofofficepage.h
index 8e536b28..ee8ba176 100644
--- a/kresources/scalix/scalixadmin/outofofficepage.h
+++ b/kresources/scalix/scalixadmin/outofofficepage.h
@@ -34,7 +34,7 @@ class OutOfOfficePage : public TQWidget
   TQ_OBJECT
 
   public:
-    OutOfOfficePage( TQWidget *tqparent = 0 );
+    OutOfOfficePage( TQWidget *parent = 0 );
     ~OutOfOfficePage();
 
   private slots:
diff --git a/kresources/scalix/scalixadmin/passwordpage.cpp b/kresources/scalix/scalixadmin/passwordpage.cpp
index 0781e3a4..51b11f6f 100644
--- a/kresources/scalix/scalixadmin/passwordpage.cpp
+++ b/kresources/scalix/scalixadmin/passwordpage.cpp
@@ -35,8 +35,8 @@
 
 #include "passwordpage.h"
 
-PasswordPage::PasswordPage( TQWidget *tqparent )
-  : TQWidget( tqparent ), mJob( 0 )
+PasswordPage::PasswordPage( TQWidget *parent )
+  : TQWidget( parent ), mJob( 0 )
 {
   TQGridLayout *tqlayout = new TQGridLayout( this, 2, 3, 11, 6 );
 
diff --git a/kresources/scalix/scalixadmin/passwordpage.h b/kresources/scalix/scalixadmin/passwordpage.h
index a461a086..5961ffe2 100644
--- a/kresources/scalix/scalixadmin/passwordpage.h
+++ b/kresources/scalix/scalixadmin/passwordpage.h
@@ -36,7 +36,7 @@ class PasswordPage : public TQWidget
   TQ_OBJECT
 
   public:
-    PasswordPage( TQWidget *tqparent = 0 );
+    PasswordPage( TQWidget *parent = 0 );
 
   private slots:
     void buttonClicked();
diff --git a/kresources/slox/kabcresourceslox.cpp b/kresources/slox/kabcresourceslox.cpp
index ba3d4115..36b6cc99 100644
--- a/kresources/slox/kabcresourceslox.cpp
+++ b/kresources/slox/kabcresourceslox.cpp
@@ -631,14 +631,14 @@ void ResourceSlox::createAddresseeFields( TQDomDocument &doc, TQDomElement &prop
   }
 }
 
-void KABC::ResourceSlox::createAddressFields( TQDomDocument &doc, TQDomElement &tqparent,
+void KABC::ResourceSlox::createAddressFields( TQDomDocument &doc, TQDomElement &parent,
                                                const TQString &prefix, const KABC::Address &addr )
 {
-  WebdavHandler::addSloxElement( this, doc, tqparent, prefix + fieldName( Street ), addr.street() );
-  WebdavHandler::addSloxElement( this, doc, tqparent, prefix + fieldName( PostalCode ), addr.postalCode() );
-  WebdavHandler::addSloxElement( this, doc, tqparent, prefix + fieldName( City ), addr.locality() );
-  WebdavHandler::addSloxElement( this, doc, tqparent, prefix + fieldName( State ), addr.region() );
-  WebdavHandler::addSloxElement( this, doc, tqparent, prefix + fieldName( Country ), addr.country() );
+  WebdavHandler::addSloxElement( this, doc, parent, prefix + fieldName( Street ), addr.street() );
+  WebdavHandler::addSloxElement( this, doc, parent, prefix + fieldName( PostalCode ), addr.postalCode() );
+  WebdavHandler::addSloxElement( this, doc, parent, prefix + fieldName( City ), addr.locality() );
+  WebdavHandler::addSloxElement( this, doc, parent, prefix + fieldName( State ), addr.region() );
+  WebdavHandler::addSloxElement( this, doc, parent, prefix + fieldName( Country ), addr.country() );
 }
 
 void ResourceSlox::slotProgress( KIO::Job *job, unsigned long percent )
diff --git a/kresources/slox/kabcresourceslox.h b/kresources/slox/kabcresourceslox.h
index d7d3417f..98be4bd5 100644
--- a/kresources/slox/kabcresourceslox.h
+++ b/kresources/slox/kabcresourceslox.h
@@ -81,7 +81,7 @@ class KDE_EXPORT ResourceSlox : public ResourceCached, public SloxBase
     void parseContactAttribute( const TQDomElement &e, Addressee &a );
 
     void createAddresseeFields( TQDomDocument &doc, TQDomElement &prop, const Addressee &a );
-    void createAddressFields( TQDomDocument &doc, TQDomElement &tqparent,
+    void createAddressFields( TQDomDocument &doc, TQDomElement &parent,
                               const TQString &prefix, const KABC::Address &addr );
 
     void uploadContacts();
diff --git a/kresources/slox/kabcresourcesloxconfig.cpp b/kresources/slox/kabcresourcesloxconfig.cpp
index d6760156..abacaf71 100644
--- a/kresources/slox/kabcresourcesloxconfig.cpp
+++ b/kresources/slox/kabcresourcesloxconfig.cpp
@@ -39,8 +39,8 @@
 
 using namespace KABC;
 
-ResourceSloxConfig::ResourceSloxConfig( TQWidget* tqparent,  const char* name )
-  : KRES::ConfigWidget( tqparent, name ), mRes( 0 )
+ResourceSloxConfig::ResourceSloxConfig( TQWidget* parent,  const char* name )
+  : KRES::ConfigWidget( parent, name ), mRes( 0 )
 {
   TQGridLayout *mainLayout = new TQGridLayout( this, 5, 2, 0, KDialog::spacingHint() );
 
diff --git a/kresources/slox/kabcresourcesloxconfig.h b/kresources/slox/kabcresourcesloxconfig.h
index 2392d5cc..79b255a1 100644
--- a/kresources/slox/kabcresourcesloxconfig.h
+++ b/kresources/slox/kabcresourcesloxconfig.h
@@ -38,7 +38,7 @@ class KDE_EXPORT ResourceSloxConfig : public KRES::ConfigWidget
   TQ_OBJECT
 
   public:
-    ResourceSloxConfig( TQWidget* tqparent = 0, const char* name = 0 );
+    ResourceSloxConfig( TQWidget* parent = 0, const char* name = 0 );
 
   public slots:
     void loadSettings( KRES::Resource* );
diff --git a/kresources/slox/kcalresourceslox.cpp b/kresources/slox/kcalresourceslox.cpp
index cb477038..b2c24b8a 100644
--- a/kresources/slox/kcalresourceslox.cpp
+++ b/kresources/slox/kcalresourceslox.cpp
@@ -393,17 +393,17 @@ void KCalResourceSlox::uploadIncidences()
 }
 
 void KCalResourceSlox::createIncidenceAttributes( TQDomDocument &doc,
-                                                  TQDomElement &tqparent,
+                                                  TQDomElement &parent,
                                                   Incidence *incidence )
 {
-  WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( IncidenceTitle ),
+  WebdavHandler::addSloxElement( this, doc, parent, fieldName( IncidenceTitle ),
                                  incidence->summary() );
 
-  WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( Description ),
+  WebdavHandler::addSloxElement( this, doc, parent, fieldName( Description ),
                                  incidence->description() );
 
   if ( incidence->attendeeCount() > 0 ) {
-    TQDomElement members = WebdavHandler::addSloxElement( this, doc, tqparent,
+    TQDomElement members = WebdavHandler::addSloxElement( this, doc, parent,
         fieldName( Participants ) );
     Attendee::List attendees = incidence->attendees();
     Attendee::List::ConstIterator it;
@@ -428,62 +428,62 @@ void KCalResourceSlox::createIncidenceAttributes( TQDomDocument &doc,
   // TODO OX support
   if ( incidence->secrecy() == Incidence::SecrecyPublic && type() != "ox" )
   {
-    TQDomElement rights = WebdavHandler::addSloxElement( this, doc, tqparent, "readrights" );
+    TQDomElement rights = WebdavHandler::addSloxElement( this, doc, parent, "readrights" );
     WebdavHandler::addSloxElement( this, doc, rights, "group", "users" );
   }
 
   // set reminder as the number of minutes to the start of the event
   KCal::Alarm::List alarms = incidence->alarms();
   if ( !alarms.isEmpty() && alarms.first()->hasStartOffset() && alarms.first()->enabled() )
-    WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( Reminder ),
+    WebdavHandler::addSloxElement( this, doc, parent, fieldName( Reminder ),
                                    TQString::number( (-1) * alarms.first()->startOffset().asSeconds() / 60 ) );
   else
-    WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( Reminder ), "0" );
+    WebdavHandler::addSloxElement( this, doc, parent, fieldName( Reminder ), "0" );
 
   // categories
-  WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( Categories ), incidence->categories().join( ", " ) );
+  WebdavHandler::addSloxElement( this, doc, parent, fieldName( Categories ), incidence->categories().join( ", " ) );
 }
 
 void KCalResourceSlox::createEventAttributes( TQDomDocument &doc,
-                                              TQDomElement &tqparent,
+                                              TQDomElement &parent,
                                               Event *event )
 {
   TQString folderId = mPrefs->calendarFolderId();
   if ( folderId.isEmpty() && type() == "ox" ) // SLOX and OX use diffrent default folders
     folderId = "-1";
-  WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( FolderId ), folderId );
+  WebdavHandler::addSloxElement( this, doc, parent, fieldName( FolderId ), folderId );
 
-  WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( EventBegin ),
+  WebdavHandler::addSloxElement( this, doc, parent, fieldName( EventBegin ),
       WebdavHandler::qDateTimeToSlox( event->dtStart(), timeZoneId() ) );
 
-  WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( EventEnd ),
+  WebdavHandler::addSloxElement( this, doc, parent, fieldName( EventEnd ),
       WebdavHandler::qDateTimeToSlox( event->dtEnd(), timeZoneId() ) );
 
-  WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( Location ), event->location() );
+  WebdavHandler::addSloxElement( this, doc, parent, fieldName( Location ), event->location() );
 
   if ( event->doesFloat() ) {
-    WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( FullTime ), boolToStr( true ) );
+    WebdavHandler::addSloxElement( this, doc, parent, fieldName( FullTime ), boolToStr( true ) );
   } else {
-    WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( FullTime ), boolToStr( false ) );
+    WebdavHandler::addSloxElement( this, doc, parent, fieldName( FullTime ), boolToStr( false ) );
   }
 }
 
 void KCalResourceSlox::createTodoAttributes( TQDomDocument &doc,
-                                             TQDomElement &tqparent,
+                                             TQDomElement &parent,
                                              Todo *todo )
 {
   TQString folderId = mPrefs->taskFolderId();
   if ( folderId.isEmpty() && type() == "ox" ) // SLOX and OX use diffrent default folders
     folderId = "-1";
-  WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( FolderId ), folderId );
+  WebdavHandler::addSloxElement( this, doc, parent, fieldName( FolderId ), folderId );
 
   if ( todo->hasStartDate() ) {
-    WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( TaskBegin ),
+    WebdavHandler::addSloxElement( this, doc, parent, fieldName( TaskBegin ),
         WebdavHandler::qDateTimeToSlox( todo->dtStart(), timeZoneId() ) );
   }
 
   if ( todo->hasDueDate() ) {
-    WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( TaskEnd ),
+    WebdavHandler::addSloxElement( this, doc, parent, fieldName( TaskEnd ),
         WebdavHandler::qDateTimeToSlox( todo->dtDue(), timeZoneId() ) );
   }
 
@@ -502,18 +502,18 @@ void KCalResourceSlox::createTodoAttributes( TQDomDocument &doc,
       txt = "2";
       break;
   }
-  WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( Priority ), txt );
+  WebdavHandler::addSloxElement( this, doc, parent, fieldName( Priority ), txt );
 
-  WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( PercentComplete ),
+  WebdavHandler::addSloxElement( this, doc, parent, fieldName( PercentComplete ),
                                  TQString::number( todo->percentComplete() ) );
 }
 
 void KCalResourceSlox::createRecurrenceAttributes( TQDomDocument &doc,
-                                                   TQDomElement &tqparent,
+                                                   TQDomElement &parent,
                                                    KCal::Incidence *incidence )
 {
   if ( !incidence->doesRecur() ) {
-    WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( RecurrenceType ),
+    WebdavHandler::addSloxElement( this, doc, parent, fieldName( RecurrenceType ),
                                    type() == "ox" ? "none" : "no" );
     return;
   }
@@ -521,13 +521,13 @@ void KCalResourceSlox::createRecurrenceAttributes( TQDomDocument &doc,
   int monthOffset = ( type() == "ox" ? -1 : 0 );
   switch ( r->recurrenceType() ) {
     case Recurrence::rDaily:
-      WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( RecurrenceType ), "daily" );
-      WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( RecurrenceDailyFreq ),
+      WebdavHandler::addSloxElement( this, doc, parent, fieldName( RecurrenceType ), "daily" );
+      WebdavHandler::addSloxElement( this, doc, parent, fieldName( RecurrenceDailyFreq ),
                                      TQString::number( r->frequency() ) );
       break;
     case Recurrence::rWeekly: {
-      WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( RecurrenceType ), "weekly" );
-      WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( RecurrenceWeeklyFreq ),
+      WebdavHandler::addSloxElement( this, doc, parent, fieldName( RecurrenceType ), "weekly" );
+      WebdavHandler::addSloxElement( this, doc, parent, fieldName( RecurrenceWeeklyFreq ),
                                      TQString::number( r->frequency() ) );
       // TODO: SLOX support
       int oxDays = 0;
@@ -536,61 +536,61 @@ void KCalResourceSlox::createRecurrenceAttributes( TQDomDocument &doc,
           oxDays += 1 << ( ( i + 1 ) % 7 );
       }
       if ( type() == "ox" )
-        WebdavHandler::addSloxElement( this, doc, tqparent, "days", TQString::number( oxDays ) );
+        WebdavHandler::addSloxElement( this, doc, parent, "days", TQString::number( oxDays ) );
       break; }
     case Recurrence::rMonthlyDay:
-      WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( RecurrenceType ), "monthly" );
-      WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( RecurrenceMonthlyFreq ),
+      WebdavHandler::addSloxElement( this, doc, parent, fieldName( RecurrenceType ), "monthly" );
+      WebdavHandler::addSloxElement( this, doc, parent, fieldName( RecurrenceMonthlyFreq ),
                                      TQString::number( r->frequency() ) );
-      WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( RecurrenceMonthlyDay ),
+      WebdavHandler::addSloxElement( this, doc, parent, fieldName( RecurrenceMonthlyDay ),
                                      TQString::number( r->monthDays().first() ) );
       break;
     case Recurrence::rMonthlyPos: {
-      WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( RecurrenceType ),
+      WebdavHandler::addSloxElement( this, doc, parent, fieldName( RecurrenceType ),
                                      type() == "ox" ? "monthly" : "monthly2" );
-      WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( RecurrenceMonthly2Freq ),
+      WebdavHandler::addSloxElement( this, doc, parent, fieldName( RecurrenceMonthly2Freq ),
                                      TQString::number( r->frequency() ) );
       RecurrenceRule::WDayPos wdp = r->monthPositions().first();
       // TODO: SLOX support
-      WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( RecurrenceMonthly2Day ),
+      WebdavHandler::addSloxElement( this, doc, parent, fieldName( RecurrenceMonthly2Day ),
                                      TQString::number( 1 << wdp.day() ) );
-      WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( RecurrenceMonthly2Pos ),
+      WebdavHandler::addSloxElement( this, doc, parent, fieldName( RecurrenceMonthly2Pos ),
                                      TQString::number( wdp.pos() ) );
       break; }
     case Recurrence::rYearlyMonth:
-      WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( RecurrenceType ), "yearly" );
-      WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( RecurrenceYearlyDay ),
+      WebdavHandler::addSloxElement( this, doc, parent, fieldName( RecurrenceType ), "yearly" );
+      WebdavHandler::addSloxElement( this, doc, parent, fieldName( RecurrenceYearlyDay ),
                                      TQString::number( r->yearDates().first() ) );
-      WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( RecurrenceYearlyMonth ),
+      WebdavHandler::addSloxElement( this, doc, parent, fieldName( RecurrenceYearlyMonth ),
                                      TQString::number( r->yearMonths().first() + monthOffset ) );
       if ( type() == "ox" )
-        WebdavHandler::addSloxElement( this, doc, tqparent, "interval", "1" );
+        WebdavHandler::addSloxElement( this, doc, parent, "interval", "1" );
       break;
     case Recurrence::rYearlyPos: {
-      WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( RecurrenceType ),
+      WebdavHandler::addSloxElement( this, doc, parent, fieldName( RecurrenceType ),
                                      type() == "ox" ? "yearly" : "yearly2" );
       RecurrenceRule::WDayPos wdp = r->monthPositions().first();
       // TODO: SLOX support
-      WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( RecurrenceYearly2Day ),
+      WebdavHandler::addSloxElement( this, doc, parent, fieldName( RecurrenceYearly2Day ),
                                      TQString::number( 1 << wdp.day() ) );
-      WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( RecurrenceYearly2Pos ),
+      WebdavHandler::addSloxElement( this, doc, parent, fieldName( RecurrenceYearly2Pos ),
                                      TQString::number( wdp.pos() ) );
-      WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( RecurrenceYearly2Month ),
+      WebdavHandler::addSloxElement( this, doc, parent, fieldName( RecurrenceYearly2Month ),
                                      TQString::number( r->yearMonths().first() + monthOffset ) );
       if ( type() == "ox" )
-        WebdavHandler::addSloxElement( this, doc, tqparent, "interval", "1" );
+        WebdavHandler::addSloxElement( this, doc, parent, "interval", "1" );
       break; }
     default:
       kdDebug() << k_funcinfo << "unsupported recurrence type: " << r->recurrenceType() << endl;
   }
-  WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( RecurrenceEnd ),
+  WebdavHandler::addSloxElement( this, doc, parent, fieldName( RecurrenceEnd ),
                                  WebdavHandler::qDateTimeToSlox( r->endDateTime() ) );
   // delete exceptions
   DateList exlist = r->exDates();
   TQStringList res;
   for ( DateList::Iterator it = exlist.begin(); it != exlist.end(); ++it )
     res.append( WebdavHandler::qDateTimeToSlox( *it ) );
-  WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( RecurrenceDelEx ), res.join( "," ) );
+  WebdavHandler::addSloxElement( this, doc, parent, fieldName( RecurrenceDelEx ), res.join( "," ) );
 }
 
 void KCalResourceSlox::parseMembersAttribute( const TQDomElement &e,
diff --git a/kresources/slox/kcalresourceslox.h b/kresources/slox/kcalresourceslox.h
index 73e44a11..17eb8789 100644
--- a/kresources/slox/kcalresourceslox.h
+++ b/kresources/slox/kcalresourceslox.h
@@ -125,16 +125,16 @@ class KDE_EXPORT KCalResourceSlox : public KCal::ResourceCached, public SloxBase
     void parseRecurrence( const TQDomNode &n, KCal::Event *event );
 
     void createIncidenceAttributes( TQDomDocument &doc,
-                                    TQDomElement &tqparent,
+                                    TQDomElement &parent,
                                     KCal::Incidence *incidence );
     void createEventAttributes( TQDomDocument &doc,
-                                TQDomElement &tqparent,
+                                TQDomElement &parent,
                                 KCal::Event *event );
     void createTodoAttributes( TQDomDocument &doc,
-                               TQDomElement &tqparent,
+                               TQDomElement &parent,
                                KCal::Todo *todo );
     void createRecurrenceAttributes( TQDomDocument &doc,
-                                     TQDomElement &tqparent,
+                                     TQDomElement &parent,
                                      KCal::Incidence *incidence );
 
     bool confirmSave();
diff --git a/kresources/slox/kcalresourcesloxconfig.cpp b/kresources/slox/kcalresourcesloxconfig.cpp
index 8b1683ea..441ea533 100644
--- a/kresources/slox/kcalresourcesloxconfig.cpp
+++ b/kresources/slox/kcalresourcesloxconfig.cpp
@@ -40,8 +40,8 @@
 
 #include "kcalresourcesloxconfig.h"
 
-KCalResourceSloxConfig::KCalResourceSloxConfig( TQWidget* tqparent,  const char* name ) :
-  KRES::ConfigWidget( tqparent, name ), mRes( 0 )
+KCalResourceSloxConfig::KCalResourceSloxConfig( TQWidget* parent,  const char* name ) :
+  KRES::ConfigWidget( parent, name ), mRes( 0 )
 {
   resize( 245, 115 );
   TQGridLayout *mainLayout = new TQGridLayout( this, 6, 2, KDialog::spacingHint(), KDialog::spacingHint() );
diff --git a/kresources/slox/kcalresourcesloxconfig.h b/kresources/slox/kcalresourcesloxconfig.h
index 56fef761..63526070 100644
--- a/kresources/slox/kcalresourcesloxconfig.h
+++ b/kresources/slox/kcalresourcesloxconfig.h
@@ -47,7 +47,7 @@ class KDE_EXPORT KCalResourceSloxConfig : public KRES::ConfigWidget
     Q_OBJECT
   TQ_OBJECT
   public:
-    KCalResourceSloxConfig( TQWidget *tqparent = 0, const char *name = 0 );
+    KCalResourceSloxConfig( TQWidget *parent = 0, const char *name = 0 );
 
   public slots:
     virtual void loadSettings( KRES::Resource *resource );
diff --git a/kresources/slox/sloxfolderdialog.cpp b/kresources/slox/sloxfolderdialog.cpp
index f2fe58a9..4f17ea89 100644
--- a/kresources/slox/sloxfolderdialog.cpp
+++ b/kresources/slox/sloxfolderdialog.cpp
@@ -25,8 +25,8 @@
 #include "sloxfolderdialog.h"
 #include "sloxfoldermanager.h"
 
-SloxFolderDialog::SloxFolderDialog( SloxFolderManager *manager, FolderType type, TQWidget *tqparent, const char *name ) :
-  KDialogBase( tqparent, name, true, i18n("Select Folder"), Ok|Cancel|User1, Ok, false, KGuiItem( i18n("Reload"), "reload" ) ),
+SloxFolderDialog::SloxFolderDialog( SloxFolderManager *manager, FolderType type, TQWidget *parent, const char *name ) :
+  KDialogBase( parent, name, true, i18n("Select Folder"), Ok|Cancel|User1, Ok, false, KGuiItem( i18n("Reload"), "reload" ) ),
   mManager( manager ),
   mFolderType( type )
 {
@@ -71,10 +71,10 @@ void SloxFolderDialog::createFolderViewItem( SloxFolder *folder )
   if ( folder->type() != mFolderType && folder->type() != Unbound )
     return;
   if( mManager->folders().contains( folder->parentId() ) ) {
-    SloxFolder *tqparent = mManager->folders()[folder->parentId()];
-    createFolderViewItem( tqparent );
-    if ( tqparent->item )
-      folder->item = new KListViewItem( tqparent->item );
+    SloxFolder *parent = mManager->folders()[folder->parentId()];
+    createFolderViewItem( parent );
+    if ( parent->item )
+      folder->item = new KListViewItem( parent->item );
     else
       folder->item = new KListViewItem( mListView );
   } else {
diff --git a/kresources/slox/sloxfolderdialog.h b/kresources/slox/sloxfolderdialog.h
index 3c2cac88..c29ebda5 100644
--- a/kresources/slox/sloxfolderdialog.h
+++ b/kresources/slox/sloxfolderdialog.h
@@ -33,7 +33,7 @@ class SloxFolderDialog : public KDialogBase
   Q_OBJECT
   TQ_OBJECT
   public:
-    SloxFolderDialog( SloxFolderManager *manager, FolderType type, TQWidget* tqparent = 0, const char *name = 0 );
+    SloxFolderDialog( SloxFolderManager *manager, FolderType type, TQWidget* parent = 0, const char *name = 0 );
     ~SloxFolderDialog();
 
     TQString selectedFolder() const;
diff --git a/kresources/tvanytime/kcal_resourcetvanytimeconfig.cpp b/kresources/tvanytime/kcal_resourcetvanytimeconfig.cpp
index 6c07a9af..47d62d37 100644
--- a/kresources/tvanytime/kcal_resourcetvanytimeconfig.cpp
+++ b/kresources/tvanytime/kcal_resourcetvanytimeconfig.cpp
@@ -40,8 +40,8 @@
 
 using namespace KCal;
 
-ResourceTVAnytimeConfig::ResourceTVAnytimeConfig( TQWidget* tqparent,  const char* name )
-    : KRES::ConfigWidget( tqparent, name )
+ResourceTVAnytimeConfig::ResourceTVAnytimeConfig( TQWidget* parent,  const char* name )
+    : KRES::ConfigWidget( parent, name )
 {
   resize( 245, 115 ); 
   TQGridLayout *mainLayout = new TQGridLayout( this, 2, 2 );
diff --git a/kresources/tvanytime/kcal_resourcetvanytimeconfig.h b/kresources/tvanytime/kcal_resourcetvanytimeconfig.h
index b4a391e2..e88ce6f0 100644
--- a/kresources/tvanytime/kcal_resourcetvanytimeconfig.h
+++ b/kresources/tvanytime/kcal_resourcetvanytimeconfig.h
@@ -43,7 +43,7 @@ class KDE_EXPORT ResourceTVAnytimeConfig : public KRES::ConfigWidget
 Q_OBJECT
   TQ_OBJECT
   public:
-    ResourceTVAnytimeConfig( TQWidget *tqparent = 0, const char *name = 0 );
+    ResourceTVAnytimeConfig( TQWidget *parent = 0, const char *name = 0 );
 
   public slots:
     virtual void loadSettings( KRES::Resource *resource );