Rename old tq methods that no longer need a unique name

20 files changed, 108 insertions, 108 deletions

diff --git a/kopete/protocols/gadu/gaduaccount.cpp b/kopete/protocols/gadu/gaduaccount.cpp
index 52f13e08..47a124b3 100644
--- a/kopete/protocols/gadu/gaduaccount.cpp
+++ b/kopete/protocols/gadu/gaduaccount.cpp
@@ -132,7 +132,7 @@ static const char* const servers_ip[] = {
 
 	setMyself( new GaduContact( accountId().toInt(), accountId(), this, Kopete::ContactList::self()->myself() ) );
 
-	p->status = GaduProtocol::protocol()->converttqStatus( GG_STATUS_NOT_AVAIL );
+	p->status = GaduProtocol::protocol()->convertStatus( GG_STATUS_NOT_AVAIL );
 	p->lastDescription = TQString();
 
 	for ( unsigned int i = 0; i < NUM_SERVERS ; i++ ) {
@@ -234,15 +234,15 @@ GaduAccount::initConnections()
 void
 GaduAccount::setAway( bool isAway, const TQString& awayMessage )
 {
-	unsigned int currenttqStatus;
+	unsigned int currentStatus;
 
 	if ( isAway ) {
-		currenttqStatus = ( awayMessage.isEmpty() ) ? GG_STATUS_BUSY : GG_STATUS_BUSY_DESCR;
+		currentStatus = ( awayMessage.isEmpty() ) ? GG_STATUS_BUSY : GG_STATUS_BUSY_DESCR;
 	}
 	else{
-		currenttqStatus = ( awayMessage.isEmpty() ) ? GG_STATUS_AVAIL : GG_STATUS_AVAIL_DESCR;
+		currentStatus = ( awayMessage.isEmpty() ) ? GG_STATUS_AVAIL : GG_STATUS_AVAIL_DESCR;
 	}
-	changetqStatus( GaduProtocol::protocol()->converttqStatus( currenttqStatus ), awayMessage );
+	changeStatus( GaduProtocol::protocol()->convertStatus( currentStatus ), awayMessage );
 }
 
 
@@ -251,8 +251,8 @@ GaduAccount::actionMenu()
 {
 	kdDebug(14100) << "actionMenu() " << endl;
 
-	p->actionMenu_ = new KActionMenu( accountId(), myself()->onlinetqStatus().iconFor( this ), this );
-	p->actionMenu_->popupMenu()->insertTitle( myself()->onlinetqStatus().iconFor( myself() ), i18n( "%1 <%2> " ).
+	p->actionMenu_ = new KActionMenu( accountId(), myself()->onlineStatus().iconFor( this ), this );
+	p->actionMenu_->popupMenu()->insertTitle( myself()->onlineStatus().iconFor( myself() ), i18n( "%1 <%2> " ).
 	    arg( myself()->property( Kopete::Global::Properties::self()->nickName()).value().toString(), accountId() ) );
 
 	if ( p->session_->isConnected() ) {
@@ -287,19 +287,19 @@ GaduAccount::actionMenu()
 		p->listFromFileAction->setEnabled( TRUE );
 	}
 	p->actionMenu_->insert( new KAction( i18n( "Go O&nline" ),
-				GaduProtocol::protocol()->converttqStatus( GG_STATUS_AVAIL ).iconFor( this ),
+				GaduProtocol::protocol()->convertStatus( GG_STATUS_AVAIL ).iconFor( this ),
 				0, this, TQT_SLOT( slotGoOnline() ), this, "actionGaduConnect" ) );
 
 	p->actionMenu_->insert( new KAction( i18n( "Set &Busy" ),
-				GaduProtocol::protocol()->converttqStatus( GG_STATUS_BUSY ).iconFor( this ),
+				GaduProtocol::protocol()->convertStatus( GG_STATUS_BUSY ).iconFor( this ),
 				0, this, TQT_SLOT( slotGoBusy() ), this, "actionGaduConnect" ) );
 
 	p->actionMenu_->insert( new KAction( i18n( "Set &Invisible" ),
-				GaduProtocol::protocol()->converttqStatus( GG_STATUS_INVISIBLE ).iconFor( this ),
+				GaduProtocol::protocol()->convertStatus( GG_STATUS_INVISIBLE ).iconFor( this ),
 				0, this, TQT_SLOT( slotGoInvisible() ), this, "actionGaduConnect" ) );
 
 	p->actionMenu_->insert( new KAction( i18n( "Go &Offline" ),
-				GaduProtocol::protocol()->converttqStatus( GG_STATUS_NOT_AVAIL ).iconFor( this ),
+				GaduProtocol::protocol()->convertStatus( GG_STATUS_NOT_AVAIL ).iconFor( this ),
 				0, this, TQT_SLOT( slotGoOffline() ), this, "actionGaduConnect" ) );
 
 	p->actionMenu_->insert( new KAction( i18n( "Set &Description..." ), "info",
@@ -332,7 +332,7 @@ GaduAccount::connectWithPassword(const TQString& password)
 	if (isConnected ())
 		return;
 	// FIXME: add status description to this mechainsm, this is a hack now. libkopete design issue.
-	changetqStatus( initialtqStatus(), p->lastDescription );
+	changeStatus( initialStatus(), p->lastDescription );
 }
 
 void
@@ -353,7 +353,7 @@ void
 GaduAccount::setOnlineStatus( const Kopete::OnlineStatus& status , const TQString &reason )
 {
 	kdDebug(14100) << k_funcinfo << "Called" << endl;
-	changetqStatus( status, reason);
+	changeStatus( status, reason);
 }
 
 void
@@ -390,7 +390,7 @@ GaduAccount::createContact( const TQString& contactId, Kopete::MetaContact* pare
 }
 
 void
-GaduAccount::changetqStatus( const Kopete::OnlineStatus& status, const TQString& descr )
+GaduAccount::changeStatus( const Kopete::OnlineStatus& status, const TQString& descr )
 {
 	unsigned int ns;
 	
@@ -418,14 +418,14 @@ GaduAccount::changetqStatus( const Kopete::OnlineStatus& status, const TQString&
 		if (!descr.isEmpty() && !GaduProtocol::protocol()->statusWithDescription( status.internalStatus() ) ) {
 			// and rerun us again. This won't cause any recursive call, as both conversions are static
 			ns = GaduProtocol::protocol()->statusToWithDescription( status );
-			changetqStatus( GaduProtocol::protocol()->converttqStatus( ns ), descr );
+			changeStatus( GaduProtocol::protocol()->convertStatus( ns ), descr );
 			return;
 		}
 
 		// well, if it's empty but we want to set status with desc, change it too
                 if (descr.isEmpty() && GaduProtocol::protocol()->statusWithDescription( status.internalStatus() ) ) {
 			ns = GaduProtocol::protocol()->statusToWithoutDescription( status );
-			changetqStatus( GaduProtocol::protocol()->converttqStatus( ns ), descr );
+			changeStatus( GaduProtocol::protocol()->convertStatus( ns ), descr );
 			return;
 		}
 				
@@ -455,7 +455,7 @@ GaduAccount::changetqStatus( const Kopete::OnlineStatus& status, const TQString&
 		else {
 			p->status = status;
 			if ( descr.isEmpty() ) {
-				if ( p->session_->changetqStatus( status.internalStatus(), p->forFriends ) != 0 )
+				if ( p->session_->changeStatus( status.internalStatus(), p->forFriends ) != 0 )
 					return;
 			}
 			else {
@@ -481,7 +481,7 @@ GaduAccount::slotLogin( int status, const TQString& dscr )
 {
 	p->lastDescription	= dscr;
 
-	myself()->setOnlineStatus( GaduProtocol::protocol()->converttqStatus( GG_STATUS_CONNECTING ));
+	myself()->setOnlineStatus( GaduProtocol::protocol()->convertStatus( GG_STATUS_CONNECTING ));
 	myself()->setProperty( GaduProtocol::protocol()->propAwayMessage, dscr );
 
 	if ( !p->session_->isConnected() ) {
@@ -507,16 +507,16 @@ GaduAccount::slotLogin( int status, const TQString& dscr )
 		}
 	}
 	else {
-		p->session_->changetqStatus( status );
+		p->session_->changeStatus( status );
 	}
 }
 
 void
 GaduAccount::slotLogoff()
 {
-	if ( p->session_->isConnected() || p->status == GaduProtocol::protocol()->converttqStatus( GG_STATUS_CONNECTING )) {
-		p->status = GaduProtocol::protocol()->converttqStatus( GG_STATUS_NOT_AVAIL );
-		changetqStatus( p->status );
+	if ( p->session_->isConnected() || p->status == GaduProtocol::protocol()->convertStatus( GG_STATUS_CONNECTING )) {
+		p->status = GaduProtocol::protocol()->convertStatus( GG_STATUS_NOT_AVAIL );
+		changeStatus( p->status );
 		p->session_->logoff();
 		dccOff();
 	}
@@ -525,7 +525,7 @@ GaduAccount::slotLogoff()
 void
 GaduAccount::slotGoOnline()
 {
-	changetqStatus( GaduProtocol::protocol()->converttqStatus( GG_STATUS_AVAIL ) );
+	changeStatus( GaduProtocol::protocol()->convertStatus( GG_STATUS_AVAIL ) );
 }
 void
 GaduAccount::slotGoOffline()
@@ -537,13 +537,13 @@ GaduAccount::slotGoOffline()
 void
 GaduAccount::slotGoInvisible()
 {
-	changetqStatus( GaduProtocol::protocol()->converttqStatus( GG_STATUS_INVISIBLE ) );
+	changeStatus( GaduProtocol::protocol()->convertStatus( GG_STATUS_INVISIBLE ) );
 }
 
 void
 GaduAccount::slotGoBusy()
 {
-	changetqStatus( GaduProtocol::protocol()->converttqStatus( GG_STATUS_BUSY ) );
+	changeStatus( GaduProtocol::protocol()->convertStatus( GG_STATUS_BUSY ) );
 }
 
 void
@@ -648,7 +648,7 @@ GaduAccount::contactStatusChanged( KGaduNotify* gaduNotify )
 		return;
 	}
 
-	contact->changedtqStatus( gaduNotify );
+	contact->changedStatus( gaduNotify );
 }
 
 void
@@ -675,7 +675,7 @@ GaduAccount::connectionFailed( gg_failure_t failure )
 		case GG_FAILURE_PASSWORD:
 			password().setWrong();
 			// user pressed CANCEL
-			p->status = GaduProtocol::protocol()->converttqStatus( GG_STATUS_NOT_AVAIL );
+			p->status = GaduProtocol::protocol()->convertStatus( GG_STATUS_NOT_AVAIL );
 			myself()->setOnlineStatus( p->status );
 			disconnected( BadPassword );
 			return;
@@ -712,7 +712,7 @@ GaduAccount::connectionFailed( gg_failure_t failure )
 	else {
 		error( i18n( "unable to connect to the Gadu-Gadu server(\"%1\")." ).tqarg( GaduSession::failureDescription( failure ) ),
 				i18n( "Connection Error" ) );
-		p->status = GaduProtocol::protocol()->converttqStatus( GG_STATUS_NOT_AVAIL );
+		p->status = GaduProtocol::protocol()->convertStatus( GG_STATUS_NOT_AVAIL );
 		myself()->setOnlineStatus( p->status );
 		disconnected( InvalidHost );
 	}
@@ -777,7 +777,7 @@ void
 GaduAccount::connectionSucceed( )
 {
 	kdDebug(14100) << "#### Gadu-Gadu connected! " << endl;
-	p->status =  GaduProtocol::protocol()->converttqStatus( p->session_->status() );
+	p->status =  GaduProtocol::protocol()->convertStatus( p->session_->status() );
 	myself()->setOnlineStatus( p->status );
 	myself()->setProperty( GaduProtocol::protocol()->propAwayMessage, p->lastDescription );
 	startNotify();
@@ -822,11 +822,11 @@ GaduAccount::slotSessionDisconnect( Kopete::Account::DisconnectReason reason )
 		p->pingTimer_->stop();
 	}
 
-	setAllContactstqStatus( GaduProtocol::protocol()->converttqStatus( GG_STATUS_NOT_AVAIL ) );
+	setAllContactsStatus( GaduProtocol::protocol()->convertStatus( GG_STATUS_NOT_AVAIL ) );
 
-	status = myself()->onlinetqStatus().internalStatus();
+	status = myself()->onlineStatus().internalStatus();
 	if ( status != GG_STATUS_NOT_AVAIL || status != GG_STATUS_NOT_AVAIL_DESCR ) {
-		myself()->setOnlineStatus( GaduProtocol::protocol()->converttqStatus( GG_STATUS_NOT_AVAIL ) );
+		myself()->setOnlineStatus( GaduProtocol::protocol()->convertStatus( GG_STATUS_NOT_AVAIL ) );
 	}
 	GaduAccount::disconnect( reason );
 }
@@ -903,7 +903,7 @@ GaduAccount::slotFriendsMode()
 	p->forFriends = !p->forFriends;
 	kdDebug( 14100 ) << "for friends mode: " << p->forFriends << " desc" << p->lastDescription << endl;
 	// now change status, it will changing it with p->forFriends flag
-	changetqStatus( p->status, p->lastDescription );
+	changeStatus( p->status, p->lastDescription );
 
 	saveFriendsMode( p->forFriends );
 
@@ -1077,7 +1077,7 @@ GaduAccount::slotDescription()
 	GaduAway* away = new GaduAway( this );
 
 	if( away->exec() == TQDialog::Accepted ) {
-		changetqStatus( GaduProtocol::protocol()->converttqStatus( away->status() ),
+		changeStatus( GaduProtocol::protocol()->convertStatus( away->status() ),
 					away->awayText() );
 	}
 	delete away;
diff --git a/kopete/protocols/gadu/gaduaccount.h b/kopete/protocols/gadu/gaduaccount.h
index 0363d181..1786e3a9 100644
--- a/kopete/protocols/gadu/gaduaccount.h
+++ b/kopete/protocols/gadu/gaduaccount.h
@@ -77,7 +77,7 @@ public slots:
 	void setOnlineStatus( const Kopete::OnlineStatus& status , const TQString &reason = TQString());
 	//}
 
-	void changetqStatus( const Kopete::OnlineStatus& status, const TQString& descr = TQString() );
+	void changeStatus( const Kopete::OnlineStatus& status, const TQString& descr = TQString() );
 	void slotLogin( int status = GG_STATUS_AVAIL, const TQString& dscr = TQString() );
 	void slotLogoff();
 	void slotGoOnline();
diff --git a/kopete/protocols/gadu/gaduaway.cpp b/kopete/protocols/gadu/gaduaway.cpp
index 8785f08f..2be2a2aa 100644
--- a/kopete/protocols/gadu/gaduaway.cpp
+++ b/kopete/protocols/gadu/gaduaway.cpp
@@ -47,7 +47,7 @@ GaduAway::GaduAway( GaduAccount* account, TQWidget* parent, const char* name )
 	ui_ = new GaduAwayUI( this );
 	setMainWidget( ui_ );
 
-	ks = account->myself()->onlinetqStatus();
+	ks = account->myself()->onlineStatus();
 	s  = GaduProtocol::protocol()->statusToWithDescription( ks );
 
 	if ( s == GG_STATUS_NOT_AVAIL_DESCR ) {
@@ -79,7 +79,7 @@ void
 GaduAway::slotApply()
 {
 	if ( account_ ) {
-		account_->changetqStatus( GaduProtocol::protocol()->converttqStatus( status() ),awayText() );
+		account_->changeStatus( GaduProtocol::protocol()->convertStatus( status() ),awayText() );
 	}
 }
 
diff --git a/kopete/protocols/gadu/gaducommands.cpp b/kopete/protocols/gadu/gaducommands.cpp
index fb5944f8..c36f1ced 100644
--- a/kopete/protocols/gadu/gaducommands.cpp
+++ b/kopete/protocols/gadu/gaducommands.cpp
@@ -204,7 +204,7 @@ void RegisterCommand::watcher()
 		}
 
 		pubDir = (struct gg_pubdir *)session_->data;
-		emit operationtqStatus( i18n( "Token retrieving status: %1" ).tqarg( GaduSession::stateDescription( session_->state ) ) );
+		emit operationStatus( i18n( "Token retrieving status: %1" ).tqarg( GaduSession::stateDescription( session_->state ) ) );
 		switch ( session_->state ) {
 			case GG_STATE_CONNECTING:
 				kdDebug( 14100 ) << "Recreating notifiers " << endl;
@@ -254,7 +254,7 @@ void RegisterCommand::watcher()
 			return;
 		}
 		pubDir = (gg_pubdir*) session_->data;
-		emit operationtqStatus( i18n( "Registration status: %1" ).tqarg( GaduSession::stateDescription( session_->state ) ) );
+		emit operationStatus( i18n( "Registration status: %1" ).tqarg( GaduSession::stateDescription( session_->state ) ) );
 		switch ( session_->state ) {
 			case GG_STATE_CONNECTING:
 				kdDebug( 14100 ) << "Recreating notifiers " << endl;
diff --git a/kopete/protocols/gadu/gaducommands.h b/kopete/protocols/gadu/gaducommands.h
index a9c78b35..a191242c 100644
--- a/kopete/protocols/gadu/gaducommands.h
+++ b/kopete/protocols/gadu/gaducommands.h
@@ -53,7 +53,7 @@ signals:
 	void done( const TQString& title, const TQString& what );
 	void error( const TQString& title, const TQString& error );
 	void socketReady();
-	void operationtqStatus( const TQString );
+	void operationStatus( const TQString );
 
 protected:
 	void checkSocket( int, int );
diff --git a/kopete/protocols/gadu/gaducontact.cpp b/kopete/protocols/gadu/gaducontact.cpp
index d7965d3b..c9a68f25 100644
--- a/kopete/protocols/gadu/gaducontact.cpp
+++ b/kopete/protocols/gadu/gaducontact.cpp
@@ -66,7 +66,7 @@ GaduContact::GaduContact( uin_t uin, const TQString& name, Kopete::Account* acco
 	setFileCapable( true );
 
 	//offline
-	setOnlineStatus( GaduProtocol::protocol()->converttqStatus( 0 ) );
+	setOnlineStatus( GaduProtocol::protocol()->convertStatus( 0 ) );
 
 	setProperty( Kopete::Global::Properties::self()->nickName(), name );
 }
@@ -107,14 +107,14 @@ GaduContact::sendFile( const KURL &sourceURL, const TQString &/*fileName*/, uint
 
 
 void
-GaduContact::changedtqStatus( KGaduNotify* newstatus )
+GaduContact::changedStatus( KGaduNotify* newstatus )
 {
 	if ( newstatus->description.isNull() ) {
-		setOnlineStatus( GaduProtocol::protocol()->converttqStatus( newstatus->status ) );
+		setOnlineStatus( GaduProtocol::protocol()->convertStatus( newstatus->status ) );
 		removeProperty( GaduProtocol::protocol()->propAwayMessage );
 	}
 	else {
-		setOnlineStatus( GaduProtocol::protocol()->converttqStatus( newstatus->status ) );
+		setOnlineStatus( GaduProtocol::protocol()->convertStatus( newstatus->status ) );
 		setProperty( GaduProtocol::protocol()->propAwayMessage, newstatus->description );
 	}
 
@@ -230,7 +230,7 @@ GaduContact::slotUserInfo()
 
 	dlg->setName( metaContact()->displayName() );
 	dlg->setId( TQString::number( uin_ ) );
-	dlg->settqStatus( onlinetqStatus().description() );
+	dlg->setStatus( onlineStatus().description() );
 	dlg->setAwayMessage( description_ );
 	dlg->show();
 }
diff --git a/kopete/protocols/gadu/gaducontact.h b/kopete/protocols/gadu/gaducontact.h
index 15eaf288..66851c0c 100644
--- a/kopete/protocols/gadu/gaducontact.h
+++ b/kopete/protocols/gadu/gaducontact.h
@@ -67,7 +67,7 @@ public:
 	bool ignored();
 
 	static TQString findBestContactName( const GaduContactsList::ContactLine* );
-	void changedtqStatus( KGaduNotify* );
+	void changedStatus( KGaduNotify* );
 
 	uin_t uin() const;
 
diff --git a/kopete/protocols/gadu/gaduprotocol.cpp b/kopete/protocols/gadu/gaduprotocol.cpp
index 517902f1..3ec773f0 100644
--- a/kopete/protocols/gadu/gaduprotocol.cpp
+++ b/kopete/protocols/gadu/gaduprotocol.cpp
@@ -199,7 +199,7 @@ GaduProtocol::statusWithDescription( uint status )
 }
 
 Kopete::OnlineStatus
-GaduProtocol::converttqStatus( uint status ) const
+GaduProtocol::convertStatus( uint status ) const
 {
 	switch( status ) {
 		case GG_STATUS_NOT_AVAIL:
diff --git a/kopete/protocols/gadu/gaduprotocol.h b/kopete/protocols/gadu/gaduprotocol.h
index 5abae065..ff34d970 100644
--- a/kopete/protocols/gadu/gaduprotocol.h
+++ b/kopete/protocols/gadu/gaduprotocol.h
@@ -71,7 +71,7 @@ public:
 	// }
 	//!Plugin reimplementation
 
-	Kopete::OnlineStatus converttqStatus( uint ) const;
+	Kopete::OnlineStatus convertStatus( uint ) const;
 	bool statusWithDescription( uint status );
 
 	uint statusToWithDescription( Kopete::OnlineStatus status );
diff --git a/kopete/protocols/gadu/gadupubdir.cpp b/kopete/protocols/gadu/gadupubdir.cpp
index 570f2796..fc496aaa 100644
--- a/kopete/protocols/gadu/gadupubdir.cpp
+++ b/kopete/protocols/gadu/gadupubdir.cpp
@@ -225,12 +225,12 @@ GaduPublicDir::validateData()
 
 // Move to GaduProtocol someday
 TQPixmap
-GaduPublicDir::iconFortqStatus( uint status )
+GaduPublicDir::iconForStatus( uint status )
 {
 	TQPixmap n;
 
 	if ( GaduProtocol::protocol() ) {
-		return GaduProtocol::protocol()->converttqStatus( status ).protocolIcon();
+		return GaduProtocol::protocol()->convertStatus( status ).protocolIcon();
 	}
 	return n;
 }
@@ -256,7 +256,7 @@ GaduPublicDir::slotSearchResult( const SearchResult& result, unsigned int )
 					(*r).city,
 					TQString::number( (*r).uin ).ascii()
 						);
-		sl->setPixmap( 0, iconFortqStatus( (*r).status ) );
+		sl->setPixmap( 0, iconForStatus( (*r).status ) );
 	}
 
 	// if not found anything, obviously we don't want to search for more
diff --git a/kopete/protocols/gadu/gadupubdir.h b/kopete/protocols/gadu/gadupubdir.h
index 42fed436..4a2dce64 100644
--- a/kopete/protocols/gadu/gadupubdir.h
+++ b/kopete/protocols/gadu/gadupubdir.h
@@ -44,7 +44,7 @@ Q_OBJECT
 public:
 	GaduPublicDir( GaduAccount* , TQWidget *parent = 0, const char* name = "GaduPublicDir" );
 	GaduPublicDir( GaduAccount* , int searchFor, TQWidget* parent = 0, const char* name = "GaduPublicDir" );
-	TQPixmap iconFortqStatus( uint status );
+	TQPixmap iconForStatus( uint status );
 
 private slots:
 	void slotSearch();
diff --git a/kopete/protocols/gadu/gaduregisteraccount.cpp b/kopete/protocols/gadu/gaduregisteraccount.cpp
index 1b24575f..22f28703 100644
--- a/kopete/protocols/gadu/gaduregisteraccount.cpp
+++ b/kopete/protocols/gadu/gaduregisteraccount.cpp
@@ -62,9 +62,9 @@ GaduRegisterAccount::GaduRegisterAccount( TQWidget* parent, const char* name )
 	connect( cRegister, TQT_SIGNAL( tokenRecieved( TQPixmap, TQString ) ), TQT_SLOT( displayToken( TQPixmap, TQString ) ) );
 	connect( cRegister, TQT_SIGNAL( done(  const TQString&,  const TQString& ) ), TQT_SLOT( registrationDone(  const TQString&,  const TQString& ) ) );
 	connect( cRegister, TQT_SIGNAL( error(  const TQString&,  const TQString& ) ), TQT_SLOT( registrationError(  const TQString&,  const TQString& ) ) );
-	connect( cRegister, TQT_SIGNAL( operationtqStatus( const TQString ) ), TQT_SLOT( updatetqStatus( const TQString ) ) );
+	connect( cRegister, TQT_SIGNAL( operationStatus( const TQString ) ), TQT_SLOT( updateStatus( const TQString ) ) );
 
-	updatetqStatus( i18n( "Retrieving token" ) );
+	updateStatus( i18n( "Retrieving token" ) );
 	cRegister->requestToken();
 
 	show();
@@ -86,7 +86,7 @@ GaduRegisterAccount::validateInput()
 
 	if ( !emailRegexp->exactMatch( ui->valueEmailAddress->text() ) )
 	{
-		updatetqStatus( i18n( "Please enter a valid E-Mail Address." ) );
+		updateStatus( i18n( "Please enter a valid E-Mail Address." ) );
 		ui->pixmapEmailAddress->setPixmap ( hintPixmap );
 		valid = false;
 	}
@@ -96,21 +96,21 @@ GaduRegisterAccount::validateInput()
 
 	if ( valid && ( ( ui->valuePassword->text().isEmpty() ) || ( ui->valuePasswordVerify->text().isEmpty() ) ) )
 	{
-		updatetqStatus( i18n( "Please enter the same password twice." ) );
+		updateStatus( i18n( "Please enter the same password twice." ) );
 		valid = false;
 		passwordHighlight = true;
 	}
 
 	if ( valid && ( ui->valuePassword->text() != ui->valuePasswordVerify->text() ) )
 	{
-		updatetqStatus( i18n( "Password entries do not match." ) );
+		updateStatus( i18n( "Password entries do not match." ) );
 		valid = false;
 		passwordHighlight = true;
 	}
 
 	if ( valid && ( ui->valueVerificationSequence->text().isEmpty() ) )
 	{
-		updatetqStatus( i18n( "Please enter the verification sequence." ) );
+		updateStatus( i18n( "Please enter the verification sequence." ) );
 		ui->pixmapVerificationSequence->setPixmap ( hintPixmap );
 		valid = false;
 	}
@@ -131,7 +131,7 @@ GaduRegisterAccount::validateInput()
 	if ( valid )
 	{
 		// clear status message if we have valid data
-		updatetqStatus( i18n( "" ) );
+		updateStatus( i18n( "" ) );
 	}
 
 	enableButton( User1, valid );
@@ -156,7 +156,7 @@ GaduRegisterAccount::registrationDone(  const TQString& /*title*/,  const TQStri
 	ui->labelVerificationSequence->setDisabled( true );
 	ui->labelInstructions->setDisabled( true );
 	emit registeredNumber( cRegister->newUin(), ui->valuePassword->text() );
-	updatetqStatus( i18n( "Account created; your new UIN is %1." ).tqarg(TQString::number( cRegister->newUin() )  ) );
+	updateStatus( i18n( "Account created; your new UIN is %1." ).tqarg(TQString::number( cRegister->newUin() )  ) );
 	enableButton( User1, false );
 	setButtonText( Ok, i18n( "&Close" ) );
 }
@@ -164,18 +164,18 @@ GaduRegisterAccount::registrationDone(  const TQString& /*title*/,  const TQStri
 void
 GaduRegisterAccount::registrationError(  const TQString& title,  const TQString& what )
 {
-	updatetqStatus( i18n( "Registration failed: %1" ).tqarg( what ) );
+	updateStatus( i18n( "Registration failed: %1" ).tqarg( what ) );
 	KMessageBox::sorry( this, "Registration was unsucessful, please try again.", title );
 
 	disconnect( this, TQT_SLOT( displayToken( TQPixmap, TQString ) ) );
 	disconnect( this, TQT_SLOT( registrationDone(  const TQString&,  const TQString& ) ) );
 	disconnect( this, TQT_SLOT( registrationError(  const TQString&,  const TQString& ) ) );
-	disconnect( this, TQT_SLOT( updatetqStatus( const TQString ) ) );
+	disconnect( this, TQT_SLOT( updateStatus( const TQString ) ) );
 
 	ui->valueVerificationSequence->setDisabled( true );
 	ui->valueVerificationSequence->setText( "" );
 	enableButton( User1, false );
-	updatetqStatus( "" );
+	updateStatus( "" );
 
 	// emit UIN 0, to enable 'register new account' button again in dialog below
 	emit registeredNumber( 0, TQString( "" ) );
@@ -192,9 +192,9 @@ GaduRegisterAccount::displayToken( TQPixmap image, TQString /*tokenId */ )
 }
 
 void
-GaduRegisterAccount::updatetqStatus( const TQString status )
+GaduRegisterAccount::updateStatus( const TQString status )
 {
-	ui->labelStatusMessage->tqsetAlignment( AlignCenter );
+	ui->labelStatusMessage->setAlignment( AlignCenter );
 	ui->labelStatusMessage->setText( status );
 }
 
diff --git a/kopete/protocols/gadu/gaduregisteraccount.h b/kopete/protocols/gadu/gaduregisteraccount.h
index f6abb06d..ddc295ec 100644
--- a/kopete/protocols/gadu/gaduregisteraccount.h
+++ b/kopete/protocols/gadu/gaduregisteraccount.h
@@ -49,7 +49,7 @@ protected slots:
 	void registrationDone(  const TQString&,  const TQString& );
 	void inputChanged( const TQString & );
 	void doRegister();
-	void updatetqStatus( const TQString status );
+	void updateStatus( const TQString status );
 
 private:
 	void validateInput();
diff --git a/kopete/protocols/gadu/gadurichtextformat.cpp b/kopete/protocols/gadu/gadurichtextformat.cpp
index 9dcdbc21..18ef22b7 100644
--- a/kopete/protocols/gadu/gadurichtextformat.cpp
+++ b/kopete/protocols/gadu/gadurichtextformat.cpp
@@ -102,7 +102,7 @@ GaduRichTextFormat::convertToHtml( const TQString& msg, unsigned int formats, vo
 			}
 			style += TQString(" color: rgb( %1, %2, %3 ); ").tqarg( r ).tqarg( g ).tqarg( b );
 
-			tmp += formatOpeningTag( TQString::tqfromLatin1("span"), TQString::tqfromLatin1("style=\"%1\"").tqarg( style ) );
+			tmp += formatOpeningTag( TQString::fromLatin1("span"), TQString::fromLatin1("style=\"%1\"").tqarg( style ) );
 			opened = true;
 
 		}
@@ -150,8 +150,8 @@ GaduRichTextFormat::convertToGaduMessage( const Kopete::Message& message )
 	output->rtf.resize(0);
 
 	// test first if there is any HTML formating in it
-	if( htmlString.find( TQString::tqfromLatin1("</span") ) > -1 ) {
-		TQRegExp findTags( TQString::tqfromLatin1("<span style=\"(.*)\">(.*)</span>") );
+	if( htmlString.find( TQString::fromLatin1("</span") ) > -1 ) {
+		TQRegExp findTags( TQString::fromLatin1("<span style=\"(.*)\">(.*)</span>") );
 		findTags.setMinimal( true );
 		int pos = 0;
 		int lastpos = 0;
@@ -226,16 +226,16 @@ GaduRichTextFormat::convertToGaduMessage( const Kopete::Message& message )
 void
 GaduRichTextFormat::parseAttributes( const TQString attribute, const TQString value )
 {
-	if( attribute == TQString::tqfromLatin1("color") ) {
+	if( attribute == TQString::fromLatin1("color") ) {
 		color.setNamedColor( value );
 	}
-	if( attribute == TQString::tqfromLatin1("font-weight") && value == TQString::tqfromLatin1("600") ) {
+	if( attribute == TQString::fromLatin1("font-weight") && value == TQString::fromLatin1("600") ) {
 		rtfs.font |= GG_FONT_BOLD;
 	}
-	if( attribute == TQString::tqfromLatin1("text-decoration")  && value == TQString::tqfromLatin1("underline") ) {
+	if( attribute == TQString::fromLatin1("text-decoration")  && value == TQString::fromLatin1("underline") ) {
 		rtfs.font |= GG_FONT_UNDERLINE ;
 	}
-	if( attribute == TQString::tqfromLatin1("font-style")  && value == TQString::tqfromLatin1("italic") ) {
+	if( attribute == TQString::fromLatin1("font-style")  && value == TQString::fromLatin1("italic") ) {
 		rtfs.font |= GG_FONT_ITALIC;
 	}
 }
@@ -282,10 +282,10 @@ GaduRichTextFormat::insertRtf( uint position)
 TQString
 GaduRichTextFormat::escapeBody( TQString& input )
 {
-	input.replace( '<', TQString::tqfromLatin1("&lt;") );
-	input.replace( '>', TQString::tqfromLatin1("&gt;") );
-	input.replace( '\n', TQString::tqfromLatin1( "<br />" ) );
-	input.replace( '\t', TQString::tqfromLatin1( "&nbsp;&nbsp;&nbsp;&nbsp;" ) );
-	input.replace( TQRegExp( TQString::tqfromLatin1( "\\s\\s" ) ), TQString::tqfromLatin1( " &nbsp;" ) );
+	input.replace( '<', TQString::fromLatin1("&lt;") );
+	input.replace( '>', TQString::fromLatin1("&gt;") );
+	input.replace( '\n', TQString::fromLatin1( "<br />" ) );
+	input.replace( '\t', TQString::fromLatin1( "&nbsp;&nbsp;&nbsp;&nbsp;" ) );
+	input.replace( TQRegExp( TQString::fromLatin1( "\\s\\s" ) ), TQString::fromLatin1( " &nbsp;" ) );
 	return input;
 }
diff --git a/kopete/protocols/gadu/gadusession.cpp b/kopete/protocols/gadu/gadusession.cpp
index a9a84691..12fc5794 100644
--- a/kopete/protocols/gadu/gadusession.cpp
+++ b/kopete/protocols/gadu/gadusession.cpp
@@ -279,7 +279,7 @@ GaduSession::sendMessage( uin_t recipient, const Kopete::Message& msg, int msgCl
 }
 
 int
-GaduSession::changetqStatus( int status, bool forFriends )
+GaduSession::changeStatus( int status, bool forFriends )
 {
 	kdDebug(14101)<<"## Changing to "<<status<<endl;
 	if ( isConnected() ) {
@@ -424,8 +424,8 @@ GaduSession::pubDirSearch(  ResLine& query, int ageFrom, int ageTo, bool onlyAli
 						(const char*)textcodec->fromUnicode( query.city ) );
 		}
 		if ( ageFrom || ageTo ) {
-			TQString yearFrom = TQString::number( TQDate::tqcurrentDate().year() - ageFrom );
-			TQString yearTo = TQString::number( TQDate::tqcurrentDate().year() - ageTo );
+			TQString yearFrom = TQString::number( TQDate::currentDate().year() - ageFrom );
+			TQString yearTo = TQString::number( TQDate::currentDate().year() - ageTo );
 
 			if ( ageFrom && ageTo ) {
 				gg_pubdir50_add( searchRequest, GG_PUBDIR50_BIRTHYEAR,
@@ -490,7 +490,7 @@ GaduSession::sendResult( gg_pubdir50_t result )
 		resultLine.status	= stat.toInt();
 		age = resultLine.age.toInt();
 		if ( age ) {
-			resultLine.age = TQString::number( TQDate::tqcurrentDate().year() - age );
+			resultLine.age = TQString::number( TQDate::currentDate().year() - age );
 		}
 		else {
 			resultLine.age.truncate( 0 );
diff --git a/kopete/protocols/gadu/gadusession.h b/kopete/protocols/gadu/gadusession.h
index 7f732749..747163e1 100644
--- a/kopete/protocols/gadu/gadusession.h
+++ b/kopete/protocols/gadu/gadusession.h
@@ -124,7 +124,7 @@ public slots:
 	int	addNotify( uin_t );
 	int	removeNotify( uin_t );
 	int	sendMessage( uin_t recipient, const Kopete::Message& msg, int msgClass );
-	int	changetqStatus( int, bool forFriends = false );
+	int	changeStatus( int, bool forFriends = false );
 	int	changeStatusDescription( int, const TQString&, bool forFriends = false );
 	int	ping();
 
diff --git a/kopete/protocols/gadu/ui/gaduawayui.ui b/kopete/protocols/gadu/ui/gaduawayui.ui
index de6b1b81..07b531f0 100644
--- a/kopete/protocols/gadu/ui/gaduawayui.ui
+++ b/kopete/protocols/gadu/ui/gaduawayui.ui
@@ -44,7 +44,7 @@
                         <cstring>statusGroup_</cstring>
                     </property>
                     <property name="title">
-                        <string>tqStatus</string>
+                        <string>Status</string>
                     </property>
                     <property name="whatsThis" stdset="0">
                         <string>Choose status, by default present status is selected. 
diff --git a/kopete/protocols/gadu/ui/gadueditaccountui.ui b/kopete/protocols/gadu/ui/gadueditaccountui.ui
index ff165d35..91556886 100644
--- a/kopete/protocols/gadu/ui/gadueditaccountui.ui
+++ b/kopete/protocols/gadu/ui/gadueditaccountui.ui
@@ -158,7 +158,7 @@
                                         <verstretch>0</verstretch>
                                     </sizepolicy>
                                 </property>
-                                <property name="tqminimumSize">
+                                <property name="minimumSize">
                                     <size>
                                         <width>0</width>
                                         <height>0</height>
@@ -201,7 +201,7 @@ If you do not currently have an account, please click the button to create one.<
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>80</height>
@@ -231,7 +231,7 @@ If you do not currently have an account, please click the button to create one.<
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>160</height>
@@ -570,7 +570,7 @@ If you do not currently have an account, please click the button to create one.<
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>30</height>
@@ -780,7 +780,7 @@ If you do not currently have an account, please click the button to create one.<
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>180</height>
diff --git a/kopete/protocols/gadu/ui/gaduregisteraccountui.ui b/kopete/protocols/gadu/ui/gaduregisteraccountui.ui
index 9397854c..cc4f6149 100644
--- a/kopete/protocols/gadu/ui/gaduregisteraccountui.ui
+++ b/kopete/protocols/gadu/ui/gaduregisteraccountui.ui
@@ -39,13 +39,13 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>16</width>
                             <height>16</height>
                         </size>
                     </property>
-                    <property name="tqmaximumSize">
+                    <property name="maximumSize">
                         <size>
                             <width>32767</width>
                             <height>32767</height>
@@ -112,13 +112,13 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>16</width>
                             <height>16</height>
                         </size>
                     </property>
-                    <property name="tqmaximumSize">
+                    <property name="maximumSize">
                         <size>
                             <width>32767</width>
                             <height>32767</height>
@@ -157,13 +157,13 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>16</width>
                             <height>16</height>
                         </size>
                     </property>
-                    <property name="tqmaximumSize">
+                    <property name="maximumSize">
                         <size>
                             <width>32767</width>
                             <height>32767</height>
@@ -216,13 +216,13 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>16</width>
                             <height>16</height>
                         </size>
                     </property>
-                    <property name="tqmaximumSize">
+                    <property name="maximumSize">
                         <size>
                             <width>32767</width>
                             <height>32767</height>
@@ -283,7 +283,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>23</width>
                             <height>20</height>
@@ -302,13 +302,13 @@
                             <verstretch>13</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>256</width>
                             <height>64</height>
                         </size>
                     </property>
-                    <property name="tqmaximumSize">
+                    <property name="maximumSize">
                         <size>
                             <width>256</width>
                             <height>64</height>
@@ -350,7 +350,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>22</width>
                             <height>20</height>
@@ -388,7 +388,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
diff --git a/kopete/protocols/gadu/ui/gadusearch.ui b/kopete/protocols/gadu/ui/gadusearch.ui
index d9c39029..3ed367d4 100644
--- a/kopete/protocols/gadu/ui/gadusearch.ui
+++ b/kopete/protocols/gadu/ui/gadusearch.ui
@@ -220,7 +220,7 @@
                                                         <property name="sizeType">
                                                             <enum>Expanding</enum>
                                                         </property>
-                                                        <property name="tqsizeHint">
+                                                        <property name="sizeHint">
                                                             <size>
                                                                 <width>297</width>
                                                                 <height>21</height>
@@ -367,7 +367,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="tqsizeHint">
+                                        <property name="sizeHint">
                                             <size>
                                                 <width>224</width>
                                                 <height>21</height>
@@ -386,7 +386,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>21</height>
@@ -411,7 +411,7 @@
                     <widget class="KListView" row="0" column="0">
                         <column>
                             <property name="text">
-                                <string>tqStatus</string>
+                                <string>Status</string>
                             </property>
                             <property name="pixmap">
                                 <pixmap>image0</pixmap>
@@ -527,13 +527,13 @@
                                 <verstretch>0</verstretch>
                             </sizepolicy>
                         </property>
-                        <property name="tqminimumSize">
+                        <property name="minimumSize">
                             <size>
                                 <width>512</width>
                                 <height>256</height>
                             </size>
                         </property>
-                        <property name="tqmaximumSize">
+                        <property name="maximumSize">
                             <size>
                                 <width>640</width>
                                 <height>512</height>