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

12 files changed, 24 insertions, 24 deletions

diff --git a/kopete/protocols/testbed/testbedaccount.cpp b/kopete/protocols/testbed/testbedaccount.cpp
index e78391ae..17c1ea73 100644
--- a/kopete/protocols/testbed/testbedaccount.cpp
+++ b/kopete/protocols/testbed/testbedaccount.cpp
@@ -29,8 +29,8 @@
 #include "testbedprotocol.h"
 
 
-TestbedAccount::TestbedAccount( TestbedProtocol *tqparent, const TQString& accountID, const char *name )
-: Kopete::Account ( tqparent, accountID , name )
+TestbedAccount::TestbedAccount( TestbedProtocol *parent, const TQString& accountID, const char *name )
+: Kopete::Account ( parent, accountID , name )
 {
 	// Init the myself contact
 	setMyself( new TestbedContact( this, accountId(), TestbedContact::Null, accountId(), Kopete::ContactList::self()->myself() ) );
diff --git a/kopete/protocols/testbed/testbedaccount.h b/kopete/protocols/testbed/testbedaccount.h
index 71840ff9..c9f1517e 100644
--- a/kopete/protocols/testbed/testbedaccount.h
+++ b/kopete/protocols/testbed/testbedaccount.h
@@ -37,7 +37,7 @@ class TestbedAccount : public Kopete::Account
 	Q_OBJECT
   TQ_OBJECT
 public:
-	TestbedAccount( TestbedProtocol *tqparent, const TQString& accountID, const char *name = 0 );
+	TestbedAccount( TestbedProtocol *parent, const TQString& accountID, const char *name = 0 );
 	~TestbedAccount();
 	/**
 	 * Construct the context menu used for the status bar icon
diff --git a/kopete/protocols/testbed/testbedaddcontactpage.cpp b/kopete/protocols/testbed/testbedaddcontactpage.cpp
index 1ee83466..9250b9a0 100644
--- a/kopete/protocols/testbed/testbedaddcontactpage.cpp
+++ b/kopete/protocols/testbed/testbedaddcontactpage.cpp
@@ -26,8 +26,8 @@
 
 #include "testbedaddui.h"
 
-TestbedAddContactPage::TestbedAddContactPage( TQWidget* tqparent, const char* name )
-		: AddContactPage(tqparent, name)
+TestbedAddContactPage::TestbedAddContactPage( TQWidget* parent, const char* name )
+		: AddContactPage(parent, name)
 {
 	kdDebug(14210) << k_funcinfo << endl;
 	( new TQVBoxLayout( this ) )->setAutoAdd( true );
diff --git a/kopete/protocols/testbed/testbedaddcontactpage.h b/kopete/protocols/testbed/testbedaddcontactpage.h
index 3189a635..a39681dd 100644
--- a/kopete/protocols/testbed/testbedaddcontactpage.h
+++ b/kopete/protocols/testbed/testbedaddcontactpage.h
@@ -32,7 +32,7 @@ class TestbedAddContactPage : public AddContactPage
 	Q_OBJECT
   TQ_OBJECT
 public:
-    TestbedAddContactPage( TQWidget* tqparent = 0, const char* name = 0 );
+    TestbedAddContactPage( TQWidget* parent = 0, const char* name = 0 );
     ~TestbedAddContactPage();
 	
     /**
diff --git a/kopete/protocols/testbed/testbedcontact.cpp b/kopete/protocols/testbed/testbedcontact.cpp
index ee816474..bf110872 100644
--- a/kopete/protocols/testbed/testbedcontact.cpp
+++ b/kopete/protocols/testbed/testbedcontact.cpp
@@ -29,8 +29,8 @@
 #include "testbedprotocol.h"
 
 TestbedContact::TestbedContact( Kopete::Account* _account, const TQString &uniqueName,
-		const TestbedContactType type, const TQString &displayName, Kopete::MetaContact *tqparent )
-: Kopete::Contact( _account, uniqueName, tqparent )
+		const TestbedContactType type, const TQString &displayName, Kopete::MetaContact *parent )
+: Kopete::Contact( _account, uniqueName, parent )
 {
 	kdDebug( 14210 ) << k_funcinfo << " uniqueName: " << uniqueName << ", displayName: " << displayName << endl;
 	m_type = type;
diff --git a/kopete/protocols/testbed/testbedcontact.h b/kopete/protocols/testbed/testbedcontact.h
index f5ac9ed6..30dc6d13 100644
--- a/kopete/protocols/testbed/testbedcontact.h
+++ b/kopete/protocols/testbed/testbedcontact.h
@@ -42,7 +42,7 @@ public:
 
 	TestbedContact( Kopete::Account* _account, const TQString &uniqueName, 
 			const TestbedContact::TestbedContactType type, const TQString &displayName, 
-			Kopete::MetaContact *tqparent );
+			Kopete::MetaContact *parent );
 
     ~TestbedContact();
 
diff --git a/kopete/protocols/testbed/testbededitaccountwidget.cpp b/kopete/protocols/testbed/testbededitaccountwidget.cpp
index 888a05f9..98a52dfc 100644
--- a/kopete/protocols/testbed/testbededitaccountwidget.cpp
+++ b/kopete/protocols/testbed/testbededitaccountwidget.cpp
@@ -24,8 +24,8 @@
 #include "testbedaccount.h"
 #include "testbedprotocol.h"
 
-TestbedEditAccountWidget::TestbedEditAccountWidget( TQWidget* tqparent, Kopete::Account* account)
-: TQWidget( tqparent ), KopeteEditAccountWidget( account )
+TestbedEditAccountWidget::TestbedEditAccountWidget( TQWidget* parent, Kopete::Account* account)
+: TQWidget( parent ), KopeteEditAccountWidget( account )
 {
 	( new TQVBoxLayout( this ) )->setAutoAdd( true );
 				kdDebug(14210) << k_funcinfo << endl;
diff --git a/kopete/protocols/testbed/testbededitaccountwidget.h b/kopete/protocols/testbed/testbededitaccountwidget.h
index 4c9d20e4..39b1a39a 100644
--- a/kopete/protocols/testbed/testbededitaccountwidget.h
+++ b/kopete/protocols/testbed/testbededitaccountwidget.h
@@ -33,7 +33,7 @@ class TestbedEditAccountWidget : public TQWidget, public KopeteEditAccountWidget
 Q_OBJECT
   TQ_OBJECT
 public:
-    TestbedEditAccountWidget( TQWidget* tqparent, Kopete::Account* account);
+    TestbedEditAccountWidget( TQWidget* parent, Kopete::Account* account);
 
     ~TestbedEditAccountWidget();
 
diff --git a/kopete/protocols/testbed/testbedprotocol.cpp b/kopete/protocols/testbed/testbedprotocol.cpp
index e8c564e2..301b8a08 100644
--- a/kopete/protocols/testbed/testbedprotocol.cpp
+++ b/kopete/protocols/testbed/testbedprotocol.cpp
@@ -29,8 +29,8 @@ K_EXPORT_COMPONENT_FACTORY( kopete_testbed, TestbedProtocolFactory( "kopete_test
 
 TestbedProtocol *TestbedProtocol::s_protocol = 0L;
 
-TestbedProtocol::TestbedProtocol( TQObject* tqparent, const char *name, const TQStringList &/*args*/ )
-	: Kopete::Protocol( TestbedProtocolFactory::instance(), tqparent, name ),
+TestbedProtocol::TestbedProtocol( TQObject* parent, const char *name, const TQStringList &/*args*/ )
+	: Kopete::Protocol( TestbedProtocolFactory::instance(), parent, name ),
 	  testbedOnline(  Kopete::OnlineStatus::Online, 25, this, 0,  TQString(),  i18n( "Online" ),   i18n( "O&nline" ) ),
 	  testbedAway(  Kopete::OnlineStatus::Away, 25, this, 1, "msn_away",  i18n( "Away" ),   i18n( "&Away" ) ),
 	  testbedOffline(  Kopete::OnlineStatus::Offline, 25, this, 2,  TQString(),  i18n( "Offline" ),   i18n( "O&ffline" ) )
@@ -74,16 +74,16 @@ Kopete::Contact *TestbedProtocol::deserializeContact(
 	return new TestbedContact(account, contactId, tbcType, displayName, metaContact);
 }
 
-AddContactPage * TestbedProtocol::createAddContactWidget( TQWidget *tqparent, Kopete::Account * /* account */ )
+AddContactPage * TestbedProtocol::createAddContactWidget( TQWidget *parent, Kopete::Account * /* account */ )
 {
 	kdDebug( 14210 ) << "Creating Add Contact Page" << endl;
-	return new TestbedAddContactPage( tqparent );
+	return new TestbedAddContactPage( parent );
 }
 
-KopeteEditAccountWidget * TestbedProtocol::createEditAccountWidget( Kopete::Account *account, TQWidget *tqparent )
+KopeteEditAccountWidget * TestbedProtocol::createEditAccountWidget( Kopete::Account *account, TQWidget *parent )
 {
 	kdDebug(14210) << "Creating Edit Account Page" << endl;
-	return new TestbedEditAccountWidget( tqparent, account );
+	return new TestbedEditAccountWidget( parent, account );
 }
 
 Kopete::Account *TestbedProtocol::createNewAccount( const TQString &accountId )
diff --git a/kopete/protocols/testbed/testbedprotocol.h b/kopete/protocols/testbed/testbedprotocol.h
index 44a6ba2a..a38dfe20 100644
--- a/kopete/protocols/testbed/testbedprotocol.h
+++ b/kopete/protocols/testbed/testbedprotocol.h
@@ -29,7 +29,7 @@ class TestbedProtocol : public Kopete::Protocol
 	Q_OBJECT
   TQ_OBJECT
 public:
-	TestbedProtocol(TQObject *tqparent, const char *name, const TQStringList &args);
+	TestbedProtocol(TQObject *parent, const char *name, const TQStringList &args);
     ~TestbedProtocol();
 	/**
 	 * Convert the serialised data back into a TestbedContact and add this
@@ -43,11 +43,11 @@ public:
 	/**
 	 * Generate the widget needed to add TestbedContacts
 	 */
-	virtual AddContactPage * createAddContactWidget( TQWidget *tqparent, Kopete::Account *account );
+	virtual AddContactPage * createAddContactWidget( TQWidget *parent, Kopete::Account *account );
 	/**
 	 * Generate the widget needed to add/edit accounts for this protocol
 	 */
-	virtual KopeteEditAccountWidget * createEditAccountWidget( Kopete::Account *account, TQWidget *tqparent );
+	virtual KopeteEditAccountWidget * createEditAccountWidget( Kopete::Account *account, TQWidget *parent );
 	/**
 	 * Generate a TestbedAccount
 	 */
diff --git a/kopete/protocols/testbed/ui/testbedwebcamdialog.cpp b/kopete/protocols/testbed/ui/testbedwebcamdialog.cpp
index fd6f6743..d5453978 100644
--- a/kopete/protocols/testbed/ui/testbedwebcamdialog.cpp
+++ b/kopete/protocols/testbed/ui/testbedwebcamdialog.cpp
@@ -27,8 +27,8 @@
 #include <kdebug.h>
 #include <klocale.h>
 
-TestbedWebcamDialog::TestbedWebcamDialog( const TQString &contactId, TQWidget * tqparent, const char * name )
-: KDialogBase( KDialogBase::Plain, TQt::WDestructiveClose, tqparent, name, false, i18n( "Webcam for %1" ).tqarg( contactId ),
+TestbedWebcamDialog::TestbedWebcamDialog( const TQString &contactId, TQWidget * parent, const char * name )
+: KDialogBase( KDialogBase::Plain, TQt::WDestructiveClose, parent, name, false, i18n( "Webcam for %1" ).tqarg( contactId ),
                    KDialogBase::Close, KDialogBase::Close, true /*seperator*/ )
 {
 	setInitialSize( TQSize(320,290), false );
diff --git a/kopete/protocols/testbed/ui/testbedwebcamdialog.h b/kopete/protocols/testbed/ui/testbedwebcamdialog.h
index 93223866..ff622a12 100644
--- a/kopete/protocols/testbed/ui/testbedwebcamdialog.h
+++ b/kopete/protocols/testbed/ui/testbedwebcamdialog.h
@@ -42,7 +42,7 @@ class TestbedWebcamDialog : public KDialogBase
 Q_OBJECT
   TQ_OBJECT
 public:
-	TestbedWebcamDialog( const TQString &, TQWidget* tqparent = 0, const char* name = 0 );
+	TestbedWebcamDialog( const TQString &, TQWidget* parent = 0, const char* name = 0 );
 	~TestbedWebcamDialog();
 	
 public slots: