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
author: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> 2011-08-10 22:19:39 +0000
committer: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> 2011-08-10 22:19:39 +0000
commit: 36a36a5c1015aa0d03f4515c401e907ddb9d6291 (patch)
tree: 0212ba6d2c749043134005a41f2bd0379619d40f /libkdepim
parent: 4c6f8d69e2d1501837affb472c4eb8fec4462240 (diff)
download: tdepim-36a36a5c1015aa0d03f4515c401e907ddb9d6291.tar.gz
tdepim-36a36a5c1015aa0d03f4515c401e907ddb9d6291.zip
114 files changed, 464 insertions, 464 deletions
diff --git a/libkdepim/addresseelineedit.cpp b/libkdepim/addresseelineedit.cpp
index 63473a6f..2a461376 100644
--- a/libkdepim/addresseelineedit.cpp
+++ b/libkdepim/addresseelineedit.cpp
@@ -109,9 +109,9 @@ static bool itemIsHeader( const TQListBoxItem* item )
 
 
 
-AddresseeLineEdit::AddresseeLineEdit( TQWidget* tqparent, bool useCompletion,
+AddresseeLineEdit::AddresseeLineEdit( TQWidget* parent, bool useCompletion,
                                       const char *name )
-  : ClickLineEdit( tqparent, TQString(), name ), DCOPObject( newLineEditDCOPObjectName() ),
+  : ClickLineEdit( parent, TQString(), name ), DCOPObject( newLineEditDCOPObjectName() ),
     m_useSemiColonAsSeparator( false ), m_allowDistLists( true )
 {
   m_useCompletion = useCompletion;
@@ -1047,7 +1047,7 @@ bool KPIM::AddresseeLineEdit::eventFilter(TQObject *obj, TQEvent *e)
       TQListBoxItem *item = completionBox()->itemAt( me->pos() );
       if ( !item ) {
         // In the case of a mouse move outside of the box we don't want
-        // the tqparent to fuzzy select a header by mistake.
+        // the parent to fuzzy select a header by mistake.
         bool eat = e->type() == TQEvent::MouseMove;
         return eat;
       }
diff --git a/libkdepim/addresseelineedit.h b/libkdepim/addresseelineedit.h
index 416af167..4cc893e4 100644
--- a/libkdepim/addresseelineedit.h
+++ b/libkdepim/addresseelineedit.h
@@ -57,7 +57,7 @@ class KDE_EXPORT AddresseeLineEdit : public ClickLineEdit, public DCOPObject
   TQ_OBJECT
 
   public:
-    AddresseeLineEdit( TQWidget* tqparent, bool useCompletion = true,
+    AddresseeLineEdit( TQWidget* parent, bool useCompletion = true,
                      const char *name = 0L);
     virtual ~AddresseeLineEdit();
 
diff --git a/libkdepim/addresseeselector.cpp b/libkdepim/addresseeselector.cpp
index d947baa1..3b81327f 100644
--- a/libkdepim/addresseeselector.cpp
+++ b/libkdepim/addresseeselector.cpp
@@ -187,9 +187,9 @@ uint SelectionItem::index() const
 class SelectionViewItem : public TQListViewItem
 {
   public:
-    SelectionViewItem( TQListView *tqparent, Selection *selection,
+    SelectionViewItem( TQListView *parent, Selection *selection,
                        SelectionItem *item )
-      : TQListViewItem( tqparent, "" ), mSelection( selection ), mItem( item )
+      : TQListViewItem( parent, "" ), mSelection( selection ), mItem( item )
     {
       if ( mItem->distributionList() == 0 )
         mIcon = mSelection->itemIcon( mItem->addressee(), mItem->index() );
@@ -224,8 +224,8 @@ class SelectionViewItem : public TQListViewItem
     TQPixmap mIcon;
 };
 
-AddresseeSelector::AddresseeSelector( Selection *selection, TQWidget *tqparent, const char *name )
-  : TQWidget( tqparent, name ), mSelection( selection ), mManager( 0 )
+AddresseeSelector::AddresseeSelector( Selection *selection, TQWidget *parent, const char *name )
+  : TQWidget( parent, name ), mSelection( selection ), mManager( 0 )
 {
   mMoveMapper = new TQSignalMapper( TQT_TQOBJECT(this) );
   mRemoveMapper = new TQSignalMapper( TQT_TQOBJECT(this) );
@@ -561,8 +561,8 @@ void AddresseeSelector::reloadAddressBook()
 
 
 AddresseeSelectorDialog::AddresseeSelectorDialog( Selection *selection,
-                                                  TQWidget *tqparent, const char *name )
-  : KDialogBase( Plain, "", Ok | Cancel, Ok, tqparent, name, true )
+                                                  TQWidget *parent, const char *name )
+  : KDialogBase( Plain, "", Ok | Cancel, Ok, parent, name, true )
 {
   TQFrame *frame = plainPage();
   TQVBoxLayout *tqlayout = new TQVBoxLayout( frame );
diff --git a/libkdepim/addresseeselector.h b/libkdepim/addresseeselector.h
index 2b4771a1..00949d74 100644
--- a/libkdepim/addresseeselector.h
+++ b/libkdepim/addresseeselector.h
@@ -170,7 +170,7 @@ class KDE_EXPORT AddresseeSelector : public TQWidget
 
   public:
     AddresseeSelector( Selection *selection,
-                       TQWidget *tqparent, const char *name = 0 );
+                       TQWidget *parent, const char *name = 0 );
     ~AddresseeSelector();
 
     /**
@@ -220,7 +220,7 @@ class KDE_EXPORT AddresseeSelectorDialog : public KDialogBase
 
   public:
     AddresseeSelectorDialog( Selection *selection,
-                             TQWidget *tqparent = 0, const char *name = 0 );
+                             TQWidget *parent = 0, const char *name = 0 );
 
   protected slots:
     void accept();
diff --git a/libkdepim/addresseeview.cpp b/libkdepim/addresseeview.cpp
index 82f0305e..786beb1c 100644
--- a/libkdepim/addresseeview.cpp
+++ b/libkdepim/addresseeview.cpp
@@ -50,9 +50,9 @@
 
 using namespace KPIM;
 
-AddresseeView::AddresseeView( TQWidget *tqparent, const char *name,
+AddresseeView::AddresseeView( TQWidget *parent, const char *name,
                               KConfig *config )
-  : KTextBrowser( tqparent, name ), mDefaultConfig( false ), mImageJob( 0 ),
+  : KTextBrowser( parent, name ), mDefaultConfig( false ), mImageJob( 0 ),
     mLinkMask( AddressLinks | EmailLinks | PhoneLinks | URLLinks | IMLinks | CustomFields )
 {
   setWrapPolicy( TQTextEdit::AtWordBoundary );
diff --git a/libkdepim/addresseeview.h b/libkdepim/addresseeview.h
index 09e17887..022d1efe 100644
--- a/libkdepim/addresseeview.h
+++ b/libkdepim/addresseeview.h
@@ -51,7 +51,7 @@ class KDE_EXPORT AddresseeView : public KTextBrowser
       @param config The config object where the settings are stored
                     which fields will be shown.
      */
-    AddresseeView( TQWidget *tqparent = 0, const char *name = 0,
+    AddresseeView( TQWidget *parent = 0, const char *name = 0,
                    KConfig *config = 0 );
 
     ~AddresseeView();
@@ -85,7 +85,7 @@ class KDE_EXPORT AddresseeView : public KTextBrowser
 
     /**
       Sets which parts of the contact shall be presented as links.
-      The tqmask can be OR'ed LinkMask. By default all links are enabled.
+      The mask can be OR'ed LinkMask. By default all links are enabled.
      */
     void enableLinks( int linkMask );
 
@@ -115,7 +115,7 @@ class KDE_EXPORT AddresseeView : public KTextBrowser
         </div>
 
       @param addr The addressee object.
-      @param linkMask The tqmask for which parts of the contact will
+      @param linkMask The mask for which parts of the contact will
                       be displayed as links.
                       The links looks like this:
                         "addr://<addr id>" for addresses
@@ -125,7 +125,7 @@ class KDE_EXPORT AddresseeView : public KTextBrowser
                         "im:<im addrss>" for instant messaging addresses
                         "sms://<phone number>" for sending a sms
       @param internalLoading If true, the loading of internal pictures is done automatically.
-      @param fieldMask The tqmask for which fields of the contact will
+      @param fieldMask The mask for which fields of the contact will
                        be displayed.
      */
     static TQString vCardAsHTML( const KABC::Addressee& addr, ::KIMProxy *proxy, LinkMask linkMask = DefaultLinks,
diff --git a/libkdepim/addressesdialog.cpp b/libkdepim/addressesdialog.cpp
index d73ab63f..8efadd40 100644
--- a/libkdepim/addressesdialog.cpp
+++ b/libkdepim/addressesdialog.cpp
@@ -91,9 +91,9 @@ struct AddressesDialog::AddressesDialogPrivate {
 };
 // privates end
 
-AddresseeViewItem::AddresseeViewItem( AddresseeViewItem *tqparent, const KABC::Addressee& addr,
+AddresseeViewItem::AddresseeViewItem( AddresseeViewItem *parent, const KABC::Addressee& addr,
                                       int emailIndex )
-  : TQObject( 0 ), KListViewItem( tqparent, addr.realName(),
+  : TQObject( 0 ), KListViewItem( parent, addr.realName(),
                                ( emailIndex == 0 ? addr.preferredEmail() : addr.emails()[ emailIndex ] ) )
 {
   d = new AddresseeViewItemPrivate;
@@ -120,17 +120,17 @@ AddresseeViewItem::AddresseeViewItem( KListView *lv, const TQString& name, Categ
   d->category = cat;
 }
 
-AddresseeViewItem::AddresseeViewItem(  AddresseeViewItem *tqparent, const TQString& name,
+AddresseeViewItem::AddresseeViewItem(  AddresseeViewItem *parent, const TQString& name,
                                        const KABC::Addressee::List &lst )
-  : TQObject(0), KListViewItem( tqparent, name, i18n("<group>") )
+  : TQObject(0), KListViewItem( parent, name, i18n("<group>") )
 {
   d = new AddresseeViewItemPrivate;
   d->category = FilledGroup;
   d->addresses = lst;
 }
 
-AddresseeViewItem::AddresseeViewItem(  AddresseeViewItem *tqparent, const TQString& name )
-  : TQObject(0), KListViewItem( tqparent, name, i18n("<group>") )
+AddresseeViewItem::AddresseeViewItem(  AddresseeViewItem *parent, const TQString& name )
+  : TQObject(0), KListViewItem( parent, name, i18n("<group>") )
 {
   d = new AddresseeViewItemPrivate;
   d->category = DistList;
@@ -544,12 +544,12 @@ AddressesDialog::availableAddressSelected( AddresseeViewItem* item, bool selecte
 void
 AddressesDialog::selectedAddressSelected( AddresseeViewItem* item, bool selected )
 {
-  // we have to avoid that a tqparent and a child is selected together
+  // we have to avoid that a parent and a child is selected together
   // because in this case we get a double object deletion ( program crashes )
   // when removing the selected items from list
-  AddresseeViewItem* tqparent = static_cast<AddresseeViewItem*>(((TQListViewItem*)item)->tqparent());
-  if ( tqparent  && selected )
-    tqparent->setSelected( false );
+  AddresseeViewItem* parent = static_cast<AddresseeViewItem*>(((TQListViewItem*)item)->parent());
+  if ( parent  && selected )
+    parent->setSelected( false );
   if (selected)
   {
     selectedSelectedAddresses.append(item);
@@ -662,10 +662,10 @@ AddressesDialog::addAddresseeToSelected( const KABC::Addressee& addr, AddresseeV
 }
 
 void
-AddressesDialog::addAddresseesToSelected( AddresseeViewItem *tqparent,
+AddressesDialog::addAddresseesToSelected( AddresseeViewItem *parent,
                                           const TQPtrList<AddresseeViewItem>& addresses )
 {
-  Q_ASSERT( tqparent );
+  Q_ASSERT( parent );
 
   TQPtrListIterator<AddresseeViewItem> itr( addresses );
 
@@ -686,15 +686,15 @@ AddressesDialog::addAddresseesToSelected( AddresseeViewItem *tqparent,
     AddresseeViewItem* newItem = 0;
     if (address->category() == AddresseeViewItem::Entry)
     {
-      newItem = new AddresseeViewItem( tqparent, address->addressee() );
+      newItem = new AddresseeViewItem( parent, address->addressee() );
     }
     else if (address->category() == AddresseeViewItem::DistList)
     {
-      newItem = new AddresseeViewItem( tqparent, address->name() );
+      newItem = new AddresseeViewItem( parent, address->name() );
     }
     else
     {
-      newItem = new AddresseeViewItem( tqparent, address->name(), allAddressee( address ) );
+      newItem = new AddresseeViewItem( parent, address->name(), allAddressee( address ) );
     }
 
     address->setSelected( false );
@@ -705,7 +705,7 @@ AddressesDialog::addAddresseesToSelected( AddresseeViewItem *tqparent,
             this, TQT_SLOT(selectedAddressSelected(AddresseeViewItem*, bool)));
   }
 
-  tqparent->setOpen( true );
+  parent->setOpen( true );
 }
 
 TQStringList
@@ -819,7 +819,7 @@ AddressesDialog::removeEntry()
       resetCC = true;
     else if( d->bccItem == item )
       resetBCC = true;
-    // we may only append tqparent items
+    // we may only append parent items
     unmapSelectedAddress(item);
     lst.append( item );
   }
@@ -854,7 +854,7 @@ AddressesDialog::removeEntry()
 
 // copied from kabcore.cpp :(
 // KDE4: should be in libkabc I think
-static KABC::Resource *requestResource( KABC::AddressBook* abook, TQWidget *tqparent )
+static KABC::Resource *requestResource( KABC::AddressBook* abook, TQWidget *parent )
 {
   TQPtrList<KABC::Resource> kabcResources = abook->resources();
 
@@ -870,7 +870,7 @@ static KABC::Resource *requestResource( KABC::AddressBook* abook, TQWidget *tqpa
     }
   }
 
-  KRES::Resource *res = KRES::SelectDialog::getResource( kresResources, tqparent );
+  KRES::Resource *res = KRES::SelectDialog::getResource( kresResources, parent );
   return static_cast<KABC::Resource*>( res );
 }
 #endif
@@ -1002,11 +1002,11 @@ AddressesDialog::filterChanged( const TQString& txt )
     if ( item->category() == AddresseeViewItem::Entry ) {
       bool matches = item->matches( txt );
       item->setVisible( matches );
-      TQListViewItem *tqparent = static_cast<TQListViewItem*>( item )->tqparent();
-      if ( matches && tqparent ) {
-        if ( tqparent == d->personal ) {
+      TQListViewItem *parent = static_cast<TQListViewItem*>( item )->parent();
+      if ( matches && parent ) {
+        if ( parent == d->personal ) {
           personalVisible++;
-        } else if ( tqparent == d->recent ) {
+        } else if ( parent == d->recent ) {
           recentVisible++;
         }
       }
@@ -1087,19 +1087,19 @@ AddressesDialog::allAddressee( KListView* view, bool onlySelected ) const
 }
 
 KABC::Addressee::List
-AddressesDialog::allAddressee( AddresseeViewItem* tqparent ) const
+AddressesDialog::allAddressee( AddresseeViewItem* parent ) const
 {
   KABC::Addressee::List lst;
 
-  if ( !tqparent ) return lst;
+  if ( !parent ) return lst;
 
-  if ( tqparent->category() == AddresseeViewItem::Entry )
+  if ( parent->category() == AddresseeViewItem::Entry )
   {
-    lst.append( tqparent->addressee() );
+    lst.append( parent->addressee() );
     return lst;
   }
 
-  AddresseeViewItem *myChild = static_cast<AddresseeViewItem*>( tqparent->firstChild() );
+  AddresseeViewItem *myChild = static_cast<AddresseeViewItem*>( parent->firstChild() );
   while( myChild ) {
     if ( myChild->category() == AddresseeViewItem::FilledGroup )
       lst += myChild->addresses();
@@ -1112,14 +1112,14 @@ AddressesDialog::allAddressee( AddresseeViewItem* tqparent ) const
 }
 
 TQStringList
-AddressesDialog::allDistributionLists( AddresseeViewItem* tqparent ) const
+AddressesDialog::allDistributionLists( AddresseeViewItem* parent ) const
 {
   TQStringList lists;
 
-  if ( !tqparent )
+  if ( !parent )
     return TQStringList();
 
-  AddresseeViewItem *item = static_cast<AddresseeViewItem*>( tqparent->firstChild() );
+  AddresseeViewItem *item = static_cast<AddresseeViewItem*>( parent->firstChild() );
   while ( item ) {
     if ( item->category() == AddresseeViewItem::DistList && !item->name().isEmpty() )
       lists.append( item->name() );
diff --git a/libkdepim/addressesdialog.h b/libkdepim/addressesdialog.h
index 71d6925d..5b5f604d 100644
--- a/libkdepim/addressesdialog.h
+++ b/libkdepim/addressesdialog.h
@@ -50,10 +50,10 @@ namespace KPIM {
       FilledGroup =5,
       DistList    =6
     };
-    AddresseeViewItem( AddresseeViewItem *tqparent, const KABC::Addressee& addr, int emailIndex = 0 );
+    AddresseeViewItem( AddresseeViewItem *parent, const KABC::Addressee& addr, int emailIndex = 0 );
     AddresseeViewItem( KListView *lv, const TQString& name, Category cat=Group );
-    AddresseeViewItem( AddresseeViewItem *tqparent, const TQString& name, const KABC::Addressee::List &lst );
-    AddresseeViewItem( AddresseeViewItem *tqparent, const TQString& name );
+    AddresseeViewItem( AddresseeViewItem *parent, const TQString& name, const KABC::Addressee::List &lst );
+    AddresseeViewItem( AddresseeViewItem *parent, const TQString& name );
     ~AddresseeViewItem();
 
     KABC::Addressee       addressee() const;
@@ -194,12 +194,12 @@ namespace KPIM {
                                   AddresseeViewItem* defaultParent=0, bool useCategory=true );
     void addAddresseeToSelected( const KABC::Addressee& addr,
                                  AddresseeViewItem* defaultParent=0 );
-    void addAddresseesToSelected( AddresseeViewItem *tqparent,
+    void addAddresseesToSelected( AddresseeViewItem *parent,
                                   const TQPtrList<AddresseeViewItem>& addresses );
     TQStringList entryToString( const KABC::Addressee::List& l ) const;
-    KABC::Addressee::List allAddressee( AddresseeViewItem* tqparent ) const;
+    KABC::Addressee::List allAddressee( AddresseeViewItem* parent ) const;
     KABC::Addressee::List allAddressee( KListView* view, bool onlySelected = true ) const;
-    TQStringList allDistributionLists( AddresseeViewItem* tqparent ) const;
+    TQStringList allDistributionLists( AddresseeViewItem* parent ) const;
 
   private:
     // if there's only one group in the available list, open it
diff --git a/libkdepim/categoryeditdialog.cpp b/libkdepim/categoryeditdialog.cpp
index c5c4885b..4b25faab 100644
--- a/libkdepim/categoryeditdialog.cpp
+++ b/libkdepim/categoryeditdialog.cpp
@@ -57,9 +57,9 @@ class CategoryListViewItem : public TQListViewItem
     }
 };
 
-CategoryEditDialog::CategoryEditDialog( KPimPrefs *prefs, TQWidget* tqparent,
+CategoryEditDialog::CategoryEditDialog( KPimPrefs *prefs, TQWidget* parent,
                                         const char* name, bool modal )
-  : KDialogBase::KDialogBase( tqparent, name, modal,
+  : KDialogBase::KDialogBase( parent, name, modal,
     i18n("Edit Categories"), Ok|Apply|Cancel|Help, Ok, true ),
     mPrefs( prefs ), d( new Private )
 {
diff --git a/libkdepim/categoryeditdialog.h b/libkdepim/categoryeditdialog.h
index 761dbad1..d4d4e3d4 100644
--- a/libkdepim/categoryeditdialog.h
+++ b/libkdepim/categoryeditdialog.h
@@ -34,7 +34,7 @@ class KDE_EXPORT CategoryEditDialog : public KDialogBase
     Q_OBJECT
   TQ_OBJECT
   public:
-    CategoryEditDialog( KPimPrefs *prefs, TQWidget* tqparent = 0,
+    CategoryEditDialog( KPimPrefs *prefs, TQWidget* parent = 0,
                         const char* name = 0,
                         bool modal = false );
     ~CategoryEditDialog();
diff --git a/libkdepim/categoryselectdialog.cpp b/libkdepim/categoryselectdialog.cpp
index 5b39139e..4eb072b1 100644
--- a/libkdepim/categoryselectdialog.cpp
+++ b/libkdepim/categoryselectdialog.cpp
@@ -32,9 +32,9 @@
 
 using namespace KPIM;
 
-CategorySelectDialog::CategorySelectDialog( KPimPrefs *prefs, TQWidget* tqparent,
+CategorySelectDialog::CategorySelectDialog( KPimPrefs *prefs, TQWidget* parent,
                                             const char* name, bool modal )
-  : KDialogBase::KDialogBase( tqparent, name, modal,
+  : KDialogBase::KDialogBase( parent, name, modal,
     i18n("Select Categories"), Ok|Apply|Cancel|Help, Ok, true ),
     mPrefs( prefs )
 {
diff --git a/libkdepim/categoryselectdialog.h b/libkdepim/categoryselectdialog.h
index 9c304444..b9d88066 100644
--- a/libkdepim/categoryselectdialog.h
+++ b/libkdepim/categoryselectdialog.h
@@ -35,7 +35,7 @@ class KDE_EXPORT CategorySelectDialog : public KDialogBase
     Q_OBJECT
   TQ_OBJECT
   public:
-    CategorySelectDialog( KPimPrefs *prefs, TQWidget *tqparent = 0,
+    CategorySelectDialog( KPimPrefs *prefs, TQWidget *parent = 0,
                           const char *name = 0, bool modal = false );
     ~CategorySelectDialog();
 
diff --git a/libkdepim/clicklineedit.cpp b/libkdepim/clicklineedit.cpp
index f8bfe0e9..98748e44 100644
--- a/libkdepim/clicklineedit.cpp
+++ b/libkdepim/clicklineedit.cpp
@@ -26,8 +26,8 @@
 
 using namespace KPIM;
 
-ClickLineEdit::ClickLineEdit(TQWidget *tqparent, const TQString &msg, const char* name) :
-  KLineEdit(tqparent, name) 
+ClickLineEdit::ClickLineEdit(TQWidget *parent, const TQString &msg, const char* name) :
+  KLineEdit(parent, name) 
 {
   mDrawClickMsg = true;
   setClickMessage( msg ); 
diff --git a/libkdepim/clicklineedit.h b/libkdepim/clicklineedit.h
index f9a9543d..a0df8410 100644
--- a/libkdepim/clicklineedit.h
+++ b/libkdepim/clicklineedit.h
@@ -39,7 +39,7 @@ class KDE_EXPORT ClickLineEdit : public KLineEdit
   TQ_OBJECT
   TQ_PROPERTY( TQString clickMessage READ clickMessage WRITE setClickMessage )
   public:
-    ClickLineEdit( TQWidget *tqparent, const TQString &msg = TQString(), const char* name = 0 );
+    ClickLineEdit( TQWidget *parent, const TQString &msg = TQString(), const char* name = 0 );
     ~ClickLineEdit();
 
     void setClickMessage( const TQString &msg );
diff --git a/libkdepim/collectingprocess.cpp b/libkdepim/collectingprocess.cpp
index d49da43b..2bd0be8f 100644
--- a/libkdepim/collectingprocess.cpp
+++ b/libkdepim/collectingprocess.cpp
@@ -49,8 +49,8 @@ struct CollectingProcess::Private {
 };
 
 
-CollectingProcess::CollectingProcess( TQObject * tqparent, const char * name )
-  : KProcess( tqparent, name )
+CollectingProcess::CollectingProcess( TQObject * parent, const char * name )
+  : KProcess( parent, name )
 {
   d = new Private();
 }
diff --git a/libkdepim/collectingprocess.h b/libkdepim/collectingprocess.h
index 8bc4651b..1f27bd9a 100644
--- a/libkdepim/collectingprocess.h
+++ b/libkdepim/collectingprocess.h
@@ -50,7 +50,7 @@ class KDE_EXPORT CollectingProcess : public KProcess {
   Q_OBJECT
   TQ_OBJECT
 public:
-  CollectingProcess( TQObject * tqparent = 0, const char * name = 0 );
+  CollectingProcess( TQObject * parent = 0, const char * name = 0 );
   ~CollectingProcess();
 
   /** Starts the process in NotifyOnExit mode and writes in to stdin of
diff --git a/libkdepim/completionordereditor.cpp b/libkdepim/completionordereditor.cpp
index c0454ca3..2687188d 100644
--- a/libkdepim/completionordereditor.cpp
+++ b/libkdepim/completionordereditor.cpp
@@ -173,8 +173,8 @@ private:
 };
 
 CompletionOrderEditor::CompletionOrderEditor( KPIM::LdapSearch* ldapSearch,
-                                              TQWidget* tqparent, const char* name )
-  : KDialogBase( tqparent, name, true, i18n("Edit Completion Order"), Ok|Cancel, Ok, true ),
+                                              TQWidget* parent, const char* name )
+  : KDialogBase( parent, name, true, i18n("Edit Completion Order"), Ok|Cancel, Ok, true ),
     mConfig( "kpimcompletionorder" ), mDirty( false )
 {
   mItems.setAutoDelete( true );
diff --git a/libkdepim/completionordereditor.h b/libkdepim/completionordereditor.h
index 7d4d3e47..50cc3b3c 100644
--- a/libkdepim/completionordereditor.h
+++ b/libkdepim/completionordereditor.h
@@ -66,7 +66,7 @@ class CompletionOrderEditor : public KDialogBase {
   TQ_OBJECT
 
 public:
-  CompletionOrderEditor( KPIM::LdapSearch* ldapSearch, TQWidget* tqparent, const char* name = 0 );
+  CompletionOrderEditor( KPIM::LdapSearch* ldapSearch, TQWidget* parent, const char* name = 0 );
   ~CompletionOrderEditor();
 
   KConfig* configFile() { return &mConfig; }
diff --git a/libkdepim/configmanager.cpp b/libkdepim/configmanager.cpp
index 47bcb9d0..64b4562f 100644
--- a/libkdepim/configmanager.cpp
+++ b/libkdepim/configmanager.cpp
@@ -21,8 +21,8 @@
 
 using namespace KPIM;
 
-ConfigManager::ConfigManager( TQObject * tqparent, const char * name )
-  : TQObject( tqparent, name )
+ConfigManager::ConfigManager( TQObject * parent, const char * name )
+  : TQObject( parent, name )
 {
 
 }
diff --git a/libkdepim/configmanager.h b/libkdepim/configmanager.h
index ba024093..b2612639 100644
--- a/libkdepim/configmanager.h
+++ b/libkdepim/configmanager.h
@@ -46,7 +46,7 @@ signals:
   void changed();
 
 protected:
-  ConfigManager( TQObject * tqparent=0, const char * name=0 );
+  ConfigManager( TQObject * parent=0, const char * name=0 );
   virtual ~ConfigManager();
 };
 
diff --git a/libkdepim/designerfields.cpp b/libkdepim/designerfields.cpp
index e1f76799..100b00a2 100644
--- a/libkdepim/designerfields.cpp
+++ b/libkdepim/designerfields.cpp
@@ -41,9 +41,9 @@
 
 using namespace KPIM;
 
-DesignerFields::DesignerFields( const TQString &uiFile, TQWidget *tqparent,
+DesignerFields::DesignerFields( const TQString &uiFile, TQWidget *parent,
   const char *name )
-  : TQWidget( tqparent, name )
+  : TQWidget( parent, name )
 {
   initGUI( uiFile );
 }
diff --git a/libkdepim/designerfields.h b/libkdepim/designerfields.h
index 89032ead..cc72647f 100644
--- a/libkdepim/designerfields.h
+++ b/libkdepim/designerfields.h
@@ -37,7 +37,7 @@ class KDE_EXPORT DesignerFields : public TQWidget
     Q_OBJECT
   TQ_OBJECT
   public:
-    DesignerFields( const TQString &uiFile, TQWidget *tqparent,
+    DesignerFields( const TQString &uiFile, TQWidget *parent,
       const char *name = 0 );
 
     class Storage
diff --git a/libkdepim/embeddedurlpage.cpp b/libkdepim/embeddedurlpage.cpp
index d45d532d..c840e3a0 100644
--- a/libkdepim/embeddedurlpage.cpp
+++ b/libkdepim/embeddedurlpage.cpp
@@ -33,8 +33,8 @@
 using namespace KPIM;
 
 EmbeddedURLPage::EmbeddedURLPage( const TQString &url, const TQString &mimetype,
-                                  TQWidget *tqparent, const char *name )
-  : TQWidget( tqparent, name ), mUri(url), mMimeType( mimetype ), mPart( 0 )
+                                  TQWidget *parent, const char *name )
+  : TQWidget( parent, name ), mUri(url), mMimeType( mimetype ), mPart( 0 )
 {
   initGUI( url, mimetype );
 }
@@ -54,7 +54,7 @@ void EmbeddedURLPage::loadContents()
     TQString mimetype = mMimeType;
     if ( mimetype == "auto" )
         mimetype == KMimeType::findByURL( mUri )->name();
-    // "this" is both the tqparent widget and the tqparent object
+    // "this" is both the parent widget and the parent object
     mPart = KParts::ComponentFactory::createPartInstanceFromQuery<KParts::ReadOnlyPart>( mimetype, TQString(), TQT_TQWIDGET(this), 0, TQT_TQOBJECT(this), 0 );
     if ( mPart ) {
         mPart->openURL( mUri );
diff --git a/libkdepim/embeddedurlpage.h b/libkdepim/embeddedurlpage.h
index 7f5c4c9e..dcae4fb5 100644
--- a/libkdepim/embeddedurlpage.h
+++ b/libkdepim/embeddedurlpage.h
@@ -35,7 +35,7 @@ class KDE_EXPORT EmbeddedURLPage : public TQWidget
   TQ_OBJECT
   public:
     EmbeddedURLPage( const TQString &url, const TQString &mimetype,
-                     TQWidget *tqparent, const char *name = 0 );
+                     TQWidget *parent, const char *name = 0 );
 
   public slots:
     void loadContents();
diff --git a/libkdepim/htmldiffalgodisplay.cpp b/libkdepim/htmldiffalgodisplay.cpp
index 124f2387..41fe99a3 100644
--- a/libkdepim/htmldiffalgodisplay.cpp
+++ b/libkdepim/htmldiffalgodisplay.cpp
@@ -30,8 +30,8 @@ static TQString textToHTML( const TQString &text )
   return TQStyleSheet::convertFromPlainText( text );
 }
 
-HTMLDiffAlgoDisplay::HTMLDiffAlgoDisplay( TQWidget *tqparent )
-  : KTextBrowser( tqparent )
+HTMLDiffAlgoDisplay::HTMLDiffAlgoDisplay( TQWidget *parent )
+  : KTextBrowser( parent )
 {
   setWrapPolicy( TQTextEdit::AtWordBoundary );
   setVScrollBarMode( TQScrollView::AlwaysOff );
diff --git a/libkdepim/htmldiffalgodisplay.h b/libkdepim/htmldiffalgodisplay.h
index 55090f41..4495e200 100644
--- a/libkdepim/htmldiffalgodisplay.h
+++ b/libkdepim/htmldiffalgodisplay.h
@@ -32,7 +32,7 @@ namespace KPIM {
 class KDE_EXPORT HTMLDiffAlgoDisplay : virtual public DiffAlgoDisplay, public KTextBrowser
 {
   public:
-    HTMLDiffAlgoDisplay( TQWidget *tqparent );
+    HTMLDiffAlgoDisplay( TQWidget *parent );
 
     void begin();
     void end();
diff --git a/libkdepim/infoextension.cpp b/libkdepim/infoextension.cpp
index 3c8ac26f..55cb3568 100644
--- a/libkdepim/infoextension.cpp
+++ b/libkdepim/infoextension.cpp
@@ -26,8 +26,8 @@
 
 using namespace KParts;
 
-InfoExtension::InfoExtension( KParts::ReadOnlyPart *tqparent, const char* name)
-: TQObject(tqparent, name), d(0)
+InfoExtension::InfoExtension( KParts::ReadOnlyPart *parent, const char* name)
+: TQObject(parent, name), d(0)
 {
 }
 
diff --git a/libkdepim/infoextension.h b/libkdepim/infoextension.h
index 343f7172..392178f5 100644
--- a/libkdepim/infoextension.h
+++ b/libkdepim/infoextension.h
@@ -44,10 +44,10 @@ namespace KParts
       /**
        * Constucts an InfoExtension.
        *
-       * @param tqparent   The tqparent widget.
+       * @param parent   The parent widget.
        * @param name     The name of the class.
        **/
-		InfoExtension( KParts::ReadOnlyPart *tqparent, const char* name);
+		InfoExtension( KParts::ReadOnlyPart *parent, const char* name);
 		~InfoExtension();
 
 	private:
diff --git a/libkdepim/kaddrbook.cpp b/libkdepim/kaddrbook.cpp
index 3a0c7dc0..1036a263 100644
--- a/libkdepim/kaddrbook.cpp
+++ b/libkdepim/kaddrbook.cpp
@@ -32,7 +32,7 @@
 #include <unistd.h>
 
 //-----------------------------------------------------------------------------
-void KAddrBookExternal::openEmail( const TQString &addr, TQWidget *tqparent ) {
+void KAddrBookExternal::openEmail( const TQString &addr, TQWidget *parent ) {
   TQString email;
   TQString name;
 
@@ -78,12 +78,12 @@ void KAddrBookExternal::openEmail( const TQString &addr, TQWidget *tqparent ) {
 #else
     TQString text = email + " " + i18n( "is not in address book" );
 #endif
-    KMessageBox::information( tqparent, text, TQString(), "notInAddressBook" );
+    KMessageBox::information( parent, text, TQString(), "notInAddressBook" );
   }
 }
 
 //-----------------------------------------------------------------------------
-void KAddrBookExternal::addEmail( const TQString& addr, TQWidget *tqparent) {
+void KAddrBookExternal::addEmail( const TQString& addr, TQWidget *parent) {
   TQString email;
   TQString name;
 
@@ -91,7 +91,7 @@ void KAddrBookExternal::addEmail( const TQString& addr, TQWidget *tqparent) {
 
   KABC::AddressBook *ab = KABC::StdAddressBook::self( true );
 
-  ab->setErrorHandler( new KABC::GuiErrorHandler( tqparent ) );
+  ab->setErrorHandler( new KABC::GuiErrorHandler( parent ) );
 
   // force a reload of the address book file so that changes that were made
   // by other programs are loaded
@@ -151,12 +151,12 @@ void KAddrBookExternal::addEmail( const TQString& addr, TQWidget *tqparent) {
       TQString text = i18n("<qt>The email address <b>%1</b> was added to your "
                           "addressbook; you can add more information to this "
                           "entry by opening the addressbook.</qt>").tqarg( addr );
-      KMessageBox::information( tqparent, text, TQString(), "addedtokabc" );
+      KMessageBox::information( parent, text, TQString(), "addedtokabc" );
     }
   } else {
     TQString text = i18n("<qt>The email address <b>%1</b> is already in your "
                         "addressbook.</qt>").tqarg( addr );
-    KMessageBox::information( tqparent, text, TQString(),
+    KMessageBox::information( parent, text, TQString(),
                               "alreadyInAddressBook" );
   }
   ab->setErrorHandler( 0 );
@@ -173,12 +173,12 @@ void KAddrBookExternal::addNewAddressee( TQWidget* )
   call.send("newContact()");
 }
 
-bool KAddrBookExternal::addVCard( const KABC::Addressee& addressee, TQWidget *tqparent )
+bool KAddrBookExternal::addVCard( const KABC::Addressee& addressee, TQWidget *parent )
 {
   KABC::AddressBook *ab = KABC::StdAddressBook::self( true );
   bool inserted = false;
 
-  ab->setErrorHandler( new KABC::GuiErrorHandler( tqparent ) );
+  ab->setErrorHandler( new KABC::GuiErrorHandler( parent ) );
 
   KABC::Addressee::List addressees =
       ab->findByEmail( addressee.preferredEmail() );
@@ -188,7 +188,7 @@ bool KAddrBookExternal::addVCard( const KABC::Addressee& addressee, TQWidget *tq
       TQString text = i18n("The VCard was added to your addressbook; "
                           "you can add more information to this "
                           "entry by opening the addressbook.");
-      KMessageBox::information( tqparent, text, TQString(), "addedtokabc" );
+      KMessageBox::information( parent, text, TQString(), "addedtokabc" );
       inserted = true;
     }
   } else {
@@ -196,7 +196,7 @@ bool KAddrBookExternal::addVCard( const KABC::Addressee& addressee, TQWidget *tq
                         "your addressbook; however, you may save the VCard "
                         "into a file and import it into the addressbook "
                         "manually.");
-    KMessageBox::information( tqparent, text );
+    KMessageBox::information( parent, text );
     inserted = true;
   }
 
diff --git a/libkdepim/kaddrbook.h b/libkdepim/kaddrbook.h
index b4835234..374753e5 100644
--- a/libkdepim/kaddrbook.h
+++ b/libkdepim/kaddrbook.h
@@ -19,12 +19,12 @@ class TQWidget;
 
 class KDE_EXPORT KAddrBookExternal {
 public:
-  static void addEmail( const TQString &addr, TQWidget *tqparent );
+  static void addEmail( const TQString &addr, TQWidget *parent );
   static void addNewAddressee( TQWidget* );
-  static void openEmail( const TQString &addr, TQWidget *tqparent );
-  static void openAddressBook( TQWidget *tqparent );
+  static void openEmail( const TQString &addr, TQWidget *parent );
+  static void openAddressBook( TQWidget *parent );
 
-  static bool addVCard( const KABC::Addressee& addressee, TQWidget *tqparent );
+  static bool addVCard( const KABC::Addressee& addressee, TQWidget *parent );
 
   static TQString expandDistributionList( const TQString& listName );
 
diff --git a/libkdepim/kcmdesignerfields.cpp b/libkdepim/kcmdesignerfields.cpp
index bc7ddb74..dbe2faca 100644
--- a/libkdepim/kcmdesignerfields.cpp
+++ b/libkdepim/kcmdesignerfields.cpp
@@ -56,8 +56,8 @@ using namespace KPIM;
 class PageItem : public TQCheckListItem
 {
   public:
-    PageItem( TQListView *tqparent, const TQString &path )
-      : TQCheckListItem( tqparent, "", TQCheckListItem::CheckBox ),
+    PageItem( TQListView *parent, const TQString &path )
+      : TQCheckListItem( parent, "", TQCheckListItem::CheckBox ),
         mPath( path ), mIsActive( false )
     {
       mName = path.mid( path.findRev( '/' ) + 1 );
@@ -126,8 +126,8 @@ class PageItem : public TQCheckListItem
     bool mIsActive;
 };
 
-KCMDesignerFields::KCMDesignerFields( TQWidget *tqparent, const char *name )
-  : KCModule( tqparent, name )
+KCMDesignerFields::KCMDesignerFields( TQWidget *parent, const char *name )
+  : KCModule( parent, name )
 {
   TQTimer::singleShot( 0, this, TQT_SLOT( delayedInit() ) );
   
@@ -174,7 +174,7 @@ void KCMDesignerFields::deleteFile()
 {
   TQListViewItem *item = mPageView->selectedItem();
   if ( item ) {
-    PageItem *pageItem = static_cast<PageItem*>( item->tqparent() ? item->tqparent() : item );
+    PageItem *pageItem = static_cast<PageItem*>( item->parent() ? item->parent() : item );
     if (KMessageBox::warningContinueCancel(this,
 	i18n( "<qt>Do you really want to delete '<b>%1</b>'?</qt>").tqarg( pageItem->text(0) ), "", KStdGuiItem::del() )
          == KMessageBox::Continue)
@@ -215,7 +215,7 @@ void KCMDesignerFields::loadActivePages(const TQStringList& ai)
 {
   TQListViewItemIterator it( mPageView );
   while ( it.current() ) {
-    if ( it.current()->tqparent() == 0 ) {
+    if ( it.current()->parent() == 0 ) {
       PageItem *item = static_cast<PageItem*>( it.current() );
       if ( ai.find( item->name() ) != ai.end() ) {
         item->setOn( true );
@@ -239,7 +239,7 @@ TQStringList KCMDesignerFields::saveActivePages()
 
   TQStringList activePages;
   while ( it.current() ) {
-    if ( it.current()->tqparent() == 0 ) {
+    if ( it.current()->parent() == 0 ) {
       PageItem *item = static_cast<PageItem*>( it.current() );
       activePages.append( item->name() );
     }
@@ -353,7 +353,7 @@ void KCMDesignerFields::updatePreview( TQListViewItem *item )
   bool widgetItemSelected = false;
 
   if ( item ) {
-    if ( item->tqparent() ) {
+    if ( item->parent() ) {
       TQString details = TQString( "<qt><table>"
                                  "<tr><td align=\"right\"><b>%1</b></td><td>%2</td></tr>"
                                  "<tr><td align=\"right\"><b>%3</b></td><td>%4</td></tr>"
@@ -371,7 +371,7 @@ void KCMDesignerFields::updatePreview( TQListViewItem *item )
 
       mPageDetails->setText( details );
 
-      PageItem *pageItem = static_cast<PageItem*>( item->tqparent() );
+      PageItem *pageItem = static_cast<PageItem*>( item->parent() );
       mPagePreview->setPixmap( pageItem->preview() );
     } else {
       mPageDetails->setText( TQString() );
@@ -394,7 +394,7 @@ void KCMDesignerFields::updatePreview( TQListViewItem *item )
 
 void KCMDesignerFields::itemClicked( TQListViewItem *item )
 {
-  if ( !item || item->tqparent() != 0 )
+  if ( !item || item->parent() != 0 )
     return;
 
   PageItem *pageItem = static_cast<PageItem*>( item );
@@ -420,7 +420,7 @@ void KCMDesignerFields::startDesigner()
 
   TQListViewItem *item = mPageView->selectedItem();
   if ( item ) {
-    PageItem *pageItem = static_cast<PageItem*>( item->tqparent() ? item->tqparent() : item );
+    PageItem *pageItem = static_cast<PageItem*>( item->parent() ? item->parent() : item );
     cmdLine += " " + KProcess::quote( pageItem->path() );
   }
 
diff --git a/libkdepim/kcmdesignerfields.h b/libkdepim/kcmdesignerfields.h
index e2e5d5a5..e978f954 100644
--- a/libkdepim/kcmdesignerfields.h
+++ b/libkdepim/kcmdesignerfields.h
@@ -39,7 +39,7 @@ class KDE_EXPORT KCMDesignerFields : public KCModule
   TQ_OBJECT
 
   public:
-    KCMDesignerFields( TQWidget *tqparent = 0, const char *name = 0 );
+    KCMDesignerFields( TQWidget *parent = 0, const char *name = 0 );
 
     virtual void load();
     virtual void save();
diff --git a/libkdepim/kconfigwizard.cpp b/libkdepim/kconfigwizard.cpp
index 99aa0b59..6db0f999 100644
--- a/libkdepim/kconfigwizard.cpp
+++ b/libkdepim/kconfigwizard.cpp
@@ -31,18 +31,18 @@
 #include <tqlayout.h>
 #include <tqtimer.h>
 
-KConfigWizard::KConfigWizard( TQWidget *tqparent,
+KConfigWizard::KConfigWizard( TQWidget *parent,
                               char *name, bool modal )
-  : KDialogBase( TreeList, i18n("Configuration Wizard"), Ok|Cancel, Ok, tqparent,
+  : KDialogBase( TreeList, i18n("Configuration Wizard"), Ok|Cancel, Ok, parent,
                  name, modal ),
     mPropagator( 0 ), mChangesPage( 0 )
 {
   init();
 }
 
-KConfigWizard::KConfigWizard( KConfigPropagator *propagator, TQWidget *tqparent,
+KConfigWizard::KConfigWizard( KConfigPropagator *propagator, TQWidget *parent,
                               char *name, bool modal )
-  : KDialogBase( TreeList, i18n("Configuration Wizard"), Ok|Cancel, Ok, tqparent,
+  : KDialogBase( TreeList, i18n("Configuration Wizard"), Ok|Cancel, Ok, parent,
                  name, modal ),
     mPropagator( propagator ), mChangesPage( 0 )
 {
diff --git a/libkdepim/kconfigwizard.h b/libkdepim/kconfigwizard.h
index 290b55e3..31cb63ed 100644
--- a/libkdepim/kconfigwizard.h
+++ b/libkdepim/kconfigwizard.h
@@ -38,12 +38,12 @@ class KDE_EXPORT KConfigWizard : public KDialogBase
     /**
       Create wizard. You have to set a propgator with setPropagator() later.
     */
-    KConfigWizard( TQWidget *tqparent = 0, char *name = 0, bool modal = false );
+    KConfigWizard( TQWidget *parent = 0, char *name = 0, bool modal = false );
     /**
       Create wizard for given KConfigPropagator. The wizard takes ownership of
       the propagator.
     */
-    KConfigWizard( KConfigPropagator *propagator, TQWidget *tqparent = 0,
+    KConfigWizard( KConfigPropagator *propagator, TQWidget *parent = 0,
                    char *name = 0, bool modal = false );
     /**
       Destructor.
diff --git a/libkdepim/kdateedit.cpp b/libkdepim/kdateedit.cpp
index 65dc3b8b..e7989c7a 100644
--- a/libkdepim/kdateedit.cpp
+++ b/libkdepim/kdateedit.cpp
@@ -37,8 +37,8 @@
 class DateValidator : public TQValidator
 {
   public:
-    DateValidator( const TQStringList &keywords, TQWidget* tqparent, const char* name = 0 )
-      : TQValidator( TQT_TQOBJECT(tqparent), name ), mKeywords( keywords )
+    DateValidator( const TQStringList &keywords, TQWidget* parent, const char* name = 0 )
+      : TQValidator( TQT_TQOBJECT(parent), name ), mKeywords( keywords )
     {}
 
     virtual State validate( TQString &str, int& ) const
@@ -64,8 +64,8 @@ class DateValidator : public TQValidator
     TQStringList mKeywords;
 };
 
-KDateEdit::KDateEdit( TQWidget *tqparent, const char *name )
-  : TQComboBox( true, tqparent, name ),
+KDateEdit::KDateEdit( TQWidget *parent, const char *name )
+  : TQComboBox( true, parent, name ),
     mReadOnly( false ),
     mDiscardNextMousePress( false )
 {
diff --git a/libkdepim/kdateedit.h b/libkdepim/kdateedit.h
index cde85b0f..500fc029 100644
--- a/libkdepim/kdateedit.h
+++ b/libkdepim/kdateedit.h
@@ -57,7 +57,7 @@ class KDE_EXPORT KDateEdit : public TQComboBox
   TQ_OBJECT
 
   public:
-    KDateEdit( TQWidget *tqparent = 0, const char *name = 0 );
+    KDateEdit( TQWidget *parent = 0, const char *name = 0 );
     virtual ~KDateEdit();
 
     /**
diff --git a/libkdepim/kdatepickerpopup.cpp b/libkdepim/kdatepickerpopup.cpp
index 7d1f6427..8e3f3695 100644
--- a/libkdepim/kdatepickerpopup.cpp
+++ b/libkdepim/kdatepickerpopup.cpp
@@ -26,9 +26,9 @@
 
 #include "kdatepickerpopup.h"
 
-KDatePickerPopup::KDatePickerPopup( int items, const TQDate &date, TQWidget *tqparent,
+KDatePickerPopup::KDatePickerPopup( int items, const TQDate &date, TQWidget *parent,
                                     const char *name )
-  : TQPopupMenu( tqparent, name )
+  : TQPopupMenu( parent, name )
 {
   mItems = items;
 
diff --git a/libkdepim/kdatepickerpopup.h b/libkdepim/kdatepickerpopup.h
index 4b563280..98138dfe 100644
--- a/libkdepim/kdatepickerpopup.h
+++ b/libkdepim/kdatepickerpopup.h
@@ -54,11 +54,11 @@ class KDE_EXPORT KDatePickerPopup: public TQPopupMenu
 
        @param items List of all desirable items, separated with a bitwise OR.
        @param date Initial date of datepicker-widget.
-       @param tqparent The object's tqparent.
+       @param parent The object's parent.
        @param name The object's name.
     */
     KDatePickerPopup( int items = DatePicker, const TQDate &date = TQDate::tqcurrentDate(),
-                      TQWidget *tqparent = 0, const char *name = 0 );
+                      TQWidget *parent = 0, const char *name = 0 );
 
     /**
        @return A pointer to the private variable mDatePicker, an instance of
diff --git a/libkdepim/kfileio.cpp b/libkdepim/kfileio.cpp
index 01188f00..8addb772 100644
--- a/libkdepim/kfileio.cpp
+++ b/libkdepim/kfileio.cpp
@@ -365,7 +365,7 @@ TQString checkAndCorrectPermissionsIfPossible( const TQString &toCheck,
   return error;
 }
 
-bool checkAndCorrectPermissionsIfPossibleWithErrorHandling( TQWidget *tqparent,
+bool checkAndCorrectPermissionsIfPossibleWithErrorHandling( TQWidget *parent,
   const TQString &toCheck, const bool recursive, const bool wantItReadable,
   const bool wantItWritable )
 {
@@ -376,7 +376,7 @@ bool checkAndCorrectPermissionsIfPossibleWithErrorHandling( TQWidget *tqparent,
   // it is just a warning.
   if ( !error.isEmpty() ) {
     kdDebug() << "checkPermissions found:" << error << endl;
-    KMessageBox::detailedSorry(tqparent,
+    KMessageBox::detailedSorry(parent,
                                i18n("Some files or folders do not have "
                                "the right permissions, please correct them "
                                "manually."),
diff --git a/libkdepim/kfileio.h b/libkdepim/kfileio.h
index 928175b6..91552888 100644
--- a/libkdepim/kfileio.h
+++ b/libkdepim/kfileio.h
@@ -78,10 +78,10 @@ TQString checkAndCorrectPermissionsIfPossible( const TQString &toCheck,
    * all files and folders below. If the permissions are not ok, it tries to correct 
    * them. If that fails then a warning with detailled information is given.
    *
-   * @param  tqparent         If tqparent is 0, then the message box becomes an
-   *                        application-global modal dialog box. If tqparent 
+   * @param  parent         If parent is 0, then the message box becomes an
+   *                        application-global modal dialog box. If parent 
    *                        is a widget, the message box becomes modal 
-   *                        relative to tqparent.
+   *                        relative to parent.
    * @param toCheck         The file or folder of which the permissions should 
    *                        be checked.
    * @param recursive       Set to true, it will check the contents of a folder
@@ -97,7 +97,7 @@ TQString checkAndCorrectPermissionsIfPossible( const TQString &toCheck,
    *         then the permissions are not ok and it was not possible to correct
    *         all errors.
    */
-bool checkAndCorrectPermissionsIfPossibleWithErrorHandling( TQWidget *tqparent, 
+bool checkAndCorrectPermissionsIfPossibleWithErrorHandling( TQWidget *parent, 
    const TQString &toCheck, const bool recursive, const bool wantItReadable,
    const bool wantItWritable );
 }
diff --git a/libkdepim/kfoldertree.cpp b/libkdepim/kfoldertree.cpp
index 69111d55..64859199 100644
--- a/libkdepim/kfoldertree.cpp
+++ b/libkdepim/kfoldertree.cpp
@@ -12,18 +12,18 @@
 #include <tqstyle.h>
 
 //-----------------------------------------------------------------------------
-KFolderTreeItem::KFolderTreeItem( KFolderTree *tqparent, const TQString & label,
+KFolderTreeItem::KFolderTreeItem( KFolderTree *parent, const TQString & label,
 				  Protocol protocol, Type type )
-  : KListViewItem( tqparent, label ), mProtocol( protocol ), mType( type ),
+  : KListViewItem( parent, label ), mProtocol( protocol ), mType( type ),
     mUnread(-1), mTotal(0), mSize(0), mFolderIsCloseToQuota( false )
 {
 }
 
 //-----------------------------------------------------------------------------
-KFolderTreeItem::KFolderTreeItem( KFolderTreeItem *tqparent,
+KFolderTreeItem::KFolderTreeItem( KFolderTreeItem *parent,
 				  const TQString & label, Protocol protocol, Type type,
           int unread, int total )
-    : KListViewItem( tqparent, label ), mProtocol( protocol ), mType( type ),
+    : KListViewItem( parent, label ), mProtocol( protocol ), mType( type ),
       mUnread( unread ), mTotal( total ), mSize(0), mFolderIsCloseToQuota( false )
 {
 }
@@ -359,8 +359,8 @@ void KFolderTreeItem::setFolderIsCloseToQuota( bool v )
 //=============================================================================
 
 
-KFolderTree::KFolderTree( TQWidget *tqparent, const char* name )
-  : KListView( tqparent, name ), mUnreadIndex(-1), mTotalIndex(-1), mSizeIndex(-1)
+KFolderTree::KFolderTree( TQWidget *parent, const char* name )
+  : KListView( parent, name ), mUnreadIndex(-1), mTotalIndex(-1), mSizeIndex(-1)
 {
   // GUI-options
   setStyleDependantFrameWidth();
diff --git a/libkdepim/kfoldertree.h b/libkdepim/kfoldertree.h
index 9206b8c5..eb297b73 100644
--- a/libkdepim/kfoldertree.h
+++ b/libkdepim/kfoldertree.h
@@ -171,11 +171,11 @@ class KDE_EXPORT KFolderTreeItem : public KListViewItem
     };
 
     /** constructs a root-item */
-    KFolderTreeItem( KFolderTree *tqparent, const TQString & label=TQString(),
+    KFolderTreeItem( KFolderTree *parent, const TQString & label=TQString(),
         Protocol protocol=NONE, Type type=Root );
 
     /** constructs a child-item */
-    KFolderTreeItem( KFolderTreeItem *tqparent, const TQString & label=TQString(),
+    KFolderTreeItem( KFolderTreeItem *parent, const TQString & label=TQString(),
         Protocol protocol=NONE, Type type=Other, int unread=0, int total=0 );
 
     /** compare */
@@ -245,7 +245,7 @@ class KDE_EXPORT KFolderTree : public KListView
   TQ_OBJECT
 
   public:
-    KFolderTree( TQWidget *tqparent, const char *name=0 );
+    KFolderTree( TQWidget *parent, const char *name=0 );
 
     /** registers MIMETypes that are handled
       @param mimeType the name of the MIMEType
diff --git a/libkdepim/kimportdialog.cpp b/libkdepim/kimportdialog.cpp
index 0e08eec2..64b49c4d 100644
--- a/libkdepim/kimportdialog.cpp
+++ b/libkdepim/kimportdialog.cpp
@@ -130,7 +130,7 @@ TQString KImportColumn::convert()
 
 class ColumnItem : public TQListViewItem {
   public:
-    ColumnItem(KImportColumn *col,TQListView *tqparent) : TQListViewItem(tqparent), mColumn(col)
+    ColumnItem(KImportColumn *col,TQListView *parent) : TQListViewItem(parent), mColumn(col)
     {
       setText(0,mColumn->header());
     }
@@ -148,8 +148,8 @@ class ColumnItem : public TQListViewItem {
   data objects, this class has to be inherited by a special class, which
   reimplements the convertRow() function.
 */
-KImportDialog::KImportDialog(TQWidget* tqparent)
-    : KDialogBase(tqparent,"importdialog",true,i18n("Import Text File"),Ok|Cancel),
+KImportDialog::KImportDialog(TQWidget* parent)
+    : KDialogBase(parent,"importdialog",true,i18n("Import Text File"),Ok|Cancel),
       mSeparator(","),
       mCurrentRow(0)
 {
diff --git a/libkdepim/kimportdialog.h b/libkdepim/kimportdialog.h
index b16f335f..59185825 100644
--- a/libkdepim/kimportdialog.h
+++ b/libkdepim/kimportdialog.h
@@ -78,7 +78,7 @@ class KImportDialog : public KDialogBase
     Q_OBJECT
   TQ_OBJECT
   public:
-    KImportDialog(TQWidget* tqparent);
+    KImportDialog(TQWidget* parent);
 
   public slots:
     bool setFile(const TQString& file);
diff --git a/libkdepim/kincidencechooser.cpp b/libkdepim/kincidencechooser.cpp
index 9e837167..082e4359 100644
--- a/libkdepim/kincidencechooser.cpp
+++ b/libkdepim/kincidencechooser.cpp
@@ -44,8 +44,8 @@
 
 int KIncidenceChooser::chooseMode = KIncidenceChooser::ask ;
 
-KIncidenceChooser::KIncidenceChooser(TQWidget *tqparent, char *name) :
-    KDialog(tqparent,name,true)
+KIncidenceChooser::KIncidenceChooser(TQWidget *parent, char *name) :
+    KDialog(parent,name,true)
 {
     KDialog *topFrame = this;
     TQGridLayout *topLayout = new TQGridLayout(topFrame,5,3);
diff --git a/libkdepim/kincidencechooser.h b/libkdepim/kincidencechooser.h
index 4dc6b2ef..95fb2548 100644
--- a/libkdepim/kincidencechooser.h
+++ b/libkdepim/kincidencechooser.h
@@ -48,7 +48,7 @@ class KDE_EXPORT KIncidenceChooser : public KDialog
       local, remote, newest, ask, both
     };
     /** Initialize dialog and pages */
-    KIncidenceChooser( TQWidget *tqparent=0, char *name=0 );
+    KIncidenceChooser( TQWidget *parent=0, char *name=0 );
     ~KIncidenceChooser();
     //void setChooseText( TQString );
     void setIncidence( KCal::Incidence *, KCal::Incidence  * );
diff --git a/libkdepim/komposer/core/core.cpp b/libkdepim/komposer/core/core.cpp
index 3618b88e..f93e59cc 100644
--- a/libkdepim/komposer/core/core.cpp
+++ b/libkdepim/komposer/core/core.cpp
@@ -53,9 +53,9 @@
 
 using namespace Komposer;
 
-Core::Core( TQWidget *tqparent, const char *name )
+Core::Core( TQWidget *parent, const char *name )
   : KomposerIface( "KomposerIface" ),
-    KMainWindow( tqparent, name ), m_currentEditor( 0 )
+    KMainWindow( parent, name ), m_currentEditor( 0 )
 {
   initWidgets();
   initCore();
diff --git a/libkdepim/komposer/core/corewidget.cpp b/libkdepim/komposer/core/corewidget.cpp
index 53e8abd2..c6589376 100644
--- a/libkdepim/komposer/core/corewidget.cpp
+++ b/libkdepim/komposer/core/corewidget.cpp
@@ -24,8 +24,8 @@
 
 using namespace Komposer;
 
-CoreWidget::CoreWidget( TQWidget *tqparent, const char *name )
-  : TQWidget( tqparent, name )
+CoreWidget::CoreWidget( TQWidget *parent, const char *name )
+  : TQWidget( parent, name )
 {
 }
 
diff --git a/libkdepim/komposer/core/corewidget.h b/libkdepim/komposer/core/corewidget.h
index 8c67e77d..7d2acc6d 100644
--- a/libkdepim/komposer/core/corewidget.h
+++ b/libkdepim/komposer/core/corewidget.h
@@ -34,7 +34,7 @@ namespace Komposer
     Q_OBJECT
   TQ_OBJECT
   public:
-    CoreWidget( TQWidget *tqparent, const char *name=0 );
+    CoreWidget( TQWidget *parent, const char *name=0 );
 
     virtual TQString subject() const =0;
     virtual TQStringList to()  const =0;
diff --git a/libkdepim/komposer/core/editor.cpp b/libkdepim/komposer/core/editor.cpp
index d9ecbd56..5dada393 100644
--- a/libkdepim/komposer/core/editor.cpp
+++ b/libkdepim/komposer/core/editor.cpp
@@ -30,8 +30,8 @@ public:
   TQString id;
 };
 
-Editor::Editor( TQObject *tqparent, const char *name, const TQStringList &args )
-  : Plugin( tqparent, name, args ), d( new Private )
+Editor::Editor( TQObject *parent, const char *name, const TQStringList &args )
+  : Plugin( parent, name, args ), d( new Private )
 {
 }
 
diff --git a/libkdepim/komposer/core/editor.h b/libkdepim/komposer/core/editor.h
index 9cc9336d..cdc05710 100644
--- a/libkdepim/komposer/core/editor.h
+++ b/libkdepim/komposer/core/editor.h
@@ -93,7 +93,7 @@ namespace Komposer {
     virtual void changeSignature( const TQString &txt ) =0;
 
   protected:
-    Editor( TQObject *tqparent, const char *name, const TQStringList &args );
+    Editor( TQObject *parent, const char *name, const TQStringList &args );
 
   private:
     class Private;
diff --git a/libkdepim/komposer/core/plugin.cpp b/libkdepim/komposer/core/plugin.cpp
index dbadaff5..41af47cd 100644
--- a/libkdepim/komposer/core/plugin.cpp
+++ b/libkdepim/komposer/core/plugin.cpp
@@ -35,8 +35,8 @@ public:
   //Core* core;
 };
 
-Plugin::Plugin( TQObject *tqparent, const char *name, const TQStringList & )
-    : TQObject( tqparent, name ), d( new Private )
+Plugin::Plugin( TQObject *parent, const char *name, const TQStringList & )
+    : TQObject( parent, name ), d( new Private )
 {
   //d->core = core;
 }
diff --git a/libkdepim/komposer/core/plugin.h b/libkdepim/komposer/core/plugin.h
index bb62f322..7acd7f70 100644
--- a/libkdepim/komposer/core/plugin.h
+++ b/libkdepim/komposer/core/plugin.h
@@ -64,7 +64,7 @@ namespace Komposer
     Core *core() const;
   protected:
     friend class PluginManager;
-    Plugin( TQObject *tqparent, const char *name, const TQStringList& args = TQStringList() );
+    Plugin( TQObject *parent, const char *name, const TQStringList& args = TQStringList() );
 
   private:
     class Private;
diff --git a/libkdepim/komposer/core/pluginmanager.cpp b/libkdepim/komposer/core/pluginmanager.cpp
index 30d52ffc..dcfea6f4 100644
--- a/libkdepim/komposer/core/pluginmanager.cpp
+++ b/libkdepim/komposer/core/pluginmanager.cpp
@@ -66,8 +66,8 @@ public:
   TQValueStack<TQString> pluginsToLoad;
 };
 
-PluginManager::PluginManager( TQObject *tqparent )
-  : TQObject( tqparent )
+PluginManager::PluginManager( TQObject *parent )
+  : TQObject( parent )
 {
   d = new Private;
 
diff --git a/libkdepim/komposer/core/prefsmodule.cpp b/libkdepim/komposer/core/prefsmodule.cpp
index 3b82f96d..af9df085 100644
--- a/libkdepim/komposer/core/prefsmodule.cpp
+++ b/libkdepim/komposer/core/prefsmodule.cpp
@@ -35,14 +35,14 @@
 
 extern "C"
 {
-  KDE_EXPORT KCModule *create_komposerconfig( TQWidget *tqparent, const char * ) {
-    return new Komposer::PrefsModule( tqparent, "komposerprefs" );
+  KDE_EXPORT KCModule *create_komposerconfig( TQWidget *parent, const char * ) {
+    return new Komposer::PrefsModule( parent, "komposerprefs" );
   }
 }
 using namespace Komposer;
 
-PrefsModule::PrefsModule( TQWidget *tqparent, const char *name )
-  : KPrefsModule( Komposer::Prefs::self(), tqparent, name )
+PrefsModule::PrefsModule( TQWidget *parent, const char *name )
+  : KPrefsModule( Komposer::Prefs::self(), parent, name )
 {
   TQVBoxLayout *topLayout = new TQVBoxLayout( this );
 
@@ -71,10 +71,10 @@ PrefsModule::aboutData() const
 
 
 EditorSelection::EditorSelection( const TQString &text, TQString &reference,
-                                  TQWidget *tqparent )
+                                  TQWidget *parent )
   : m_reference( reference )
 {
-  m_box = new TQGroupBox( 0, TQt::Vertical, text, tqparent );
+  m_box = new TQGroupBox( 0, TQt::Vertical, text, parent );
   TQVBoxLayout *boxLayout = new TQVBoxLayout( m_box->tqlayout() );
   boxLayout->tqsetAlignment( TQt::AlignTop );
 
diff --git a/libkdepim/komposer/core/prefsmodule.h b/libkdepim/komposer/core/prefsmodule.h
index ab174404..aba969f1 100644
--- a/libkdepim/komposer/core/prefsmodule.h
+++ b/libkdepim/komposer/core/prefsmodule.h
@@ -37,7 +37,7 @@ namespace Komposer {
     Q_OBJECT
   TQ_OBJECT
   public:
-    PrefsModule( TQWidget *tqparent=0, const char *name=0 );
+    PrefsModule( TQWidget *parent=0, const char *name=0 );
     virtual const KAboutData *aboutData() const;
   };
 
@@ -47,7 +47,7 @@ namespace Komposer {
   TQ_OBJECT
 
   public:
-    EditorSelection( const TQString &text, TQString &reference, TQWidget *tqparent );
+    EditorSelection( const TQString &text, TQString &reference, TQWidget *parent );
     ~EditorSelection();
 
     void readConfig();
diff --git a/libkdepim/komposer/core/tests/managertest.cpp b/libkdepim/komposer/core/tests/managertest.cpp
index 4224a2e2..487a84c5 100644
--- a/libkdepim/komposer/core/tests/managertest.cpp
+++ b/libkdepim/komposer/core/tests/managertest.cpp
@@ -23,8 +23,8 @@
 #include "pluginmanager.h"
 using namespace Komposer;
 
-ManagerTest::ManagerTest( TQObject* tqparent )
-    : TQObject( tqparent )
+ManagerTest::ManagerTest( TQObject* parent )
+    : TQObject( parent )
 {
     m_manager = new PluginManager( this );
 }
diff --git a/libkdepim/komposer/core/tests/managertest.h b/libkdepim/komposer/core/tests/managertest.h
index c0351b39..f02510e6 100644
--- a/libkdepim/komposer/core/tests/managertest.h
+++ b/libkdepim/komposer/core/tests/managertest.h
@@ -34,7 +34,7 @@ class ManagerTest : public TQObject,
     Q_OBJECT
   TQ_OBJECT
 public:
-    ManagerTest( TQObject* tqparent = 0 );
+    ManagerTest( TQObject* parent = 0 );
 
 public slots:
     void allTests();
diff --git a/libkdepim/komposer/core/tests/tester.cpp b/libkdepim/komposer/core/tests/tester.cpp
index 2a0c8461..b32c8964 100644
--- a/libkdepim/komposer/core/tests/tester.cpp
+++ b/libkdepim/komposer/core/tests/tester.cpp
@@ -21,8 +21,8 @@
 #include "tester.h"
 
 
-Tester::Tester( TQObject* tqparent )
-    : TQObject( tqparent )
+Tester::Tester( TQObject* parent )
+    : TQObject( parent )
 {
 }
 
diff --git a/libkdepim/komposer/core/tests/testmanager.cpp b/libkdepim/komposer/core/tests/testmanager.cpp
index 893b35b8..0fcba16b 100644
--- a/libkdepim/komposer/core/tests/testmanager.cpp
+++ b/libkdepim/komposer/core/tests/testmanager.cpp
@@ -11,8 +11,8 @@
 
 using namespace Komposer;
 
-TestManager::TestManager( TQObject *tqparent )
-  : TQObject( tqparent )
+TestManager::TestManager( TQObject *parent )
+  : TQObject( parent )
 {
   m_manager = new PluginManager( this );
   connect( m_manager, TQT_SIGNAL(pluginLoaded(Plugin*)),
diff --git a/libkdepim/komposer/core/tests/testmanager.h b/libkdepim/komposer/core/tests/testmanager.h
index b574bc87..5dfaa15d 100644
--- a/libkdepim/komposer/core/tests/testmanager.h
+++ b/libkdepim/komposer/core/tests/testmanager.h
@@ -14,7 +14,7 @@ class TestManager : public TQObject
   Q_OBJECT
   TQ_OBJECT
 public:
-  TestManager( TQObject *tqparent );
+  TestManager( TQObject *parent );
 
 public slots:
   void slotPluginLoaded( Plugin *plugin );
diff --git a/libkdepim/komposer/plugins/default/defaulteditor.cpp b/libkdepim/komposer/plugins/default/defaulteditor.cpp
index 96458ae3..27018ce5 100644
--- a/libkdepim/komposer/plugins/default/defaulteditor.cpp
+++ b/libkdepim/komposer/plugins/default/defaulteditor.cpp
@@ -46,8 +46,8 @@ typedef KGenericFactory<DefaultEditor> DefaultEditorFactory;
 K_EXPORT_COMPONENT_FACTORY( libkomposer_defaulteditor,
                             DefaultEditorFactory( "komposer_defaulteditor" ) )
 
-DefaultEditor::DefaultEditor( TQObject *tqparent, const char *name, const TQStringList &args )
-  : Editor( tqparent, name, args ), m_textEdit( 0 )
+DefaultEditor::DefaultEditor( TQObject *parent, const char *name, const TQStringList &args )
+  : Editor( parent, name, args ), m_textEdit( 0 )
 {
   setInstance( DefaultEditorFactory::instance() );
 
diff --git a/libkdepim/komposer/plugins/default/defaulteditor.h b/libkdepim/komposer/plugins/default/defaulteditor.h
index 7c33bb33..84cedcbc 100644
--- a/libkdepim/komposer/plugins/default/defaulteditor.h
+++ b/libkdepim/komposer/plugins/default/defaulteditor.h
@@ -36,7 +36,7 @@ class DefaultEditor : public Komposer::Editor
   Q_OBJECT
   TQ_OBJECT
 public:
-  DefaultEditor( TQObject *tqparent, const char *name, const TQStringList &args );
+  DefaultEditor( TQObject *parent, const char *name, const TQStringList &args );
   ~DefaultEditor();
 
   virtual TQWidget *widget();
diff --git a/libkdepim/kpartsdesignerplugin/kpartsdesignerplugin.cpp b/libkdepim/kpartsdesignerplugin/kpartsdesignerplugin.cpp
index 16cb61bb..afe8bad6 100644
--- a/libkdepim/kpartsdesignerplugin/kpartsdesignerplugin.cpp
+++ b/libkdepim/kpartsdesignerplugin/kpartsdesignerplugin.cpp
@@ -47,7 +47,7 @@ void KPartsGenericPart::load()
     if ( m_part ) {
         delete m_part;
     }
-    // "this" is both the tqparent widget and the tqparent object
+    // "this" is both the parent widget and the parent object
     m_part = KParts::ComponentFactory::createPartInstanceFromQuery<KParts::ReadOnlyPart>( mimetype, TQString(), TQT_TQWIDGET(this), 0, TQT_TQOBJECT(this), 0 );
     if ( m_part ) {
         m_part->openURL( m_url );
@@ -63,9 +63,9 @@ TQStringList KPartsWidgetPlugin::keys() const {
     return TQStringList() << mykey;
 }
 
-TQWidget * KPartsWidgetPlugin::create( const TQString & key, TQWidget * tqparent, const char * name ) {
+TQWidget * KPartsWidgetPlugin::create( const TQString & key, TQWidget * parent, const char * name ) {
     if ( key == mykey )
-        return new KPartsGenericPart( tqparent, name );
+        return new KPartsGenericPart( parent, name );
     return 0;
 }
 
diff --git a/libkdepim/kpartsdesignerplugin/kpartsdesignerplugin.h b/libkdepim/kpartsdesignerplugin/kpartsdesignerplugin.h
index e87b8d01..fc49f251 100644
--- a/libkdepim/kpartsdesignerplugin/kpartsdesignerplugin.h
+++ b/libkdepim/kpartsdesignerplugin/kpartsdesignerplugin.h
@@ -59,7 +59,7 @@ private:
 class KPartsWidgetPlugin : public TQWidgetPlugin {
 public:
   TQStringList keys() const;
-  TQWidget * create( const TQString & key, TQWidget * tqparent, const char * name );
+  TQWidget * create( const TQString & key, TQWidget * parent, const char * name );
   TQString group( const TQString & key ) const;
   //TQIconSet iconSet( const TQString & key ) const;
   TQString includeFile( const TQString & key ) const;
diff --git a/libkdepim/kpimurlrequesterdlg.cpp b/libkdepim/kpimurlrequesterdlg.cpp
index 7815aee5..553ca659 100644
--- a/libkdepim/kpimurlrequesterdlg.cpp
+++ b/libkdepim/kpimurlrequesterdlg.cpp
@@ -25,9 +25,9 @@
 
 // KDE3.4 or KDE4.0: FIXME: Move to kdelibs!
 KURL KPimURLRequesterDlg::getURL( const TQString& dir, const TQString &label,
-                                  TQWidget *tqparent, const TQString& caption )
+                                  TQWidget *parent, const TQString& caption )
 {
-    KURLRequesterDlg dlg(dir, label, tqparent, "filedialog", true);
+    KURLRequesterDlg dlg(dir, label, parent, "filedialog", true);
 
     dlg.setCaption(caption.isNull() ? i18n("Open") : caption);
 
diff --git a/libkdepim/kpimurlrequesterdlg.h b/libkdepim/kpimurlrequesterdlg.h
index ef4cc987..ccbccc88 100644
--- a/libkdepim/kpimurlrequesterdlg.h
+++ b/libkdepim/kpimurlrequesterdlg.h
@@ -35,11 +35,11 @@ class KDE_EXPORT KPimURLRequesterDlg
      *
      * @param url This specifies the initial path of the input line.
 		 * @param text The text to be shown on the label.
-     * @param tqparent The widget the dialog will be centered on initially.
+     * @param parent The widget the dialog will be centered on initially.
      */
 		static KURL getURL( const TQString &url = TQString(), 
 			                const TQString &text = TQString(),
-                      TQWidget *tqparent = 0, 
+                      TQWidget *parent = 0, 
 			                const TQString &caption = TQString() );
 };
 
diff --git a/libkdepim/kpixmapregionselectordialog.cpp b/libkdepim/kpixmapregionselectordialog.cpp
index e7645d30..4766a452 100644
--- a/libkdepim/kpixmapregionselectordialog.cpp
+++ b/libkdepim/kpixmapregionselectordialog.cpp
@@ -28,8 +28,8 @@
 
 using namespace KPIM;
 
-KPixmapRegionSelectorDialog::KPixmapRegionSelectorDialog(TQWidget *tqparent,
-     const char *name, bool modal ) : KDialogBase(tqparent, name, modal, i18n("Select Region of Image"), Help|Ok|Cancel, Ok, true )
+KPixmapRegionSelectorDialog::KPixmapRegionSelectorDialog(TQWidget *parent,
+     const char *name, bool modal ) : KDialogBase(parent, name, modal, i18n("Select Region of Image"), Help|Ok|Cancel, Ok, true )
 {
   TQVBox *vbox=new TQVBox(this);
   new TQLabel(i18n("Please click and drag on the image to select the region of interest:"), vbox);
@@ -44,9 +44,9 @@ KPixmapRegionSelectorDialog::~KPixmapRegionSelectorDialog()
 {
 }
 
-TQRect KPixmapRegionSelectorDialog::getSelectedRegion(const TQPixmap &pixmap, TQWidget *tqparent )
+TQRect KPixmapRegionSelectorDialog::getSelectedRegion(const TQPixmap &pixmap, TQWidget *parent )
 {
-  KPixmapRegionSelectorDialog dialog(tqparent);
+  KPixmapRegionSelectorDialog dialog(parent);
 
   dialog.pixmapRegionSelectorWidget()->setPixmap(pixmap);
 
@@ -65,9 +65,9 @@ TQRect KPixmapRegionSelectorDialog::getSelectedRegion(const TQPixmap &pixmap, TQ
   return rect;
 }
 
-TQRect KPixmapRegionSelectorDialog::getSelectedRegion(const TQPixmap &pixmap, int aspectRatioWidth, int aspectRatioHeight, TQWidget *tqparent )
+TQRect KPixmapRegionSelectorDialog::getSelectedRegion(const TQPixmap &pixmap, int aspectRatioWidth, int aspectRatioHeight, TQWidget *parent )
 {
-  KPixmapRegionSelectorDialog dialog(tqparent);
+  KPixmapRegionSelectorDialog dialog(parent);
 
   dialog.pixmapRegionSelectorWidget()->setPixmap(pixmap);
   dialog.pixmapRegionSelectorWidget()->setSelectionAspectRatio(aspectRatioWidth,aspectRatioHeight);
@@ -87,9 +87,9 @@ TQRect KPixmapRegionSelectorDialog::getSelectedRegion(const TQPixmap &pixmap, in
   return rect;
 }
 
-TQImage KPixmapRegionSelectorDialog::getSelectedImage(const TQPixmap &pixmap, TQWidget *tqparent )
+TQImage KPixmapRegionSelectorDialog::getSelectedImage(const TQPixmap &pixmap, TQWidget *parent )
 {
-  KPixmapRegionSelectorDialog dialog(tqparent);
+  KPixmapRegionSelectorDialog dialog(parent);
 
   dialog.pixmapRegionSelectorWidget()->setPixmap(pixmap);
 
@@ -107,9 +107,9 @@ TQImage KPixmapRegionSelectorDialog::getSelectedImage(const TQPixmap &pixmap, TQ
   return image;
 }
 
-TQImage KPixmapRegionSelectorDialog::getSelectedImage(const TQPixmap &pixmap, int aspectRatioWidth, int aspectRatioHeight, TQWidget *tqparent )
+TQImage KPixmapRegionSelectorDialog::getSelectedImage(const TQPixmap &pixmap, int aspectRatioWidth, int aspectRatioHeight, TQWidget *parent )
 {
-  KPixmapRegionSelectorDialog dialog(tqparent);
+  KPixmapRegionSelectorDialog dialog(parent);
 
   dialog.pixmapRegionSelectorWidget()->setPixmap(pixmap);
   dialog.pixmapRegionSelectorWidget()->setSelectionAspectRatio(aspectRatioWidth,aspectRatioHeight);
diff --git a/libkdepim/kpixmapregionselectordialog.h b/libkdepim/kpixmapregionselectordialog.h
index 477148fd..7cc08e32 100644
--- a/libkdepim/kpixmapregionselectordialog.h
+++ b/libkdepim/kpixmapregionselectordialog.h
@@ -51,7 +51,7 @@ public:
     * later the setPixmap method of the KPixmapRegionSelectorWidget widget of
     * the new object.
     */
-   KPixmapRegionSelectorDialog(TQWidget *tqparent=0L, const char *name=0L,
+   KPixmapRegionSelectorDialog(TQWidget *parent=0L, const char *name=0L,
                       bool modal = false );
    /**
     * The destructor of the dialog
@@ -72,7 +72,7 @@ public:
     * @returns the selected rectangle, or an invalid rectangle if the user
     * pressed the Cancel button.
     */
-   static TQRect getSelectedRegion(const TQPixmap &pixmap, TQWidget *tqparent = 0L );
+   static TQRect getSelectedRegion(const TQPixmap &pixmap, TQWidget *parent = 0L );
 
    /**
     * Creates a modal dialog, lets the user to select a region of the @p pixmap
@@ -82,7 +82,7 @@ public:
     * @returns the selected rectangle, or an invalid rectangle if the user
     * pressed the Cancel button.
     */
-   static TQRect getSelectedRegion(const TQPixmap &pixmap, int aspectRatioWidth, int aspectRatioHeight, TQWidget *tqparent = 0L );
+   static TQRect getSelectedRegion(const TQPixmap &pixmap, int aspectRatioWidth, int aspectRatioHeight, TQWidget *parent = 0L );
 
    /**
     * Creates a modal dialog, lets the user to select a region of the @p pixmap
@@ -91,7 +91,7 @@ public:
     * @returns the selected image, or an invalid image if the user
     * pressed the Cancel button.
     */
-   static TQImage getSelectedImage(const TQPixmap &pixmap, TQWidget *tqparent = 0L );
+   static TQImage getSelectedImage(const TQPixmap &pixmap, TQWidget *parent = 0L );
 
    /**
     * Creates a modal dialog, lets the user to select a region of the @p pixmap
@@ -101,7 +101,7 @@ public:
     * @returns the selected image, or an invalid image if the user
     * pressed the Cancel button.
     */
-   static TQImage getSelectedImage(const TQPixmap &pixmap, int aspectRatioWidth, int aspectRatioHeight, TQWidget *tqparent = 0L );
+   static TQImage getSelectedImage(const TQPixmap &pixmap, int aspectRatioWidth, int aspectRatioHeight, TQWidget *parent = 0L );
 
 protected:
    KPIM::KPixmapRegionSelectorWidget *m_pixmapSelectorWidget;
diff --git a/libkdepim/kpixmapregionselectorwidget.cpp b/libkdepim/kpixmapregionselectorwidget.cpp
index 46e65524..ee4c0a20 100644
--- a/libkdepim/kpixmapregionselectorwidget.cpp
+++ b/libkdepim/kpixmapregionselectorwidget.cpp
@@ -41,8 +41,8 @@
 
 using namespace KPIM;
 
-KPixmapRegionSelectorWidget::KPixmapRegionSelectorWidget( TQWidget *tqparent,
-      const char *name) : TQWidget( tqparent, name)
+KPixmapRegionSelectorWidget::KPixmapRegionSelectorWidget( TQWidget *parent,
+      const char *name) : TQWidget( parent, name)
 {
    TQHBoxLayout * hboxLayout=new TQHBoxLayout( this );
 
diff --git a/libkdepim/kpixmapregionselectorwidget.h b/libkdepim/kpixmapregionselectorwidget.h
index b1ad7bbd..b06c4df9 100644
--- a/libkdepim/kpixmapregionselectorwidget.h
+++ b/libkdepim/kpixmapregionselectorwidget.h
@@ -53,7 +53,7 @@ public:
    /**
     * Constructor for a KPixmapRegionSelectorWidget.
     */
-   KPixmapRegionSelectorWidget( TQWidget *tqparent = 0L, const char *name=0L);
+   KPixmapRegionSelectorWidget( TQWidget *parent = 0L, const char *name=0L);
 
    /**
     * Destructor for a KPixmapRegionSelectorWidget
diff --git a/libkdepim/kprefsdialog.cpp b/libkdepim/kprefsdialog.cpp
index 38adc8fa..ca848911 100644
--- a/libkdepim/kprefsdialog.cpp
+++ b/libkdepim/kprefsdialog.cpp
@@ -50,18 +50,18 @@
 
 namespace KPrefsWidFactory {
 
-KPrefsWid *create( KConfigSkeletonItem *item, TQWidget *tqparent )
+KPrefsWid *create( KConfigSkeletonItem *item, TQWidget *parent )
 {
   KConfigSkeleton::ItemBool *boolItem =
       dynamic_cast<KConfigSkeleton::ItemBool *>( item );
   if ( boolItem ) {
-    return new KPrefsWidBool( boolItem, tqparent );
+    return new KPrefsWidBool( boolItem, parent );
   }
 
   KConfigSkeleton::ItemString *stringItem =
       dynamic_cast<KConfigSkeleton::ItemString *>( item );
   if ( stringItem ) {
-    return new KPrefsWidString( stringItem, tqparent );
+    return new KPrefsWidString( stringItem, parent );
   }
 
   KConfigSkeleton::ItemEnum *enumItem =
@@ -72,7 +72,7 @@ KPrefsWid *create( KConfigSkeletonItem *item, TQWidget *tqparent )
       kdError() << "KPrefsWidFactory::create(): Enum has no choices." << endl;
       return 0;
     } else {
-      KPrefsWidRadios *radios = new KPrefsWidRadios( enumItem, tqparent );
+      KPrefsWidRadios *radios = new KPrefsWidRadios( enumItem, parent );
       TQValueList<KConfigSkeleton::ItemEnum::Choice>::ConstIterator it;
       for( it = choices.begin(); it != choices.end(); ++it ) {
         radios->addRadio( (*it).label );
@@ -84,7 +84,7 @@ KPrefsWid *create( KConfigSkeletonItem *item, TQWidget *tqparent )
   KConfigSkeleton::ItemInt *intItem =
       dynamic_cast<KConfigSkeleton::ItemInt *>( item );
   if ( intItem ) {
-    return new KPrefsWidInt( intItem, tqparent );
+    return new KPrefsWidInt( intItem, parent );
   }
 
   return 0;
@@ -99,10 +99,10 @@ TQValueList<TQWidget *> KPrefsWid::widgets() const
 }
 
 
-KPrefsWidBool::KPrefsWidBool( KConfigSkeleton::ItemBool *item, TQWidget *tqparent )
+KPrefsWidBool::KPrefsWidBool( KConfigSkeleton::ItemBool *item, TQWidget *parent )
   : mItem( item )
 {
-  mCheck = new TQCheckBox( item->label(), tqparent);
+  mCheck = new TQCheckBox( item->label(), parent);
   connect( mCheck, TQT_SIGNAL( clicked() ), TQT_SIGNAL( changed() ) );
   if ( !item->whatsThis().isNull() ) {
     TQWhatsThis::add( mCheck, item->whatsThis() );
@@ -133,11 +133,11 @@ TQValueList<TQWidget *> KPrefsWidBool::widgets() const
 
 
 KPrefsWidInt::KPrefsWidInt( KConfigSkeleton::ItemInt *item,
-                            TQWidget *tqparent )
+                            TQWidget *parent )
   : mItem( item )
 {
-  mLabel = new TQLabel( mItem->label()+':', tqparent );
-  mSpin = new TQSpinBox( tqparent );
+  mLabel = new TQLabel( mItem->label()+':', parent );
+  mSpin = new TQSpinBox( parent );
   if ( !item->minValue().isNull() ) {
     mSpin->setMinValue( item->minValue().toInt() );
   }
@@ -183,12 +183,12 @@ TQValueList<TQWidget *> KPrefsWidInt::widgets() const
 
 
 KPrefsWidColor::KPrefsWidColor( KConfigSkeleton::ItemColor *item,
-                                TQWidget *tqparent )
+                                TQWidget *parent )
   : mItem( item )
 {
-  mButton = new KColorButton( tqparent );
+  mButton = new KColorButton( parent );
   connect( mButton, TQT_SIGNAL( changed( const TQColor & ) ), TQT_SIGNAL( changed() ) );
-  mLabel = new TQLabel( mButton, mItem->label()+':', tqparent );
+  mLabel = new TQLabel( mButton, mItem->label()+':', parent );
   mLabel->setBuddy( mButton );
   TQString whatsThis = mItem->whatsThis();
   if (!whatsThis.isNull()) {
@@ -223,15 +223,15 @@ KColorButton *KPrefsWidColor::button()
 
 
 KPrefsWidFont::KPrefsWidFont( KConfigSkeleton::ItemFont *item,
-                              TQWidget *tqparent, const TQString &sampleText )
+                              TQWidget *parent, const TQString &sampleText )
   : mItem( item )
 {
-  mLabel = new TQLabel( mItem->label()+':', tqparent );
+  mLabel = new TQLabel( mItem->label()+':', parent );
 
-  mPreview = new TQLabel( sampleText, tqparent );
+  mPreview = new TQLabel( sampleText, parent );
   mPreview->setFrameStyle( TQFrame::Panel | TQFrame::Sunken );
 
-  mButton = new TQPushButton( i18n("Choose..."), tqparent );
+  mButton = new TQPushButton( i18n("Choose..."), parent );
   connect( mButton, TQT_SIGNAL( clicked() ), TQT_SLOT( selectFont() ) );
   TQString whatsThis = mItem->whatsThis();
   if (!whatsThis.isNull()) {
@@ -281,11 +281,11 @@ void KPrefsWidFont::selectFont()
 
 
 KPrefsWidTime::KPrefsWidTime( KConfigSkeleton::ItemDateTime *item,
-                              TQWidget *tqparent )
+                              TQWidget *parent )
   : mItem( item )
 {
-  mLabel = new TQLabel( mItem->label()+':', tqparent );
-  mTimeEdit = new KTimeEdit( tqparent );
+  mLabel = new TQLabel( mItem->label()+':', parent );
+  mTimeEdit = new KTimeEdit( parent );
   mLabel->setBuddy( mTimeEdit );
   connect( mTimeEdit, TQT_SIGNAL( timeChanged( TQTime ) ), TQT_SIGNAL( changed() ) );
   TQString whatsThis = mItem->whatsThis();
@@ -320,11 +320,11 @@ KTimeEdit *KPrefsWidTime::timeEdit()
 
 
 KPrefsWidDuration::KPrefsWidDuration( KConfigSkeleton::ItemDateTime *item,
-                                      TQWidget *tqparent )
+                                      TQWidget *parent )
   : mItem( item )
 {
-  mLabel = new TQLabel( mItem->label()+':', tqparent );
-  mTimeEdit = new TQTimeEdit( tqparent );
+  mLabel = new TQLabel( mItem->label()+':', parent );
+  mTimeEdit = new TQTimeEdit( parent );
   mLabel->setBuddy( mTimeEdit );
   mTimeEdit->setAutoAdvance( true );
   mTimeEdit->setDisplay( TQTimeEdit::Hours | TQTimeEdit::Minutes );
@@ -361,11 +361,11 @@ TQTimeEdit *KPrefsWidDuration::timeEdit()
 
 
 KPrefsWidDate::KPrefsWidDate( KConfigSkeleton::ItemDateTime *item,
-                              TQWidget *tqparent )
+                              TQWidget *parent )
   : mItem( item )
 {
-  mLabel = new TQLabel( mItem->label()+':', tqparent );
-  mDateEdit = new KDateEdit( tqparent );
+  mLabel = new TQLabel( mItem->label()+':', parent );
+  mDateEdit = new KDateEdit( parent );
   mLabel->setBuddy( mDateEdit );
   connect( mDateEdit, TQT_SIGNAL( dateChanged( const TQDate& ) ), TQT_SIGNAL( changed() ) );
   TQString whatsThis = mItem->whatsThis();
@@ -398,10 +398,10 @@ KDateEdit *KPrefsWidDate::dateEdit()
 
 
 KPrefsWidRadios::KPrefsWidRadios( KConfigSkeleton::ItemEnum *item,
-                                  TQWidget *tqparent )
+                                  TQWidget *parent )
   : mItem( item )
 {
-  mBox = new TQButtonGroup( 1, Qt::Horizontal, mItem->label(), tqparent );
+  mBox = new TQButtonGroup( 1, Qt::Horizontal, mItem->label(), parent );
   connect( mBox, TQT_SIGNAL( clicked( int ) ), TQT_SIGNAL( changed() ) );
 }
 
@@ -440,10 +440,10 @@ TQValueList<TQWidget *> KPrefsWidRadios::widgets() const
 }
 
 KPrefsWidCombo::KPrefsWidCombo( KConfigSkeleton::ItemEnum *item,
-                                  TQWidget *tqparent )
+                                  TQWidget *parent )
   : mItem( item )
 {
-  TQHBox *hbox = new TQHBox(tqparent);
+  TQHBox *hbox = new TQHBox(parent);
   new TQLabel( mItem->label(), hbox );
   mCombo = new TQComboBox( hbox );
   connect( mCombo, TQT_SIGNAL( activated( int ) ), TQT_SIGNAL( changed() ) );
@@ -476,12 +476,12 @@ TQComboBox* KPrefsWidCombo::comboBox()
 }
 
 KPrefsWidString::KPrefsWidString( KConfigSkeleton::ItemString *item,
-                                  TQWidget *tqparent,
+                                  TQWidget *parent,
                                   TQLineEdit::EchoMode echomode )
   : mItem( item )
 {
-  mLabel = new TQLabel( mItem->label()+':', tqparent );
-  mEdit = new TQLineEdit( tqparent );
+  mLabel = new TQLabel( mItem->label()+':', parent );
+  mEdit = new TQLineEdit( parent );
   mLabel->setBuddy( mEdit );
   connect( mEdit, TQT_SIGNAL( textChanged( const TQString & ) ),
            TQT_SIGNAL( changed() ) );
@@ -525,12 +525,12 @@ TQValueList<TQWidget *> KPrefsWidString::widgets() const
 }
 
 
-KPrefsWidPath::KPrefsWidPath( KConfigSkeleton::ItemPath *item, TQWidget *tqparent,
+KPrefsWidPath::KPrefsWidPath( KConfigSkeleton::ItemPath *item, TQWidget *parent,
                               const TQString &filter, uint mode )
   : mItem( item )
 {
-  mLabel = new TQLabel( mItem->label()+':', tqparent );
-  mURLRequester = new KURLRequester( tqparent );
+  mLabel = new TQLabel( mItem->label()+':', parent );
+  mURLRequester = new KURLRequester( parent );
   mLabel->setBuddy( mURLRequester );
   mURLRequester->setMode( mode );
   mURLRequester->setFilter( filter );
@@ -590,49 +590,49 @@ void KPrefsWidManager::addWid( KPrefsWid *wid )
 }
 
 KPrefsWidBool *KPrefsWidManager::addWidBool( KConfigSkeleton::ItemBool *item,
-                                             TQWidget *tqparent )
+                                             TQWidget *parent )
 {
-  KPrefsWidBool *w = new KPrefsWidBool( item, tqparent );
+  KPrefsWidBool *w = new KPrefsWidBool( item, parent );
   addWid( w );
   return w;
 }
 
 KPrefsWidTime *KPrefsWidManager::addWidTime( KConfigSkeleton::ItemDateTime *item,
-                                             TQWidget *tqparent )
+                                             TQWidget *parent )
 {
-  KPrefsWidTime *w = new KPrefsWidTime( item, tqparent );
+  KPrefsWidTime *w = new KPrefsWidTime( item, parent );
   addWid( w );
   return w;
 }
 
 KPrefsWidDuration *KPrefsWidManager::addWidDuration( KConfigSkeleton::ItemDateTime *item,
-                                                     TQWidget *tqparent )
+                                                     TQWidget *parent )
 {
-  KPrefsWidDuration *w = new KPrefsWidDuration( item, tqparent );
+  KPrefsWidDuration *w = new KPrefsWidDuration( item, parent );
   addWid( w );
   return w;
 }
 
 KPrefsWidDate *KPrefsWidManager::addWidDate( KConfigSkeleton::ItemDateTime *item,
-                                             TQWidget *tqparent )
+                                             TQWidget *parent )
 {
-  KPrefsWidDate *w = new KPrefsWidDate( item, tqparent );
+  KPrefsWidDate *w = new KPrefsWidDate( item, parent );
   addWid( w );
   return w;
 }
 
 KPrefsWidColor *KPrefsWidManager::addWidColor( KConfigSkeleton::ItemColor *item,
-                                               TQWidget *tqparent )
+                                               TQWidget *parent )
 {
-  KPrefsWidColor *w = new KPrefsWidColor( item, tqparent );
+  KPrefsWidColor *w = new KPrefsWidColor( item, parent );
   addWid( w );
   return w;
 }
 
 KPrefsWidRadios *KPrefsWidManager::addWidRadios( KConfigSkeleton::ItemEnum *item,
-                                                 TQWidget *tqparent )
+                                                 TQWidget *parent )
 {
-  KPrefsWidRadios *w = new KPrefsWidRadios( item, tqparent );
+  KPrefsWidRadios *w = new KPrefsWidRadios( item, parent );
   TQValueList<KConfigSkeleton::ItemEnum::Choice> choices;
   choices = item->choices();
   TQValueList<KConfigSkeleton::ItemEnum::Choice>::ConstIterator it;
@@ -644,9 +644,9 @@ KPrefsWidRadios *KPrefsWidManager::addWidRadios( KConfigSkeleton::ItemEnum *item
 }
 
 KPrefsWidCombo *KPrefsWidManager::addWidCombo( KConfigSkeleton::ItemEnum *item,
-                                               TQWidget* tqparent )
+                                               TQWidget* parent )
 {
-  KPrefsWidCombo *w = new KPrefsWidCombo( item, tqparent );
+  KPrefsWidCombo *w = new KPrefsWidCombo( item, parent );
   TQValueList<KConfigSkeleton::ItemEnum::Choice> choices;
   choices = item->choices();
   TQValueList<KConfigSkeleton::ItemEnum::Choice>::ConstIterator it;
@@ -658,43 +658,43 @@ KPrefsWidCombo *KPrefsWidManager::addWidCombo( KConfigSkeleton::ItemEnum *item,
 }
 
 KPrefsWidString *KPrefsWidManager::addWidString( KConfigSkeleton::ItemString *item,
-                                                 TQWidget *tqparent )
+                                                 TQWidget *parent )
 {
-  KPrefsWidString *w = new KPrefsWidString( item, tqparent,
+  KPrefsWidString *w = new KPrefsWidString( item, parent,
                                             TQLineEdit::Normal );
   addWid( w );
   return w;
 }
 
 KPrefsWidPath *KPrefsWidManager::addWidPath( KConfigSkeleton::ItemPath *item,
-                                             TQWidget *tqparent, const TQString &filter, uint mode )
+                                             TQWidget *parent, const TQString &filter, uint mode )
 {
-  KPrefsWidPath *w = new KPrefsWidPath( item, tqparent, filter, mode );
+  KPrefsWidPath *w = new KPrefsWidPath( item, parent, filter, mode );
   addWid( w );
   return w;
 }
 
 KPrefsWidString *KPrefsWidManager::addWidPassword( KConfigSkeleton::ItemString *item,
-                                                   TQWidget *tqparent )
+                                                   TQWidget *parent )
 {
-  KPrefsWidString *w = new KPrefsWidString( item, tqparent, TQLineEdit::Password );
+  KPrefsWidString *w = new KPrefsWidString( item, parent, TQLineEdit::Password );
   addWid( w );
   return w;
 }
 
 KPrefsWidFont *KPrefsWidManager::addWidFont( KConfigSkeleton::ItemFont *item,
-                                             TQWidget *tqparent,
+                                             TQWidget *parent,
                                              const TQString &sampleText )
 {
-  KPrefsWidFont *w = new KPrefsWidFont( item, tqparent, sampleText );
+  KPrefsWidFont *w = new KPrefsWidFont( item, parent, sampleText );
   addWid( w );
   return w;
 }
 
 KPrefsWidInt *KPrefsWidManager::addWidInt( KConfigSkeleton::ItemInt *item,
-                                           TQWidget *tqparent )
+                                           TQWidget *parent )
 {
-  KPrefsWidInt *w = new KPrefsWidInt( item, tqparent );
+  KPrefsWidInt *w = new KPrefsWidInt( item, parent );
   addWid( w );
   return w;
 }
@@ -733,9 +733,9 @@ void KPrefsWidManager::writeWidConfig()
 }
 
 
-KPrefsDialog::KPrefsDialog( KConfigSkeleton *prefs, TQWidget *tqparent, char *name,
+KPrefsDialog::KPrefsDialog( KConfigSkeleton *prefs, TQWidget *parent, char *name,
                             bool modal )
-  : KDialogBase(IconList,i18n("Preferences"),Ok|Apply|Cancel|Default,Ok,tqparent,
+  : KDialogBase(IconList,i18n("Preferences"),Ok|Apply|Cancel|Default,Ok,parent,
                 name,modal,true),
     KPrefsWidManager( prefs )
 {
@@ -857,9 +857,9 @@ void KPrefsDialog::slotDefault()
 }
 
 
-KPrefsModule::KPrefsModule( KConfigSkeleton *prefs, TQWidget *tqparent,
+KPrefsModule::KPrefsModule( KConfigSkeleton *prefs, TQWidget *parent,
                             const char *name )
-  : KCModule( tqparent, name ),
+  : KCModule( parent, name ),
     KPrefsWidManager( prefs )
 {
   emit changed( false );
diff --git a/libkdepim/kprefsdialog.h b/libkdepim/kprefsdialog.h
index e94b4a44..9aa01159 100644
--- a/libkdepim/kprefsdialog.h
+++ b/libkdepim/kprefsdialog.h
@@ -96,9 +96,9 @@ class KDE_EXPORT KPrefsWidBool : public KPrefsWid
       Create a bool value control element consisting of a TQCheckbox.
 
       @param item    The KConfigSkeletonItem representing the preferences entry.
-      @param tqparent  Parent widget.
+      @param parent  Parent widget.
     */
-    KPrefsWidBool( KConfigSkeleton::ItemBool *item, TQWidget *tqparent );
+    KPrefsWidBool( KConfigSkeleton::ItemBool *item, TQWidget *parent );
 
     /**
       Return the TQCheckbox used by this control element.
@@ -131,9 +131,9 @@ class KDE_EXPORT KPrefsWidInt : public KPrefsWid
       spinbox.
 
       @param item    The KConfigSkeletonItem representing the preferences entry.
-      @param tqparent  Parent widget.
+      @param parent  Parent widget.
     */
-    KPrefsWidInt( KConfigSkeleton::ItemInt *item, TQWidget *tqparent );
+    KPrefsWidInt( KConfigSkeleton::ItemInt *item, TQWidget *parent );
 
     /**
       Return TQLabel used by this control element.
@@ -171,9 +171,9 @@ class KDE_EXPORT KPrefsWidTime : public KPrefsWid
       Create a time value control element consisting of a label and a spinbox.
 
       @param item    The KConfigSkeletonItem representing the preferences entry.
-      @param tqparent  Parent widget.
+      @param parent  Parent widget.
     */
-    KPrefsWidTime( KConfigSkeleton::ItemDateTime *item, TQWidget *tqparent );
+    KPrefsWidTime( KConfigSkeleton::ItemDateTime *item, TQWidget *parent );
 
     /**
       Return TQLabel used by this widget.
@@ -209,9 +209,9 @@ class KDE_EXPORT KPrefsWidDuration : public KPrefsWid
       spinbox.
 
       @param item    The KConfigSkeletonItem representing the preferences entry.
-      @param tqparent  Parent widget.
+      @param parent  Parent widget.
     */
-    KPrefsWidDuration( KConfigSkeleton::ItemDateTime *item, TQWidget *tqparent );
+    KPrefsWidDuration( KConfigSkeleton::ItemDateTime *item, TQWidget *parent );
 
     /**
       Return TQLabel used by this widget.
@@ -246,9 +246,9 @@ class KDE_EXPORT KPrefsWidDate : public KPrefsWid
       Create a time value control element consisting of a label and a date box.
 
       @param item    The KConfigSkeletonItem representing the preferences entry.
-      @param tqparent  Parent widget.
+      @param parent  Parent widget.
     */
-    KPrefsWidDate( KConfigSkeleton::ItemDateTime *item, TQWidget *tqparent );
+    KPrefsWidDate( KConfigSkeleton::ItemDateTime *item, TQWidget *parent );
 
     /**
       Return TQLabel used by this widget.
@@ -286,9 +286,9 @@ class KDE_EXPORT KPrefsWidColor : public KPrefsWid
       button for opening a color dialog.
 
       @param item    The KConfigSkeletonItem representing the preferences entry.
-      @param tqparent  Parent widget.
+      @param parent  Parent widget.
     */
-    KPrefsWidColor( KConfigSkeleton::ItemColor *item, TQWidget *tqparent );
+    KPrefsWidColor( KConfigSkeleton::ItemColor *item, TQWidget *parent );
     /**
       Destruct color setting widget.
     */
@@ -329,11 +329,11 @@ class KDE_EXPORT KPrefsWidFont : public KPrefsWid
       button for opening a font dialog.
 
       @param item    The KConfigSkeletonItem representing the preferences entry.
-      @param tqparent  Parent widget.
+      @param parent  Parent widget.
       @param sampleText Sample text for previewing the selected font.
     */
     KPrefsWidFont( KConfigSkeleton::ItemFont *item,
-                   TQWidget *tqparent, const TQString &sampleText );
+                   TQWidget *parent, const TQString &sampleText );
     /**
       Destruct font setting widget.
     */
@@ -385,9 +385,9 @@ class KDE_EXPORT KPrefsWidRadios : public KPrefsWid
       with several radio buttons.
 
       @param item    The KConfigSkeletonItem representing the preferences entry.
-      @param tqparent  Parent widget.
+      @param parent  Parent widget.
     */
-    KPrefsWidRadios( KConfigSkeleton::ItemEnum *item, TQWidget *tqparent );
+    KPrefsWidRadios( KConfigSkeleton::ItemEnum *item, TQWidget *parent );
     virtual ~KPrefsWidRadios();
 
     /**
@@ -433,9 +433,9 @@ class KDE_EXPORT KPrefsWidCombo : public KPrefsWid
       combo box.
 
       @param item    The KConfigSkeletonItem representing the preferences entry.
-      @param tqparent  Parent widget.
+      @param parent  Parent widget.
     */
-    KPrefsWidCombo( KConfigSkeleton::ItemEnum *item, TQWidget *tqparent );
+    KPrefsWidCombo( KConfigSkeleton::ItemEnum *item, TQWidget *parent );
     virtual ~KPrefsWidCombo();
 
     void readConfig();
@@ -466,10 +466,10 @@ class KDE_EXPORT KPrefsWidString : public KPrefsWid
       line edit.
 
       @param item    The KConfigSkeletonItem representing the preferences entry.
-      @param tqparent  Parent widget.
+      @param parent  Parent widget.
       @param echomode  Describes how a line edit should display its contents.
     */
-    KPrefsWidString( KConfigSkeleton::ItemString *item, TQWidget *tqparent,
+    KPrefsWidString( KConfigSkeleton::ItemString *item, TQWidget *parent,
                      TQLineEdit::EchoMode echomode=TQLineEdit::Normal );
     /**
       Destructor.
@@ -513,11 +513,11 @@ class KDE_EXPORT KPrefsWidPath : public KPrefsWid
       line edit.
 
       @param item    The KConfigSkeletonItem representing the preferences entry.
-      @param tqparent  Parent widget.
+      @param parent  Parent widget.
       @param filter URLRequester filter
       @param mode  Describes how a line edit should display its contents.
     */
-    KPrefsWidPath( KConfigSkeleton::ItemPath *item, TQWidget *tqparent,
+    KPrefsWidPath( KConfigSkeleton::ItemPath *item, TQWidget *parent,
                    const TQString &filter = TQString(), uint mode = KFile::File );
     /**
       Destructor.
@@ -579,94 +579,94 @@ class KDE_EXPORT KPrefsWidManager
       Register a @ref KPrefsWidBool object.
 
       @param item    The KConfigSkeletonItem representing the preferences entry.
-      @param tqparent  Parent widget.
+      @param parent  Parent widget.
     */
     KPrefsWidBool *addWidBool( KConfigSkeleton::ItemBool *item,
-                               TQWidget *tqparent );
+                               TQWidget *parent );
 
     /**
       Register a @ref KPrefsWidInt object.
 
       @param item    The KConfigSkeletonItem representing the preferences entry.
-      @param tqparent  Parent widget.
+      @param parent  Parent widget.
     */
     KPrefsWidInt *addWidInt( KConfigSkeleton::ItemInt *item,
-                             TQWidget *tqparent );
+                             TQWidget *parent );
 
     /**
       Register a @ref KPrefsWidDate object.
 
       @param item    The KConfigSkeletonItem representing the preferences entry.
-      @param tqparent  Parent widget.
+      @param parent  Parent widget.
     */
     KPrefsWidDate *addWidDate( KConfigSkeleton::ItemDateTime *item,
-                               TQWidget *tqparent );
+                               TQWidget *parent );
 
     /**
       Register a @ref KPrefsWidTime object.
 
       @param item    The KConfigSkeletonItem representing the preferences entry.
-      @param tqparent  Parent widget.
+      @param parent  Parent widget.
     */
     KPrefsWidTime *addWidTime( KConfigSkeleton::ItemDateTime *item,
-                               TQWidget *tqparent );
+                               TQWidget *parent );
 
     /**
       Register a @ref KPrefsWidDuration object.
 
       @param item    The KConfigSkeletonItem representing the preferences entry.
-      @param tqparent  Parent widget.
+      @param parent  Parent widget.
     */
     KPrefsWidDuration *addWidDuration( KConfigSkeleton::ItemDateTime *item,
-                                       TQWidget *tqparent );
+                                       TQWidget *parent );
 
     /**
       Register a @ref KPrefsWidColor object.
 
       @param item    The KConfigSkeletonItem representing the preferences entry.
-      @param tqparent  Parent widget.
+      @param parent  Parent widget.
     */
     KPrefsWidColor *addWidColor( KConfigSkeleton::ItemColor *item,
-                                 TQWidget *tqparent );
+                                 TQWidget *parent );
 
     /**
       Register a @ref KPrefsWidRadios object. The choices represented by the
       given item object are automatically added as radio buttons.
 
       @param item    The KConfigSkeletonItem representing the preferences entry.
-      @param tqparent  Parent widget.
+      @param parent  Parent widget.
     */
     KPrefsWidRadios *addWidRadios( KConfigSkeleton::ItemEnum *item,
-                                   TQWidget *tqparent );
+                                   TQWidget *parent );
 
     /**
       Register a @ref KPrefsWidCombo object. The choices represented by the
       given item object are automatically added to the combo box.
 
       @param item    The KConfigSkeletonItem representing the preferences entry.
-      @param tqparent  Parent widget.
+      @param parent  Parent widget.
     */
     KPrefsWidCombo *addWidCombo( KConfigSkeleton::ItemEnum *item,
-                                   TQWidget *tqparent );
+                                   TQWidget *parent );
 
     /**
       Register a @ref KPrefsWidString object.
 
       @param item    The KConfigSkeletonItem representing the preferences entry.
-      @param tqparent  Parent widget.
+      @param parent  Parent widget.
     */
     KPrefsWidString *addWidString( KConfigSkeleton::ItemString *item,
-                                   TQWidget *tqparent );
+                                   TQWidget *parent );
 
     /**
       Register a path @ref KPrefsWidPath object.
 
       @param item    The KConfigSkeletonItem representing the preferences entry.
-      @param tqparent  Parent widget.
+      @param parent  Parent widget.
       @param filter URLRequester filter
       @param mode URLRequester mode
     */
-    KPrefsWidPath *addWidPath ( KConfigSkeleton::ItemPath *item, TQWidget *tqparent,
+    KPrefsWidPath *addWidPath ( KConfigSkeleton::ItemPath *item, TQWidget *parent,
                                 const TQString &filter = TQString(),
                                 uint mode = KFile::File );
 
@@ -674,21 +674,21 @@ class KDE_EXPORT KPrefsWidManager
       Register a password @ref KPrefsWidString object, with echomode set to TQLineEdit::Password.
 
       @param item    The KConfigSkeletonItem representing the preferences entry.
-      @param tqparent  Parent widget.
+      @param parent  Parent widget.
     */
     KPrefsWidString *addWidPassword ( KConfigSkeleton::ItemString *item,
-                                      TQWidget *tqparent );
+                                      TQWidget *parent );
 
     /**
       Register a @ref KPrefsWidFont object.
 
       @param item       The KConfigSkeletonItem representing the preferences
                         entry.
-      @param tqparent     Parent widget.
+      @param parent     Parent widget.
       @param sampleText Sample text for previewing the selected font.
     */
     KPrefsWidFont *addWidFont( KConfigSkeleton::ItemFont *item,
-                               TQWidget *tqparent, const TQString &sampleText );
+                               TQWidget *parent, const TQString &sampleText );
 
     /** Set all widgets to default values. */
     void setWidDefaults();
@@ -727,11 +727,11 @@ class KDE_EXPORT KPrefsDialog : public KDialogBase, public KPrefsWidManager
       Create a KPrefsDialog for a KPrefs object.
 
       @param prefs  KPrefs object used to access te configuration.
-      @param tqparent Parent widget.
+      @param parent Parent widget.
       @param name   Widget name.
       @param modal  true, if dialog has to be modal, false for non-modal.
     */
-    KPrefsDialog( KConfigSkeleton *prefs, TQWidget *tqparent = 0, char *name = 0,
+    KPrefsDialog( KConfigSkeleton *prefs, TQWidget *parent = 0, char *name = 0,
                   bool modal = false );
     /**
       Destructor.
@@ -777,7 +777,7 @@ class KDE_EXPORT KPrefsModule : public KCModule, public KPrefsWidManager
     Q_OBJECT
   TQ_OBJECT
   public:
-    KPrefsModule( KConfigSkeleton *, TQWidget *tqparent = 0, const char *name = 0 );
+    KPrefsModule( KConfigSkeleton *, TQWidget *parent = 0, const char *name = 0 );
 
     virtual void addWid( KPrefsWid * );
 
diff --git a/libkdepim/krsqueezedtextlabel.cpp b/libkdepim/krsqueezedtextlabel.cpp
index 512db73c..ef9746ee 100644
--- a/libkdepim/krsqueezedtextlabel.cpp
+++ b/libkdepim/krsqueezedtextlabel.cpp
@@ -22,15 +22,15 @@
 #include "kstringhandler.h"
 #include <tqtooltip.h>
 
-KRSqueezedTextLabel::KRSqueezedTextLabel( const TQString &text , TQWidget *tqparent, const char *name )
- : TQLabel ( tqparent, name ) {
+KRSqueezedTextLabel::KRSqueezedTextLabel( const TQString &text , TQWidget *parent, const char *name )
+ : TQLabel ( parent, name ) {
   tqsetSizePolicy(TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
   fullText = text;
   squeezeTextToLabel();
 }
 
-KRSqueezedTextLabel::KRSqueezedTextLabel( TQWidget *tqparent, const char *name )
- : TQLabel ( tqparent, name ) {
+KRSqueezedTextLabel::KRSqueezedTextLabel( TQWidget *parent, const char *name )
+ : TQLabel ( parent, name ) {
   tqsetSizePolicy(TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
 }
 
diff --git a/libkdepim/krsqueezedtextlabel.h b/libkdepim/krsqueezedtextlabel.h
index 0b54da78..f6a74527 100644
--- a/libkdepim/krsqueezedtextlabel.h
+++ b/libkdepim/krsqueezedtextlabel.h
@@ -46,8 +46,8 @@ public:
   /**
    * Default constructor.
    */
-  KRSqueezedTextLabel( TQWidget *tqparent, const char *name = 0 );
-  KRSqueezedTextLabel( const TQString &text, TQWidget *tqparent, const char *name = 0 );
+  KRSqueezedTextLabel( TQWidget *parent, const char *name = 0 );
+  KRSqueezedTextLabel( const TQString &text, TQWidget *parent, const char *name = 0 );
 
   virtual TQSize tqminimumSizeHint() const;
   virtual TQSize tqsizeHint() const;
diff --git a/libkdepim/kscoringeditor.cpp b/libkdepim/kscoringeditor.cpp
index 0c1a4294..6e520e98 100644
--- a/libkdepim/kscoringeditor.cpp
+++ b/libkdepim/kscoringeditor.cpp
@@ -160,9 +160,9 @@ ConditionEditWidget::ConditionEditWidget(KScoringManager *m, TQWidget *p, const
 ConditionEditWidget::~ConditionEditWidget()
 {}
 
-TQWidget* ConditionEditWidget::createWidget(TQWidget *tqparent)
+TQWidget* ConditionEditWidget::createWidget(TQWidget *parent)
 {
-  return new SingleConditionWidget(manager,tqparent);
+  return new SingleConditionWidget(manager,parent);
 }
 
 void ConditionEditWidget::clearWidget(TQWidget *w)
@@ -334,9 +334,9 @@ ActionEditWidget::ActionEditWidget(KScoringManager *m,TQWidget *p, const char *n
 ActionEditWidget::~ActionEditWidget()
 {}
 
-TQWidget* ActionEditWidget::createWidget( TQWidget *tqparent )
+TQWidget* ActionEditWidget::createWidget( TQWidget *parent )
 {
-  return new SingleActionWidget(manager,tqparent);
+  return new SingleActionWidget(manager,parent);
 }
 
 void ActionEditWidget::slotEditRule(KScoringRule *rule)
@@ -858,8 +858,8 @@ void RuleListWidget::slotRuleDown()
 KScoringEditor* KScoringEditor::scoreEditor = 0;
 
 KScoringEditor::KScoringEditor(KScoringManager* m,
-                               TQWidget *tqparent, const char *name)
-  : KDialogBase(tqparent,name,false,i18n("Rule Editor"),Ok|Apply|Cancel,Ok,true), manager(m)
+                               TQWidget *parent, const char *name)
+  : KDialogBase(parent,name,false,i18n("Rule Editor"),Ok|Apply|Cancel,Ok,true), manager(m)
 {
   manager->pushRuleList();
   if (!scoreEditor) scoreEditor = this;
@@ -896,10 +896,10 @@ KScoringEditor::~KScoringEditor()
 }
 
 KScoringEditor* KScoringEditor::createEditor(KScoringManager* m,
-                                             TQWidget *tqparent, const char *name)
+                                             TQWidget *parent, const char *name)
 {
   if (scoreEditor) return scoreEditor;
-  else return new KScoringEditor(m,tqparent,name);
+  else return new KScoringEditor(m,parent,name);
 }
 
 void KScoringEditor::setRule(KScoringRule* r)
diff --git a/libkdepim/kscoringeditor.h b/libkdepim/kscoringeditor.h
index a4e9555d..fae5f21f 100644
--- a/libkdepim/kscoringeditor.h
+++ b/libkdepim/kscoringeditor.h
@@ -138,7 +138,7 @@ class KDE_EXPORT ActionEditWidget : public KWidgetLister
 public:
   ActionEditWidget(KScoringManager *m,TQWidget *p =0, const char *n =0);
   ~ActionEditWidget();
-  TQWidget* createWidget(TQWidget *tqparent);
+  TQWidget* createWidget(TQWidget *parent);
   void updateRule(KScoringRule*);
   void clearWidget(TQWidget *);
 public slots:
@@ -258,11 +258,11 @@ class KDE_EXPORT KScoringEditor : public KDialogBase
 public:
   ~KScoringEditor();
   void setRule(KScoringRule*);
-  static KScoringEditor *createEditor(KScoringManager* m, TQWidget *tqparent=0, const char *name=0);
+  static KScoringEditor *createEditor(KScoringManager* m, TQWidget *parent=0, const char *name=0);
   static KScoringEditor *editor() { return scoreEditor; }
   void setDirty();
 protected:
-  KScoringEditor(KScoringManager* m, TQWidget *tqparent=0, const char *name=0);
+  KScoringEditor(KScoringManager* m, TQWidget *parent=0, const char *name=0);
 private:
   /** the editor for the current rule */
   RuleEditWidget* ruleEditor;
@@ -287,7 +287,7 @@ class KScoringEditorWidgetDialog : public KDialogBase
   Q_OBJECT
   TQ_OBJECT
 public:
-  KScoringEditorWidgetDialog(KScoringManager *m, const TQString& rName, TQWidget *tqparent=0, const char *name=0);
+  KScoringEditorWidgetDialog(KScoringManager *m, const TQString& rName, TQWidget *parent=0, const char *name=0);
 protected slots:
   void slotApply();
   void slotOk();
diff --git a/libkdepim/ksubscription.cpp b/libkdepim/ksubscription.cpp
index f5aef4a4..b611e126 100644
--- a/libkdepim/ksubscription.cpp
+++ b/libkdepim/ksubscription.cpp
@@ -105,7 +105,7 @@ void GroupItem::setOn( bool on )
 //------------------------------------------------------------------------------
 void GroupItem::stateChange( bool on )
 {
-  // delegate to tqparent
+  // delegate to parent
   if ( !mIgnoreStateChange )
     mBrowser->changeItemState(this, on);
 }
@@ -156,8 +156,8 @@ void GroupItem::setVisible( bool b )
       for ( ; it.current(); ++it)
       {
         // move the checkitem to top
-        TQListViewItem* tqparent = it.current()->tqparent();
-        if (tqparent) tqparent->takeItem(it.current());
+        TQListViewItem* parent = it.current()->parent();
+        if (parent) parent->takeItem(it.current());
         listView()->insertItem(it.current());
       }
       TQListViewItem::setVisible(false);
@@ -206,9 +206,9 @@ void GroupItem::setup()
 
 //=============================================================================
 
-KSubscription::KSubscription( TQWidget *tqparent, const TQString &caption,
+KSubscription::KSubscription( TQWidget *parent, const TQString &caption,
     KAccount * acct, int buttons, const TQString &user1, bool descriptionColumn )
-  : KDialogBase( tqparent, 0, true, caption, buttons | Help | Ok | Cancel, Ok,
+  : KDialogBase( parent, 0, true, caption, buttons | Help | Ok | Cancel, Ok,
       true, i18n("Reload &List"), user1 ),
     mAcct( acct )
 {
@@ -445,7 +445,7 @@ void KSubscription::changeItemState( GroupItem* item, bool on )
   {
     if (!itemInListView(unsubView, item->info()))
     {
-      TQListViewItem *p = item->tqparent();
+      TQListViewItem *p = item->parent();
       while (p)
       {
         // make sure all parents are subscribed
@@ -457,7 +457,7 @@ void KSubscription::changeItemState( GroupItem* item, bool on )
           pi->setIgnoreStateChange(false);
           new GroupItem(subView, pi->info(), this);
         }
-        p = p->tqparent();
+        p = p->parent();
       }
       new GroupItem(subView, item->info(), this);
     }
@@ -560,7 +560,7 @@ void KSubscription::restoreOriginalParent()
   {
     TQListViewItem* origParent = static_cast<GroupItem*>(it.current())->
       originalParent();
-    if (origParent && origParent != it.current()->tqparent())
+    if (origParent && origParent != it.current()->parent())
     {
       // remember this to avoid messing up the iterator
       move.append(it.current());
@@ -569,7 +569,7 @@ void KSubscription::restoreOriginalParent()
   TQPtrListIterator<TQListViewItem> it2( move );
   for ( ; it2.current(); ++it2)
   {
-    // restore the original tqparent
+    // restore the original parent
     TQListViewItem* origParent = static_cast<GroupItem*>(it2.current())->
       originalParent();
     groupView->takeItem(it2.current());
@@ -612,12 +612,12 @@ void KSubscription::slotLoadingComplete()
   noTreeCB->setEnabled(true);
   subCB->setEnabled(true);
 
-  // remember the correct tqparent
+  // remember the correct parent
   TQListViewItemIterator it(groupView);
   for ( ; it.current(); ++it)
   {
     static_cast<GroupItem*>(it.current())->
-      setOriginalParent( it.current()->tqparent() );
+      setOriginalParent( it.current()->parent() );
   }
 
   emit listChanged();
diff --git a/libkdepim/ksubscription.h b/libkdepim/ksubscription.h
index f9ce044a..6febedfa 100644
--- a/libkdepim/ksubscription.h
+++ b/libkdepim/ksubscription.h
@@ -84,10 +84,10 @@ class KDE_EXPORT GroupItem : public TQCheckListItem
     void setInfo( KGroupInfo info );
 
     /**
-     * Get/Set the original tqparent
+     * Get/Set the original parent
      */
     TQListViewItem* originalParent() { return mOriginalParent; }
-    void setOriginalParent( TQListViewItem* tqparent ) { mOriginalParent = tqparent; }
+    void setOriginalParent( TQListViewItem* parent ) { mOriginalParent = parent; }
 
     /**
      * Get/Set the last open state
@@ -199,7 +199,7 @@ class KDE_EXPORT KSubscription : public KDialogBase
       Right
     };
 
-    KSubscription( TQWidget *tqparent, const TQString &caption, KAccount* acct,
+    KSubscription( TQWidget *parent, const TQString &caption, KAccount* acct,
         int buttons = 0, const TQString &user1 = TQString(),
         bool descriptionColumn = true );
 
diff --git a/libkdepim/ktimeedit.cpp b/libkdepim/ktimeedit.cpp
index 8869dbd0..aec230ea 100644
--- a/libkdepim/ktimeedit.cpp
+++ b/libkdepim/ktimeedit.cpp
@@ -43,7 +43,7 @@
 class KOTimeValidator : public TQValidator
 {
 public:
-    KOTimeValidator(TQWidget* tqparent, const char* name=0) : TQValidator(TQT_TQOBJECT(tqparent), name) {}
+    KOTimeValidator(TQWidget* parent, const char* name=0) : TQValidator(TQT_TQOBJECT(parent), name) {}
 
     virtual State validate(TQString& str, int& /*cursorPos*/) const
     {
@@ -104,9 +104,9 @@ public:
 
 // KTimeWidget/TQTimeEdit provide nicer editing, but don't provide a combobox.
 // Difficult to get all in one...
-// But TQt-3.2 will offer TQLineEdit::setMask, so a "99:99" tqmask would help.
-KTimeEdit::KTimeEdit( TQWidget *tqparent, TQTime qt, const char *name )
-  : TQComboBox( true, tqparent, name )
+// But TQt-3.2 will offer TQLineEdit::setMask, so a "99:99" mask would help.
+KTimeEdit::KTimeEdit( TQWidget *parent, TQTime qt, const char *name )
+  : TQComboBox( true, parent, name )
 {
   setInsertionPolicy( NoInsertion );
   setValidator( new KOTimeValidator( this ) );
diff --git a/libkdepim/ktimeedit.h b/libkdepim/ktimeedit.h
index 1bd86bdf..b783fc54 100644
--- a/libkdepim/ktimeedit.h
+++ b/libkdepim/ktimeedit.h
@@ -47,7 +47,7 @@ class KDE_EXPORT KTimeEdit : public TQComboBox
   TQ_OBJECT
   public:
     /** constructs a new time edit. */
-    KTimeEdit(TQWidget *tqparent=0, TQTime qt=TQTime(12,0), const char *name=0);
+    KTimeEdit(TQWidget *parent=0, TQTime qt=TQTime(12,0), const char *name=0);
 
     virtual ~KTimeEdit();
 
diff --git a/libkdepim/kwidgetlister.cpp b/libkdepim/kwidgetlister.cpp
index bc9d8980..b2b839f4 100644
--- a/libkdepim/kwidgetlister.cpp
+++ b/libkdepim/kwidgetlister.cpp
@@ -43,8 +43,8 @@
 #include <kpushbutton.h>
 #include <kdialog.h>
 
-KWidgetLister::KWidgetLister( int minWidgets, int maxWidgets, TQWidget *tqparent, const char* name )
-  : TQWidget( tqparent, name )
+KWidgetLister::KWidgetLister( int minWidgets, int maxWidgets, TQWidget *parent, const char* name )
+  : TQWidget( parent, name )
 {
   mWidgetList.setAutoDelete(TRUE);
 
@@ -146,9 +146,9 @@ void KWidgetLister::clearWidget( TQWidget* /*aWidget*/ )
 {
 }
 
-TQWidget* KWidgetLister::createWidget( TQWidget* tqparent )
+TQWidget* KWidgetLister::createWidget( TQWidget* parent )
 {
-  return new TQWidget( tqparent );
+  return new TQWidget( parent );
 }
 
 void KWidgetLister::setNumberOfShownWidgetsTo( int aNum )
diff --git a/libkdepim/kwidgetlister.h b/libkdepim/kwidgetlister.h
index 9af7bb9b..c350ed4b 100644
--- a/libkdepim/kwidgetlister.h
+++ b/libkdepim/kwidgetlister.h
@@ -67,7 +67,7 @@ class KDE_EXPORT KWidgetLister : public TQWidget
   Q_OBJECT
   TQ_OBJECT
 public:
-  KWidgetLister( int minWidgets=1, int maxWidgets=8, TQWidget* tqparent=0, const char* name=0 );
+  KWidgetLister( int minWidgets=1, int maxWidgets=8, TQWidget* parent=0, const char* name=0 );
   virtual ~KWidgetLister();
 
 protected slots:
@@ -100,7 +100,7 @@ protected:
       when showing it on screen. Make sure you call this
       implementaion, though, since you cannot put the widget on screen
       from derived classes (@p mLayout is private).
-      Make sure the tqparent of the TQWidget to add is this KWidgetLister. */
+      Make sure the parent of the TQWidget to add is this KWidgetLister. */
   virtual void addWidgetAtEnd(TQWidget *w =0);
   /** Removes a single (always the last) widget. Doesn't care if there
       are still only @ref mMinWidgets left on screen and whether it
@@ -117,7 +117,7 @@ protected:
       classes, we are forced to emulate this by forcing the
       implementers of subclasses of KWidgetLister to reimplement this
       function which replaces the "@p new @p T" call. */
-  virtual TQWidget* createWidget( TQWidget *tqparent );
+  virtual TQWidget* createWidget( TQWidget *parent );
   /** Sets the number of widgets on scrren to exactly @p aNum. Doesn't
       check if @p aNum is inside the range @p
       [mMinWidgets,mMaxWidgets]. */
diff --git a/libkdepim/ldapclient.cpp b/libkdepim/ldapclient.cpp
index a7dcfcd2..f8497f08 100644
--- a/libkdepim/ldapclient.cpp
+++ b/libkdepim/ldapclient.cpp
@@ -76,8 +76,8 @@ void LdapObject::assign( const LdapObject& that )
   }
 }
 
-LdapClient::LdapClient( int clientNumber, TQObject* tqparent, const char* name )
-  : TQObject( tqparent, name ), mJob( 0 ), mActive( false ), mReportObjectClass( false )
+LdapClient::LdapClient( int clientNumber, TQObject* parent, const char* name )
+  : TQObject( parent, name ), mJob( 0 ), mActive( false ), mReportObjectClass( false )
 {
 //  d = new LdapClientPrivate;
   mClientNumber = clientNumber;
diff --git a/libkdepim/ldapclient.h b/libkdepim/ldapclient.h
index dba6f1c3..d9b88955 100644
--- a/libkdepim/ldapclient.h
+++ b/libkdepim/ldapclient.h
@@ -145,7 +145,7 @@ class KDE_EXPORT LdapClient : public TQObject
   TQ_OBJECT
 
   public:
-    LdapClient( int clientNumber, TQObject* tqparent = 0, const char* name = 0 );
+    LdapClient( int clientNumber, TQObject* parent = 0, const char* name = 0 );
     virtual ~LdapClient();
 
     /*! returns true if there is a query running */
diff --git a/libkdepim/ldapsearchdialog.cpp b/libkdepim/ldapsearchdialog.cpp
index 36c7517b..ed1aa293 100644
--- a/libkdepim/ldapsearchdialog.cpp
+++ b/libkdepim/ldapsearchdialog.cpp
@@ -101,8 +101,8 @@ namespace KPIM {
 class ContactListItem : public TQListViewItem
 {
   public:
-    ContactListItem( TQListView* tqparent, const KPIM::LdapAttrMap& attrs )
-      : TQListViewItem( tqparent ), mAttrs( attrs )
+    ContactListItem( TQListView* parent, const KPIM::LdapAttrMap& attrs )
+      : TQListViewItem( parent ), mAttrs( attrs )
     {
       const KPIM::LdapAttrValue &mailAttrs = attrs[ "mail" ];
       if ( mailAttrs.isEmpty() ) {
@@ -124,9 +124,9 @@ class ContactListItem : public TQListViewItem
 
 }
 
-LDAPSearchDialog::LDAPSearchDialog( TQWidget* tqparent, const char* name )
+LDAPSearchDialog::LDAPSearchDialog( TQWidget* parent, const char* name )
   : KDialogBase( Plain, i18n( "Search for Addresses in Directory" ), Help | User1 |
-    User2 | User3 | Cancel, Default, tqparent, name, false, true )
+    User2 | User3 | Cancel, Default, parent, name, false, true )
 {
   setButtonCancel( KStdGuiItem::close() );
   TQFrame *page = plainPage();
diff --git a/libkdepim/ldapsearchdialog.h b/libkdepim/ldapsearchdialog.h
index 4b647aca..45e174ef 100644
--- a/libkdepim/ldapsearchdialog.h
+++ b/libkdepim/ldapsearchdialog.h
@@ -41,7 +41,7 @@ class LDAPSearchDialog : public KDialogBase
   TQ_OBJECT
 
   public:
-    LDAPSearchDialog( TQWidget* tqparent, const char* name = 0 );
+    LDAPSearchDialog( TQWidget* parent, const char* name = 0 );
     ~LDAPSearchDialog();
 
     bool isOK() const { return mIsOK; }
diff --git a/libkdepim/maillistdrag.cpp b/libkdepim/maillistdrag.cpp
index 3daf889e..059f730c 100644
--- a/libkdepim/maillistdrag.cpp
+++ b/libkdepim/maillistdrag.cpp
@@ -78,8 +78,8 @@ void MailSummary::set( TQ_UINT32 serialNumber, TQString messageId,
     mDate = date;
 }
 
-MailListDrag::MailListDrag( MailList mailList, TQWidget * tqparent, MailTextSource *src )
-    : TQStoredDrag( MailListDrag::format(), tqparent ), _src(src)
+MailListDrag::MailListDrag( MailList mailList, TQWidget * parent, MailTextSource *src )
+    : TQStoredDrag( MailListDrag::format(), parent ), _src(src)
 {
     setMailList( mailList );
 }
diff --git a/libkdepim/maillistdrag.h b/libkdepim/maillistdrag.h
index 335fa3e2..5d89cd52 100644
--- a/libkdepim/maillistdrag.h
+++ b/libkdepim/maillistdrag.h
@@ -96,7 +96,7 @@ class KDE_EXPORT MailListDrag : public TQStoredDrag
 {
 public:
     // Takes ownership of "src" and deletes it when done
-    MailListDrag( MailList, TQWidget * tqparent = 0, MailTextSource *src = 0 );
+    MailListDrag( MailList, TQWidget * parent = 0, MailTextSource *src = 0 );
     ~MailListDrag();
 
     const char *format(int i) const;
diff --git a/libkdepim/overlaywidget.cpp b/libkdepim/overlaywidget.cpp
index 209b8c42..ac05d84f 100644
--- a/libkdepim/overlaywidget.cpp
+++ b/libkdepim/overlaywidget.cpp
@@ -31,8 +31,8 @@
 #include "overlaywidget.h"
 using namespace KPIM;
 
-OverlayWidget::OverlayWidget( TQWidget* alignWidget, TQWidget* tqparent, const char* name )
-  : TQHBox( tqparent, name ), mAlignWidget( 0 )
+OverlayWidget::OverlayWidget( TQWidget* alignWidget, TQWidget* parent, const char* name )
+  : TQHBox( parent, name ), mAlignWidget( 0 )
 {
   setAlignWidget( alignWidget );
 }
diff --git a/libkdepim/overlaywidget.h b/libkdepim/overlaywidget.h
index f49b4672..9e611fb9 100644
--- a/libkdepim/overlaywidget.h
+++ b/libkdepim/overlaywidget.h
@@ -47,7 +47,7 @@ class OverlayWidget : public TQHBox
   TQ_OBJECT
 
 public:
-  OverlayWidget( TQWidget* alignWidget, TQWidget* tqparent, const char* name = 0 );
+  OverlayWidget( TQWidget* alignWidget, TQWidget* parent, const char* name = 0 );
   ~OverlayWidget();
 
   TQWidget * alignWidget() { return mAlignWidget; }
diff --git a/libkdepim/progressdialog.cpp b/libkdepim/progressdialog.cpp
index e12a1b75..bd5b594c 100644
--- a/libkdepim/progressdialog.cpp
+++ b/libkdepim/progressdialog.cpp
@@ -60,10 +60,10 @@ namespace KPIM {
 
 class TransactionItem;
 
-TransactionItemView::TransactionItemView( TQWidget * tqparent,
+TransactionItemView::TransactionItemView( TQWidget * parent,
                                           const char * name,
                                           WFlags f )
-    : TQScrollView( tqparent, name, f ) {
+    : TQScrollView( parent, name, f ) {
   setFrameStyle( NoFrame );
   mBigBox = new TQVBox( viewport() );
   mBigBox->setSpacing( 5 );
@@ -84,9 +84,9 @@ void TransactionItemView::resizeContents( int w, int h )
   // (handling of TQEvent::LayoutHint in TQScrollView calls this method)
   //kdDebug(5300) << k_funcinfo << w << "," << h << endl;
   TQScrollView::resizeContents( w, h );
-  // Tell the tqlayout in the tqparent (progressdialog) that our size changed
+  // Tell the tqlayout in the parent (progressdialog) that our size changed
   updateGeometry();
-  // Resize the tqparent (progressdialog) - this works but resize horizontally too often
+  // Resize the parent (progressdialog) - this works but resize horizontally too often
   //parentWidget()->adjustSize();
 
   TQApplication::sendPostedEvents( 0, TQEvent::ChildInserted );
@@ -139,9 +139,9 @@ void TransactionItemView::slotLayoutFirstItem()
 
 // ----------------------------------------------------------------------------
 
-TransactionItem::TransactionItem( TQWidget* tqparent,
+TransactionItem::TransactionItem( TQWidget* parent,
                                   ProgressItem *item, bool first )
-  : TQVBox( tqparent, "TransactionItem" ), mCancelButton( 0 ), mItem( item )
+  : TQVBox( parent, "TransactionItem" ), mCancelButton( 0 ), mItem( item )
 
 {
   setSpacing( 2 );
@@ -244,8 +244,8 @@ void TransactionItem::addSubTransaction( ProgressItem* /*item*/ )
 
 // ---------------------------------------------------------------------------
 
-ProgressDialog::ProgressDialog( TQWidget* alignWidget, TQWidget* tqparent, const char* name )
-    : OverlayWidget( alignWidget, tqparent, name ), mWasLastShown( false )
+ProgressDialog::ProgressDialog( TQWidget* alignWidget, TQWidget* parent, const char* name )
+    : OverlayWidget( alignWidget, parent, name ), mWasLastShown( false )
 {
     setFrameStyle( TQFrame::Panel | TQFrame::Sunken ); // TQFrame
     setSpacing( 0 ); // TQHBox
@@ -307,11 +307,11 @@ ProgressDialog::~ProgressDialog()
 
 void ProgressDialog::slotTransactionAdded( ProgressItem *item )
 {
-   TransactionItem *tqparent = 0;
-   if ( item->tqparent() ) {
-     if ( mTransactionsToListviewItems.contains( item->tqparent() ) ) {
-       tqparent = mTransactionsToListviewItems[ item->tqparent() ];
-       tqparent->addSubTransaction( item );
+   TransactionItem *parent = 0;
+   if ( item->parent() ) {
+     if ( mTransactionsToListviewItems.contains( item->parent() ) ) {
+       parent = mTransactionsToListviewItems[ item->parent() ];
+       parent->addSubTransaction( item );
      }
    } else {
      const bool first = mTransactionsToListviewItems.empty();
diff --git a/libkdepim/progressdialog.h b/libkdepim/progressdialog.h
index 26d9b94d..91fa771f 100644
--- a/libkdepim/progressdialog.h
+++ b/libkdepim/progressdialog.h
@@ -54,7 +54,7 @@ class TransactionItemView : public TQScrollView {
   Q_OBJECT
   TQ_OBJECT
 public:
-  TransactionItemView( TQWidget * tqparent = 0,
+  TransactionItemView( TQWidget * parent = 0,
                        const char * name = 0,
                        WFlags f = 0 );
 
@@ -81,7 +81,7 @@ class TransactionItem : public TQVBox {
   TQ_OBJECT
 
 public:
-  TransactionItem( TQWidget * tqparent,
+  TransactionItem( TQWidget * parent,
                    ProgressItem* item, bool first );
 
   ~TransactionItem();
@@ -121,7 +121,7 @@ class KDE_EXPORT ProgressDialog : public OverlayWidget
   TQ_OBJECT
 
 public:
-  ProgressDialog( TQWidget* alignWidget, TQWidget* tqparent, const char* name = 0 );
+  ProgressDialog( TQWidget* alignWidget, TQWidget* parent, const char* name = 0 );
   ~ProgressDialog();
   void setVisible( bool b );
 
diff --git a/libkdepim/progressmanager.cpp b/libkdepim/progressmanager.cpp
index 9dd80c9d..a00970c5 100644
--- a/libkdepim/progressmanager.cpp
+++ b/libkdepim/progressmanager.cpp
@@ -35,10 +35,10 @@ KPIM::ProgressManager * KPIM::ProgressManager::mInstance = 0;
 unsigned int KPIM::ProgressManager::uID = 42;
 
 ProgressItem::ProgressItem(
-       ProgressItem* tqparent, const TQString& id,
+       ProgressItem* parent, const TQString& id,
        const TQString& label, const TQString& status, bool canBeCanceled,
        bool usesCrypto )
-       :mId( id ), mLabel( label ), mtqStatus( status ), mParent( tqparent ),
+       :mId( id ), mLabel( label ), mtqStatus( status ), mParent( parent ),
         mCanBeCanceled( canBeCanceled ), mProgress( 0 ), mTotal( 0 ),
         mCompleted( 0 ), mWaitingForKids( false ), mCanceled( false ),
         mUsesCrypto( usesCrypto ), mUsesBusyIndicator( false )
@@ -56,8 +56,8 @@ void ProgressItem::setComplete()
      if ( !mCanceled )
        setProgress( 100 );
      emit progressItemCompleted( this );
-     if ( tqparent() )
-       tqparent()->removeChild( this );
+     if ( parent() )
+       parent()->removeChild( this );
      deleteLater();
    } else {
      mWaitingForKids = true;
@@ -147,16 +147,16 @@ ProgressManager* ProgressManager::instance()
 }
 
 ProgressItem* ProgressManager::createProgressItemImpl(
-     ProgressItem* tqparent, const TQString& id,
+     ProgressItem* parent, const TQString& id,
      const TQString &label, const TQString &status,
      bool cancellable, bool usesCrypto )
 {
    ProgressItem *t = 0;
    if ( !mTransactions[ id ] ) {
-     t = new ProgressItem ( tqparent, id, label, status, cancellable, usesCrypto );
+     t = new ProgressItem ( parent, id, label, status, cancellable, usesCrypto );
      mTransactions.insert( id, t );
-     if ( tqparent ) {
-       ProgressItem *p = mTransactions[ tqparent->id() ];
+     if ( parent ) {
+       ProgressItem *p = mTransactions[ parent->id() ];
        if ( p ) {
          p->addChild( t );
        }
@@ -188,11 +188,11 @@ ProgressItem* ProgressManager::createProgressItemImpl(
 }
 
 ProgressItem* ProgressManager::createProgressItemImpl(
-     const TQString& tqparent, const TQString &id,
+     const TQString& parent, const TQString &id,
      const TQString &label, const TQString& status,
      bool canBeCanceled, bool usesCrypto )
 {
-   ProgressItem * p = mTransactions[tqparent];
+   ProgressItem * p = mTransactions[parent];
    return createProgressItemImpl( p, id, label, status, canBeCanceled, usesCrypto );
 }
 
@@ -225,7 +225,7 @@ ProgressItem* ProgressManager::singleItem() const
     if ( (*it)->usesBusyIndicator() )
       return 0;
 
-    if ( !(*it)->tqparent() ) {             // if it's a top level one, only those count
+    if ( !(*it)->parent() ) {             // if it's a top level one, only those count
       if ( item )
         return 0; // we found more than one
       else
diff --git a/libkdepim/progressmanager.h b/libkdepim/progressmanager.h
index 3edffd0d..7798162d 100644
--- a/libkdepim/progressmanager.h
+++ b/libkdepim/progressmanager.h
@@ -52,9 +52,9 @@ class KDE_EXPORT ProgressItem : public TQObject
     const TQString& id() const { return mId; }
 
     /**
-     * @return The tqparent item of this one, if there is one.
+     * @return The parent item of this one, if there is one.
      */
-    ProgressItem *tqparent() const { return mParent; }
+    ProgressItem *parent() const { return mParent; }
 
     /**
      * @return The user visible string to be used to represent this item.
@@ -217,7 +217,7 @@ signals:
 
   protected:
     /* Only to be used by our good friend the ProgressManager */
-    ProgressItem( ProgressItem* tqparent,
+    ProgressItem( ProgressItem* parent,
                              const TQString& id,
                              const TQString& label,
                              const TQString& status,
@@ -288,7 +288,7 @@ class KDE_EXPORT ProgressManager : public TQObject
      /**
       * Creates a ProgressItem with a unique id and the given label.
       * This is the simplest way to aquire a progress item. It will not
-      * have a tqparent and will be set to be cancellable and not using crypto.
+      * have a parent and will be set to be cancellable and not using crypto.
       *
       * @param label The text to be displayed by progress handlers. It will be
       *              interpreted as rich text, so it might have to be escaped.
@@ -299,10 +299,10 @@ class KDE_EXPORT ProgressManager : public TQObject
      }
 
     /**
-     * Creates a new progressItem with the given tqparent, id, label and initial
+     * Creates a new progressItem with the given parent, id, label and initial
      * status.
      *
-     * @param tqparent Specify an already existing item as the tqparent of this one.
+     * @param parent Specify an already existing item as the parent of this one.
      * @param id Used to identify this operation for cancel and progress info.
      * @param label The text to be displayed by progress handlers. It will be
      *              interpreted as rich text, so it might have to be escaped.
@@ -310,36 +310,36 @@ class KDE_EXPORT ProgressManager : public TQObject
      *               interpreted as rich text, so it might have to be escaped.
      * @param canBeCanceled can the user cancel this operation?
      * @param usesCrypto does the operation use secure transports (SSL)
-     * Cancelling the tqparent will cancel the tqchildren as well (if they can be
+     * Cancelling the parent will cancel the tqchildren as well (if they can be
      * cancelled) and ongoing tqchildren prevent parents from finishing.
      * @return The ProgressItem representing the operation.
      */
-     static ProgressItem * createProgressItem( ProgressItem* tqparent,
+     static ProgressItem * createProgressItem( ProgressItem* parent,
                                                const TQString& id,
                                                const TQString& label,
                                                const TQString& status = TQString(),
                                                bool canBeCanceled = true,
                                                bool usesCrypto = false ) {
-       return instance()->createProgressItemImpl( tqparent, id, label, status,
+       return instance()->createProgressItemImpl( parent, id, label, status,
                                                   canBeCanceled, usesCrypto );
      }
 
      /**
-      * Use this version if you have the id string of the tqparent and want to
+      * Use this version if you have the id string of the parent and want to
       * add a subjob to it.
       */
-     static ProgressItem * createProgressItem( const TQString& tqparent,
+     static ProgressItem * createProgressItem( const TQString& parent,
                                                const TQString& id,
                                                const TQString& label,
                                                const TQString& status = TQString(),
                                                bool canBeCanceled = true,
                                                bool usesCrypto = false ) {
-       return instance()->createProgressItemImpl( tqparent, id, label,
+       return instance()->createProgressItemImpl( parent, id, label,
                                                  status, canBeCanceled, usesCrypto );
      }
 
      /**
-      * Version without a tqparent.
+      * Version without a parent.
       */
      static ProgressItem * createProgressItem( const TQString& id,
                                                const TQString& label,
@@ -419,11 +419,11 @@ class KDE_EXPORT ProgressManager : public TQObject
     ProgressManager( const ProgressManager& );
 
     virtual ProgressItem* createProgressItemImpl(
-                ProgressItem* tqparent, const TQString& id,
+                ProgressItem* parent, const TQString& id,
                 const TQString& label, const TQString& status,
                 bool cancellable, bool usesCrypto );
     virtual ProgressItem* createProgressItemImpl(
-                const TQString& tqparent,  const TQString& id,
+                const TQString& parent,  const TQString& id,
                 const TQString& label, const TQString& status,
                 bool cancellable, bool usesCrypto );
     void emitShowProgressDialogImpl();
diff --git a/libkdepim/qutf7codec.cpp b/libkdepim/qutf7codec.cpp
index db6589cd..dc8ef2a2 100644
--- a/libkdepim/qutf7codec.cpp
+++ b/libkdepim/qutf7codec.cpp
@@ -374,8 +374,8 @@ private:
 	// if mayContinue, this char has already been written
 	*t++ = toBase64( outbits | ( u >> 14 ) );
       }
-      *t++ = toBase64( (u & 0x3F00 /* tqmask top 2 bits */ ) >> 8 );
-      *t++ = toBase64( (u & 0x00FC /* tqmask msbyte */ ) >> 2 );
+      *t++ = toBase64( (u & 0x3F00 /* mask top 2 bits */ ) >> 8 );
+      *t++ = toBase64( (u & 0x00FC /* mask msbyte */ ) >> 2 );
       // save 2 lowest-significant bits in outbits[5..4]
       outbits = (u & 0x0003) << 4;
       break;
diff --git a/libkdepim/recentaddresses.cpp b/libkdepim/recentaddresses.cpp
index 6e1054d1..ac790693 100644
--- a/libkdepim/recentaddresses.cpp
+++ b/libkdepim/recentaddresses.cpp
@@ -157,9 +157,9 @@ TQStringList RecentAddresses::addresses() const
     return addresses;
 }
 
-RecentAddressDialog::RecentAddressDialog( TQWidget *tqparent, const char *name )
+RecentAddressDialog::RecentAddressDialog( TQWidget *parent, const char *name )
   : KDialogBase( Plain, i18n( "Edit Recent Addresses" ), Ok | Cancel, Ok,
-                 tqparent, name, true )
+                 parent, name, true )
 {
   TQWidget *page = plainPage();
   TQVBoxLayout *tqlayout = new TQVBoxLayout( page, 0, spacingHint() );
diff --git a/libkdepim/recentaddresses.h b/libkdepim/recentaddresses.h
index f7ec276e..be763369 100644
--- a/libkdepim/recentaddresses.h
+++ b/libkdepim/recentaddresses.h
@@ -44,7 +44,7 @@ namespace KRecentAddress {
 class KDE_EXPORT RecentAddressDialog : public KDialogBase
 {
  public:
-  RecentAddressDialog( TQWidget *tqparent, const char *name = 0 );
+  RecentAddressDialog( TQWidget *parent, const char *name = 0 );
   void setAddresses( const TQStringList &addrs );
   TQStringList addresses() const;
  private:
diff --git a/libkdepim/sendsmsdialog.cpp b/libkdepim/sendsmsdialog.cpp
index d034fd73..03c5af56 100644
--- a/libkdepim/sendsmsdialog.cpp
+++ b/libkdepim/sendsmsdialog.cpp
@@ -27,8 +27,8 @@
 
 #include "sendsmsdialog.h"
 
-SendSMSDialog::SendSMSDialog( const TQString &recipientName, TQWidget *tqparent, const char *name )
-  : KDialogBase( Plain, i18n( "Send SMS" ), Ok | Cancel, Ok, tqparent, name, true, true )
+SendSMSDialog::SendSMSDialog( const TQString &recipientName, TQWidget *parent, const char *name )
+  : KDialogBase( Plain, i18n( "Send SMS" ), Ok | Cancel, Ok, parent, name, true, true )
 {
   TQWidget *page = plainPage();
 
diff --git a/libkdepim/sendsmsdialog.h b/libkdepim/sendsmsdialog.h
index 43bfe72e..4430fc1a 100644
--- a/libkdepim/sendsmsdialog.h
+++ b/libkdepim/sendsmsdialog.h
@@ -33,7 +33,7 @@ class SendSMSDialog : public KDialogBase
   TQ_OBJECT
 
   public:
-    SendSMSDialog( const TQString &recipientName, TQWidget *tqparent, const char *name = 0 );
+    SendSMSDialog( const TQString &recipientName, TQWidget *parent, const char *name = 0 );
 
     TQString text() const;
 
diff --git a/libkdepim/sidebarextension.cpp b/libkdepim/sidebarextension.cpp
index 1ce8e9a8..dc3413eb 100644
--- a/libkdepim/sidebarextension.cpp
+++ b/libkdepim/sidebarextension.cpp
@@ -26,8 +26,8 @@
 
 using namespace KParts;
 
-SideBarExtension::SideBarExtension(TQWidget *exported, KParts::ReadOnlyPart *tqparent, const char* name)
-: TQObject(tqparent, name), m_exported(exported), d(0)
+SideBarExtension::SideBarExtension(TQWidget *exported, KParts::ReadOnlyPart *parent, const char* name)
+: TQObject(parent, name), m_exported(exported), d(0)
 {
 }
 
diff --git a/libkdepim/sidebarextension.h b/libkdepim/sidebarextension.h
index 98b185c1..e5551ff6 100644
--- a/libkdepim/sidebarextension.h
+++ b/libkdepim/sidebarextension.h
@@ -46,10 +46,10 @@ namespace KParts
        *
        * @param exported A TQWidget derived widget that will be provided for the
        *                 users of SideBarExtension.
-       * @param tqparent   The tqparent widget.
+       * @param parent   The parent widget.
        * @param name     The name of the class.
        **/
-      SideBarExtension(TQWidget *exported, KParts::ReadOnlyPart *tqparent, const char* name);
+      SideBarExtension(TQWidget *exported, KParts::ReadOnlyPart *parent, const char* name);
       ~SideBarExtension();
 
       /**
diff --git a/libkdepim/ssllabel.cpp b/libkdepim/ssllabel.cpp
index 1349d4e8..8068aa00 100644
--- a/libkdepim/ssllabel.cpp
+++ b/libkdepim/ssllabel.cpp
@@ -41,8 +41,8 @@
 
 namespace KPIM {
 
-SSLLabel::SSLLabel( TQWidget* tqparent )
-  : TQLabel( tqparent )
+SSLLabel::SSLLabel( TQWidget* parent )
+  : TQLabel( parent )
 {
   setState( Done );
 }
diff --git a/libkdepim/ssllabel.h b/libkdepim/ssllabel.h
index 81f1d227..03a841be 100644
--- a/libkdepim/ssllabel.h
+++ b/libkdepim/ssllabel.h
@@ -45,7 +45,7 @@ namespace KPIM {
       Clean,
       Done
     };
-    SSLLabel( TQWidget* tqparent );
+    SSLLabel( TQWidget* parent );
 
     void setEncrypted( bool enc=true );
     void setState( State state );
diff --git a/libkdepim/statusbarprogresswidget.cpp b/libkdepim/statusbarprogresswidget.cpp
index 2b2ef1db..c417905a 100644
--- a/libkdepim/statusbarprogresswidget.cpp
+++ b/libkdepim/statusbarprogresswidget.cpp
@@ -58,8 +58,8 @@ using KPIM::ProgressManager;
 using namespace KPIM;
 
 //-----------------------------------------------------------------------------
-StatusbarProgressWidget::StatusbarProgressWidget( ProgressDialog* progressDialog, TQWidget* tqparent, bool button )
-  : TQFrame( tqparent ), mCurrentItem( 0 ), mProgressDialog( progressDialog ),
+StatusbarProgressWidget::StatusbarProgressWidget( ProgressDialog* progressDialog, TQWidget* parent, bool button )
+  : TQFrame( parent ), mCurrentItem( 0 ), mProgressDialog( progressDialog ),
     mDelayTimer( 0 ), mBusyTimer( 0 )
 {
   m_bShowButton = button;
@@ -141,7 +141,7 @@ void StatusbarProgressWidget::updateBusyMode()
 
 void StatusbarProgressWidget::slotProgressItemAdded( ProgressItem *item )
 {
-  if ( item->tqparent() )
+  if ( item->parent() )
     return; // we are only interested in top level items
 
   updateBusyMode();
@@ -149,7 +149,7 @@ void StatusbarProgressWidget::slotProgressItemAdded( ProgressItem *item )
 
 void StatusbarProgressWidget::slotProgressItemCompleted( ProgressItem *item )
 {
-  if ( item->tqparent() ) return; // we are only interested in top level items
+  if ( item->parent() ) return; // we are only interested in top level items
   connectSingleItem(); // if going back to 1 item
   if ( ProgressManager::instance()->isEmpty() ) { // No item
     // Done. In 5s the progress-widget will close, then we can clean up the statusbar
diff --git a/libkdepim/statusbarprogresswidget.h b/libkdepim/statusbarprogresswidget.h
index 3a473495..1c836542 100644
--- a/libkdepim/statusbarprogresswidget.h
+++ b/libkdepim/statusbarprogresswidget.h
@@ -58,7 +58,7 @@ class KDE_EXPORT StatusbarProgressWidget : public TQFrame {
 
 public:
 
-  StatusbarProgressWidget( ProgressDialog* progressDialog, TQWidget* tqparent, bool button = true );
+  StatusbarProgressWidget( ProgressDialog* progressDialog, TQWidget* parent, bool button = true );
 
 public slots:
 
diff --git a/libkdepim/tests/testdateedit.cpp b/libkdepim/tests/testdateedit.cpp
index 6b4ef339..e0d1d732 100644
--- a/libkdepim/tests/testdateedit.cpp
+++ b/libkdepim/tests/testdateedit.cpp
@@ -31,8 +31,8 @@
 
 #include "testdateedit.h"
 
-DateEdit::DateEdit( TQWidget *tqparent, const char *name )
-  : TQWidget( tqparent, name )
+DateEdit::DateEdit( TQWidget *parent, const char *name )
+  : TQWidget( parent, name )
 {
   TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
   
diff --git a/libkdepim/tests/testdateedit.h b/libkdepim/tests/testdateedit.h
index 44cb214a..816e87e7 100644
--- a/libkdepim/tests/testdateedit.h
+++ b/libkdepim/tests/testdateedit.h
@@ -30,7 +30,7 @@ class DateEdit : public TQWidget
   TQ_OBJECT
 
   public:
-    DateEdit( TQWidget *tqparent = 0, const char *name = 0 );
+    DateEdit( TQWidget *parent = 0, const char *name = 0 );
 
   public slots:
     void dateChanged( const TQDate& );
diff --git a/libkdepim/weaver.cpp b/libkdepim/weaver.cpp
index 0e718e01..b1dba8de 100644
--- a/libkdepim/weaver.cpp
+++ b/libkdepim/weaver.cpp
@@ -28,8 +28,8 @@ namespace ThreadWeaver {
     bool Debug = true;
     int DebugLevel = 2;
 
-    Job::Job (TQObject* tqparent, const char* name)
-        : TQObject (tqparent, name),
+    Job::Job (TQObject* parent, const char* name)
+        : TQObject (parent, name),
           m_finished (false),
           m_mutex (new TQMutex (true) ),
           m_thread (0)
@@ -178,9 +178,9 @@ namespace ThreadWeaver {
 
     unsigned int Thread::sm_Id;
 
-    Thread::Thread (Weaver *tqparent)
+    Thread::Thread (Weaver *parent)
         : TQThread (),
-          m_tqparent ( tqparent ),
+          m_parent ( parent ),
           m_id ( makeId() )
     {
     }
@@ -212,7 +212,7 @@ namespace ThreadWeaver {
         {
             debug ( 3, "Thread::run [%u]: trying to execute the next job.\n", id() );
 
-            job = m_tqparent->applyForWork ( this, job );
+            job = m_parent->applyForWork ( this, job );
 
             if (job == 0)
             {
@@ -229,7 +229,7 @@ namespace ThreadWeaver {
 
     void Thread::post (Event::Action a, Job *j)
     {
-        m_tqparent->post ( a, this, j);
+        m_parent->post ( a, this, j);
     }
 
     void Thread::msleep(unsigned long msec)
@@ -237,9 +237,9 @@ namespace ThreadWeaver {
         TQThread::msleep(msec);
     }
 
-    Weaver::Weaver(TQObject* tqparent, const char* name,
+    Weaver::Weaver(TQObject* parent, const char* name,
                    int inventoryMin, int inventoryMax)
-        : TQObject(tqparent, name),
+        : TQObject(parent, name),
           m_active(0),
           m_inventoryMin(inventoryMin),
           m_inventoryMax(inventoryMax),
diff --git a/libkdepim/weaver.h b/libkdepim/weaver.h
index 43d4368d..33989e12 100644
--- a/libkdepim/weaver.h
+++ b/libkdepim/weaver.h
@@ -167,7 +167,7 @@ namespace ThreadWeaver {
   TQ_OBJECT
     public:
         /** Construct a Job object. */
-        Job(TQObject* tqparent=0, const char* name=0);
+        Job(TQObject* parent=0, const char* name=0);
 
         /** Destructor. */
         virtual ~Job();
@@ -251,9 +251,9 @@ namespace ThreadWeaver {
     {
     public:
         /** Create a thread.
-            These thread objects are only used inside the Weaver tqparent
+            These thread objects are only used inside the Weaver parent
             object. */
-        Thread(Weaver *tqparent);
+        Thread(Weaver *parent);
 
         /** The destructor. */
         ~Thread();
@@ -261,7 +261,7 @@ namespace ThreadWeaver {
         /** Overloaded to execute the assigned job.
             This will NOT return until shutdown() is called. The
             thread will try to execute one job after the other, asking
-            the Weaver tqparent for a new job when the assigned one is
+            the Weaver parent for a new job when the assigned one is
             finished.
             If no jobs are available, the thread will suspend.
             After shutdown() is called, the thread will end as soon as
@@ -283,7 +283,7 @@ namespace ThreadWeaver {
         void post (Event::Action, Job* = 0);
 
     private:
-        Weaver *m_tqparent;
+        Weaver *m_parent;
 
         const unsigned int m_id;
 
@@ -299,7 +299,7 @@ namespace ThreadWeaver {
         Q_OBJECT
   TQ_OBJECT
     public:
-        Weaver (TQObject* tqparent=0, const char* name=0,
+        Weaver (TQObject* parent=0, const char* name=0,
                 int inventoryMin = 4, // minimal number of provided threads
                 int inventoryMax = 32); // maximum number of provided threads
         virtual ~Weaver ();
diff --git a/libkdepim/weaverextensions.cpp b/libkdepim/weaverextensions.cpp
index e0cdfb38..9859b6d6 100644
--- a/libkdepim/weaverextensions.cpp
+++ b/libkdepim/weaverextensions.cpp
@@ -19,8 +19,8 @@
 namespace KPIM {
 namespace ThreadWeaver {
 
-    WeaverExtension::WeaverExtension ( TQObject *tqparent, const char *name)
-        : TQObject (tqparent, name)
+    WeaverExtension::WeaverExtension ( TQObject *parent, const char *name)
+        : TQObject (parent, name)
     {
     }
 
diff --git a/libkdepim/weaverextensions.h b/libkdepim/weaverextensions.h
index 53eff64c..26bccade 100644
--- a/libkdepim/weaverextensions.h
+++ b/libkdepim/weaverextensions.h
@@ -35,7 +35,7 @@ namespace ThreadWeaver {
             Q_OBJECT
   TQ_OBJECT
         public:
-            WeaverExtension ( TQObject *tqparent = 0, const char *name = 0);
+            WeaverExtension ( TQObject *parent = 0, const char *name = 0);
             /** Attach() is a convenience method that will connect all our
             slots to signals emitted by the weaver. It is also possible to
             avoid attach() and only connect necessary signals. */
diff --git a/libkdepim/weaverlogger.cpp b/libkdepim/weaverlogger.cpp
index 14b3c505..e5164c80 100644
--- a/libkdepim/weaverlogger.cpp
+++ b/libkdepim/weaverlogger.cpp
@@ -21,8 +21,8 @@ namespace ThreadWeaver {
 
     extern void debug(int severity, const char * cformat, ...);
 
-    WeaverThreadLogger::WeaverThreadLogger( TQObject *tqparent, const char *name)
-        : WeaverExtension (tqparent, name)
+    WeaverThreadLogger::WeaverThreadLogger( TQObject *parent, const char *name)
+        : WeaverExtension (parent, name)
     {
     }
 
diff --git a/libkdepim/weaverlogger.h b/libkdepim/weaverlogger.h
index ece3ddea..d4d35ff4 100644
--- a/libkdepim/weaverlogger.h
+++ b/libkdepim/weaverlogger.h
@@ -28,7 +28,7 @@ namespace ThreadWeaver {
         Q_OBJECT
   TQ_OBJECT
     public:
-        WeaverThreadLogger( TQObject *tqparent = 0, const char *name = 0);
+        WeaverThreadLogger( TQObject *parent = 0, const char *name = 0);
         ~WeaverThreadLogger();
         void threadCreated (Thread *);
         void threadDestroyed (Thread *);
author	tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>	2011-08-10 22:19:39 +0000
committer	tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>	2011-08-10 22:19:39 +0000
commit	36a36a5c1015aa0d03f4515c401e907ddb9d6291 (patch)
tree	0212ba6d2c749043134005a41f2bd0379619d40f /libkdepim
parent	4c6f8d69e2d1501837affb472c4eb8fec4462240 (diff)
download	tdepim-36a36a5c1015aa0d03f4515c401e907ddb9d6291.tar.gz tdepim-36a36a5c1015aa0d03f4515c401e907ddb9d6291.zip