1 files changed, 13 insertions, 13 deletions

diff --git a/kopete/protocols/testbed/testbedaccount.cpp b/kopete/protocols/testbed/testbedaccount.cpp
index cc906447..e722bed2 100644
--- a/kopete/protocols/testbed/testbedaccount.cpp
+++ b/kopete/protocols/testbed/testbedaccount.cpp
@@ -29,8 +29,8 @@
 #include "testbedprotocol.h"
 
 
-TestbedAccount::TestbedAccount( TestbedProtocol *parent, const TQString& accountID, const char *name )
-: Kopete::Account ( parent, accountID , name )
+TestbedAccount::TestbedAccount( TestbedProtocol *tqparent, const TQString& accountID, const char *name )
+: Kopete::Account ( tqparent, accountID , name )
 {
 	// Init the myself contact
 	setMyself( new TestbedContact( this, accountId(), TestbedContact::Null, accountId(), Kopete::ContactList::self()->myself() ) );
@@ -58,9 +58,9 @@ KActionMenu* TestbedAccount::actionMenu()
 	return mActionMenu;
 }
 
-bool TestbedAccount::createContact(const TQString& contactId, Kopete::MetaContact* parentContact)
+bool TestbedAccount::createContact(const TQString& contactId, Kopete::MetaContact* tqparentContact)
 {
-	TestbedContact* newContact = new TestbedContact( this, contactId, TestbedContact::Echo, parentContact->displayName(), parentContact );
+	TestbedContact* newContact = new TestbedContact( this, contactId, TestbedContact::Echo, tqparentContact->displayName(), tqparentContact );
 	return newContact != 0L;
 }
 
@@ -75,10 +75,10 @@ void TestbedAccount::setAway( bool away, const TQString & /* reason */ )
 void TestbedAccount::setOnlineStatus(const Kopete::OnlineStatus& status, const TQString &reason )
 {
 	if ( status.status() == Kopete::OnlineStatus::Online &&
-			myself()->onlineStatus().status() == Kopete::OnlineStatus::Offline )
+			myself()->onlinetqStatus().status() == Kopete::OnlineStatus::Offline )
 		slotGoOnline();
 	else if (status.status() == Kopete::OnlineStatus::Online &&
-			myself()->onlineStatus().status() == Kopete::OnlineStatus::Away )
+			myself()->onlinetqStatus().status() == Kopete::OnlineStatus::Away )
 		setAway( false, reason );
 	else if ( status.status() == Kopete::OnlineStatus::Offline )
 		slotGoOffline();
@@ -86,7 +86,7 @@ void TestbedAccount::setOnlineStatus(const Kopete::OnlineStatus& status, const T
 		slotGoAway( /* reason */ );
 }
 
-void TestbedAccount::connect( const Kopete::OnlineStatus& /* initialStatus */ )
+void TestbedAccount::connect( const Kopete::OnlineStatus& /* initialtqStatus */ )
 {
 	kdDebug ( 14210 ) << k_funcinfo << endl;
 	myself()->setOnlineStatus( TestbedProtocol::protocol()->testbedOnline );
@@ -114,7 +114,7 @@ void TestbedAccount::slotGoOnline ()
 		connect ();
 	else
 		myself()->setOnlineStatus( TestbedProtocol::protocol()->testbedOnline );
-	updateContactStatus();
+	updateContacttqStatus();
 }
 
 void TestbedAccount::slotGoAway ()
@@ -125,7 +125,7 @@ void TestbedAccount::slotGoAway ()
 		connect();
 
 	myself()->setOnlineStatus( TestbedProtocol::protocol()->testbedAway );
-	updateContactStatus();
+	updateContacttqStatus();
 }
 
 
@@ -135,7 +135,7 @@ void TestbedAccount::slotGoOffline ()
 
 	if (isConnected ())
 		disconnect ();
-	updateContactStatus();
+	updateContacttqStatus();
 }
 
 void TestbedAccount::slotShowVideo ()
@@ -144,7 +144,7 @@ void TestbedAccount::slotShowVideo ()
 
 	if (isConnected ())
 		TestbedWebcamDialog *testbedWebcamDialog = new TestbedWebcamDialog(0, 0, "Testbed video window");
-	updateContactStatus();
+	updateContacttqStatus();
 }
 
 void TestbedAccount::receivedMessage( const TQString &message )
@@ -165,11 +165,11 @@ void TestbedAccount::receivedMessage( const TQString &message )
 		kdWarning(14210) << k_funcinfo << "unable to look up contact for delivery" << endl;
 }
 
-void TestbedAccount::updateContactStatus()
+void TestbedAccount::updateContacttqStatus()
 {
 	TQDictIterator<Kopete::Contact> itr( contacts() );
 	for ( ; itr.current(); ++itr )
-		itr.current()->setOnlineStatus( myself()->onlineStatus() );
+		itr.current()->setOnlineStatus( myself()->onlinetqStatus() );
 }