rename the following methods:

tqparent parent
tqmask mask


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

34 files changed, 163 insertions, 163 deletions

diff --git a/kopete/libkopete/ui/accountselector.cpp b/kopete/libkopete/ui/accountselector.cpp
index e1f31900..3a9b94ff 100644
--- a/kopete/libkopete/ui/accountselector.cpp
+++ b/kopete/libkopete/ui/accountselector.cpp
@@ -32,8 +32,8 @@ class AccountListViewItem : public KListViewItem
 		Kopete::Account *mAccount;
 
 	public:
-		AccountListViewItem(TQListView *tqparent, Kopete::Account *acc)
-			: KListViewItem(tqparent)
+		AccountListViewItem(TQListView *parent, Kopete::Account *acc)
+			: KListViewItem(parent)
 		{
 			if (acc==0)
 				return;
@@ -62,8 +62,8 @@ class AccountSelectorPrivate
 };
 
 
-AccountSelector::AccountSelector(TQWidget *tqparent, const char *name)
-	: TQWidget(tqparent, name)
+AccountSelector::AccountSelector(TQWidget *parent, const char *name)
+	: TQWidget(parent, name)
 {
 	//kdDebug(14010) << k_funcinfo << "for no special protocol" << endl;
 	d = new AccountSelectorPrivate;
@@ -72,8 +72,8 @@ AccountSelector::AccountSelector(TQWidget *tqparent, const char *name)
 }
 
 
-AccountSelector::AccountSelector(Kopete::Protocol *proto, TQWidget *tqparent,
-	const char *name) : TQWidget(tqparent, name)
+AccountSelector::AccountSelector(Kopete::Protocol *proto, TQWidget *parent,
+	const char *name) : TQWidget(parent, name)
 {
 	//kdDebug(14010) << k_funcinfo << " for protocol " << proto->pluginId() << endl;
 	d = new AccountSelectorPrivate;
diff --git a/kopete/libkopete/ui/accountselector.h b/kopete/libkopete/ui/accountselector.h
index bdb4c888..2ad22a53 100644
--- a/kopete/libkopete/ui/accountselector.h
+++ b/kopete/libkopete/ui/accountselector.h
@@ -37,19 +37,19 @@ Q_OBJECT
 		/**
 		 * Constructor.
 		 *
-		 * The parameters @p tqparent and @p name are handled by
+		 * The parameters @p parent and @p name are handled by
 		 * KListView.
 		 */
-		AccountSelector(TQWidget *tqparent=0, const char *name=0);
+		AccountSelector(TQWidget *parent=0, const char *name=0);
 
 		/**
 		 * Constructor for a list of accounts for one protocol only
 		 *
-		 * The parameters @p tqparent and @p name are handled by
+		 * The parameters @p parent and @p name are handled by
 		 * KListView. @p proto defines the protocol whose accounts are
 		 * shown in the list
 		 */
-		AccountSelector(Kopete::Protocol *proto, TQWidget *tqparent=0, const char *name=0);
+		AccountSelector(Kopete::Protocol *proto, TQWidget *parent=0, const char *name=0);
 
 		/**
 		 * Destructor.
diff --git a/kopete/libkopete/ui/addcontactpage.cpp b/kopete/libkopete/ui/addcontactpage.cpp
index 4916b955..846815f2 100644
--- a/kopete/libkopete/ui/addcontactpage.cpp
+++ b/kopete/libkopete/ui/addcontactpage.cpp
@@ -17,7 +17,7 @@
 
 #include "addcontactpage.h"
 
-AddContactPage::AddContactPage(TQWidget *tqparent, const char *name ) : TQWidget(tqparent,name)
+AddContactPage::AddContactPage(TQWidget *parent, const char *name ) : TQWidget(parent,name)
 {
 }
 
diff --git a/kopete/libkopete/ui/addcontactpage.h b/kopete/libkopete/ui/addcontactpage.h
index f215f3b0..8ef81e0e 100644
--- a/kopete/libkopete/ui/addcontactpage.h
+++ b/kopete/libkopete/ui/addcontactpage.h
@@ -35,7 +35,7 @@ Q_OBJECT
   TQ_OBJECT
 
 public:
-	AddContactPage(TQWidget *tqparent=0, const char *name=0);
+	AddContactPage(TQWidget *parent=0, const char *name=0);
 	virtual ~AddContactPage();
 	//Kopete::Protocol *protocol;
 
diff --git a/kopete/libkopete/ui/addressbooklinkwidget.cpp b/kopete/libkopete/ui/addressbooklinkwidget.cpp
index e34518b7..f12e7116 100644
--- a/kopete/libkopete/ui/addressbooklinkwidget.cpp
+++ b/kopete/libkopete/ui/addressbooklinkwidget.cpp
@@ -38,7 +38,7 @@ namespace Kopete {
 namespace UI {
 
 
-AddressBookLinkWidget::AddressBookLinkWidget( TQWidget * tqparent, const char * name ) : AddressBookLinkWidgetBase( tqparent, name ), mMetaContact( 0 )
+AddressBookLinkWidget::AddressBookLinkWidget( TQWidget * parent, const char * name ) : AddressBookLinkWidgetBase( parent, name ), mMetaContact( 0 )
 {
 	btnClear->setIconSet( SmallIconSet( TQApplication::reverseLayout() ? TQString::tqfromLatin1( "locationbar_erase" ) : TQString::tqfromLatin1( "clear_left") ) );
 	connect( btnClear, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotClearAddressee() ) );
diff --git a/kopete/libkopete/ui/addressbooklinkwidget.h b/kopete/libkopete/ui/addressbooklinkwidget.h
index 31d90a8c..cec68f8d 100644
--- a/kopete/libkopete/ui/addressbooklinkwidget.h
+++ b/kopete/libkopete/ui/addressbooklinkwidget.h
@@ -45,7 +45,7 @@ class AddressBookLinkWidget : public AddressBookLinkWidgetBase
 Q_OBJECT
   TQ_OBJECT
 public:
-	AddressBookLinkWidget( TQWidget * tqparent, const char * name );
+	AddressBookLinkWidget( TQWidget * parent, const char * name );
 	~AddressBookLinkWidget() {}
 	/**
 	 * Set the currently selected addressee
diff --git a/kopete/libkopete/ui/addressbookselectordialog.cpp b/kopete/libkopete/ui/addressbookselectordialog.cpp
index 5133b4ee..44f42e2a 100644
--- a/kopete/libkopete/ui/addressbookselectordialog.cpp
+++ b/kopete/libkopete/ui/addressbookselectordialog.cpp
@@ -30,7 +30,7 @@ namespace Kopete
 namespace UI
 {
 
-AddressBookSelectorDialog::AddressBookSelectorDialog(const TQString &title, const TQString &message, const TQString &preSelectUid, TQWidget *tqparent, const char *name, bool modal ) : KDialogBase(tqparent, name, modal, title, Help|Ok|Cancel, Ok, true )
+AddressBookSelectorDialog::AddressBookSelectorDialog(const TQString &title, const TQString &message, const TQString &preSelectUid, TQWidget *parent, const char *name, bool modal ) : KDialogBase(parent, name, modal, title, Help|Ok|Cancel, Ok, true )
 {
 	TQVBox *vbox=new TQVBox(this);
 	m_addressBookSelectorWidget= new AddressBookSelectorWidget(vbox);
@@ -52,9 +52,9 @@ AddressBookSelectorDialog::~AddressBookSelectorDialog()
 {
 }
 
-KABC::Addressee AddressBookSelectorDialog::getAddressee( const TQString &title, const TQString &message, const TQString &preSelectUid, TQWidget *tqparent)
+KABC::Addressee AddressBookSelectorDialog::getAddressee( const TQString &title, const TQString &message, const TQString &preSelectUid, TQWidget *parent)
 {
-	AddressBookSelectorDialog dialog(title, message, preSelectUid, tqparent);
+	AddressBookSelectorDialog dialog(title, message, preSelectUid, parent);
 	int result = dialog.exec();
 
 	KABC::Addressee adr;
diff --git a/kopete/libkopete/ui/addressbookselectordialog.h b/kopete/libkopete/ui/addressbookselectordialog.h
index db676a3c..235dabd5 100644
--- a/kopete/libkopete/ui/addressbookselectordialog.h
+++ b/kopete/libkopete/ui/addressbookselectordialog.h
@@ -52,7 +52,7 @@ public:
    /**
 	* The constructor of an empty AddressBookSelectorWidget
 	*/
-	AddressBookSelectorDialog( const TQString &title, const TQString &message, const TQString &preSelectUid, TQWidget *tqparent=0L, const char *name=0L, bool modal = false );
+	AddressBookSelectorDialog( const TQString &title, const TQString &message, const TQString &preSelectUid, TQWidget *parent=0L, const char *name=0L, bool modal = false );
    /**
 	* The destructor of the dialog
 	*/
@@ -72,7 +72,7 @@ public:
 	* @returns the selected contact, or a null addressee if the user 
 	* pressed the Cancel button. Optionally
 	*/
-	static KABC::Addressee getAddressee( const TQString &title, const TQString &message, const TQString &preSelectUid, TQWidget *tqparent = 0L );
+	static KABC::Addressee getAddressee( const TQString &title, const TQString &message, const TQString &preSelectUid, TQWidget *parent = 0L );
 
 protected slots:
 	virtual void accept();
diff --git a/kopete/libkopete/ui/addressbookselectorwidget.cpp b/kopete/libkopete/ui/addressbookselectorwidget.cpp
index a0ce53af..ec9604a8 100644
--- a/kopete/libkopete/ui/addressbookselectorwidget.cpp
+++ b/kopete/libkopete/ui/addressbookselectorwidget.cpp
@@ -54,8 +54,8 @@ namespace Kopete
 namespace UI
 {
 
-AddressBookSelectorWidget::AddressBookSelectorWidget( TQWidget *tqparent, const char *name )
-		: AddressBookSelectorWidget_Base( tqparent, name )
+AddressBookSelectorWidget::AddressBookSelectorWidget( TQWidget *parent, const char *name )
+		: AddressBookSelectorWidget_Base( parent, name )
 {
 	m_addressBook = Kopete::KABCPersistence::self()->addressBook();
 
diff --git a/kopete/libkopete/ui/addressbookselectorwidget.h b/kopete/libkopete/ui/addressbookselectorwidget.h
index 028e6d6c..6aff7fb5 100644
--- a/kopete/libkopete/ui/addressbookselectorwidget.h
+++ b/kopete/libkopete/ui/addressbookselectorwidget.h
@@ -50,7 +50,7 @@ class KOPETE_EXPORT AddressBookSelectorWidget : public AddressBookSelectorWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	AddressBookSelectorWidget( TQWidget *tqparent = 0, const char *name  = 0 );
+	AddressBookSelectorWidget( TQWidget *parent = 0, const char *name  = 0 );
 	~AddressBookSelectorWidget();
 	KABC::Addressee addressee();
 	/**
diff --git a/kopete/libkopete/ui/addresseeitem.cpp b/kopete/libkopete/ui/addresseeitem.cpp
index 382693ea..55b58068 100644
--- a/kopete/libkopete/ui/addresseeitem.cpp
+++ b/kopete/libkopete/ui/addresseeitem.cpp
@@ -27,8 +27,8 @@
 
 #include "addresseeitem.h"
 
-AddresseeItem::AddresseeItem( TQListView *tqparent, const KABC::Addressee &addressee) :
-  KListViewItem( tqparent ),
+AddresseeItem::AddresseeItem( TQListView *parent, const KABC::Addressee &addressee) :
+  KListViewItem( parent ),
   mAddressee( addressee )
 {
   //We can't save showphoto because we don't have a d pointer
diff --git a/kopete/libkopete/ui/addresseeitem.h b/kopete/libkopete/ui/addresseeitem.h
index 695ea6c2..36d1d284 100644
--- a/kopete/libkopete/ui/addresseeitem.h
+++ b/kopete/libkopete/ui/addresseeitem.h
@@ -46,10 +46,10 @@ class AddresseeItem : public KListViewItem
     /**
       Constructor.
 
-      @param tqparent    The tqparent listview.
+      @param parent    The parent listview.
       @param addressee The associated addressee.
     */
-    AddresseeItem( TQListView *tqparent, const KABC::Addressee &addressee );
+    AddresseeItem( TQListView *parent, const KABC::Addressee &addressee );
    
     /**
       Returns the addressee.
diff --git a/kopete/libkopete/ui/contactaddednotifydialog.h b/kopete/libkopete/ui/contactaddednotifydialog.h
index e4fe5a61..ae873344 100644
--- a/kopete/libkopete/ui/contactaddednotifydialog.h
+++ b/kopete/libkopete/ui/contactaddednotifydialog.h
@@ -91,7 +91,7 @@ public:
 	 * @param contactId the contactId of the contact which just added the user
 	 * @param contactNick the nickname of the contact if available.
 	 * @param account is used to display the account icon and informaiton about the account
-	 * @param hide a bittqmask of HideWidget used to hide some widget. By default, everything is shown.
+	 * @param hide a bitmask of HideWidget used to hide some widget. By default, everything is shown.
 	 *
 	 */
 	ContactAddedNotifyDialog(const TQString& contactId, const TQString& contactNick=TQString(),
@@ -153,7 +153,7 @@ signals:
 	 * signal to a slot which show a dialog with more info about the
 	 * contact.
 	 *
-	 * hint: you can use sender() as tqparent of the new dialog
+	 * hint: you can use sender() as parent of the new dialog
 	 * @param contactId is the id of the contact passed in the constructor.
 	 */
 	void infoClicked(const TQString &contactId);
diff --git a/kopete/libkopete/ui/kopete.widgets b/kopete/libkopete/ui/kopete.widgets
index 14a6b4e6..7c441d0f 100644
--- a/kopete/libkopete/ui/kopete.widgets
+++ b/kopete/libkopete/ui/kopete.widgets
@@ -13,12 +13,12 @@ Group=Views (Kopete)
 ToolTip=List View Search Line (Kopete)
 WhatsThis=Search line able to use Kopete custom list View.
 IncludeFile=kopetelistviewsearchline.h
-ConstructorArgs=(tqparent, 0, name)
+ConstructorArgs=(parent, 0, name)
 Group=Input (Kopete)
 
 [Kopete::UI::AddressBookLinkWidget]
 ToolTip=Address Book Link Widget (Kopete)
 WhatsThis=KABC::Addressee display/selector
 IncludeFile=addressbooklinkwidget.h
-ConstructorArgs=(tqparent, name)
+ConstructorArgs=(parent, name)
 Group=Input (Kopete)
diff --git a/kopete/libkopete/ui/kopetecontactaction.cpp b/kopete/libkopete/ui/kopetecontactaction.cpp
index c3938aff..6492d1c0 100644
--- a/kopete/libkopete/ui/kopetecontactaction.cpp
+++ b/kopete/libkopete/ui/kopetecontactaction.cpp
@@ -22,9 +22,9 @@
 #include "kopeteonlinestatus.h"
 
 KopeteContactAction::KopeteContactAction( Kopete::Contact *contact, const TQObject *receiver,
-	const char *slot, KAction *tqparent )
+	const char *slot, KAction *parent )
 : KAction( contact->metaContact()->displayName(), TQIconSet( contact->onlinetqStatus().iconFor( contact ) ), KShortcut(),
-	tqparent, contact->contactId().latin1() )
+	parent, contact->contactId().latin1() )
 {
 	m_contact = contact;
 
diff --git a/kopete/libkopete/ui/kopetecontactaction.h b/kopete/libkopete/ui/kopetecontactaction.h
index 73c39bb7..e87b0437 100644
--- a/kopete/libkopete/ui/kopetecontactaction.h
+++ b/kopete/libkopete/ui/kopetecontactaction.h
@@ -38,7 +38,7 @@ public:
 	/**
 	 * Create a new KopeteContactAction
 	 */
-	KopeteContactAction( Kopete::Contact *contact, const TQObject* receiver, const char* slot, KAction* tqparent );
+	KopeteContactAction( Kopete::Contact *contact, const TQObject* receiver, const char* slot, KAction* parent );
 	~KopeteContactAction();
 
 	Kopete::Contact * contact() const;
diff --git a/kopete/libkopete/ui/kopetefileconfirmdialog.cpp b/kopete/libkopete/ui/kopetefileconfirmdialog.cpp
index bf456663..fc9310fa 100644
--- a/kopete/libkopete/ui/kopetefileconfirmdialog.cpp
+++ b/kopete/libkopete/ui/kopetefileconfirmdialog.cpp
@@ -31,8 +31,8 @@
 #include "kopetemetacontact.h"
 #include "kopetecontact.h"
 
-KopeteFileConfirmDialog::KopeteFileConfirmDialog(const Kopete::FileTransferInfo &info,const TQString& description,TQWidget *tqparent, const char *name )
-: KDialogBase( tqparent, name, false, i18n( "A User Would Like to Send You a File" ),
+KopeteFileConfirmDialog::KopeteFileConfirmDialog(const Kopete::FileTransferInfo &info,const TQString& description,TQWidget *parent, const char *name )
+: KDialogBase( parent, name, false, i18n( "A User Would Like to Send You a File" ),
 	KDialogBase::User1 | KDialogBase::User2, KDialogBase::User1, true, i18n( "&Refuse" ), i18n( "&Accept" ) ),
 	m_info( info )
 {
diff --git a/kopete/libkopete/ui/kopetefileconfirmdialog.h b/kopete/libkopete/ui/kopetefileconfirmdialog.h
index 0292f4d7..3a15693d 100644
--- a/kopete/libkopete/ui/kopetefileconfirmdialog.h
+++ b/kopete/libkopete/ui/kopetefileconfirmdialog.h
@@ -34,7 +34,7 @@ Q_OBJECT
   TQ_OBJECT
 
 public:
-	KopeteFileConfirmDialog(const Kopete::FileTransferInfo &info,const TQString& description=TQString(), TQWidget *tqparent=0, const char* name=0);
+	KopeteFileConfirmDialog(const Kopete::FileTransferInfo &info,const TQString& description=TQString(), TQWidget *parent=0, const char* name=0);
 	~KopeteFileConfirmDialog();
 
 private:
diff --git a/kopete/libkopete/ui/kopetelistview.cpp b/kopete/libkopete/ui/kopetelistview.cpp
index 91b251a9..cf1fae01 100644
--- a/kopete/libkopete/ui/kopetelistview.cpp
+++ b/kopete/libkopete/ui/kopetelistview.cpp
@@ -47,7 +47,7 @@ namespace ListView {
 class ToolTip : public TQToolTip
 {
 public:
-	ToolTip( TQWidget *tqparent, ListView *lv );
+	ToolTip( TQWidget *parent, ListView *lv );
 	virtual ~ToolTip();
 
 	void maybeTip( const TQPoint &pos );
@@ -56,8 +56,8 @@ private:
 	ListView *m_listView;
 };
 
-ToolTip::ToolTip( TQWidget *tqparent, ListView *lv )
- : TQToolTip( tqparent )
+ToolTip::ToolTip( TQWidget *parent, ListView *lv )
+ : TQToolTip( parent )
 {
 	m_listView = lv;
 }
@@ -102,8 +102,8 @@ struct ListView::Private
 	Private() {}
 };
 
-ListView::ListView( TQWidget *tqparent, const char *name )
- : KListView( tqparent, name ), d( new Private )
+ListView::ListView( TQWidget *parent, const char *name )
+ : KListView( parent, name ), d( new Private )
 {
 	connect( &d->sortTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotSort() ) );
 
@@ -120,7 +120,7 @@ ListView::ListView( TQWidget *tqparent, const char *name )
 	clearWFlags( WStaticContents );
 	setWFlags( WNoAutoErase );
 
-	// clear the appropriate flags from the viewport - qt docs say we have to tqmask
+	// clear the appropriate flags from the viewport - qt docs say we have to mask
 	// these flags out of the TQListView to make weirdly painted list items work, but
 	// that doesn't do the job. masking them out of the viewport does.
 //	class MyWidget : public TQWidget { public: using TQWidget::clearWFlags; };
diff --git a/kopete/libkopete/ui/kopetelistview.h b/kopete/libkopete/ui/kopetelistview.h
index 05102e53..6dcf4ccc 100644
--- a/kopete/libkopete/ui/kopetelistview.h
+++ b/kopete/libkopete/ui/kopetelistview.h
@@ -35,7 +35,7 @@ class ListView : public KListView
   TQ_OBJECT
 
 public:
-	ListView( TQWidget *tqparent = 0, const char *name = 0 );
+	ListView( TQWidget *parent = 0, const char *name = 0 );
 	~ListView();
 
 	/**
diff --git a/kopete/libkopete/ui/kopetelistviewitem.cpp b/kopete/libkopete/ui/kopetelistviewitem.cpp
index b4c156fb..6156b6aa 100644
--- a/kopete/libkopete/ui/kopetelistviewitem.cpp
+++ b/kopete/libkopete/ui/kopetelistviewitem.cpp
@@ -144,13 +144,13 @@ void ComponentBase::updateAnimationPosition( int p, int s )
 class Component::Private
 {
 public:
-	Private( ComponentBase *tqparent )
-	 : tqparent( tqparent ), minWidth( 0 ), minHeight( 0 )
+	Private( ComponentBase *parent )
+	 : parent( parent ), minWidth( 0 ), minHeight( 0 )
 	 , growHoriz( false ), growVert( false )
 	 , tipSource( 0 )
 	{
 	}
-	ComponentBase *tqparent;
+	ComponentBase *parent;
 	TQRect rect;
 	TQRect startRect, targetRect;
 	int minWidth, minHeight;
@@ -159,10 +159,10 @@ public:
 	ToolTipSource *tipSource;
 };
 
-Component::Component( ComponentBase *tqparent )
- : d( new Private( tqparent ) )
+Component::Component( ComponentBase *parent )
+ : d( new Private( parent ) )
 {
-	d->tqparent->componentAdded( this );
+	d->parent->componentAdded( this );
 	d->show = true;
 }
 
@@ -170,7 +170,7 @@ int Component::RTTI = Rtti_Component;
 
 Component::~Component()
 {
-	d->tqparent->componentRemoved( this );
+	d->parent->componentRemoved( this );
 	delete d;
 }
 
@@ -224,7 +224,7 @@ bool Component::setMinWidth( int width )
 	if ( d->minWidth == width ) return false;
 	d->minWidth = width;
 
-	d->tqparent->componentResized( this );
+	d->parent->componentResized( this );
 	return true;
 }
 bool Component::setMinHeight( int height )
@@ -232,7 +232,7 @@ bool Component::setMinHeight( int height )
 	if ( d->minHeight == height ) return false;
 	d->minHeight = height;
 
-	d->tqparent->componentResized( this );
+	d->parent->componentResized( this );
 	return true;
 }
 
@@ -264,12 +264,12 @@ void Component::paint( TQPainter *painter, const TQColorGroup &cg )
 
 void Component::tqrepaint()
 {
-	d->tqparent->tqrepaint();
+	d->parent->tqrepaint();
 }
 
 void Component::retqlayout()
 {
-	d->tqparent->retqlayout();
+	d->parent->retqlayout();
 }
 
 void Component::componentAdded( Component *component )
@@ -295,8 +295,8 @@ public:
 	static const int padding = 0;
 };
 
-BoxComponent::BoxComponent( ComponentBase *tqparent, Direction dir )
- : Component( tqparent ), d( new Private( dir ) )
+BoxComponent::BoxComponent( ComponentBase *parent, Direction dir )
+ : Component( parent ), d( new Private( dir ) )
 {
 }
 
@@ -482,8 +482,8 @@ public:
 	TQPixmap 			bottom_pixmap;
 };
 
-ContactBoxComponent::ContactBoxComponent(ComponentBase *tqparent, Direction dir)
- : BoxComponent(tqparent, dir), d(new Private())
+ContactBoxComponent::ContactBoxComponent(ComponentBase *parent, Direction dir)
+ : BoxComponent(parent, dir), d(new Private())
 {}
 
 ContactBoxComponent::~ContactBoxComponent()
@@ -620,8 +620,8 @@ public:
 	TQPixmap 			bottom_pixmap;
 };
 
-GroupBoxComponent::GroupBoxComponent(ComponentBase *tqparent, Direction dir)
- : BoxComponent(tqparent, dir), d(new Private())
+GroupBoxComponent::GroupBoxComponent(ComponentBase *parent, Direction dir)
+ : BoxComponent(parent, dir), d(new Private())
 {}
 
 GroupBoxComponent::~GroupBoxComponent()
@@ -746,15 +746,15 @@ public:
 	TQPixmap image;
 };
 
-ImageComponent::ImageComponent( ComponentBase *tqparent )
- : Component( tqparent ), d( new Private )
+ImageComponent::ImageComponent( ComponentBase *parent )
+ : Component( parent ), d( new Private )
 {
 }
 
 int ImageComponent::RTTI = Rtti_ImageComponent;
 
-ImageComponent::ImageComponent( ComponentBase *tqparent, int minW, int minH )
- : Component( tqparent ), d( new Private )
+ImageComponent::ImageComponent( ComponentBase *parent, int minW, int minH )
+ : Component( parent ), d( new Private )
 {
 	setMinWidth( minW );
 	setMinHeight( minH );
@@ -858,8 +858,8 @@ public:
 	TQFont font;
 };
 
-TextComponent::TextComponent( ComponentBase *tqparent, const TQFont &font, const TQString &text )
- : Component( tqparent ), d( new Private )
+TextComponent::TextComponent( ComponentBase *parent, const TQFont &font, const TQString &text )
+ : Component( parent ), d( new Private )
 {
 	setFont( font );
 	setText( text );
@@ -956,8 +956,8 @@ public:
     TQFont font;
 };
 
-DisplayNameComponent::DisplayNameComponent( ComponentBase *tqparent )
- : BoxComponent( tqparent ), d( new Private )
+DisplayNameComponent::DisplayNameComponent( ComponentBase *parent )
+ : BoxComponent( parent ), d( new Private )
 {
 }
 
@@ -1092,8 +1092,8 @@ TQString DisplayNameComponent::text()
 
 // HSpacerComponent --------
 
-HSpacerComponent::HSpacerComponent( ComponentBase *tqparent )
- : Component( tqparent )
+HSpacerComponent::HSpacerComponent( ComponentBase *parent )
+ : Component( parent )
 {
 	setMinWidth( 0 );
 	setMinHeight( 0 );
@@ -1108,8 +1108,8 @@ int HSpacerComponent::widthForHeight( int )
 
 // VSpacerComponent --------
 
-VSpacerComponent::VSpacerComponent( ComponentBase *tqparent )
- : Component( tqparent )
+VSpacerComponent::VSpacerComponent( ComponentBase *parent )
+ : Component( parent )
 {
 	setMinWidth( 0 );
 	setMinHeight( 0 );
@@ -1131,7 +1131,7 @@ public:
 	int iconSize;
 };
 
-ContactComponent::ContactComponent( ComponentBase *tqparent, Kopete::Contact *contact, int) : ImageComponent( tqparent ) , d( new Private )
+ContactComponent::ContactComponent( ComponentBase *parent, Kopete::Contact *contact, int) : ImageComponent( parent ) , d( new Private )
 {
 	d->contact = contact;
 	d->iconSize = 12; // size of the image is fixed to 12 pixels
@@ -1160,7 +1160,7 @@ std::pair<TQString,TQRect> ContactComponent::toolTip( const TQPoint &/*relativeP
 
 //////////////////  SpacerComponent /////////////////////////
 
-SpacerComponent::SpacerComponent( ComponentBase *tqparent, int w, int h ) : Component( tqparent )
+SpacerComponent::SpacerComponent( ComponentBase *parent, int w, int h ) : Component( parent )
 {
 	setMinWidth(w);
 	setMinHeight(h);
@@ -1279,14 +1279,14 @@ bool Item::Private::animateChanges = true;
 bool Item::Private::fadeVisibility = true;
 bool Item::Private::foldVisibility = true;
 
-Item::Item( TQListViewItem *tqparent, TQObject *owner, const char *name )
- : TQObject( owner, name ), KListViewItem( tqparent ), d( new Private(this) )
+Item::Item( TQListViewItem *parent, TQObject *owner, const char *name )
+ : TQObject( owner, name ), KListViewItem( parent ), d( new Private(this) )
 {
 	initLVI();
 }
 
-Item::Item( TQListView *tqparent, TQObject *owner, const char *name )
- : TQObject( owner, name ), KListViewItem( tqparent ), d( new Private(this) )
+Item::Item( TQListView *parent, TQObject *owner, const char *name )
+ : TQObject( owner, name ), KListViewItem( parent ), d( new Private(this) )
 {
 	initLVI();
 }
@@ -1411,7 +1411,7 @@ void Item::setTargetVisibility( bool vis )
 {
 	if ( d->visibilityTarget == vis )
 	{
-		// in case we're getting called because our tqparent was shown and
+		// in case we're getting called because our parent was shown and
 		// we need to be rehidden
 		if ( !d->visibilityTimer.isActive() )
 			setVisible( vis && d->searchMatch );
diff --git a/kopete/libkopete/ui/kopetelistviewitem.h b/kopete/libkopete/ui/kopetelistviewitem.h
index ac19c4b8..0868afab 100644
--- a/kopete/libkopete/ui/kopetelistviewitem.h
+++ b/kopete/libkopete/ui/kopetelistviewitem.h
@@ -102,7 +102,7 @@ public:
 class Component : public ComponentBase
 {
 protected:
-	Component( ComponentBase *tqparent );
+	Component( ComponentBase *parent );
 public:
 	virtual ~Component() = 0;
 
@@ -110,7 +110,7 @@ public:
 	 * Set the size and position of this item relative to the list view item. Should
 	 * only be called by the containing item.
 	 * @param rect the new rectangle this component will paint in, relative to the painter
-	 *             passed to the paint() function by the tqparent item.
+	 *             passed to the paint() function by the parent item.
 	 */
 	virtual void tqlayout( const TQRect &rect );
 
@@ -200,7 +200,7 @@ protected:
 	 * @param width the minimum width
 	 * @return true if the size has actually changed, false if it's been set to
 	 *         the existing values. if it returns true, you do not need to retqlayout,
-	 *         since the tqparent component will do that for you.
+	 *         since the parent component will do that for you.
 	 */
 	bool setMinWidth( int width );
 	/**
@@ -209,7 +209,7 @@ protected:
 	 * @param height the minimum height
 	 * @return true if the size has actually changed, false if it's been set to
 	 *         the existing values. If it returns true, you do not need to retqlayout,
-	 *         since the tqparent component will do that for you.
+	 *         since the parent component will do that for you.
 	 */
 	bool setMinHeight( int height );
 
@@ -233,7 +233,7 @@ class BoxComponent : public Component
 {
 public:
 	enum Direction {Horizontal,Vertical };
-	BoxComponent( ComponentBase *tqparent, Direction dir =Horizontal );
+	BoxComponent( ComponentBase *parent, Direction dir =Horizontal );
 	~BoxComponent();
 
 	virtual void tqlayout( const TQRect &rect );
@@ -262,7 +262,7 @@ private:
 class ContactBoxComponent : public BoxComponent
 {
 public:
-	ContactBoxComponent(ComponentBase *tqparent, Direction dir =Horizontal);
+	ContactBoxComponent(ComponentBase *parent, Direction dir =Horizontal);
 	~ContactBoxComponent();
 
 	virtual void	reloadTheme();
@@ -285,7 +285,7 @@ private:
 class GroupBoxComponent : public BoxComponent
 {
 public:
-	GroupBoxComponent(ComponentBase *tqparent, Direction dir =Horizontal);
+	GroupBoxComponent(ComponentBase *parent, Direction dir =Horizontal);
 	~GroupBoxComponent();
 
 	virtual void	reloadTheme();
@@ -305,7 +305,7 @@ private:
 class TextComponent : public Component
 {
 public:
-	TextComponent( ComponentBase *tqparent, const TQFont &font = TQFont(), const TQString &text = TQString() );
+	TextComponent( ComponentBase *parent, const TQFont &font = TQFont(), const TQString &text = TQString() );
 	~TextComponent();
 
 	TQString text();
@@ -335,8 +335,8 @@ private:
 class ImageComponent : public Component
 {
 public:
-	ImageComponent( ComponentBase *tqparent );
-	ImageComponent( ComponentBase *tqparent, int minW, int minH );
+	ImageComponent( ComponentBase *parent );
+	ImageComponent( ComponentBase *parent, int minW, int minH );
 	~ImageComponent();
 
 	virtual void setPixmap( const TQPixmap &img, bool adjustSize = true);
@@ -358,8 +358,8 @@ protected:
 class FaceComponent : public ImageComponent
 {
 public:
-	FaceComponent(ComponentBase *tqparent): ImageComponent(tqparent) {}
-	FaceComponent(ComponentBase *tqparent, int minW, int minH): ImageComponent(tqparent, minH, minW) {}
+	FaceComponent(ComponentBase *parent): ImageComponent(parent) {}
+	FaceComponent(ComponentBase *parent, int minW, int minH): ImageComponent(parent, minH, minW) {}
 
 	void	setPixmap(const TQPixmap &img, bool adjustSize = true);
 	void	paint(TQPainter *painter, const TQColorGroup &cg);
@@ -371,7 +371,7 @@ public:
 class ContactComponent : public ImageComponent
 {
 public:
-	ContactComponent( ComponentBase *tqparent, Kopete::Contact *contact, int iconSize);
+	ContactComponent( ComponentBase *parent, Kopete::Contact *contact, int iconSize);
 	~ContactComponent();
 	void updatePixmap();
 	Kopete::Contact *contact();
@@ -387,7 +387,7 @@ protected:
 class SpacerComponent : public Component
 {
 public:
-	SpacerComponent( ComponentBase *tqparent, int w, int h );
+	SpacerComponent( ComponentBase *parent, int w, int h );
 };
 
 /**
@@ -400,7 +400,7 @@ public:
 	/**
 	 * Constructor
 	 */
-	DisplayNameComponent( ComponentBase *tqparent );
+	DisplayNameComponent( ComponentBase *parent );
 
 	/**
 	 * Dtor
@@ -428,7 +428,7 @@ private:
 class HSpacerComponent : public Component
 {
 public:
-	HSpacerComponent( ComponentBase *tqparent );
+	HSpacerComponent( ComponentBase *parent );
 	int widthForHeight( int );
 
 	static int RTTI;
@@ -438,7 +438,7 @@ public:
 class VSpacerComponent : public Component
 {
 public:
-	VSpacerComponent( ComponentBase *tqparent );
+	VSpacerComponent( ComponentBase *parent );
 	int heightForWidth( int );
 
 	static int RTTI;
@@ -456,8 +456,8 @@ class Item : public TQObject, public KListViewItem, public ComponentBase
 	Q_OBJECT
   TQ_OBJECT
 public:
-	Item( TQListView *tqparent, TQObject *owner = 0, const char *name = 0 );
-	Item( TQListViewItem *tqparent, TQObject *owner = 0, const char *name = 0  );
+	Item( TQListView *parent, TQObject *owner = 0, const char *name = 0 );
+	Item( TQListViewItem *parent, TQObject *owner = 0, const char *name = 0  );
 	~Item();
 
 	void tqrepaint();
diff --git a/kopete/libkopete/ui/kopetelistviewsearchline.cpp b/kopete/libkopete/ui/kopetelistviewsearchline.cpp
index 1ab9c398..af626858 100644
--- a/kopete/libkopete/ui/kopetelistviewsearchline.cpp
+++ b/kopete/libkopete/ui/kopetelistviewsearchline.cpp
@@ -24,13 +24,13 @@ namespace Kopete {
 namespace UI {
 namespace ListView {
 
-SearchLine::SearchLine( TQWidget *tqparent, ListView *listView, const char *name )
-	: KListViewSearchLine( tqparent, listView, name )
+SearchLine::SearchLine( TQWidget *parent, ListView *listView, const char *name )
+	: KListViewSearchLine( parent, listView, name )
 {
 }
 
-SearchLine::SearchLine(TQWidget *tqparent, const char *name)
-	: KListViewSearchLine( tqparent, 0, name )
+SearchLine::SearchLine(TQWidget *parent, const char *name)
+	: KListViewSearchLine( parent, 0, name )
 {
 }
 
diff --git a/kopete/libkopete/ui/kopetelistviewsearchline.h b/kopete/libkopete/ui/kopetelistviewsearchline.h
index 799337e8..c30cc90f 100644
--- a/kopete/libkopete/ui/kopetelistviewsearchline.h
+++ b/kopete/libkopete/ui/kopetelistviewsearchline.h
@@ -38,12 +38,12 @@ public:
 	 * If \a listView is null then the widget will be disabled until a listview
 	 * is set with setListView().
 	 */
-	SearchLine( TQWidget *tqparent, ListView *listView = 0, const char *name = 0 );
+	SearchLine( TQWidget *parent, ListView *listView = 0, const char *name = 0 );
 	/**
 	 * Constructs a SearchLine without any ListView to filter. The
 	 * KListView object has to be set later with setListView().
 	 */
-	SearchLine(TQWidget *tqparent, const char *name);
+	SearchLine(TQWidget *parent, const char *name);
 	/**
 	 * Destroys the SearchLine.
 	 */
diff --git a/kopete/libkopete/ui/kopetepasswordwidget.cpp b/kopete/libkopete/ui/kopetepasswordwidget.cpp
index dd798363..23a48d00 100644
--- a/kopete/libkopete/ui/kopetepasswordwidget.cpp
+++ b/kopete/libkopete/ui/kopetepasswordwidget.cpp
@@ -28,8 +28,8 @@ public:
 	uint maxLength;
 };
 
-Kopete::UI::PasswordWidget::PasswordWidget( TQWidget *tqparent, const char *name, Kopete::Password *from )
- : KopetePasswordWidgetBase( tqparent, name ), d( new Private )
+Kopete::UI::PasswordWidget::PasswordWidget( TQWidget *parent, const char *name, Kopete::Password *from )
+ : KopetePasswordWidgetBase( parent, name ), d( new Private )
 {
 	load( from );
 }
diff --git a/kopete/libkopete/ui/kopetepasswordwidget.h b/kopete/libkopete/ui/kopetepasswordwidget.h
index e8c45a90..d4ad2c11 100644
--- a/kopete/libkopete/ui/kopetepasswordwidget.h
+++ b/kopete/libkopete/ui/kopetepasswordwidget.h
@@ -42,11 +42,11 @@ class KOPETE_EXPORT PasswordWidget : public KopetePasswordWidgetBase
 public:
 	/**
 	 * Creates a Kopete::PasswordWidget.
-	 * @param tqparent The widget to nest this one inside
+	 * @param parent The widget to nest this one inside
 	 * @param name The name of this TQObject
 	 * @param from The password to load the data for this widget from, or 0 if none
 	 */
-	PasswordWidget( TQWidget *tqparent, const char *name = 0, Kopete::Password *from = 0 );
+	PasswordWidget( TQWidget *parent, const char *name = 0, Kopete::Password *from = 0 );
 	~PasswordWidget();
 
 	/**
diff --git a/kopete/libkopete/ui/kopetestdaction.cpp b/kopete/libkopete/ui/kopetestdaction.cpp
index cd8f2326..d9a6a632 100644
--- a/kopete/libkopete/ui/kopetestdaction.cpp
+++ b/kopete/libkopete/ui/kopetestdaction.cpp
@@ -36,12 +36,12 @@
 
 KSettings::Dialog *KopetePreferencesAction::s_settingsDialog = 0L;
 
-KopetePreferencesAction::KopetePreferencesAction( KActionCollection *tqparent, const char *name )
+KopetePreferencesAction::KopetePreferencesAction( KActionCollection *parent, const char *name )
 #if KDE_IS_VERSION( 3, 3, 90 )
-: KAction( KStdGuiItem::configure(), 0, 0, 0, tqparent, name )
+: KAction( KStdGuiItem::configure(), 0, 0, 0, parent, name )
 #else
 : KAction( KGuiItem( i18n( "&Configure Kopete..." ),
-	TQString::tqfromLatin1( "configure" ) ), 0, 0, 0, tqparent, name )
+	TQString::tqfromLatin1( "configure" ) ), 0, 0, 0, parent, name )
 #endif
 {
 	connect( this, TQT_SIGNAL( activated() ), this, TQT_SLOT( slotShowPreferences() ) );
@@ -63,64 +63,64 @@ void KopetePreferencesAction::slotShowPreferences()
 	KWin::activateWindow( s_settingsDialog->dialog()->winId() );
 }
 
-KAction * KopeteStdAction::preferences( KActionCollection *tqparent, const char *name )
+KAction * KopeteStdAction::preferences( KActionCollection *parent, const char *name )
 {
-	return new KopetePreferencesAction( tqparent, name );
+	return new KopetePreferencesAction( parent, name );
 }
 
-KAction * KopeteStdAction::chat( const TQObject *recvr, const char *slot, TQObject *tqparent, const char *name )
+KAction * KopeteStdAction::chat( const TQObject *recvr, const char *slot, TQObject *parent, const char *name )
 {
-	return new KAction( i18n( "Start &Chat..." ), TQString::tqfromLatin1( "mail_generic" ), 0, recvr, slot, tqparent, name );
+	return new KAction( i18n( "Start &Chat..." ), TQString::tqfromLatin1( "mail_generic" ), 0, recvr, slot, parent, name );
 }
 
-KAction * KopeteStdAction::sendMessage( const TQObject *recvr, const char *slot, TQObject *tqparent, const char *name )
+KAction * KopeteStdAction::sendMessage( const TQObject *recvr, const char *slot, TQObject *parent, const char *name )
 {
-	return new KAction( i18n( "&Send Single Message..." ), TQString::tqfromLatin1( "mail_generic" ), 0, recvr, slot, tqparent, name );
+	return new KAction( i18n( "&Send Single Message..." ), TQString::tqfromLatin1( "mail_generic" ), 0, recvr, slot, parent, name );
 }
 
-KAction * KopeteStdAction::contactInfo( const TQObject *recvr, const char *slot, TQObject *tqparent, const char *name )
+KAction * KopeteStdAction::contactInfo( const TQObject *recvr, const char *slot, TQObject *parent, const char *name )
 {
-	return new KAction( i18n( "User &Info" ), TQString::tqfromLatin1( "messagebox_info" ), 0, recvr, slot, tqparent, name );
+	return new KAction( i18n( "User &Info" ), TQString::tqfromLatin1( "messagebox_info" ), 0, recvr, slot, parent, name );
 }
 
-KAction * KopeteStdAction::sendFile( const TQObject *recvr, const char *slot, TQObject *tqparent, const char *name )
+KAction * KopeteStdAction::sendFile( const TQObject *recvr, const char *slot, TQObject *parent, const char *name )
 {
-	return new KAction( i18n( "Send &File..." ), TQString::tqfromLatin1( "attach" ), 0, recvr, slot, tqparent, name );
+	return new KAction( i18n( "Send &File..." ), TQString::tqfromLatin1( "attach" ), 0, recvr, slot, parent, name );
 }
 
-KAction * KopeteStdAction::viewHistory( const TQObject *recvr, const char *slot, TQObject *tqparent, const char *name )
+KAction * KopeteStdAction::viewHistory( const TQObject *recvr, const char *slot, TQObject *parent, const char *name )
 {
-	return new KAction( i18n( "View &History..." ), TQString::tqfromLatin1( "history" ), 0, recvr, slot, tqparent, name );
+	return new KAction( i18n( "View &History..." ), TQString::tqfromLatin1( "history" ), 0, recvr, slot, parent, name );
 }
 
-KAction * KopeteStdAction::addGroup( const TQObject *recvr, const char *slot, TQObject *tqparent, const char *name )
+KAction * KopeteStdAction::addGroup( const TQObject *recvr, const char *slot, TQObject *parent, const char *name )
 {
-	return new KAction( i18n( "&Create Group..." ), TQString::tqfromLatin1( "folder" ), 0, recvr, slot, tqparent, name );
+	return new KAction( i18n( "&Create Group..." ), TQString::tqfromLatin1( "folder" ), 0, recvr, slot, parent, name );
 }
 
-KAction * KopeteStdAction::changeMetaContact( const TQObject *recvr, const char *slot, TQObject *tqparent, const char *name )
+KAction * KopeteStdAction::changeMetaContact( const TQObject *recvr, const char *slot, TQObject *parent, const char *name )
 {
-	return new KAction( i18n( "Cha&nge Meta Contact..." ), TQString::tqfromLatin1( "move" ), 0, recvr, slot, tqparent, name );
+	return new KAction( i18n( "Cha&nge Meta Contact..." ), TQString::tqfromLatin1( "move" ), 0, recvr, slot, parent, name );
 }
 
-KAction * KopeteStdAction::deleteContact( const TQObject *recvr, const char *slot, TQObject *tqparent, const char *name )
+KAction * KopeteStdAction::deleteContact( const TQObject *recvr, const char *slot, TQObject *parent, const char *name )
 {
-	return new KAction( i18n( "&Delete Contact" ), TQString::tqfromLatin1( "delete_user" ), TQt::Key_Delete, recvr, slot, tqparent, name );
+	return new KAction( i18n( "&Delete Contact" ), TQString::tqfromLatin1( "delete_user" ), TQt::Key_Delete, recvr, slot, parent, name );
 }
 
-KAction * KopeteStdAction::changeAlias( const TQObject *recvr, const char *slot, TQObject *tqparent, const char *name )
+KAction * KopeteStdAction::changeAlias( const TQObject *recvr, const char *slot, TQObject *parent, const char *name )
 {
-	return new KAction( i18n( "Change A&lias..." ), TQString::tqfromLatin1( "signature" ), 0, recvr, slot, tqparent, name );
+	return new KAction( i18n( "Change A&lias..." ), TQString::tqfromLatin1( "signature" ), 0, recvr, slot, parent, name );
 }
 
-KAction * KopeteStdAction::blockContact( const TQObject *recvr, const char *slot, TQObject* tqparent, const char *name )
+KAction * KopeteStdAction::blockContact( const TQObject *recvr, const char *slot, TQObject* parent, const char *name )
 {
-	return new KAction( i18n( "&Block Contact" ), TQString::tqfromLatin1( "player_pause" ), 0, recvr, slot, tqparent, name );
+	return new KAction( i18n( "&Block Contact" ), TQString::tqfromLatin1( "player_pause" ), 0, recvr, slot, parent, name );
 }
 
-KAction * KopeteStdAction::unblockContact( const TQObject *recvr, const char *slot, TQObject* tqparent, const char *name )
+KAction * KopeteStdAction::unblockContact( const TQObject *recvr, const char *slot, TQObject* parent, const char *name )
 {
-	return new KAction( i18n( "Un&block Contact" ), TQString::tqfromLatin1( "player_play" ), 0, recvr, slot, tqparent, name );
+	return new KAction( i18n( "Un&block Contact" ), TQString::tqfromLatin1( "player_play" ), 0, recvr, slot, parent, name );
 }
 
 #include "kopetestdaction.moc"
diff --git a/kopete/libkopete/ui/kopetestdaction.h b/kopete/libkopete/ui/kopetestdaction.h
index 06bb40eb..c4941e20 100644
--- a/kopete/libkopete/ui/kopetestdaction.h
+++ b/kopete/libkopete/ui/kopetestdaction.h
@@ -35,64 +35,64 @@ public:
 	 * Standard action to start a chat
 	 */
 	static KAction *chat( const TQObject *recvr, const char *slot,
-		TQObject* tqparent, const char *name = 0 );
+		TQObject* parent, const char *name = 0 );
 	/**
 	 * Standard action to send a single message
 	 */
 	static KAction *sendMessage(const TQObject *recvr, const char *slot,
-		TQObject* tqparent, const char *name = 0);
+		TQObject* parent, const char *name = 0);
 	/**
 	 * Standard action to open a user info dialog
 	 */
 	static KAction *contactInfo(const TQObject *recvr, const char *slot,
-		TQObject* tqparent, const char *name = 0);
+		TQObject* parent, const char *name = 0);
 	/**
 	 * Standard action to open a history dialog or something similar
 	 */
 	static KAction *viewHistory(const TQObject *recvr, const char *slot,
-		TQObject* tqparent, const char *name = 0);
+		TQObject* parent, const char *name = 0);
 	/**
 	 * Standard action to initiate sending a file to a contact
 	 */
 	static KAction *sendFile(const TQObject *recvr, const char *slot,
-		TQObject* tqparent, const char *name = 0);
+		TQObject* parent, const char *name = 0);
 	/**
 	 * Standard action to change a contacts @ref Kopete::MetaContact
 	 */
 	static KAction *changeMetaContact(const TQObject *recvr, const char *slot,
-		TQObject* tqparent, const char *name = 0);
+		TQObject* parent, const char *name = 0);
 	/**
 	 * Standard action to add a group
 	 */
 	static KAction *addGroup(const TQObject *recvr, const char *slot,
-		TQObject* tqparent, const char *name = 0);
+		TQObject* parent, const char *name = 0);
 	/**
 	 * Standard action to delete a contact
 	 */
 	static KAction *deleteContact(const TQObject *recvr, const char *slot,
-		TQObject* tqparent, const char *name = 0);
+		TQObject* parent, const char *name = 0);
 	/**
 	 * Standard action to change a contact alias/nickname in your contactlist
 	 */
 	static KAction *changeAlias(const TQObject *recvr, const char *slot,
-		TQObject* tqparent, const char *name = 0);
+		TQObject* parent, const char *name = 0);
 	/**
 	 * Standard action to block a contact
 	 */
 	static KAction *blockContact(const TQObject *recvr, const char *slot,
-		TQObject* tqparent, const char *name = 0);
+		TQObject* parent, const char *name = 0);
 	/**
 	 * Standard action to unblock a contact
 	 */
 	static KAction *unblockContact(const TQObject *recvr, const char *slot,
-		TQObject* tqparent, const char *name = 0);
+		TQObject* parent, const char *name = 0);
 
 	/**
 	 * Return an action to change the Kopete preferences.
 	 *
 	 * The object has no signal/slot, the prefs are automatically shown
 	 */
-	static KAction *preferences(KActionCollection *tqparent, const char *name = 0);
+	static KAction *preferences(KActionCollection *parent, const char *name = 0);
 };
 
 
@@ -107,7 +107,7 @@ class KOPETE_EXPORT KopetePreferencesAction : public KAction
   TQ_OBJECT
 
 	  public:
-			 KopetePreferencesAction( KActionCollection *tqparent, const char *name = 0 );
+			 KopetePreferencesAction( KActionCollection *parent, const char *name = 0 );
 			 ~KopetePreferencesAction();
 
 	  protected slots:
diff --git a/kopete/libkopete/ui/kopeteview.h b/kopete/libkopete/ui/kopeteview.h
index 99655e39..c54b1dba 100644
--- a/kopete/libkopete/ui/kopeteview.h
+++ b/kopete/libkopete/ui/kopeteview.h
@@ -31,7 +31,7 @@ namespace Kopete
 /**
  * @author Jason Keirstead
  *
- * Abstract tqparent class for all types of views used for messaging.These view objects
+ * Abstract parent class for all types of views used for messaging.These view objects
  * are provided by a @ref Kopete::ViewPlugin
  *
  * @see Kopete::ViewPlugin
@@ -42,7 +42,7 @@ class KOPETE_EXPORT KopeteView
 		/**
 		 * constructor
 		 */
-		KopeteView( Kopete::ChatSession *manager, Kopete::ViewPlugin *tqparent );
+		KopeteView( Kopete::ChatSession *manager, Kopete::ViewPlugin *parent );
 		virtual ~KopeteView();
 
 		/**
diff --git a/kopete/libkopete/ui/kopeteviewplugin.cpp b/kopete/libkopete/ui/kopeteviewplugin.cpp
index d1d0375e..843fe939 100644
--- a/kopete/libkopete/ui/kopeteviewplugin.cpp
+++ b/kopete/libkopete/ui/kopeteviewplugin.cpp
@@ -16,8 +16,8 @@
 
 #include "kopeteviewplugin.h"
 
-Kopete::ViewPlugin::ViewPlugin( KInstance *instance, TQObject *tqparent, const char *name ) :
-	Kopete::Plugin( instance, tqparent, name )
+Kopete::ViewPlugin::ViewPlugin( KInstance *instance, TQObject *parent, const char *name ) :
+	Kopete::Plugin( instance, parent, name )
 {
 
 }
diff --git a/kopete/libkopete/ui/kopeteviewplugin.h b/kopete/libkopete/ui/kopeteviewplugin.h
index ccef3950..25ce704b 100644
--- a/kopete/libkopete/ui/kopeteviewplugin.h
+++ b/kopete/libkopete/ui/kopeteviewplugin.h
@@ -41,7 +41,7 @@ class KOPETE_EXPORT ViewPlugin : public Plugin
 		/**
 		 * @brief Create and initialize the plugin
 		 */
-		ViewPlugin( KInstance *instance, TQObject *tqparent = 0L, const char *name = 0L );
+		ViewPlugin( KInstance *instance, TQObject *parent = 0L, const char *name = 0L );
 
 		/**
 		 * @brief Creates a view to be associated with the passed in session
diff --git a/kopete/libkopete/ui/kopetewidgets.cpp b/kopete/libkopete/ui/kopetewidgets.cpp
index e424dc45..4b03f729 100644
--- a/kopete/libkopete/ui/kopetewidgets.cpp
+++ b/kopete/libkopete/ui/kopetewidgets.cpp
@@ -28,7 +28,7 @@ public:
 		return result;
 	}
 	
-	virtual TQWidget *create(const TQString &key, TQWidget *tqparent = 0, const char *name = 0);
+	virtual TQWidget *create(const TQString &key, TQWidget *parent = 0, const char *name = 0);
 	
 	virtual TQIconSet iconSet(const TQString &key) const
 	{
@@ -113,17 +113,17 @@ KopeteWidgets::~KopeteWidgets()
 {
 	
 }
-TQWidget *KopeteWidgets::create(const TQString &key, TQWidget *tqparent, const char *name)
+TQWidget *KopeteWidgets::create(const TQString &key, TQWidget *parent, const char *name)
 {
 
          if (key == TQString::tqfromLatin1("Kopete::UI::AddressBookLinkWidget"))
-                return new Kopete::UI::AddressBookLinkWidget(tqparent, name);
+                return new Kopete::UI::AddressBookLinkWidget(parent, name);
 
          if (key == TQString::tqfromLatin1("Kopete::UI::ListView::ListView"))
-                return new Kopete::UI::ListView::ListView(tqparent, name);
+                return new Kopete::UI::ListView::ListView(parent, name);
 
          if (key == TQString::tqfromLatin1("Kopete::UI::ListView::SearchLine"))
-                return new Kopete::UI::ListView::SearchLine(tqparent, 0, name);
+                return new Kopete::UI::ListView::SearchLine(parent, 0, name);
 
 	return 0;
 }
diff --git a/kopete/libkopete/ui/metacontactselectorwidget.cpp b/kopete/libkopete/ui/metacontactselectorwidget.cpp
index 6da2b351..425b1be8 100644
--- a/kopete/libkopete/ui/metacontactselectorwidget.cpp
+++ b/kopete/libkopete/ui/metacontactselectorwidget.cpp
@@ -68,7 +68,7 @@ public:
 };
 
 
-MetaContactSelectorWidgetLVI::MetaContactSelectorWidgetLVI(Kopete::MetaContact *mc, TQListView *tqparent, TQObject *owner, const char *name) : Kopete::UI::ListView::Item(tqparent, owner, name) , d( new Private() )
+MetaContactSelectorWidgetLVI::MetaContactSelectorWidgetLVI(Kopete::MetaContact *mc, TQListView *parent, TQObject *owner, const char *name) : Kopete::UI::ListView::Item(parent, owner, name) , d( new Private() )
 {
 	d->metaContact = mc;
 	d->photoSize = 60;
@@ -181,8 +181,8 @@ public:
 };
 
 
-MetaContactSelectorWidget::MetaContactSelectorWidget( TQWidget *tqparent, const char *name )
-		: TQWidget( tqparent, name ), d( new Private() )
+MetaContactSelectorWidget::MetaContactSelectorWidget( TQWidget *parent, const char *name )
+		: TQWidget( parent, name ), d( new Private() )
 {
 	TQBoxLayout *l = new TQVBoxLayout(this);
 	d->widget = new MetaContactSelectorWidget_Base(this);
diff --git a/kopete/libkopete/ui/metacontactselectorwidget.h b/kopete/libkopete/ui/metacontactselectorwidget.h
index cc30f83f..0335ac62 100644
--- a/kopete/libkopete/ui/metacontactselectorwidget.h
+++ b/kopete/libkopete/ui/metacontactselectorwidget.h
@@ -40,7 +40,7 @@ class KOPETE_EXPORT MetaContactSelectorWidget : public TQWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	MetaContactSelectorWidget( TQWidget *tqparent = 0, const char *name  = 0 );
+	MetaContactSelectorWidget( TQWidget *parent = 0, const char *name  = 0 );
 	~MetaContactSelectorWidget();
 	Kopete::MetaContact* metaContact();
 	/**
@@ -83,7 +83,7 @@ class MetaContactSelectorWidgetLVI : public Kopete::UI::ListView::Item
 	Q_OBJECT
   TQ_OBJECT
 public:
-	MetaContactSelectorWidgetLVI(Kopete::MetaContact *mc, TQListView *tqparent, TQObject *owner = 0, const char *name = 0 );
+	MetaContactSelectorWidgetLVI(Kopete::MetaContact *mc, TQListView *parent, TQObject *owner = 0, const char *name = 0 );
 	Kopete::MetaContact* metaContact();
 	virtual TQString text ( int column ) const;
 protected slots: