From 47c8a359c5276062c4bc17f0e82410f29081b502 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 31 Jul 2010 19:48:06 +0000 Subject: Trinity Qt initial conversion git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1157648 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kopete/protocols/msn/msnaccount.cpp | 324 ++++++++++++++++++------------------ 1 file changed, 162 insertions(+), 162 deletions(-) (limited to 'kopete/protocols/msn/msnaccount.cpp') diff --git a/kopete/protocols/msn/msnaccount.cpp b/kopete/protocols/msn/msnaccount.cpp index 01caec11..267cd0d7 100644 --- a/kopete/protocols/msn/msnaccount.cpp +++ b/kopete/protocols/msn/msnaccount.cpp @@ -31,10 +31,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include "msncontact.h" #include "msnnotifysocket.h" @@ -61,7 +61,7 @@ #include "avdevice/videodevicepool.h" #endif -MSNAccount::MSNAccount( MSNProtocol *parent, const QString& AccountID, const char *name ) +MSNAccount::MSNAccount( MSNProtocol *parent, const TQString& AccountID, const char *name ) : Kopete::PasswordedAccount ( parent, AccountID.lower(), 0, name ) { m_notifySocket = 0L; @@ -73,16 +73,16 @@ MSNAccount::MSNAccount( MSNProtocol *parent, const QString& AccountID, const cha setMyself( new MSNContact( this, accountId(), Kopete::ContactList::self()->myself() ) ); //myself()->setOnlineStatus( MSNProtocol::protocol()->FLN ); - QObject::connect( Kopete::ContactList::self(), SIGNAL( groupRenamed( Kopete::Group *, const QString & ) ), - SLOT( slotKopeteGroupRenamed( Kopete::Group * ) ) ); - QObject::connect( Kopete::ContactList::self(), SIGNAL( groupRemoved( Kopete::Group * ) ), - SLOT( slotKopeteGroupRemoved( Kopete::Group * ) ) ); + TQObject::connect( Kopete::ContactList::self(), TQT_SIGNAL( groupRenamed( Kopete::Group *, const TQString & ) ), + TQT_SLOT( slotKopeteGroupRenamed( Kopete::Group * ) ) ); + TQObject::connect( Kopete::ContactList::self(), TQT_SIGNAL( groupRemoved( Kopete::Group * ) ), + TQT_SLOT( slotKopeteGroupRemoved( Kopete::Group * ) ) ); - QObject::connect( Kopete::ContactList::self(), SIGNAL( globalIdentityChanged(const QString&, const QVariant& ) ), SLOT( slotGlobalIdentityChanged(const QString&, const QVariant& ) )); + TQObject::connect( Kopete::ContactList::self(), TQT_SIGNAL( globalIdentityChanged(const TQString&, const TQVariant& ) ), TQT_SLOT( slotGlobalIdentityChanged(const TQString&, const TQVariant& ) )); - m_openInboxAction = new KAction( i18n( "Open Inbo&x..." ), "mail_generic", 0, this, SLOT( slotOpenInbox() ), this, "m_openInboxAction" ); - m_changeDNAction = new KAction( i18n( "&Change Display Name..." ), QString::null, 0, this, SLOT( slotChangePublicName() ), this, "renameAction" ); - m_startChatAction = new KAction( i18n( "&Start Chat..." ), "mail_generic", 0, this, SLOT( slotStartChat() ), this, "startChatAction" ); + m_openInboxAction = new KAction( i18n( "Open Inbo&x..." ), "mail_generic", 0, this, TQT_SLOT( slotOpenInbox() ), this, "m_openInboxAction" ); + m_changeDNAction = new KAction( i18n( "&Change Display Name..." ), TQString::null, 0, this, TQT_SLOT( slotChangePublicName() ), this, "renameAction" ); + m_startChatAction = new KAction( i18n( "&Start Chat..." ), "mail_generic", 0, this, TQT_SLOT( slotStartChat() ), this, "startChatAction" ); KConfigGroup *config=configGroup(); @@ -92,7 +92,7 @@ MSNAccount::MSNAccount( MSNProtocol *parent, const QString& AccountID, const cha m_reverseList = config->readListEntry( "reverseList" ) ; // Load the avatar - m_pictureFilename = locateLocal( "appdata", "msnpicture-"+ accountId().lower().replace(QRegExp("[./~]"),"-") +".png" ); + m_pictureFilename = locateLocal( "appdata", "msnpicture-"+ accountId().lower().replace(TQRegExp("[./~]"),"-") +".png" ); resetPictureObject(true); static_cast( myself() )->setInfo( "PHH", config->readEntry("PHH") ); @@ -103,10 +103,10 @@ MSNAccount::MSNAccount( MSNProtocol *parent, const QString& AccountID, const cha //construct the group list //Before 2003-11-14 the MSN server allowed us to download the group list without downloading the whole contactlist, but it's not possible anymore - QPtrList groupList = Kopete::ContactList::self()->groups(); + TQPtrList groupList = Kopete::ContactList::self()->groups(); for ( Kopete::Group *g = groupList.first(); g; g = groupList.next() ) { - QString groupGuid=g->pluginData( protocol(), accountId() + " id" ); + TQString groupGuid=g->pluginData( protocol(), accountId() + " id" ); if ( !groupGuid.isEmpty() ) m_groupList.insert( groupGuid , g ); } @@ -124,7 +124,7 @@ MSNAccount::MSNAccount( MSNProtocol *parent, const QString& AccountID, const cha } -QString MSNAccount::serverName() +TQString MSNAccount::serverName() { return configGroup()->readEntry( "serverName" , "messenger.hotmail.com" ); } @@ -139,12 +139,12 @@ bool MSNAccount::useHttpMethod() const return configGroup()->readBoolEntry( "useHttpMethod" , false ); } -QString MSNAccount::myselfClientId() const +TQString MSNAccount::myselfClientId() const { - return QString::number(m_clientId, 10); + return TQString::number(m_clientId, 10); } -void MSNAccount::connectWithPassword( const QString &passwd ) +void MSNAccount::connectWithPassword( const TQString &passwd ) { m_newContactList=false; if ( isConnected() ) @@ -181,13 +181,13 @@ void MSNAccount::connectWithPassword( const QString &passwd ) createNotificationServer(serverName(), serverPort()); } -void MSNAccount::createNotificationServer( const QString &host, uint port ) +void MSNAccount::createNotificationServer( const TQString &host, uint port ) { if(m_notifySocket) //we are switching from one to another notifysocket. { //remove every slots to that socket, so we won't delete receive signals // from the old socket thinking they are from the new one - QObject::disconnect( m_notifySocket , 0, this, 0 ); + TQObject::disconnect( m_notifySocket , 0, this, 0 ); m_notifySocket->deleteLater(); //be sure it will be deleted m_notifySocket=0L; } @@ -200,36 +200,36 @@ void MSNAccount::createNotificationServer( const QString &host, uint port ) m_notifySocket = new MSNNotifySocket( this, accountId() , m_password); m_notifySocket->setUseHttpMethod( useHttpMethod() ); - QObject::connect( m_notifySocket, SIGNAL( groupAdded( const QString&, const QString& ) ), - SLOT( slotGroupAdded( const QString&, const QString& ) ) ); - QObject::connect( m_notifySocket, SIGNAL( groupRenamed( const QString&, const QString& ) ), - SLOT( slotGroupRenamed( const QString&, const QString& ) ) ); - QObject::connect( m_notifySocket, SIGNAL( groupListed( const QString&, const QString& ) ), - SLOT( slotGroupAdded( const QString&, const QString& ) ) ); - QObject::connect( m_notifySocket, SIGNAL( groupRemoved( const QString& ) ), - SLOT( slotGroupRemoved( const QString& ) ) ); - QObject::connect( m_notifySocket, SIGNAL( contactList(const QString&, const QString&, const QString&, uint, const QString& ) ), - SLOT( slotContactListed(const QString&, const QString&, const QString&, uint, const QString& ) ) ); - QObject::connect( m_notifySocket, SIGNAL(contactAdded(const QString&, const QString&, const QString&, const QString&, const QString& ) ), - SLOT( slotContactAdded(const QString&, const QString&, const QString&, const QString&, const QString& ) ) ); - QObject::connect( m_notifySocket, SIGNAL( contactRemoved(const QString&, const QString&, const QString&, const QString& ) ), - SLOT( slotContactRemoved(const QString&, const QString&, const QString&, const QString& ) ) ); - QObject::connect( m_notifySocket, SIGNAL( statusChanged( const Kopete::OnlineStatus & ) ), - SLOT( slotStatusChanged( const Kopete::OnlineStatus & ) ) ); - QObject::connect( m_notifySocket, SIGNAL( invitedToChat( const QString&, const QString&, const QString&, const QString&, const QString& ) ), - SLOT( slotCreateChat( const QString&, const QString&, const QString&, const QString&, const QString& ) ) ); - QObject::connect( m_notifySocket, SIGNAL( startChat( const QString&, const QString& ) ), - SLOT( slotCreateChat( const QString&, const QString& ) ) ); - QObject::connect( m_notifySocket, SIGNAL( socketClosed() ), - SLOT( slotNotifySocketClosed() ) ); - QObject::connect( m_notifySocket, SIGNAL( newContactList() ), - SLOT( slotNewContactList() ) ); - QObject::connect( m_notifySocket, SIGNAL( receivedNotificationServer(const QString&, uint ) ), - SLOT(createNotificationServer(const QString&, uint ) ) ); - QObject::connect( m_notifySocket, SIGNAL( hotmailSeted( bool ) ), - m_openInboxAction, SLOT( setEnabled( bool ) ) ); - QObject::connect( m_notifySocket, SIGNAL( errorMessage(int, const QString& ) ), - SLOT( slotErrorMessageReceived(int, const QString& ) ) ); + TQObject::connect( m_notifySocket, TQT_SIGNAL( groupAdded( const TQString&, const TQString& ) ), + TQT_SLOT( slotGroupAdded( const TQString&, const TQString& ) ) ); + TQObject::connect( m_notifySocket, TQT_SIGNAL( groupRenamed( const TQString&, const TQString& ) ), + TQT_SLOT( slotGroupRenamed( const TQString&, const TQString& ) ) ); + TQObject::connect( m_notifySocket, TQT_SIGNAL( groupListed( const TQString&, const TQString& ) ), + TQT_SLOT( slotGroupAdded( const TQString&, const TQString& ) ) ); + TQObject::connect( m_notifySocket, TQT_SIGNAL( groupRemoved( const TQString& ) ), + TQT_SLOT( slotGroupRemoved( const TQString& ) ) ); + TQObject::connect( m_notifySocket, TQT_SIGNAL( contactList(const TQString&, const TQString&, const TQString&, uint, const TQString& ) ), + TQT_SLOT( slotContactListed(const TQString&, const TQString&, const TQString&, uint, const TQString& ) ) ); + TQObject::connect( m_notifySocket, TQT_SIGNAL(contactAdded(const TQString&, const TQString&, const TQString&, const TQString&, const TQString& ) ), + TQT_SLOT( slotContactAdded(const TQString&, const TQString&, const TQString&, const TQString&, const TQString& ) ) ); + TQObject::connect( m_notifySocket, TQT_SIGNAL( contactRemoved(const TQString&, const TQString&, const TQString&, const TQString& ) ), + TQT_SLOT( slotContactRemoved(const TQString&, const TQString&, const TQString&, const TQString& ) ) ); + TQObject::connect( m_notifySocket, TQT_SIGNAL( statusChanged( const Kopete::OnlineStatus & ) ), + TQT_SLOT( slotStatusChanged( const Kopete::OnlineStatus & ) ) ); + TQObject::connect( m_notifySocket, TQT_SIGNAL( invitedToChat( const TQString&, const TQString&, const TQString&, const TQString&, const TQString& ) ), + TQT_SLOT( slotCreateChat( const TQString&, const TQString&, const TQString&, const TQString&, const TQString& ) ) ); + TQObject::connect( m_notifySocket, TQT_SIGNAL( startChat( const TQString&, const TQString& ) ), + TQT_SLOT( slotCreateChat( const TQString&, const TQString& ) ) ); + TQObject::connect( m_notifySocket, TQT_SIGNAL( socketClosed() ), + TQT_SLOT( slotNotifySocketClosed() ) ); + TQObject::connect( m_notifySocket, TQT_SIGNAL( newContactList() ), + TQT_SLOT( slotNewContactList() ) ); + TQObject::connect( m_notifySocket, TQT_SIGNAL( receivedNotificationServer(const TQString&, uint ) ), + TQT_SLOT(createNotificationServer(const TQString&, uint ) ) ); + TQObject::connect( m_notifySocket, TQT_SIGNAL( hotmailSeted( bool ) ), + m_openInboxAction, TQT_SLOT( setEnabled( bool ) ) ); + TQObject::connect( m_notifySocket, TQT_SIGNAL( errorMessage(int, const TQString& ) ), + TQT_SLOT( slotErrorMessageReceived(int, const TQString& ) ) ); m_notifySocket->setStatus( m_connectstatus ); m_notifySocket->connect(host, port); @@ -269,7 +269,7 @@ KActionMenu * MSNAccount::actionMenu() #if !defined NDEBUG KActionMenu *debugMenu = new KActionMenu( "Debug", m_actionMenu ); debugMenu->insert( new KAction( i18n( "Send Raw C&ommand..." ), 0, - this, SLOT( slotDebugRawCommand() ), debugMenu, "m_debugRawCommand" ) ); + this, TQT_SLOT( slotDebugRawCommand() ), debugMenu, "m_debugRawCommand" ) ); m_actionMenu->popupMenu()->insertSeparator(); m_actionMenu->insert( debugMenu ); #endif @@ -283,7 +283,7 @@ MSNNotifySocket *MSNAccount::notifySocket() } -void MSNAccount::setOnlineStatus( const Kopete::OnlineStatus &status , const QString &reason) +void MSNAccount::setOnlineStatus( const Kopete::OnlineStatus &status , const TQString &reason) { kdDebug( 14140 ) << k_funcinfo << status.description() << endl; @@ -298,7 +298,7 @@ void MSNAccount::setOnlineStatus( const Kopete::OnlineStatus &status , const QSt // since it's the same. if( reason.contains("[Music]") ) { - QString personalMessage = reason.section("[Music]", 1); + TQString personalMessage = reason.section("[Music]", 1); setPersonalMessage( MSNProtocol::PersonalMessageMusic, personalMessage ); // Don't send un-needed status change. @@ -329,8 +329,8 @@ void MSNAccount::slotStartChat() { bool ok; - QString handle = KInputDialog::getText( i18n( "Start Chat - MSN Plugin" ), - i18n( "Please enter the email address of the person with whom you want to chat:" ), QString::null, &ok ).lower(); + TQString handle = KInputDialog::getText( i18n( "Start Chat - MSN Plugin" ), + i18n( "Please enter the email address of the person with whom you want to chat:" ), TQString::null, &ok ).lower(); if ( ok ) { if ( MSNProtocol::validContactId( handle ) ) @@ -356,7 +356,7 @@ void MSNAccount::slotDebugRawCommand() MSNDebugRawCmdDlg *dlg = new MSNDebugRawCmdDlg( 0L ); int result = dlg->exec(); - if ( result == QDialog::Accepted && m_notifySocket ) + if ( result == TQDialog::Accepted && m_notifySocket ) { m_notifySocket->sendCommand( dlg->command(), dlg->params(), dlg->addId(), dlg->msg().replace( "\n", "\r\n" ).utf8() ); @@ -374,7 +374,7 @@ void MSNAccount::slotChangePublicName() } bool ok; - QString name = KInputDialog::getText( i18n( "Change Display Name - MSN Plugin" ), + TQString name = KInputDialog::getText( i18n( "Change Display Name - MSN Plugin" ), i18n( "Enter the new display name by which you want to be visible to your friends on MSN:" ), myself()->property( Kopete::Global::Properties::self()->nickName()).value().toString(), &ok ); @@ -416,8 +416,8 @@ void MSNAccount::slotNotifySocketClosed() if(reason == Kopete::Account::OtherClient) { //close all chat sessions, so new message will arive to the other client. - QValueList sessions = Kopete::ChatSessionManager::self()->sessions(); - QValueList::Iterator it; + TQValueList sessions = Kopete::ChatSessionManager::self()->sessions(); + TQValueList::Iterator it; for (it=sessions.begin() ; it != sessions.end() ; it++ ) { MSNChatSession *msnCS = dynamic_cast( *it ); @@ -449,7 +449,7 @@ void MSNAccount::slotStatusChanged( const Kopete::OnlineStatus &status ) { m_newContactList=false; - QDictIterator it( contacts() ); + TQDictIterator it( contacts() ); for ( ; it.current(); ++it ) { MSNContact *c = static_cast( *it ); @@ -470,9 +470,9 @@ void MSNAccount::slotStatusChanged( const Kopete::OnlineStatus &status ) } -void MSNAccount::slotPersonalMessageChanged( const QString& personalMessage ) +void MSNAccount::slotPersonalMessageChanged( const TQString& personalMessage ) { - QString oldPersonalMessage=myself()->property(MSNProtocol::protocol()->propPersonalMessage).value().toString() ; + TQString oldPersonalMessage=myself()->property(MSNProtocol::protocol()->propPersonalMessage).value().toString() ; if ( personalMessage != oldPersonalMessage ) { myself()->setProperty( MSNProtocol::protocol()->propPersonalMessage, personalMessage ); @@ -480,15 +480,15 @@ void MSNAccount::slotPersonalMessageChanged( const QString& personalMessage ) } } -void MSNAccount::setPublicName( const QString &publicName ) +void MSNAccount::setPublicName( const TQString &publicName ) { if ( m_notifySocket ) { - m_notifySocket->changePublicName( publicName, QString::null ); + m_notifySocket->changePublicName( publicName, TQString::null ); } } -void MSNAccount::setPersonalMessage( MSNProtocol::PersonalMessageType type, const QString &personalMessage ) +void MSNAccount::setPersonalMessage( MSNProtocol::PersonalMessageType type, const TQString &personalMessage ) { if ( m_notifySocket ) { @@ -501,7 +501,7 @@ void MSNAccount::setPersonalMessage( MSNProtocol::PersonalMessageType type, cons }*/ } -void MSNAccount::slotGroupAdded( const QString& groupName, const QString &groupGuid ) +void MSNAccount::slotGroupAdded( const TQString& groupName, const TQString &groupGuid ) { if ( m_groupList.contains( groupGuid ) ) { @@ -512,11 +512,11 @@ void MSNAccount::slotGroupAdded( const QString& groupName, const QString &groupG } //--------- Find the appropriate Kopete::Group, or create one ---------// - QPtrList groupList = Kopete::ContactList::self()->groups(); + TQPtrList groupList = Kopete::ContactList::self()->groups(); Kopete::Group *fallBack = 0L; //check if we have one in the old group list. if yes, update the id translate map. - for(QMap::Iterator it=m_oldGroupList.begin() ; it != m_oldGroupList.end() ; ++it ) + for(TQMap::Iterator it=m_oldGroupList.begin() ; it != m_oldGroupList.end() ; ++it ) { Kopete::Group *g=it.data(); if (g && g->pluginData( protocol(), accountId() + " displayName" ) == groupName && @@ -543,7 +543,7 @@ void MSNAccount::slotGroupAdded( const QString& groupName, const QString &groupG if ( g->pluginData( protocol(), accountId() + " id" ).toUInt() == groupNumber ) { m_groupList.insert( groupNumber, g ); - QString oldGroupName; + TQString oldGroupName; if ( g->pluginData( protocol(), accountId() + " displayName" ) != groupName ) { // The displayName of the group has been modified by another client @@ -589,14 +589,14 @@ void MSNAccount::slotGroupAdded( const QString& groupName, const QString &groupG // We have pending groups that we need add a contact to if ( tmp_addToNewGroup.contains(groupName) ) { - QStringList list=tmp_addToNewGroup[groupName]; - for ( QStringList::Iterator it = list.begin(); it != list.end(); ++it ) + TQStringList list=tmp_addToNewGroup[groupName]; + for ( TQStringList::Iterator it = list.begin(); it != list.end(); ++it ) { - QString contactId = *it; + TQString contactId = *it; kdDebug( 14140 ) << k_funcinfo << "Adding to new group: " << contactId << endl; MSNContact *c = static_cast(contacts()[contactId]); if(c && c->hasProperty(MSNProtocol::protocol()->propGuid.key()) ) - notifySocket()->addContact( contactId, MSNProtocol::FL, QString::null, c->guid(), groupGuid ); + notifySocket()->addContact( contactId, MSNProtocol::FL, TQString::null, c->guid(), groupGuid ); else { // If we get to here, we're currently adding a new contact, add the groupGUID to the groupList @@ -604,14 +604,14 @@ void MSNAccount::slotGroupAdded( const QString& groupName, const QString &groupG if( tmp_addNewContactToGroup.contains( contactId ) ) tmp_addNewContactToGroup[contactId].append(groupGuid); else - tmp_addNewContactToGroup.insert(contactId, QStringList(groupGuid) ); + tmp_addNewContactToGroup.insert(contactId, TQStringList(groupGuid) ); } } tmp_addToNewGroup.remove(groupName); } } -void MSNAccount::slotGroupRenamed( const QString &groupGuid, const QString& groupName ) +void MSNAccount::slotGroupRenamed( const TQString &groupGuid, const TQString& groupName ) { if ( m_groupList.contains( groupGuid ) ) { @@ -625,16 +625,16 @@ void MSNAccount::slotGroupRenamed( const QString &groupGuid, const QString& grou } } -void MSNAccount::slotGroupRemoved( const QString& groupGuid ) +void MSNAccount::slotGroupRemoved( const TQString& groupGuid ) { if ( m_groupList.contains( groupGuid ) ) { - m_groupList[ groupGuid ]->setPluginData( protocol(), QMap() ); + m_groupList[ groupGuid ]->setPluginData( protocol(), TQMap() ); m_groupList.remove( groupGuid ); } } -void MSNAccount::addGroup( const QString &groupName, const QString& contactToAdd ) +void MSNAccount::addGroup( const TQString &groupName, const TQString& contactToAdd ) { if ( !contactToAdd.isNull() ) { @@ -648,7 +648,7 @@ void MSNAccount::addGroup( const QString &groupName, const QString& contactToAdd } else { - tmp_addToNewGroup.insert(groupName,QStringList(contactToAdd)); + tmp_addToNewGroup.insert(groupName,TQStringList(contactToAdd)); kdDebug( 14140 ) << k_funcinfo << "preparing to add " << groupName << " for " << contactToAdd << endl; } } @@ -682,7 +682,7 @@ void MSNAccount::slotKopeteGroupRemoved( Kopete::Group *g ) if ( !g->pluginData( protocol(), accountId() + " id" ).isEmpty() ) { - QString groupGuid = g->pluginData( protocol(), accountId() + " id" ); + TQString groupGuid = g->pluginData( protocol(), accountId() + " id" ); if ( !m_groupList.contains( groupGuid ) ) { // the group is maybe already removed in the server @@ -703,7 +703,7 @@ void MSNAccount::slotKopeteGroupRemoved( Kopete::Group *g ) Kopete::Group::topLevel()->setPluginData( protocol(), accountId() + " id", "" ); Kopete::Group::topLevel()->setPluginData( protocol(), accountId() + " displayName", g->pluginData( protocol(), accountId() + " displayName" ) ); - g->setPluginData( protocol(), accountId() + " id", QString::null ); // the group should be soon deleted, but make sure + g->setPluginData( protocol(), accountId() + " id", TQString::null ); // the group should be soon deleted, but make sure return; } @@ -712,7 +712,7 @@ void MSNAccount::slotKopeteGroupRemoved( Kopete::Group *g ) { bool still_have_contact=false; // if contact are contains only in the group we are removing, abort the - QDictIterator it( contacts() ); + TQDictIterator it( contacts() ); for ( ; it.current(); ++it ) { MSNContact *c = static_cast( it.current() ); @@ -734,10 +734,10 @@ void MSNAccount::slotKopeteGroupRemoved( Kopete::Group *g ) void MSNAccount::slotNewContactList() { m_oldGroupList=m_groupList; - for(QMap::Iterator it=m_oldGroupList.begin() ; it != m_oldGroupList.end() ; ++it ) + for(TQMap::Iterator it=m_oldGroupList.begin() ; it != m_oldGroupList.end() ; ++it ) { //they are about to be changed if(it.data()) - it.data()->setPluginData( protocol(), accountId() + " id", QString::null ); + it.data()->setPluginData( protocol(), accountId() + " id", TQString::null ); } m_allowList.clear(); @@ -745,13 +745,13 @@ void MSNAccount::slotNewContactList() m_reverseList.clear(); m_groupList.clear(); KConfigGroup *config=configGroup(); - config->writeEntry( "blockList" , QString::null ) ; - config->writeEntry( "allowList" , QString::null ); - config->writeEntry( "reverseList" , QString::null ); + config->writeEntry( "blockList" , TQString::null ) ; + config->writeEntry( "allowList" , TQString::null ); + config->writeEntry( "reverseList" , TQString::null ); // clear all date information which will be received. // if the information is not anymore on the server, it will not be received - QDictIterator it( contacts() ); + TQDictIterator it( contacts() ); for ( ; it.current(); ++it ) { MSNContact *c = static_cast( *it ); @@ -759,15 +759,15 @@ void MSNAccount::slotNewContactList() c->setAllowed( false ); c->setReversed( false ); c->setDeleted( true ); - c->setInfo( "PHH", QString::null ); - c->setInfo( "PHW", QString::null ); - c->setInfo( "PHM", QString::null ); + c->setInfo( "PHH", TQString::null ); + c->setInfo( "PHW", TQString::null ); + c->setInfo( "PHM", TQString::null ); c->removeProperty( MSNProtocol::protocol()->propGuid ); } m_newContactList=true; } -void MSNAccount::slotContactListed( const QString& handle, const QString& publicName, const QString &contactGuid, uint lists, const QString& groups ) +void MSNAccount::slotContactListed( const TQString& handle, const TQString& publicName, const TQString &contactGuid, uint lists, const TQString& groups ) { // On empty lists handle might be empty, ignore that // ignore also the myself contact. @@ -778,7 +778,7 @@ void MSNAccount::slotContactListed( const QString& handle, const QString& public if ( lists & 1 ) // FL { - QStringList contactGroups = QStringList::split( ",", groups, false ); + TQStringList contactGroups = TQStringList::split( ",", groups, false ); if ( c ) { if( !c->metaContact() ) @@ -799,11 +799,11 @@ void MSNAccount::slotContactListed( const QString& handle, const QString& public c->removeProperty( Kopete::Global::Properties::self()->nickName() ); c->setProperty( MSNProtocol::protocol()->propGuid, contactGuid); - const QMap oldServerGroups = c->serverGroups(); + const TQMap oldServerGroups = c->serverGroups(); c->clearServerGroups(); - for ( QStringList::ConstIterator it = contactGroups.begin(); it != contactGroups.end(); ++it ) + for ( TQStringList::ConstIterator it = contactGroups.begin(); it != contactGroups.end(); ++it ) { - QString newServerGroupID = *it; + TQString newServerGroupID = *it; if(m_groupList.contains(newServerGroupID)) { Kopete::Group *newServerGroup=m_groupList[ newServerGroupID ] ; @@ -816,12 +816,12 @@ void MSNAccount::slotContactListed( const QString& handle, const QString& public } } - for ( QMap::ConstIterator it = oldServerGroups.begin(); it != oldServerGroups.end(); ++it ) + for ( TQMap::ConstIterator it = oldServerGroups.begin(); it != oldServerGroups.end(); ++it ) { Kopete::Group *old_group=m_oldGroupList[it.key()]; if(old_group) { - QString oldnewID=old_group->pluginData(protocol() , accountId() +" id"); + TQString oldnewID=old_group->pluginData(protocol() , accountId() +" id"); if ( !oldnewID.isEmpty() && contactGroups.contains( oldnewID ) ) continue; //ok, it's correctn no need to do anything. @@ -847,10 +847,10 @@ void MSNAccount::slotContactListed( const QString& handle, const QString& public c->removeProperty( Kopete::Global::Properties::self()->nickName() ); c->setProperty( MSNProtocol::protocol()->propGuid, contactGuid ); - for ( QStringList::Iterator it = contactGroups.begin(); + for ( TQStringList::Iterator it = contactGroups.begin(); it != contactGroups.end(); ++it ) { - QString groupGuid = *it; + TQString groupGuid = *it; if(m_groupList.contains(groupGuid)) { c->contactAddedToGroup( groupGuid, m_groupList[ groupGuid ] ); @@ -874,25 +874,25 @@ void MSNAccount::slotContactListed( const QString& handle, const QString& public } } if ( lists & 2 ) - slotContactAdded( handle, "AL", publicName, QString::null, QString::null ); + slotContactAdded( handle, "AL", publicName, TQString::null, TQString::null ); else if(c) c->setAllowed(false); if ( lists & 4 ) - slotContactAdded( handle, "BL", publicName, QString::null, QString::null ); + slotContactAdded( handle, "BL", publicName, TQString::null, TQString::null ); else if(c) c->setBlocked(false); if ( lists & 8 ) - slotContactAdded( handle, "RL", publicName, QString::null, QString::null ); + slotContactAdded( handle, "RL", publicName, TQString::null, TQString::null ); else if(c) c->setReversed(false); if ( lists & 16 ) // This contact is on the pending list. Add to the reverse list and delete from the pending list { - notifySocket()->addContact( handle, MSNProtocol::RL, QString::null, QString::null, QString::null ); - notifySocket()->removeContact( handle, MSNProtocol::PL, QString::null, QString::null ); + notifySocket()->addContact( handle, MSNProtocol::RL, TQString::null, TQString::null, TQString::null ); + notifySocket()->removeContact( handle, MSNProtocol::PL, TQString::null, TQString::null ); } } -void MSNAccount::slotContactAdded( const QString& handle, const QString& list, const QString& publicName, const QString& contactGuid, const QString &groupGuid ) +void MSNAccount::slotContactAdded( const TQString& handle, const TQString& list, const TQString& publicName, const TQString& contactGuid, const TQString &groupGuid ) { if ( list == "FL" ) { @@ -912,17 +912,17 @@ void MSNAccount::slotContactAdded( const QString& handle, const QString& list, c // Add the new contact to the group he belongs. if ( tmp_addNewContactToGroup.contains(handle) ) { - QStringList list = tmp_addNewContactToGroup[handle]; - for ( QStringList::Iterator it = list.begin(); it != list.end(); ++it ) + TQStringList list = tmp_addNewContactToGroup[handle]; + for ( TQStringList::Iterator it = list.begin(); it != list.end(); ++it ) { - QString groupGuid = *it; + TQString groupGuid = *it; // If the group didn't exist yet (yay for async operations), don't add the contact to the group // Let slotGroupAdded do it. if( m_groupList.contains(groupGuid) ) { kdDebug( 14140 ) << k_funcinfo << "Adding " << handle << " to group: " << groupGuid << endl; - notifySocket()->addContact( handle, MSNProtocol::FL, QString::null, contactGuid, groupGuid ); + notifySocket()->addContact( handle, MSNProtocol::FL, TQString::null, contactGuid, groupGuid ); c->contactAddedToGroup( groupGuid, m_groupList[ groupGuid ] ); @@ -971,7 +971,7 @@ void MSNAccount::slotContactAdded( const QString& handle, const QString& list, c if ( !handle.isEmpty() && !m_allowList.contains( handle ) && !m_blockList.contains( handle ) ) { kdDebug(14140) << k_funcinfo << "Trying to add contact to AL. " << endl; - notifySocket()->addContact(handle, MSNProtocol::AL, QString::null, QString::null, QString::null ); + notifySocket()->addContact(handle, MSNProtocol::AL, TQString::null, TQString::null, TQString::null ); } } else if ( list == "BL" ) @@ -1006,14 +1006,14 @@ void MSNAccount::slotContactAdded( const QString& handle, const QString& list, c // before I declare it good :- ) if ( !m_allowList.contains( handle ) && !m_blockList.contains( handle ) ) { - QString nick; //in most case, the public name is not know + TQString nick; //in most case, the public name is not know if(publicName!=handle) // so we don't whos it if it is not know nick=publicName; Kopete::UI::ContactAddedNotifyDialog *dialog= new Kopete::UI::ContactAddedNotifyDialog( handle,nick,this, Kopete::UI::ContactAddedNotifyDialog::InfoButton ); - QObject::connect(dialog,SIGNAL(applyClicked(const QString&)), - this,SLOT(slotContactAddedNotifyDialogClosed(const QString& ))); + TQObject::connect(dialog,TQT_SIGNAL(applyClicked(const TQString&)), + this,TQT_SLOT(slotContactAddedNotifyDialogClosed(const TQString& ))); dialog->show(); } } @@ -1026,7 +1026,7 @@ void MSNAccount::slotContactAdded( const QString& handle, const QString& list, c } } -void MSNAccount::slotContactRemoved( const QString& handle, const QString& list, const QString& contactGuid, const QString& groupGuid ) +void MSNAccount::slotContactRemoved( const TQString& handle, const TQString& list, const TQString& contactGuid, const TQString& groupGuid ) { kdDebug( 14140 ) << k_funcinfo << "handle: " << handle << " list: " << list << " contact-uid: " << contactGuid << endl; MSNContact *c=static_cast( contacts()[ handle ] ); @@ -1035,7 +1035,7 @@ void MSNAccount::slotContactRemoved( const QString& handle, const QString& list, m_blockList.remove( handle ); configGroup()->writeEntry( "blockList" , m_blockList ) ; if ( !m_allowList.contains( handle ) ) - notifySocket()->addContact( handle, MSNProtocol::AL, QString::null, QString::null, QString::null ); + notifySocket()->addContact( handle, MSNProtocol::AL, TQString::null, TQString::null, TQString::null ); if(c) c->setBlocked( false ); @@ -1045,7 +1045,7 @@ void MSNAccount::slotContactRemoved( const QString& handle, const QString& list, m_allowList.remove( handle ); configGroup()->writeEntry( "allowList" , m_allowList ) ; if ( !m_blockList.contains( handle ) ) - notifySocket()->addContact( handle, MSNProtocol::BL, QString::null, QString::null, QString::null ); + notifySocket()->addContact( handle, MSNProtocol::BL, TQString::null, TQString::null, TQString::null ); if(c) c->setAllowed( false ); @@ -1063,7 +1063,7 @@ void MSNAccount::slotContactRemoved( const QString& handle, const QString& list, /* InfoWidget *info = new InfoWidget( 0 ); info->title->setText( "" + i18n( "Contact removed!" ) +"" ); - QString dummy; + TQString dummy; dummy = "
" + imContact->getPublicName() + "( " +imContact->getHandle() +" )

"; dummy += i18n( "has removed you from his contact list!" ) + "
"; dummy += i18n( "This contact is now removed from your contact list" ); @@ -1077,15 +1077,15 @@ void MSNAccount::slotContactRemoved( const QString& handle, const QString& list, { // The FL list only use the contact GUID, use the contact referenced by the GUID. MSNContact *contactRemoved = findContactByGuid(contactGuid); - QStringList groupGuidList; + TQStringList groupGuidList; bool deleteContact = groupGuid.isEmpty() ? true : false; // Delete the contact when the group GUID is empty. // Remove the contact from the contact list for all the group he is a member. if( groupGuid.isEmpty() ) { if(contactRemoved) { - QPtrList groupList = contactRemoved->metaContact()->groups(); - for( QPtrList::Iterator it = groupList.begin(); it != groupList.end(); ++it ) + TQPtrList groupList = contactRemoved->metaContact()->groups(); + for( TQPtrList::Iterator it = groupList.begin(); it != groupList.end(); ++it ) { Kopete::Group *group = *it; if ( !group->pluginData( protocol(), accountId() + " id" ).isEmpty() ) @@ -1102,7 +1102,7 @@ void MSNAccount::slotContactRemoved( const QString& handle, const QString& list, if( !groupGuidList.isEmpty() ) { - QStringList::const_iterator stringIt; + TQStringList::const_iterator stringIt; for( stringIt = groupGuidList.begin(); stringIt != groupGuidList.end(); ++stringIt ) { // Contact is removed from the FL list, remove it from the group @@ -1114,7 +1114,7 @@ void MSNAccount::slotContactRemoved( const QString& handle, const QString& list, { bool still_have_contact=false; // if contact are contains only in the group we are removing, abort the - QDictIterator it( contacts() ); + TQDictIterator it( contacts() ); for ( ; it.current(); ++it ) { MSNContact *c2 = static_cast( it.current() ); @@ -1137,15 +1137,15 @@ void MSNAccount::slotContactRemoved( const QString& handle, const QString& list, } } -void MSNAccount::slotCreateChat( const QString& address, const QString& auth ) +void MSNAccount::slotCreateChat( const TQString& address, const TQString& auth ) { slotCreateChat( 0L, address, auth, m_msgHandle.first(), m_msgHandle.first() ); } -void MSNAccount::slotCreateChat( const QString& ID, const QString& address, const QString& auth, - const QString& handle_, const QString& publicName ) +void MSNAccount::slotCreateChat( const TQString& ID, const TQString& address, const TQString& auth, + const TQString& handle_, const TQString& publicName ) { - QString handle = handle_.lower(); + TQString handle = handle_.lower(); if ( handle.isEmpty() ) { @@ -1189,7 +1189,7 @@ void MSNAccount::slotCreateChat( const QString& ID, const QString& address, cons if ( !ID.isEmpty() && notifyNewChat ) { // this temporary message should open the window if they not exist - QString body = i18n( "%1 has started a chat with you" ).arg( c->metaContact()->displayName() ); + TQString body = i18n( "%1 has started a chat with you" ).arg( c->metaContact()->displayName() ); Kopete::Message tmpMsg = Kopete::Message( c, manager->members(), body, Kopete::Message::Internal, Kopete::Message::PlainText ); manager->appendMessage( tmpMsg ); } @@ -1200,7 +1200,7 @@ void MSNAccount::slotCreateChat( const QString& ID, const QString& address, cons m_msgHandle.pop_front(); } -void MSNAccount::slotStartChatSession( const QString& handle ) +void MSNAccount::slotStartChatSession( const TQString& handle ) { // First create a message manager, because we might get an existing // manager back, in which case we likely also have an active switchboard @@ -1218,7 +1218,7 @@ void MSNAccount::slotStartChatSession( const QString& handle ) } } -void MSNAccount::slotContactAddedNotifyDialogClosed(const QString& handle) +void MSNAccount::slotContactAddedNotifyDialogClosed(const TQString& handle) { const Kopete::UI::ContactAddedNotifyDialog *dialog = dynamic_cast(sender()); @@ -1242,29 +1242,29 @@ void MSNAccount::slotContactAddedNotifyDialogClosed(const QString& handle) if ( !dialog->authorized() ) { if ( m_allowList.contains( handle ) ) - m_notifySocket->removeContact( handle, MSNProtocol::AL, QString::null, QString::null ); + m_notifySocket->removeContact( handle, MSNProtocol::AL, TQString::null, TQString::null ); else if ( !m_blockList.contains( handle ) ) - m_notifySocket->addContact( handle, MSNProtocol::BL, QString::null, QString::null, QString::null ); + m_notifySocket->addContact( handle, MSNProtocol::BL, TQString::null, TQString::null, TQString::null ); } else { if ( m_blockList.contains( handle ) ) - m_notifySocket->removeContact( handle, MSNProtocol::BL, QString::null, QString::null ); + m_notifySocket->removeContact( handle, MSNProtocol::BL, TQString::null, TQString::null ); else if ( !m_allowList.contains( handle ) ) - m_notifySocket->addContact( handle, MSNProtocol::AL, QString::null, QString::null, QString::null ); + m_notifySocket->addContact( handle, MSNProtocol::AL, TQString::null, TQString::null, TQString::null ); } } -void MSNAccount::slotGlobalIdentityChanged( const QString &key, const QVariant &value ) +void MSNAccount::slotGlobalIdentityChanged( const TQString &key, const TQVariant &value ) { if( !configGroup()->readBoolEntry("ExcludeGlobalIdentity", false) ) { if(key == Kopete::Global::Properties::self()->nickName().key()) { - QString oldNick = myself()->property( Kopete::Global::Properties::self()->nickName()).value().toString(); - QString newNick = value.toString(); + TQString oldNick = myself()->property( Kopete::Global::Properties::self()->nickName()).value().toString(); + TQString newNick = value.toString(); if(newNick != oldNick) { @@ -1280,9 +1280,9 @@ void MSNAccount::slotGlobalIdentityChanged( const QString &key, const QVariant & } } -void MSNAccount::slotErrorMessageReceived( int type, const QString &msg ) +void MSNAccount::slotErrorMessageReceived( int type, const TQString &msg ) { - QString caption = i18n( "MSN Plugin" ); + TQString caption = i18n( "MSN Plugin" ); // Use different notification type based on the error context. switch(type) @@ -1316,7 +1316,7 @@ void MSNAccount::slotErrorMessageReceived( int type, const QString &msg ) } } -bool MSNAccount::createContact( const QString &contactId, Kopete::MetaContact *metaContact ) +bool MSNAccount::createContact( const TQString &contactId, Kopete::MetaContact *metaContact ) { if ( !metaContact->isTemporary() && m_notifySocket) { @@ -1339,14 +1339,14 @@ bool MSNAccount::createContact( const QString &contactId, Kopete::MetaContact *m } -void MSNAccount::addContactServerside(const QString &contactId, QPtrList groupList) +void MSNAccount::addContactServerside(const TQString &contactId, TQPtrList groupList) { // First of all, fill the temporary group list. The contact will be moved to his group(s). // When we receive back his contact GUID(required to move a contact between groups) for( Kopete::Group *group = groupList.first(); group; group = groupList.next() ) { // TODO: It it time that libkopete generate a unique ID that contains protocols, account and contact id. - QString groupId = group->pluginData( protocol(), accountId() + " id" ); + TQString groupId = group->pluginData( protocol(), accountId() + " id" ); // If the groupId is empty, that's mean the Kopete group is not on the MSN server. if( !groupId.isEmpty() ) { @@ -1354,8 +1354,8 @@ void MSNAccount::addContactServerside(const QString &contactId, QPtrListsetPluginData( protocol() , accountId() + " id" , QString::null); - group->setPluginData( protocol() , accountId() + " displayName" , QString::null); + group->setPluginData( protocol() , accountId() + " id" , TQString::null); + group->setPluginData( protocol() , accountId() + " displayName" , TQString::null); kdDebug( 14140 ) << k_funcinfo << " Group " << group->displayName() << " marked with id #" << groupId << " does not seems to be anymore on the server" << endl; // Add the group on MSN server, will fix the corruption. @@ -1368,7 +1368,7 @@ void MSNAccount::addContactServerside(const QString &contactId, QPtrListaddContact( contactId, MSNProtocol::FL, contactId, QString::null, QString::null ); + m_notifySocket->addContact( contactId, MSNProtocol::FL, contactId, TQString::null, TQString::null ); } -MSNContact *MSNAccount::findContactByGuid(const QString &contactGuid) +MSNContact *MSNAccount::findContactByGuid(const TQString &contactGuid) { kdDebug(14140) << k_funcinfo << "Looking for " << contactGuid << endl; - QDictIterator it( contacts() ); + TQDictIterator it( contacts() ); for ( ; it.current(); ++it ) { MSNContact *c = dynamic_cast( it.current() ); @@ -1412,17 +1412,17 @@ bool MSNAccount::isHotmail() const return m_openInboxAction->isEnabled(); } -QString MSNAccount::pictureUrl() +TQString MSNAccount::pictureUrl() { return m_pictureFilename; } -void MSNAccount::setPictureUrl(const QString &url) +void MSNAccount::setPictureUrl(const TQString &url) { m_pictureFilename = url; } -QString MSNAccount::pictureObject() +TQString MSNAccount::pictureObject() { if(m_pictureObj.isNull()) resetPictureObject(true); //silent=true to keep infinite loop away @@ -1431,7 +1431,7 @@ QString MSNAccount::pictureObject() void MSNAccount::resetPictureObject(bool silent, bool force) { - QString old=m_pictureObj; + TQString old=m_pictureObj; if(!configGroup()->readBoolEntry("exportCustomPicture") && !force) { @@ -1441,7 +1441,7 @@ void MSNAccount::resetPictureObject(bool silent, bool force) else { // Check if the picture is a 96x96 image, if not scale, crop and save. - QImage picture(m_pictureFilename); + TQImage picture(m_pictureFilename); if(picture.isNull()) { m_pictureObj=""; @@ -1452,7 +1452,7 @@ void MSNAccount::resetPictureObject(bool silent, bool force) if(picture.width() != 96 || picture.height() != 96) { // Save to a new location in msnpictures. - QString newLocation( locateLocal( "appdata", "msnpictures/"+ KURL(m_pictureFilename).fileName().lower() ) ); + TQString newLocation( locateLocal( "appdata", "msnpictures/"+ KURL(m_pictureFilename).fileName().lower() ) ); // Scale and crop the picture. picture = MSNProtocol::protocol()->scalePicture(picture); @@ -1467,7 +1467,7 @@ void MSNAccount::resetPictureObject(bool silent, bool force) } } - QFile pictFile( m_pictureFilename ); + TQFile pictFile( m_pictureFilename ); if(!pictFile.open(IO_ReadOnly)) { m_pictureObj=""; @@ -1475,12 +1475,12 @@ void MSNAccount::resetPictureObject(bool silent, bool force) } else { - QByteArray ar=pictFile.readAll(); - QString sha1d= QString((KCodecs::base64Encode(SHA1::hash(ar)))); + TQByteArray ar=pictFile.readAll(); + TQString sha1d= TQString((KCodecs::base64Encode(SHA1::hash(ar)))); - QString size=QString::number( pictFile.size() ); - QString all= "Creator"+accountId()+"Size"+size+"Type3Locationkopete.tmpFriendlyAAA=SHA1D"+ sha1d; - m_pictureObj=""; + TQString size=TQString::number( pictFile.size() ); + TQString all= "Creator"+accountId()+"Size"+size+"Type3Locationkopete.tmpFriendlyAAA=SHA1D"+ sha1d; + m_pictureObj=""; myself()->setProperty( Kopete::Global::Properties::self()->photo() , m_pictureFilename ); } } -- cgit v1.2.1