From d0be1721b4656109c9e21cc0ecb6f23b343b7c26 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Sat, 9 Jul 2011 02:23:29 +0000
Subject: 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
---
 kopete/protocols/winpopup/ui/wpaddcontactbase.ui  | 2 +-
 kopete/protocols/winpopup/ui/wpeditaccountbase.ui | 2 +-
 kopete/protocols/winpopup/ui/wpuserinfowidget.ui  | 2 +-
 kopete/protocols/winpopup/wpaccount.cpp           | 4 ++--
 kopete/protocols/winpopup/wpaccount.h             | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'kopete/protocols/winpopup')

diff --git a/kopete/protocols/winpopup/ui/wpaddcontactbase.ui b/kopete/protocols/winpopup/ui/wpaddcontactbase.ui
index c9f63825..8049dab1 100644
--- a/kopete/protocols/winpopup/ui/wpaddcontactbase.ui
+++ b/kopete/protocols/winpopup/ui/wpaddcontactbase.ui
@@ -180,7 +180,7 @@
     <tabstop>mHostGroup</tabstop>
     <tabstop>mRefresh</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kcombobox.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/kopete/protocols/winpopup/ui/wpeditaccountbase.ui b/kopete/protocols/winpopup/ui/wpeditaccountbase.ui
index b12e9c2c..32c8ead5 100644
--- a/kopete/protocols/winpopup/ui/wpeditaccountbase.ui
+++ b/kopete/protocols/winpopup/ui/wpeditaccountbase.ui
@@ -347,7 +347,7 @@ However, the recommended way is to ask your administrator to create this directo
 <Q_SLOTS>
     <slot>installSamba()</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kpushbutton.h</includehint>
     <includehint>knuminput.h</includehint>
diff --git a/kopete/protocols/winpopup/ui/wpuserinfowidget.ui b/kopete/protocols/winpopup/ui/wpuserinfowidget.ui
index d717c9c4..aaec0dbe 100644
--- a/kopete/protocols/winpopup/ui/wpuserinfowidget.ui
+++ b/kopete/protocols/winpopup/ui/wpuserinfowidget.ui
@@ -208,7 +208,7 @@
     <tabstop>sOS</tabstop>
     <tabstop>sServer</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="0"/>
+<layoutdefaults spacing="6" margin="0"/>
 <includehints>
     <includehint>klineedit.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/kopete/protocols/winpopup/wpaccount.cpp b/kopete/protocols/winpopup/wpaccount.cpp
index addb88bb..9366d31f 100644
--- a/kopete/protocols/winpopup/wpaccount.cpp
+++ b/kopete/protocols/winpopup/wpaccount.cpp
@@ -75,12 +75,12 @@ bool WPAccount::checkHost(const TQString &Name)
 	}
 }
 
-bool WPAccount::createContact(const TQString &contactId, Kopete::MetaContact *tqparentContact )
+bool WPAccount::createContact(const TQString &contactId, Kopete::MetaContact *parentContact )
 {
 //	kdDebug(14170) << "[WPAccount::createContact] contactId: " << contactId << endl;
 
 	if (!contacts()[contactId]) {
-		WPContact *newContact = new WPContact(this, contactId, tqparentContact->displayName(), tqparentContact);
+		WPContact *newContact = new WPContact(this, contactId, parentContact->displayName(), parentContact);
 		return newContact != 0;
 	} else {
 		kdDebug(14170) << "[WPAccount::addContact] Contact already exists" << endl;
diff --git a/kopete/protocols/winpopup/wpaccount.h b/kopete/protocols/winpopup/wpaccount.h
index eb343541..19209a65 100644
--- a/kopete/protocols/winpopup/wpaccount.h
+++ b/kopete/protocols/winpopup/wpaccount.h
@@ -92,7 +92,7 @@ public slots:
 	void setOnlineStatus( const Kopete::OnlineStatus &status , const TQString &reason = TQString());
 
 protected:
-	virtual bool createContact(const TQString &contactId, Kopete::MetaContact *tqparentContact);
+	virtual bool createContact(const TQString &contactId, Kopete::MetaContact *parentContact);
 
 private slots:
 //	void updateAccountId();
-- 
cgit v1.2.1