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

19 files changed, 50 insertions, 50 deletions

diff --git a/kopete/protocols/sms/services/gsmlib.cpp b/kopete/protocols/sms/services/gsmlib.cpp
index 82bd0017..1d4836a1 100644
--- a/kopete/protocols/sms/services/gsmlib.cpp
+++ b/kopete/protocols/sms/services/gsmlib.cpp
@@ -67,10 +67,10 @@ void GSMLibEvent::setSubType(GSMLibEvent::SubType t)
 }
 
 /////////////////////////////////////////////////////////////////////
-GSMLibThread::GSMLibThread(TQString dev, GSMLib* tqparent)
+GSMLibThread::GSMLibThread(TQString dev, GSMLib* parent)
 {
 	m_device = dev;
-	m_parent = tqparent;
+	m_parent = parent;
 	m_run = true;
 	m_MeTa = NULL;
 }
@@ -348,11 +348,11 @@ void GSMLib::disconnect()
 
 }
 
-void GSMLib::setWidgetContainer(TQWidget* tqparent, TQGridLayout* tqlayout)
+void GSMLib::setWidgetContainer(TQWidget* parent, TQGridLayout* tqlayout)
 {
-	m_parent = tqparent;
+	m_parent = parent;
 	m_layout = tqlayout;
-	TQWidget *configWidget = configureWidget(tqparent);
+	TQWidget *configWidget = configureWidget(parent);
 	tqlayout->addMultiCellWidget(configWidget, 0, 1, 0, 1);
 	configWidget->show();
 }
@@ -362,11 +362,11 @@ void GSMLib::send(const Kopete::Message& msg)
 	m_thread->send(msg);
 }
 
-TQWidget* GSMLib::configureWidget(TQWidget* tqparent)
+TQWidget* GSMLib::configureWidget(TQWidget* parent)
 {
 
 	if (prefWidget == 0L)
-		prefWidget = new GSMLibPrefsUI(tqparent);
+		prefWidget = new GSMLibPrefsUI(parent);
 
 	loadConfig();
 	prefWidget->device->setURL(m_device);
diff --git a/kopete/protocols/sms/services/gsmlib.h b/kopete/protocols/sms/services/gsmlib.h
index a3f01995..ac5066c7 100644
--- a/kopete/protocols/sms/services/gsmlib.h
+++ b/kopete/protocols/sms/services/gsmlib.h
@@ -52,7 +52,7 @@ public:
     ~GSMLib();
 
     void send(const Kopete::Message& msg);
-    void setWidgetContainer(TQWidget* tqparent, TQGridLayout* container);
+    void setWidgetContainer(TQWidget* parent, TQGridLayout* container);
 
     int maxSize();
     const TQString& description();
@@ -67,7 +67,7 @@ public slots:
 protected:
 	virtual void customEvent(TQCustomEvent* e);
 	
-    TQWidget* configureWidget(TQWidget* tqparent);
+    TQWidget* configureWidget(TQWidget* parent);
 	void saveConfig(); 
 	void loadConfig(); 
 
@@ -108,7 +108,7 @@ protected:
 class GSMLibThread : public TQThread, gsmlib::GsmEvent
 {
 public:
-	GSMLibThread(TQString dev, GSMLib* tqparent);
+	GSMLibThread(TQString dev, GSMLib* parent);
 	virtual ~GSMLibThread();
 	
 	virtual void run();
diff --git a/kopete/protocols/sms/services/smsclient.cpp b/kopete/protocols/sms/services/smsclient.cpp
index b45793d1..05712501 100644
--- a/kopete/protocols/sms/services/smsclient.cpp
+++ b/kopete/protocols/sms/services/smsclient.cpp
@@ -41,12 +41,12 @@ SMSClient::~SMSClient()
 {
 }
 
-void SMSClient::setWidgetContainer(TQWidget* tqparent, TQGridLayout* tqlayout)
+void SMSClient::setWidgetContainer(TQWidget* parent, TQGridLayout* tqlayout)
 {
-	kdWarning( 14160 ) << k_funcinfo << "ml: " << tqlayout << ", " << "mp: " << tqparent << endl;
-	m_parent = tqparent;
+	kdWarning( 14160 ) << k_funcinfo << "ml: " << tqlayout << ", " << "mp: " << parent << endl;
+	m_parent = parent;
 	m_layout = tqlayout;
-	TQWidget *configWidget = configureWidget(tqparent);
+	TQWidget *configWidget = configureWidget(parent);
 	tqlayout->addMultiCellWidget(configWidget, 0, 1, 0, 1);
 	configWidget->show();
 }
@@ -87,12 +87,12 @@ void SMSClient::send(const Kopete::Message& msg)
 	p->start(KProcess::Block, KProcess::AllOutput);
 }
 
-TQWidget* SMSClient::configureWidget(TQWidget* tqparent)
+TQWidget* SMSClient::configureWidget(TQWidget* parent)
 {
 	kdWarning( 14160 ) << k_funcinfo << "m_account = " << m_account << " (should be ok if zero!!)" << endl;
 
 	if (prefWidget == 0L)
-		prefWidget = new SMSClientPrefsUI(tqparent);
+		prefWidget = new SMSClientPrefsUI(parent);
 
 	prefWidget->configDir->setMode(KFile::Directory);
 	TQString configDir;
diff --git a/kopete/protocols/sms/services/smsclient.h b/kopete/protocols/sms/services/smsclient.h
index f922a011..06a89050 100644
--- a/kopete/protocols/sms/services/smsclient.h
+++ b/kopete/protocols/sms/services/smsclient.h
@@ -37,7 +37,7 @@ public:
 	~SMSClient();
 
 	void send(const Kopete::Message& msg);
-	void setWidgetContainer(TQWidget* tqparent, TQGridLayout* container);
+	void setWidgetContainer(TQWidget* parent, TQGridLayout* container);
 
 	int maxSize();
 	const TQString& description();
@@ -52,7 +52,7 @@ signals:
 	void messageSent(const Kopete::Message &);
 
 private:
-	TQWidget* configureWidget(TQWidget* tqparent);
+	TQWidget* configureWidget(TQWidget* parent);
 
 	SMSClientPrefsUI* prefWidget;
 	TQStringList providers();
diff --git a/kopete/protocols/sms/services/smssend.cpp b/kopete/protocols/sms/services/smssend.cpp
index 8249948a..442d7f16 100644
--- a/kopete/protocols/sms/services/smssend.cpp
+++ b/kopete/protocols/sms/services/smssend.cpp
@@ -73,15 +73,15 @@ void SMSSend::send(const Kopete::Message& msg)
 	m_provider->send(msg);
 }
 
-void SMSSend::setWidgetContainer(TQWidget* tqparent, TQGridLayout* tqlayout)
+void SMSSend::setWidgetContainer(TQWidget* parent, TQGridLayout* tqlayout)
 {
-	kdWarning( 14160 ) << k_funcinfo << "ml: " << tqlayout << ", " << "mp: " << tqparent << endl;
-	m_parent = tqparent;
+	kdWarning( 14160 ) << k_funcinfo << "ml: " << tqlayout << ", " << "mp: " << parent << endl;
+	m_parent = parent;
 	m_layout = tqlayout;
 
 	// could end up being deleted twice??
 	delete prefWidget;
-	prefWidget = new SMSSendPrefsUI(tqparent);
+	prefWidget = new SMSSendPrefsUI(parent);
 	tqlayout->addMultiCellWidget(prefWidget, 0, 1, 0, 1);
 
 	prefWidget->program->setMode(KFile::Directory);
diff --git a/kopete/protocols/sms/services/smssend.h b/kopete/protocols/sms/services/smssend.h
index 14adbd20..bd36d89c 100644
--- a/kopete/protocols/sms/services/smssend.h
+++ b/kopete/protocols/sms/services/smssend.h
@@ -41,7 +41,7 @@ public:
 	virtual void setAccount(Kopete::Account* account);
 
 	void send(const Kopete::Message& msg);
-	void setWidgetContainer(TQWidget* tqparent, TQGridLayout* container);
+	void setWidgetContainer(TQWidget* parent, TQGridLayout* container);
 
 	int maxSize();
 	const TQString& description();
diff --git a/kopete/protocols/sms/services/smssendprovider.cpp b/kopete/protocols/sms/services/smssendprovider.cpp
index e2f607aa..ffd0897e 100644
--- a/kopete/protocols/sms/services/smssendprovider.cpp
+++ b/kopete/protocols/sms/services/smssendprovider.cpp
@@ -32,8 +32,8 @@
 #include "smsprotocol.h"
 #include "smscontact.h"
 
-SMSSendProvider::SMSSendProvider(const TQString& providerName, const TQString& prefixValue, Kopete::Account* account, TQObject* tqparent, const char *name)
-	: TQObject( tqparent, name ), m_account(account)
+SMSSendProvider::SMSSendProvider(const TQString& providerName, const TQString& prefixValue, Kopete::Account* account, TQObject* parent, const char *name)
+	: TQObject( parent, name ), m_account(account)
 {
 	kdWarning( 14160 ) << k_funcinfo << "this = " << this << ", m_account = " << m_account << " (should be ok if zero!!)" << endl;
 
diff --git a/kopete/protocols/sms/services/smssendprovider.h b/kopete/protocols/sms/services/smssendprovider.h
index 9d899ce8..3ea98307 100644
--- a/kopete/protocols/sms/services/smssendprovider.h
+++ b/kopete/protocols/sms/services/smssendprovider.h
@@ -38,7 +38,7 @@ class SMSSendProvider : public TQObject
 	Q_OBJECT
   TQ_OBJECT
 public:
-	SMSSendProvider(const TQString& providerName, const TQString& prefixValue, Kopete::Account* account, TQObject* tqparent = 0, const char* name = 0);
+	SMSSendProvider(const TQString& providerName, const TQString& prefixValue, Kopete::Account* account, TQObject* parent = 0, const char* name = 0);
 	~SMSSendProvider();
 
 	void setAccount(Kopete::Account *account);
diff --git a/kopete/protocols/sms/smsaccount.cpp b/kopete/protocols/sms/smsaccount.cpp
index fcafc9fb..fc12437c 100644
--- a/kopete/protocols/sms/smsaccount.cpp
+++ b/kopete/protocols/sms/smsaccount.cpp
@@ -34,8 +34,8 @@
 #include "smsprotocol.h"
 #include "smscontact.h"
 
-SMSAccount::SMSAccount( SMSProtocol *tqparent, const TQString &accountID, const char *name )
-	: Kopete::Account( tqparent, accountID, name )
+SMSAccount::SMSAccount( SMSProtocol *parent, const TQString &accountID, const char *name )
+	: Kopete::Account( parent, accountID, name )
 {
 	setMyself( new SMSContact(this, accountID, accountID, Kopete::ContactList::self()->myself()) );
 	loadConfig();
diff --git a/kopete/protocols/sms/smsaccount.h b/kopete/protocols/sms/smsaccount.h
index 05caa989..db7d0f9a 100644
--- a/kopete/protocols/sms/smsaccount.h
+++ b/kopete/protocols/sms/smsaccount.h
@@ -33,7 +33,7 @@ class SMSAccount : public Kopete::Account
   TQ_OBJECT
 
 public:
-	SMSAccount( SMSProtocol *tqparent, const TQString &accountID, const char *name = 0L );
+	SMSAccount( SMSProtocol *parent, const TQString &accountID, const char *name = 0L );
 	~SMSAccount();
 
 	virtual KActionMenu* actionMenu();			// Per-protocol actions for the systray and the status bar
diff --git a/kopete/protocols/sms/smsaddcontactpage.cpp b/kopete/protocols/sms/smsaddcontactpage.cpp
index a1be6890..c18e5866 100644
--- a/kopete/protocols/sms/smsaddcontactpage.cpp
+++ b/kopete/protocols/sms/smsaddcontactpage.cpp
@@ -22,8 +22,8 @@
 
 
 
-SMSAddContactPage::SMSAddContactPage(TQWidget *tqparent, const char *name )
-				  : AddContactPage(tqparent,name)
+SMSAddContactPage::SMSAddContactPage(TQWidget *parent, const char *name )
+				  : AddContactPage(parent,name)
 {
 	(new TQVBoxLayout(this))->setAutoAdd(true);
 	smsdata = new smsAddUI(this);
diff --git a/kopete/protocols/sms/smsaddcontactpage.h b/kopete/protocols/sms/smsaddcontactpage.h
index 4c4899d9..25239bcb 100644
--- a/kopete/protocols/sms/smsaddcontactpage.h
+++ b/kopete/protocols/sms/smsaddcontactpage.h
@@ -28,7 +28,7 @@ class SMSAddContactPage : public AddContactPage
    Q_OBJECT
   TQ_OBJECT
 public:
-	SMSAddContactPage(TQWidget *tqparent=0, const char *name=0);
+	SMSAddContactPage(TQWidget *parent=0, const char *name=0);
 	~SMSAddContactPage();
 	smsAddUI *smsdata;
 	virtual bool validateData();
diff --git a/kopete/protocols/sms/smscontact.cpp b/kopete/protocols/sms/smscontact.cpp
index 19a42549..f47a0b46 100644
--- a/kopete/protocols/sms/smscontact.cpp
+++ b/kopete/protocols/sms/smscontact.cpp
@@ -32,8 +32,8 @@
 #include "smsuserpreferences.h"
 
 SMSContact::SMSContact( Kopete::Account* _account, const TQString &phoneNumber,
-	const TQString &displayName, Kopete::MetaContact *tqparent )
-: Kopete::Contact( _account, phoneNumber, tqparent ), m_phoneNumber( phoneNumber )
+	const TQString &displayName, Kopete::MetaContact *parent )
+: Kopete::Contact( _account, phoneNumber, parent ), m_phoneNumber( phoneNumber )
 {
 //	kdWarning( 14160 ) << k_funcinfo << " this = " << this << ", phone = " << phoneNumber << endl;
 	setNickName( displayName );
diff --git a/kopete/protocols/sms/smscontact.h b/kopete/protocols/sms/smscontact.h
index 1c77f25f..ae11e564 100644
--- a/kopete/protocols/sms/smscontact.h
+++ b/kopete/protocols/sms/smscontact.h
@@ -35,7 +35,7 @@ class SMSContact : public Kopete::Contact
   TQ_OBJECT
 public:
 	SMSContact( Kopete::Account* _account, const TQString &phoneNumber,
-		const TQString &displayName, Kopete::MetaContact *tqparent );
+		const TQString &displayName, Kopete::MetaContact *parent );
 
 	TQPtrList<KAction>* customContextMenuActions();
 
diff --git a/kopete/protocols/sms/smseditaccountwidget.cpp b/kopete/protocols/sms/smseditaccountwidget.cpp
index 94d480c2..c355c287 100644
--- a/kopete/protocols/sms/smseditaccountwidget.cpp
+++ b/kopete/protocols/sms/smseditaccountwidget.cpp
@@ -35,8 +35,8 @@
 #include "smsprotocol.h"
 #include "smsaccount.h"
 
-SMSEditAccountWidget::SMSEditAccountWidget(SMSProtocol *protocol, Kopete::Account *account, TQWidget *tqparent, const char */*name*/)
-	: TQWidget(tqparent), KopeteEditAccountWidget(account)
+SMSEditAccountWidget::SMSEditAccountWidget(SMSProtocol *protocol, Kopete::Account *account, TQWidget *parent, const char */*name*/)
+	: TQWidget(parent), KopeteEditAccountWidget(account)
 {
 	TQVBoxLayout *l = new TQVBoxLayout(this, TQBoxLayout::Down);
 	preferencesDialog = new smsActPrefsUI(this);
diff --git a/kopete/protocols/sms/smseditaccountwidget.h b/kopete/protocols/sms/smseditaccountwidget.h
index de8ef844..00011639 100644
--- a/kopete/protocols/sms/smseditaccountwidget.h
+++ b/kopete/protocols/sms/smseditaccountwidget.h
@@ -31,7 +31,7 @@ class SMSEditAccountWidget : public TQWidget, public KopeteEditAccountWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	SMSEditAccountWidget(SMSProtocol *protocol, Kopete::Account *theAccount, TQWidget *tqparent = 0, const char *name = 0);
+	SMSEditAccountWidget(SMSProtocol *protocol, Kopete::Account *theAccount, TQWidget *parent = 0, const char *name = 0);
 	~SMSEditAccountWidget();
 
 	bool validateData();
diff --git a/kopete/protocols/sms/smsprotocol.cpp b/kopete/protocols/sms/smsprotocol.cpp
index 5e17e7ed..cd32d959 100644
--- a/kopete/protocols/sms/smsprotocol.cpp
+++ b/kopete/protocols/sms/smsprotocol.cpp
@@ -32,8 +32,8 @@ K_EXPORT_COMPONENT_FACTORY( kopete_sms, SMSProtocolFactory( "kopete_sms" )  )
 
 SMSProtocol* SMSProtocol::s_protocol = 0L;
 
-SMSProtocol::SMSProtocol(TQObject *tqparent, const char *name, const TQStringList &/*args*/)
-: Kopete::Protocol( SMSProtocolFactory::instance(), tqparent, name ),
+SMSProtocol::SMSProtocol(TQObject *parent, const char *name, const TQStringList &/*args*/)
+: Kopete::Protocol( SMSProtocolFactory::instance(), parent, name ),
 	SMSOnline(  Kopete::OnlineStatus::Online,  25, this, 0,  TQString(),   i18n( "Online" ), i18n( "Online" ), Kopete::OnlineStatusManager::Online ),
 	SMSConnecting( Kopete::OnlineStatus::Connecting,2, this, 3, TQString(),    i18n( "Connecting" ) ),
 	SMSOffline( Kopete::OnlineStatus::Offline, 0, this, 2,  TQString(),   i18n( "Offline" ), i18n( "Offline" ), Kopete::OnlineStatusManager::Offline )
@@ -51,14 +51,14 @@ SMSProtocol::~SMSProtocol()
 	s_protocol = 0L;
 }
 
-AddContactPage *SMSProtocol::createAddContactWidget(TQWidget *tqparent, Kopete::Account */*i*/)
+AddContactPage *SMSProtocol::createAddContactWidget(TQWidget *parent, Kopete::Account */*i*/)
 {
-	return new SMSAddContactPage(tqparent);
+	return new SMSAddContactPage(parent);
 }
 
-KopeteEditAccountWidget* SMSProtocol::createEditAccountWidget(Kopete::Account *account, TQWidget *tqparent)
+KopeteEditAccountWidget* SMSProtocol::createEditAccountWidget(Kopete::Account *account, TQWidget *parent)
 {
-	return new SMSEditAccountWidget(this, account, tqparent);
+	return new SMSEditAccountWidget(this, account, parent);
 }
 
 SMSProtocol* SMSProtocol::protocol()
diff --git a/kopete/protocols/sms/smsprotocol.h b/kopete/protocols/sms/smsprotocol.h
index 5785407d..a97d1282 100644
--- a/kopete/protocols/sms/smsprotocol.h
+++ b/kopete/protocols/sms/smsprotocol.h
@@ -43,7 +43,7 @@ class SMSProtocol : public Kopete::Protocol
   TQ_OBJECT
 
 public:
-	SMSProtocol(TQObject *tqparent, const char *name, const TQStringList &args);
+	SMSProtocol(TQObject *parent, const char *name, const TQStringList &args);
 	~SMSProtocol();
 
 	static SMSProtocol *protocol();
@@ -54,8 +54,8 @@ public:
 	virtual Kopete::Contact *deserializeContact(Kopete::MetaContact *metaContact,
 		const TQMap<TQString, TQString> &serializedData, const TQMap<TQString, TQString> &addressBookData );
 
-	virtual AddContactPage *createAddContactWidget(TQWidget *tqparent , Kopete::Account *i);
-	virtual KopeteEditAccountWidget *createEditAccountWidget(Kopete::Account *account, TQWidget *tqparent);
+	virtual AddContactPage *createAddContactWidget(TQWidget *parent , Kopete::Account *i);
+	virtual KopeteEditAccountWidget *createEditAccountWidget(Kopete::Account *account, TQWidget *parent);
 	virtual Kopete::Account *createNewAccount(const TQString &accountId);
 
 	const Kopete::OnlineStatus SMSOnline;
diff --git a/kopete/protocols/sms/smsservice.h b/kopete/protocols/sms/smsservice.h
index d448570b..c5ea28ab 100644
--- a/kopete/protocols/sms/smsservice.h
+++ b/kopete/protocols/sms/smsservice.h
@@ -45,11 +45,11 @@ public:
 	virtual void setAccount(Kopete::Account* account);
 
 	/**
-	 * Called when the settings widget has a place to be. @param tqparent is the
-	 * settings widget's tqparent and @param tqlayout is the 2xn grid tqlayout it may
+	 * Called when the settings widget has a place to be. @param parent is the
+	 * settings widget's parent and @param tqlayout is the 2xn grid tqlayout it may
 	 * use.
 	 */
-	virtual void setWidgetContainer(TQWidget* tqparent, TQGridLayout* tqlayout) = 0;
+	virtual void setWidgetContainer(TQWidget* parent, TQGridLayout* tqlayout) = 0;
 
 	virtual void send(const Kopete::Message& msg) = 0;
 	virtual int maxSize() = 0;