Rename old tq methods that no longer need a unique name

1 files changed, 12 insertions, 12 deletions

diff --git a/kopete/plugins/webpresence/webpresenceplugin.cpp b/kopete/plugins/webpresence/webpresenceplugin.cpp
index 88de6c07..bb7b9d4c 100644
--- a/kopete/plugins/webpresence/webpresenceplugin.cpp
+++ b/kopete/plugins/webpresence/webpresenceplugin.cpp
@@ -228,7 +228,7 @@ KTempFile* WebPresencePlugin::generateFile()
 	// insert the current date/time
 	TQDomElement date = doc.createElement( "listdate" );
 	TQDomText t = doc.createTextNode( 
-			KGlobal::locale()->formatDateTime( TQDateTime::tqcurrentDateTime() ) );
+			KGlobal::locale()->formatDateTime( TQDateTime::currentDateTime() ) );
 	date.appendChild( t );
 	root.appendChild( date );
 
@@ -272,30 +272,30 @@ KTempFile* WebPresencePlugin::generateFile()
 			accName.appendChild( accNameText );
 			acc.appendChild( accName );
 
-			TQDomElement acctqStatus = doc.createElement( "accountstatus" );
+			TQDomElement accStatus = doc.createElement( "accountstatus" );
 			TQDomText statusText = doc.createTextNode( ( me )
-					? statusAsString( me->onlinetqStatus() )
+					? statusAsString( me->onlineStatus() )
 					: notKnown ) ;
-			acctqStatus.appendChild( statusText );
+			accStatus.appendChild( statusText );
 
 			// Dont add these if we're shutting down, because the result
 			// would be quite weird.
 			if ( !shuttingDown ) {
 
 				// Add away message as an attribute, if one exists.
-				if ( me->onlinetqStatus().status() == Kopete::OnlineStatus::Away &&
+				if ( me->onlineStatus().status() == Kopete::OnlineStatus::Away &&
 						!me->property("awayMessage").value().toString().isEmpty() ) {
-					acctqStatus.setAttribute( "awayreason",
+					accStatus.setAttribute( "awayreason",
 							me->property("awayMessage").value().toString() );
 				}
 
 				// Add the online status description as an attribute, if one exits.
-				if ( !me->onlinetqStatus().description().isEmpty() ) {
-					acctqStatus.setAttribute( "statusdescription",
-							me->onlinetqStatus().description() );
+				if ( !me->onlineStatus().description().isEmpty() ) {
+					accStatus.setAttribute( "statusdescription",
+							me->onlineStatus().description() );
 				}
 			}
-			acc.appendChild( acctqStatus );
+			acc.appendChild( accStatus );
 
 			if ( showAddresses )
 			{
@@ -430,13 +430,13 @@ ProtocolList WebPresencePlugin::allProtocols()
 	return result;
 }
 
-TQString WebPresencePlugin::statusAsString( const Kopete::OnlineStatus &newtqStatus )
+TQString WebPresencePlugin::statusAsString( const Kopete::OnlineStatus &newStatus )
 {
 	if (shuttingDown)
 		return "OFFLINE";
 
 	TQString status;
-	switch ( newtqStatus.status() )
+	switch ( newStatus.status() )
 	{
 	case Kopete::OnlineStatus::Online:
 		status = "ONLINE";