TQt4 port kdenetwork

This enables compilation under both Qt3 and Qt4


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

1 files changed, 18 insertions, 18 deletions

diff --git a/kopete/libkopete/kopeteaccountmanager.cpp b/kopete/libkopete/kopeteaccountmanager.cpp
index d12aa7ce..f3671d10 100644
--- a/kopete/libkopete/kopeteaccountmanager.cpp
+++ b/kopete/libkopete/kopeteaccountmanager.cpp
@@ -75,7 +75,7 @@ AccountManager * AccountManager::self()
 
 
 AccountManager::AccountManager()
-: TQObject( qApp, "KopeteAccountManager" )
+: TQObject( tqApp, "KopeteAccountManager" )
 {
 	d = new Private;
 }
@@ -138,7 +138,7 @@ void AccountManager::setAwayAll( const TQString &awayReason, bool away )
 	{
 		// FIXME: ICQ's invisible online should be set to invisible away
 		Contact *self = it.current()->myself();
-		bool isInvisible = self && self->onlineStatus().status() == OnlineStatus::Invisible;
+		bool isInvisible = self && self->onlinetqStatus().status() == OnlineStatus::Invisible;
 		if ( anyConnected )
 		{
 			if ( it.current()->isConnected() && !isInvisible )
@@ -160,7 +160,7 @@ void AccountManager::setOnlineStatus( uint category , const TQString& awayMessag
 	for ( TQPtrListIterator<Account> it( d->accounts ); it.current(); ++it )
 	{
 		Account *account = it.current();
-		Kopete::OnlineStatus status = OnlineStatusManager::self()->onlineStatus(account->protocol() , katgor);
+		Kopete::OnlineStatus status = OnlineStatusManager::self()->onlinetqStatus(account->protocol() , katgor);
 		if ( anyConnected )
 		{
 			if ( account->isConnected() || ( (flags & ConnectIfOffline) && !account->excludeConnect() ) )
@@ -196,22 +196,22 @@ TQColor AccountManager::guessColor( Protocol *protocol ) const
 		color = TQColor();
 		break;
 	case 1:
-		color = Qt::red;
+		color = TQt::red;
 		break;
 	case 2:
-		color = Qt::green;
+		color = TQt::green;
 		break;
 	case 3:
-		color = Qt::blue;
+		color = TQt::blue;
 		break;
 	case 4:
-		color = Qt::yellow;
+		color = TQt::yellow;
 		break;
 	case 5:
-		color = Qt::magenta;
+		color = TQt::magenta;
 		break;
 	case 6:
-		color = Qt::cyan;
+		color = TQt::cyan;
 		break;
 	}
 
@@ -220,7 +220,7 @@ TQColor AccountManager::guessColor( Protocol *protocol ) const
 
 Account* AccountManager::registerAccount( Account *account )
 {
-	if( !account || d->accounts.contains( account ) )
+	if( !account || d->accounts.tqcontains( account ) )
 		return account;
 
 	if( account->accountId().isEmpty() )
@@ -314,7 +314,7 @@ void AccountManager::removeAccount( Account *account )
 			Group* group = mc->groups().first();
 			TQPtrList<MetaContact> groupMembers = group->members();
 			ContactList::self()->removeMetaContact( mc );
-			if ( groupMembers.count() == 1 && groupMembers.findRef( mc ) != -1 )
+			if ( groupMembers.count() == 1 && groupMembers.tqfindRef( mc ) != -1 )
 				ContactList::self()->removeGroup( group );
 		}
 	}
@@ -332,7 +332,7 @@ void AccountManager::removeAccount( Account *account )
 	{
 		// FIXME: pluginId() should return the internal name and not the class name, so
 		//        we can get rid of this hack - Olivier/Martijn
-		TQString protocolName = protocol->pluginId().remove( TQString::fromLatin1( "Protocol" ) ).lower();
+		TQString protocolName = protocol->pluginId().remove( TQString::tqfromLatin1( "Protocol" ) ).lower();
 
 		PluginManager::self()->setPluginEnabled( protocolName, false );
 		PluginManager::self()->unloadPlugin( protocolName );
@@ -365,14 +365,14 @@ void AccountManager::load()
 	// Don't try to optimize duplicate calls out, the plugin queue is smart enough
 	// (and fast enough) to handle that without adding complexity here
 	KConfig *config = KGlobal::config();
-	TQStringList accountGroups = config->groupList().grep( TQRegExp( TQString::fromLatin1( "^Account_" ) ) );
+	TQStringList accountGroups = config->groupList().grep( TQRegExp( TQString::tqfromLatin1( "^Account_" ) ) );
 	for ( TQStringList::Iterator it = accountGroups.begin(); it != accountGroups.end(); ++it )
 	{
 		config->setGroup( *it );
 
 		TQString protocol = config->readEntry( "Protocol" );
-		if ( protocol.endsWith( TQString::fromLatin1( "Protocol" ) ) )
-			protocol = TQString::fromLatin1( "kopete_" ) + protocol.lower().remove( TQString::fromLatin1( "protocol" ) );
+		if ( protocol.endsWith( TQString::tqfromLatin1( "Protocol" ) ) )
+			protocol = TQString::tqfromLatin1( "kopete_" ) + protocol.lower().remove( TQString::tqfromLatin1( "protocol" ) );
 
 		if ( config->readBoolEntry( "Enabled", true ) )
 			PluginManager::self()->loadPlugin( protocol, PluginManager::LoadAsync );
@@ -388,7 +388,7 @@ void AccountManager::slotPluginLoaded( Plugin *plugin )
 	// Iterate over all groups that start with "Account_" as those are accounts
 	// and parse them if they are from this protocol
 	KConfig *config = KGlobal::config();
-	TQStringList accountGroups = config->groupList().grep( TQRegExp( TQString::fromLatin1( "^Account_" ) ) );
+	TQStringList accountGroups = config->groupList().grep( TQRegExp( TQString::tqfromLatin1( "^Account_" ) ) );
 	for ( TQStringList::Iterator it = accountGroups.begin(); it != accountGroups.end(); ++it )
 	{
 		config->setGroup( *it );
@@ -423,14 +423,14 @@ void AccountManager::slotPluginLoaded( Plugin *plugin )
 }
 
 void AccountManager::slotAccountOnlineStatusChanged(Contact *c,
-	const OnlineStatus &oldStatus, const OnlineStatus &newStatus)
+	const OnlineStatus &oldtqStatus, const OnlineStatus &newtqStatus)
 {
 	Account *account = c->account();
 	if (!account)
 		return;
 
 	//kdDebug(14010) << k_funcinfo << endl;
-	emit accountOnlineStatusChanged(account, oldStatus, newStatus);
+	emit accountOnlineStatusChanged(account, oldtqStatus, newtqStatus);
 }
 
 } //END namespace Kopete