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, 15 insertions, 15 deletions

diff --git a/kopete/protocols/msn/msnprotocol.cpp b/kopete/protocols/msn/msnprotocol.cpp
index 9c0007fc..587826ad 100644
--- a/kopete/protocols/msn/msnprotocol.cpp
+++ b/kopete/protocols/msn/msnprotocol.cpp
@@ -47,18 +47,18 @@ K_EXPORT_COMPONENT_FACTORY( libkopete_msn_shared, MSNProtocolFactory( "kopete_ms
 
 MSNProtocol *MSNProtocol::s_protocol = 0L;
 
-MSNProtocol::MSNProtocol( TQObject *parent, const char *name, const TQStringList & /* args */ )
-: Kopete::Protocol( MSNProtocolFactory::instance(), parent, name ),
-	NLN( Kopete::OnlineStatus::Online,    25, this, 1, TQString::null,               i18n( "Online" ) ,           i18n( "O&nline" ),        Kopete::OnlineStatusManager::Online,Kopete::OnlineStatusManager::HasAwayMessage ),
+MSNProtocol::MSNProtocol( TQObject *tqparent, const char *name, const TQStringList & /* args */ )
+: Kopete::Protocol( MSNProtocolFactory::instance(), tqparent, name ),
+	NLN( Kopete::OnlineStatus::Online,    25, this, 1, TQString(),               i18n( "Online" ) ,           i18n( "O&nline" ),        Kopete::OnlineStatusManager::Online,Kopete::OnlineStatusManager::HasAwayMessage ),
 	BSY( Kopete::OnlineStatus::Away,      20, this, 2, "msn_busy",                  i18n( "Busy" ) ,             i18n( "&Busy" ),          Kopete::OnlineStatusManager::Busy,  Kopete::OnlineStatusManager::HasAwayMessage ),
 	BRB( Kopete::OnlineStatus::Away,      22, this, 3, "msn_brb",                   i18n( "Be Right Back" ),     i18n( "Be &Right Back" ) ,  0  ,                              Kopete::OnlineStatusManager::HasAwayMessage ),
 	AWY( Kopete::OnlineStatus::Away,      18, this, 4, "contact_away_overlay",      i18n( "Away From Computer" ),i18n( "&Away" ),          Kopete::OnlineStatusManager::Away,  Kopete::OnlineStatusManager::HasAwayMessage ),
 	PHN( Kopete::OnlineStatus::Away,      12, this, 5, "contact_phone_overlay",     i18n( "On the Phone" ) ,     i18n( "On The &Phone" )  ,  0  ,                              Kopete::OnlineStatusManager::HasAwayMessage ),
 	LUN( Kopete::OnlineStatus::Away,      15, this, 6, "contact_food_overlay",      i18n( "Out to Lunch" ) ,     i18n( "Out To &Lunch" )  ,  0  ,                              Kopete::OnlineStatusManager::HasAwayMessage ),
-	FLN( Kopete::OnlineStatus::Offline,    0, this, 7, TQString::null,               i18n( "Offline" ) ,          i18n( "&Offline" ),       Kopete::OnlineStatusManager::Offline,Kopete::OnlineStatusManager::DisabledIfOffline ),
+	FLN( Kopete::OnlineStatus::Offline,    0, this, 7, TQString(),               i18n( "Offline" ) ,          i18n( "&Offline" ),       Kopete::OnlineStatusManager::Offline,Kopete::OnlineStatusManager::DisabledIfOffline ),
 	HDN( Kopete::OnlineStatus::Invisible,  3, this, 8, "contact_invisible_overlay", i18n( "Invisible" ) ,        i18n( "&Invisible" ),     Kopete::OnlineStatusManager::Invisible ), 
 	IDL( Kopete::OnlineStatus::Away,      10, this, 9, "contact_away_overlay",      i18n( "Idle" ) ,             i18n( "&Idle" ),          Kopete::OnlineStatusManager::Idle , Kopete::OnlineStatusManager::HideFromMenu ),
-	UNK( Kopete::OnlineStatus::Unknown,   25, this, 0, "status_unknown",            i18n( "Status not available" ) ),
+	UNK( Kopete::OnlineStatus::Unknown,   25, this, 0, "status_unknown",            i18n( "tqStatus not available" ) ),
 	CNT( Kopete::OnlineStatus::Connecting, 2, this, 10,"msn_connecting",            i18n( "Connecting" ) ),
 	propEmail(Kopete::Global::Properties::self()->emailAddress()),
 	propPhoneHome(Kopete::Global::Properties::self()->privatePhone()),
@@ -74,7 +74,7 @@ MSNProtocol::MSNProtocol( TQObject *parent, const char *name, const TQStringList
 
 	setCapabilities( Kopete::Protocol::BaseFgColor | Kopete::Protocol::BaseFont | Kopete::Protocol::BaseFormatting );
 
-	// m_status = m_unknownStatus = UNK;
+	// m_status = m_unknowntqStatus = UNK;
 }
 
 Kopete::Contact *MSNProtocol::deserializeContact( Kopete::MetaContact *metaContact, const TQMap<TQString, TQString> &serializedData,
@@ -104,21 +104,21 @@ Kopete::Contact *MSNProtocol::deserializeContact( Kopete::MetaContact *metaConta
 	c->setInfo( "PHM" , serializedData[ "PHM" ] );
 	c->setProperty( propGuid, contactGuid );
 
-	c->setBlocked(  (bool)(lists.contains('B')) );
-	c->setAllowed(  (bool)(lists.contains('A')) );
-	c->setReversed( (bool)(lists.contains('R')) );
+	c->setBlocked(  (bool)(lists.tqcontains('B')) );
+	c->setAllowed(  (bool)(lists.tqcontains('A')) );
+	c->setReversed( (bool)(lists.tqcontains('R')) );
 
 	return c;
 }
 
-AddContactPage *MSNProtocol::createAddContactWidget(TQWidget *parent , Kopete::Account *i)
+AddContactPage *MSNProtocol::createAddContactWidget(TQWidget *tqparent , Kopete::Account *i)
 {
-	return (new MSNAddContactPage(i->isConnected(),parent));
+	return (new MSNAddContactPage(i->isConnected(),tqparent));
 }
 
-KopeteEditAccountWidget *MSNProtocol::createEditAccountWidget(Kopete::Account *account, TQWidget *parent)
+KopeteEditAccountWidget *MSNProtocol::createEditAccountWidget(Kopete::Account *account, TQWidget *tqparent)
 {
-	return new MSNEditAccountWidget(this,account,parent);
+	return new MSNEditAccountWidget(this,account,tqparent);
 }
 
 Kopete::Account *MSNProtocol::createNewAccount(const TQString &accountId)
@@ -154,13 +154,13 @@ MSNProtocol* MSNProtocol::protocol()
 
 bool MSNProtocol::validContactId(const TQString& userid)
 {
-	return ( userid.contains('@') ==1 && userid.contains('.') >=1 && userid.contains(' ') == 0);
+	return ( userid.tqcontains('@') ==1 && userid.tqcontains('.') >=1 && userid.tqcontains(' ') == 0);
 }
 
 TQImage MSNProtocol::scalePicture(const TQImage &picture)
 {
 	TQImage img(picture);
-	img = img.smoothScale( 96, 96, TQImage::ScaleMin );
+	img = img.smoothScale( 96, 96, TQ_ScaleMin );
 	// crop image if not square
 	if(img.width() < img.height())
 	{