Remove the tq in front of these incorrectly TQt4-converted methods/data members:

tqrepaint[...]
tqinvalidate[...]
tqparent[...]
tqmask[...]
tqlayout[...]
tqalignment[...]


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

25 files changed, 40 insertions, 40 deletions

diff --git a/kopete/protocols/oscar/aim/aimaccount.cpp b/kopete/protocols/oscar/aim/aimaccount.cpp
index 1f0269c8..201d7d01 100644
--- a/kopete/protocols/oscar/aim/aimaccount.cpp
+++ b/kopete/protocols/oscar/aim/aimaccount.cpp
@@ -235,9 +235,9 @@ AIMAccount::~AIMAccount()
 {
 }
 
-OscarContact *AIMAccount::createNewContact( const TQString &contactId, Kopete::MetaContact *tqparentContact, const SSI& ssiItem )
+OscarContact *AIMAccount::createNewContact( const TQString &contactId, Kopete::MetaContact *parentContact, const SSI& ssiItem )
 {
-	AIMContact* contact = new AIMContact( this, contactId, tqparentContact, TQString(), ssiItem );
+	AIMContact* contact = new AIMContact( this, contactId, parentContact, TQString(), ssiItem );
 	if ( !ssiItem.alias().isEmpty() )
 		contact->setProperty( Kopete::Global::Properties::self()->nickName(), ssiItem.alias() );
 
diff --git a/kopete/protocols/oscar/aim/aimaccount.h b/kopete/protocols/oscar/aim/aimaccount.h
index 35c7adb5..fc3d57ff 100644
--- a/kopete/protocols/oscar/aim/aimaccount.h
+++ b/kopete/protocols/oscar/aim/aimaccount.h
@@ -133,7 +133,7 @@ protected:
 	* Implement virtual method from OscarAccount
 	* This allows OscarAccount to take care of adding new contacts
 	*/
-	OscarContact *createNewContact( const TQString &contactId, Kopete::MetaContact *tqparentContact, const SSI& ssiItem );
+	OscarContact *createNewContact( const TQString &contactId, Kopete::MetaContact *parentContact, const SSI& ssiItem );
 
 	TQString sanitizedMessage( const TQString& message );
 
diff --git a/kopete/protocols/oscar/aim/ui/aimaddcontactui.ui b/kopete/protocols/oscar/aim/ui/aimaddcontactui.ui
index 97484a6d..663d2fc5 100644
--- a/kopete/protocols/oscar/aim/ui/aimaddcontactui.ui
+++ b/kopete/protocols/oscar/aim/ui/aimaddcontactui.ui
@@ -26,9 +26,9 @@
             <property name="title">
                 <string>Contact Information</string>
             </property>
-            <property name="tqlayoutMargin" stdset="0">
+            <property name="layoutMargin" stdset="0">
             </property>
-            <property name="tqlayoutSpacing" stdset="0">
+            <property name="layoutSpacing" stdset="0">
             </property>
             <grid>
                 <property name="name">
@@ -60,5 +60,5 @@
 <tabstops>
     <tabstop>addSN</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kopete/protocols/oscar/aim/ui/aimeditaccountui.ui b/kopete/protocols/oscar/aim/ui/aimeditaccountui.ui
index a1b8dbfd..5221130e 100644
--- a/kopete/protocols/oscar/aim/ui/aimeditaccountui.ui
+++ b/kopete/protocols/oscar/aim/ui/aimeditaccountui.ui
@@ -533,7 +533,7 @@
     <tabstop>rbBlockAIM</tabstop>
     <tabstop>rbBlockDenyList</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kopetepasswordwidget.h</includehint>
 </includehints>
diff --git a/kopete/protocols/oscar/aim/ui/aiminfobase.ui b/kopete/protocols/oscar/aim/ui/aiminfobase.ui
index 5743d7e7..9457068e 100644
--- a/kopete/protocols/oscar/aim/ui/aiminfobase.ui
+++ b/kopete/protocols/oscar/aim/ui/aiminfobase.ui
@@ -18,7 +18,7 @@
             <height>400</height>
         </size>
     </property>
-    <property name="tqlayoutMargin" stdset="0">
+    <property name="layoutMargin" stdset="0">
     </property>
     <vbox>
         <property name="name">
@@ -239,7 +239,7 @@
     <tabstop>txtOnlineSince</tabstop>
     <tabstop>txtAwayMessage</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>ktextbrowser.h</includehint>
 </includehints>
diff --git a/kopete/protocols/oscar/aim/ui/aimjoinchatbase.ui b/kopete/protocols/oscar/aim/ui/aimjoinchatbase.ui
index 4b3b12aa..fdfe2a53 100644
--- a/kopete/protocols/oscar/aim/ui/aimjoinchatbase.ui
+++ b/kopete/protocols/oscar/aim/ui/aimjoinchatbase.ui
@@ -120,5 +120,5 @@
         </spacer>
     </grid>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kopete/protocols/oscar/icq/icqaccount.cpp b/kopete/protocols/oscar/icq/icqaccount.cpp
index e9772233..b65f7e4e 100644
--- a/kopete/protocols/oscar/icq/icqaccount.cpp
+++ b/kopete/protocols/oscar/icq/icqaccount.cpp
@@ -375,9 +375,9 @@ void ICQAccount::setOnlineStatus( const Kopete::OnlineStatus& status, const TQSt
 }
 
 
-OscarContact *ICQAccount::createNewContact( const TQString &contactId, Kopete::MetaContact *tqparentContact, const SSI& ssiItem )
+OscarContact *ICQAccount::createNewContact( const TQString &contactId, Kopete::MetaContact *parentContact, const SSI& ssiItem )
 {
-	ICQContact* contact = new ICQContact( this, contactId, tqparentContact, TQString(), ssiItem );
+	ICQContact* contact = new ICQContact( this, contactId, parentContact, TQString(), ssiItem );
 	if ( !ssiItem.alias().isEmpty() )
 		contact->setProperty( Kopete::Global::Properties::self()->nickName(), ssiItem.alias() );
 
diff --git a/kopete/protocols/oscar/icq/icqaccount.h b/kopete/protocols/oscar/icq/icqaccount.h
index 256c54dd..e6a86819 100644
--- a/kopete/protocols/oscar/icq/icqaccount.h
+++ b/kopete/protocols/oscar/icq/icqaccount.h
@@ -69,7 +69,7 @@ public:
 	void setUserProfile( const TQString &profile );
 
 protected:
-	virtual OscarContact *createNewContact( const TQString &contactId, Kopete::MetaContact *tqparentContact, const SSI& ssiItem );
+	virtual OscarContact *createNewContact( const TQString &contactId, Kopete::MetaContact *parentContact, const SSI& ssiItem );
 
 	virtual TQString sanitizedMessage( const TQString& message );
 
diff --git a/kopete/protocols/oscar/icq/ui/icqadd.ui b/kopete/protocols/oscar/icq/ui/icqadd.ui
index c42adfe2..5ac8d973 100644
--- a/kopete/protocols/oscar/icq/ui/icqadd.ui
+++ b/kopete/protocols/oscar/icq/ui/icqadd.ui
@@ -115,7 +115,7 @@
         <data format="PNG" length="736">89504e470d0a1a0a0000000d49484452000000100000001008060000001ff3ff61000002a749444154388d7d91cd4b945114c69f73ef3b33ea7ca838a6a32681501194d2975050b4c82f92dc042e5a550b5bf60744bb16b58a8268218144d026da64da228a0a2b52d1c8c8c48f2c54669c19df79df793fefbd2d662469860e1cb870cef3e339cf2500989b5b88e56cb78b0857f2b6d3e67b0e0b0503baf4e57bdbb21eb8b6fadedf7fda4599a2e999f9bdb66b5fb75db79b3164b8c6b3504af8426852885adff3272dc31cb14c313e38d827fe0568593d77225811b8d8d810475555a89e88e0791e0c330f2515cc7c9e6ccb822f8d6f00964a009e6b5f8ed554211a0d235c5501ce1874c30411414a89582cdc0625c3e964e64c3900b35de768301000e70c1ae7608c81738e80a6a1b2b202b16814cd4d8946ced550b90c98e33a158c113ccf47ceccc3cc5b080534282591d94c637d6d1d5bd92c2ccb3af2f0d1e8bd92135cd7370184018088c0350ec639a291086291083ccf432e6740d3822c994cc54a1c5886f5d1755d48a920a584520a4a291000251508844c3a83baf82e1051e90996e5dc5959fe0d21fd4270424208015184e9ba8e0f139350d050460fd6de7ec80e5786313b3307c33021a484effb104222994c61ecc52b380ec1cbfcc281fcd33dd3379af7ec04d0f497c5ae8977afc77b7acf6262620a7a2e0d2505a0181a1a1388d735209f5a41647504bb833fdcad8de4e896c9864edd5edb00006d9bd49468c4c0406f318b420b2121a440eaf324226d3588b79c0f6a536303d6fc2a9e5d4d5c1bb8bfb6cc769829f7cd2010aaf77741f7dbb095d1517bb81b0dadf57dd1907bf3f1a5448b5656b52d2ea6c62b6bf076ad09355f17cc939d84face736185d10bd9d9541dfbbb5c1010018c1158f14d44205600ad878ebdf9f47cfceec6a6e5b0d6e39a1139d8a5b1e2707878e47f660a15aaddfcb9a4df4a3f79d921abf7f52cda1d737f0030624881b39160420000000049454e44ae426082</data>
     </image>
 </images>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kpushbutton.h</includehint>
 </includehints>
diff --git a/kopete/protocols/oscar/icq/ui/icqaddcontactpage.cpp b/kopete/protocols/oscar/icq/ui/icqaddcontactpage.cpp
index 6280644b..05d9eb70 100644
--- a/kopete/protocols/oscar/icq/ui/icqaddcontactpage.cpp
+++ b/kopete/protocols/oscar/icq/ui/icqaddcontactpage.cpp
@@ -66,13 +66,13 @@ void ICQAddContactPage::showEvent(TQShowEvent *e)
 	AddContactPage::showEvent(e);
 }
 
-bool ICQAddContactPage::apply(Kopete::Account* , Kopete::MetaContact *tqparentContact  )
+bool ICQAddContactPage::apply(Kopete::Account* , Kopete::MetaContact *parentContact  )
 {
 	kdDebug(14153) << k_funcinfo << "called; adding contact..." << endl;
 
 	TQString contactId = addUI->uinEdit->text();
 	kdDebug(14153) << k_funcinfo << "uin=" << contactId << endl;
-	return mAccount->addContact(contactId, tqparentContact, Kopete::Account::ChangeKABC );
+	return mAccount->addContact(contactId, parentContact, Kopete::Account::ChangeKABC );
 
 }
 
diff --git a/kopete/protocols/oscar/icq/ui/icqaddcontactpage.h b/kopete/protocols/oscar/icq/ui/icqaddcontactpage.h
index 23c514f6..ba658f94 100644
--- a/kopete/protocols/oscar/icq/ui/icqaddcontactpage.h
+++ b/kopete/protocols/oscar/icq/ui/icqaddcontactpage.h
@@ -39,7 +39,7 @@ public:
 	~ICQAddContactPage();
 	
 	virtual bool validateData();
-	virtual bool apply(Kopete::Account* , Kopete::MetaContact *tqparentContact);
+	virtual bool apply(Kopete::Account* , Kopete::MetaContact *parentContact);
 	
 	void setUINFromSearch( const TQString& );
 	
diff --git a/kopete/protocols/oscar/icq/ui/icqauthreplyui.ui b/kopete/protocols/oscar/icq/ui/icqauthreplyui.ui
index a73b95a2..61fc84cb 100644
--- a/kopete/protocols/oscar/icq/ui/icqauthreplyui.ui
+++ b/kopete/protocols/oscar/icq/ui/icqauthreplyui.ui
@@ -192,5 +192,5 @@
         </widget>
     </grid>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kopete/protocols/oscar/icq/ui/icqeditaccountui.ui b/kopete/protocols/oscar/icq/ui/icqeditaccountui.ui
index 074e4424..8c8776e0 100644
--- a/kopete/protocols/oscar/icq/ui/icqeditaccountui.ui
+++ b/kopete/protocols/oscar/icq/ui/icqeditaccountui.ui
@@ -479,7 +479,7 @@ If you do not currently have an ICQ account, please click the button to create o
     <tabstop>chkHideIP</tabstop>
     <tabstop>chkWebAware</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kopetepasswordwidget.h</includehint>
 </includehints>
diff --git a/kopete/protocols/oscar/icq/ui/icqgeneralinfo.ui b/kopete/protocols/oscar/icq/ui/icqgeneralinfo.ui
index 52288b38..c48e8ff9 100644
--- a/kopete/protocols/oscar/icq/ui/icqgeneralinfo.ui
+++ b/kopete/protocols/oscar/icq/ui/icqgeneralinfo.ui
@@ -607,5 +607,5 @@
     <tabstop>emailEdit</tabstop>
     <tabstop>homepageEdit</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kopete/protocols/oscar/icq/ui/icqinterestinfowidget.ui b/kopete/protocols/oscar/icq/ui/icqinterestinfowidget.ui
index a8107e44..009780f0 100644
--- a/kopete/protocols/oscar/icq/ui/icqinterestinfowidget.ui
+++ b/kopete/protocols/oscar/icq/ui/icqinterestinfowidget.ui
@@ -112,5 +112,5 @@
         </spacer>
     </grid>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kopete/protocols/oscar/icq/ui/icqotherinfowidget.ui b/kopete/protocols/oscar/icq/ui/icqotherinfowidget.ui
index 2e1079a2..d5d77c09 100644
--- a/kopete/protocols/oscar/icq/ui/icqotherinfowidget.ui
+++ b/kopete/protocols/oscar/icq/ui/icqotherinfowidget.ui
@@ -64,5 +64,5 @@
         </widget>
     </grid>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kopete/protocols/oscar/icq/ui/icqsearchbase.ui b/kopete/protocols/oscar/icq/ui/icqsearchbase.ui
index 5e2b3bf6..140f17fa 100644
--- a/kopete/protocols/oscar/icq/ui/icqsearchbase.ui
+++ b/kopete/protocols/oscar/icq/ui/icqsearchbase.ui
@@ -479,7 +479,7 @@
     <tabstop>closeButton</tabstop>
     <tabstop>searchResults</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
diff --git a/kopete/protocols/oscar/icq/ui/icqworkinfowidget.ui b/kopete/protocols/oscar/icq/ui/icqworkinfowidget.ui
index bd6b714a..4707dbe8 100644
--- a/kopete/protocols/oscar/icq/ui/icqworkinfowidget.ui
+++ b/kopete/protocols/oscar/icq/ui/icqworkinfowidget.ui
@@ -245,5 +245,5 @@
         </spacer>
     </vbox>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kopete/protocols/oscar/liboscar/HACKING b/kopete/protocols/oscar/liboscar/HACKING
index 36a6edf5..0259505d 100644
--- a/kopete/protocols/oscar/liboscar/HACKING
+++ b/kopete/protocols/oscar/liboscar/HACKING
@@ -101,7 +101,7 @@ Spaces
 ================================================================================
 
 Spaces should be used between the conditional / loop type and the
-conditional statement.  They should also not be used after tqparenthesis.  However
+conditional statement.  They should also not be used after parenthesis.  However
 the should be to mark of mathematical or comparative operators.
 
 if ( foo == bar )
@@ -188,7 +188,7 @@ written in this document. Those files that don't match will be corrected eventua
 To make things easier on you, kate modelines are provided at the end of certain files
 to help enforce the coding style. If you're using the new C S&S Indenter that will be in
 KDE 3.4, I can provide a patch that will automatically implement the space padding around
-tqparenthesis. Please mail me so I can send it to you.
+parenthesis. Please mail me so I can send it to you.
 
 Matt Rogers <mattr@kde.org>
 
diff --git a/kopete/protocols/oscar/liboscar/aimlogintask.cpp b/kopete/protocols/oscar/liboscar/aimlogintask.cpp
index 05a63198..56fa497f 100644
--- a/kopete/protocols/oscar/liboscar/aimlogintask.cpp
+++ b/kopete/protocols/oscar/liboscar/aimlogintask.cpp
@@ -158,7 +158,7 @@ void AimLoginTask::sendLoginRequest()
 	
 	outbuf->addTLV(0x0001, client()->userId().length(), client()->userId().latin1());
 
-	TQByteArray digest( 17 ); //aptqparently MD5 digests are 16 bytes long
+	TQByteArray digest( 17 ); //apparently MD5 digests are 16 bytes long
 	encodePassword( digest );
 	digest[16] = '\0';  //do this so that addTLV sees a NULL-terminator
 
diff --git a/kopete/protocols/oscar/oscaraccount.cpp b/kopete/protocols/oscar/oscaraccount.cpp
index 4ff71b1c..38d01121 100644
--- a/kopete/protocols/oscar/oscaraccount.cpp
+++ b/kopete/protocols/oscar/oscaraccount.cpp
@@ -555,7 +555,7 @@ Connection* OscarAccount::setupConnection( const TQString& server, uint port )
 
 
 bool OscarAccount::createContact(const TQString &contactId,
-	Kopete::MetaContact *tqparentContact)
+	Kopete::MetaContact *parentContact)
 {
 	/* We're not even online or connecting
 	 * (when getting server contacts), so don't bother
@@ -577,10 +577,10 @@ bool OscarAccount::createContact(const TQString &contactId,
 	 */
 
 	TQValueList<TLV> dummyList;
-	if ( tqparentContact->isTemporary() )
+	if ( parentContact->isTemporary() )
 	{
 		SSI tempItem( contactId, 0, 0, 0xFFFF, dummyList, 0 );
-		return createNewContact( contactId, tqparentContact, tempItem );
+		return createNewContact( contactId, parentContact, tempItem );
 	}
 
 	SSI ssiItem = d->engine->ssiManager()->findContact( contactId );
@@ -597,7 +597,7 @@ bool OscarAccount::createContact(const TQString &contactId,
 		else
 		{
 			kdDebug(OSCAR_GEN_DEBUG) << k_funcinfo << "Didn't find contact in list, creating new contact" << endl;
-			return createNewContact( contactId, tqparentContact, ssiItem );
+			return createNewContact( contactId, parentContact, ssiItem );
 		}
 	}
 	else
@@ -608,7 +608,7 @@ bool OscarAccount::createContact(const TQString &contactId,
 		kdDebug(OSCAR_GEN_DEBUG) << k_funcinfo << "Adding " << contactId << " to server side list" << endl;
 
 		TQString groupName;
-		Kopete::GroupList kopeteGroups = tqparentContact->groups(); //get the group list
+		Kopete::GroupList kopeteGroups = parentContact->groups(); //get the group list
 
 		if ( kopeteGroups.isEmpty() || kopeteGroups.first() == Kopete::Group::topLevel() )
 		{
@@ -617,7 +617,7 @@ bool OscarAccount::createContact(const TQString &contactId,
 		}
 		else
 		{
-				//aptqparently kopeteGroups.first() can be invalid. Attempt to prevent
+				//apparently kopeteGroups.first() can be invalid. Attempt to prevent
 				//crashes in SSIData::findGroup(const TQString& name)
 			groupName = kopeteGroups.first() ? kopeteGroups.first()->displayName() : i18n("Buddies");
 
@@ -631,7 +631,7 @@ bool OscarAccount::createContact(const TQString &contactId,
 			return false;
 		}
 
-		d->addContactMap[Oscar::normalize( contactId )] = tqparentContact;
+		d->addContactMap[Oscar::normalize( contactId )] = parentContact;
 		addContactToSSI( Oscar::normalize( contactId ), groupName, true );
 		return true;
 	}
diff --git a/kopete/protocols/oscar/oscaraccount.h b/kopete/protocols/oscar/oscaraccount.h
index bccaa9a1..2371a640 100644
--- a/kopete/protocols/oscar/oscaraccount.h
+++ b/kopete/protocols/oscar/oscaraccount.h
@@ -134,16 +134,16 @@ protected:
 	 * Adds a contact to a meta contact
 	 */
 	virtual bool createContact(const TQString &contactId,
-		 Kopete::MetaContact *tqparentContact );
+		 Kopete::MetaContact *parentContact );
 
 	/**
 	 * Protocols using Oscar must implement this to perform the instantiation
 	 * of their contact for Kopete.  Called by @ref createContact().
 	 * @param contactId theprotocol unique id of the contact
-	 * @param tqparentContact the tqparent metacontact
+	 * @param parentContact the tqparent metacontact
 	 * @return whether the creation succeeded or not
 	 */
-	virtual OscarContact *createNewContact( const TQString &contactId, Kopete::MetaContact *tqparentContact, const SSI& ssiItem ) = 0;
+	virtual OscarContact *createNewContact( const TQString &contactId, Kopete::MetaContact *parentContact, const SSI& ssiItem ) = 0;
 
 	virtual TQString sanitizedMessage( const TQString& message ) = 0;
 
diff --git a/kopete/protocols/oscar/oscarencodingselectionbase.ui b/kopete/protocols/oscar/oscarencodingselectionbase.ui
index bf10a6ca..97ef3f74 100644
--- a/kopete/protocols/oscar/oscarencodingselectionbase.ui
+++ b/kopete/protocols/oscar/oscarencodingselectionbase.ui
@@ -54,5 +54,5 @@
         </spacer>
     </grid>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kopete/protocols/oscar/oscarlistcontactsbase.ui b/kopete/protocols/oscar/oscarlistcontactsbase.ui
index a5415391..4f318e78 100644
--- a/kopete/protocols/oscar/oscarlistcontactsbase.ui
+++ b/kopete/protocols/oscar/oscarlistcontactsbase.ui
@@ -45,5 +45,5 @@
         </widget>
     </vbox>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kopete/protocols/oscar/oscarvisibilitybase.ui b/kopete/protocols/oscar/oscarvisibilitybase.ui
index fe70ffe1..4a3bb1a1 100644
--- a/kopete/protocols/oscar/oscarvisibilitybase.ui
+++ b/kopete/protocols/oscar/oscarvisibilitybase.ui
@@ -166,5 +166,5 @@
     <tabstop>visibleContacts</tabstop>
     <tabstop>invisibleContacts</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>