summaryrefslogtreecommitdiffstats
path: root/kopete/protocols/msn
diff options
context:
space:
mode:
Diffstat (limited to 'kopete/protocols/msn')
-rw-r--r--kopete/protocols/msn/config/kopete_msn_config.desktop2
-rw-r--r--kopete/protocols/msn/incomingtransfer.cpp6
-rw-r--r--kopete/protocols/msn/incomingtransfer.h4
-rw-r--r--kopete/protocols/msn/msnaccount.cpp4
-rw-r--r--kopete/protocols/msn/msnchatsession.cpp6
-rw-r--r--kopete/protocols/msn/msncontact.cpp6
-rw-r--r--kopete/protocols/msn/msnfiletransfersocket.cpp14
-rw-r--r--kopete/protocols/msn/msnfiletransfersocket.h4
-rw-r--r--kopete/protocols/msn/msnsecureloginhandler.cpp12
-rw-r--r--kopete/protocols/msn/msnsecureloginhandler.h8
-rw-r--r--kopete/protocols/msn/msnsocket.cpp12
-rw-r--r--kopete/protocols/msn/msnsocket.h4
-rw-r--r--kopete/protocols/msn/msnswitchboardsocket.cpp6
-rw-r--r--kopete/protocols/msn/outgoingtransfer.cpp6
-rw-r--r--kopete/protocols/msn/p2p.cpp2
-rw-r--r--kopete/protocols/msn/ui/msneditaccountwidget.cpp8
-rw-r--r--kopete/protocols/msn/webcam.cpp12
-rw-r--r--kopete/protocols/msn/webcam.h4
18 files changed, 60 insertions, 60 deletions
diff --git a/kopete/protocols/msn/config/kopete_msn_config.desktop b/kopete/protocols/msn/config/kopete_msn_config.desktop
index a67868c2..4754ae1f 100644
--- a/kopete/protocols/msn/config/kopete_msn_config.desktop
+++ b/kopete/protocols/msn/config/kopete_msn_config.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Icon=msn_protocol
Type=Service
-ServiceTypes=KCModule
+ServiceTypes=TDECModule
X-TDE-ModuleType=Library
X-TDE-Library=kopete_msn
diff --git a/kopete/protocols/msn/incomingtransfer.cpp b/kopete/protocols/msn/incomingtransfer.cpp
index dd616a1b..f78b253d 100644
--- a/kopete/protocols/msn/incomingtransfer.cpp
+++ b/kopete/protocols/msn/incomingtransfer.cpp
@@ -109,7 +109,7 @@ void IncomingTransfer::acknowledged()
TQFile *destination = new TQFile(m_transfer->destinationURL().path());
if(!destination->open(IO_WriteOnly))
{
- m_transfer->slotError(KIO::ERR_CANNOT_OPEN_FOR_WRITING, i18n("Cannot open file for writing"));
+ m_transfer->slotError(TDEIO::ERR_CANNOT_OPEN_FOR_WRITING, i18n("Cannot open file for writing"));
m_transfer = 0l;
error();
@@ -240,7 +240,7 @@ void IncomingTransfer::processMessage(const Message& message)
if(wouldListen)
{
// Create a listening socket for direct file transfer.
- m_listener = new KServerSocket("", "");
+ m_listener = new TDEServerSocket("", "");
m_listener->setResolutionEnabled(true);
// Create the callback that will try to accept incoming connections.
TQObject::connect(m_listener, TQT_SIGNAL(readyAccept()), TQT_SLOT(slotAccept()));
@@ -297,7 +297,7 @@ void IncomingTransfer::processMessage(const Message& message)
// The transfer has been canceled remotely.
if(m_transfer){
// Inform the user of the file transfer cancelation.
- m_transfer->slotError(KIO::ERR_ABORTED, i18n("File transfer canceled."));
+ m_transfer->slotError(TDEIO::ERR_ABORTED, i18n("File transfer canceled."));
}
// Remove the partially received file.
m_file->remove();
diff --git a/kopete/protocols/msn/incomingtransfer.h b/kopete/protocols/msn/incomingtransfer.h
index 5ef5a209..3ce3f391 100644
--- a/kopete/protocols/msn/incomingtransfer.h
+++ b/kopete/protocols/msn/incomingtransfer.h
@@ -21,7 +21,7 @@
#include "dispatcher.h"
namespace KNetwork{
- class KServerSocket;
+ class TDEServerSocket;
}
/**
@@ -51,7 +51,7 @@ namespace P2P{
virtual void processMessage(const Message& message);
KTempFile *m_tempFile;
- KNetwork::KServerSocket *m_listener;
+ KNetwork::TDEServerSocket *m_listener;
};
}
diff --git a/kopete/protocols/msn/msnaccount.cpp b/kopete/protocols/msn/msnaccount.cpp
index 034f2548..58072441 100644
--- a/kopete/protocols/msn/msnaccount.cpp
+++ b/kopete/protocols/msn/msnaccount.cpp
@@ -85,7 +85,7 @@ MSNAccount::MSNAccount( MSNProtocol *parent, const TQString& AccountID, const ch
m_startChatAction = new KAction( i18n( "&Start Chat..." ), "mail_generic", 0, this, TQT_SLOT( slotStartChat() ), this, "startChatAction" );
- KConfigGroup *config=configGroup();
+ TDEConfigGroup *config=configGroup();
m_blockList = config->readListEntry( "blockList" ) ;
m_allowList = config->readListEntry( "allowList" ) ;
@@ -744,7 +744,7 @@ void MSNAccount::slotNewContactList()
m_blockList.clear();
m_reverseList.clear();
m_groupList.clear();
- KConfigGroup *config=configGroup();
+ TDEConfigGroup *config=configGroup();
config->writeEntry( "blockList" , TQString() ) ;
config->writeEntry( "allowList" , TQString() );
config->writeEntry( "reverseList" , TQString() );
diff --git a/kopete/protocols/msn/msnchatsession.cpp b/kopete/protocols/msn/msnchatsession.cpp
index 8e2113a1..df621d65 100644
--- a/kopete/protocols/msn/msnchatsession.cpp
+++ b/kopete/protocols/msn/msnchatsession.cpp
@@ -173,7 +173,7 @@ void MSNChatSession::createChat( const TQString &handle,
this, TQT_SLOT( slotSwitchBoardClosed() ) );
connect( m_chatService, TQT_SIGNAL( receivedTypingMsg( const TQString &, bool ) ),
this, TQT_SLOT( receivedTypingMsg( const TQString &, bool ) ) );
- KConfig *config = TDEGlobal::config();
+ TDEConfig *config = TDEGlobal::config();
config->setGroup( "MSN" );
if(config->readBoolEntry( "SendTypingNotification" , true) )
{
@@ -223,7 +223,7 @@ void MSNChatSession::slotUserJoined( const TQString &handle, const TQString &pub
if(!m_messagesQueue.empty() || !m_invitations.isEmpty())
sendMessageQueue();
- KConfig *config = TDEGlobal::config();
+ TDEConfig *config = TDEGlobal::config();
config->setGroup( "MSN" );
if ( members().count()==1 && config->readNumEntry( "DownloadPicture", 1 ) >= 1 && !c->object().isEmpty() && !c->hasProperty(Kopete::Global::Properties::self()->photo().key()))
slotRequestPicture();
@@ -584,7 +584,7 @@ void MSNChatSession::slotDisplayPictureChanged()
}
else
{
- KConfig *config = TDEGlobal::config();
+ TDEConfig *config = TDEGlobal::config();
config->setGroup( "MSN" );
if ( config->readNumEntry( "DownloadPicture", 1 ) >= 1 && !c->object().isEmpty() )
slotRequestPicture();
diff --git a/kopete/protocols/msn/msncontact.cpp b/kopete/protocols/msn/msncontact.cpp
index e77ba2ff..84333bcf 100644
--- a/kopete/protocols/msn/msncontact.cpp
+++ b/kopete/protocols/msn/msncontact.cpp
@@ -674,13 +674,13 @@ void MSNContact::setDisplayPicture(KTempFile *f)
// but the custom emoticon code is to deeply merged in the display picture code while it could be separated.
TQString newlocation=locateLocal( "appdata", "msnpictures/"+ contactId().lower().replace(TQRegExp("[./~]"),"-") +".png" ) ;
- KIO::Job *j=KIO::file_move( KURL::fromPathOrURL( f->name() ) , KURL::fromPathOrURL( newlocation ) , -1, true /*overwrite*/ , false /*resume*/ , false /*showProgressInfo*/ );
+ TDEIO::Job *j=TDEIO::file_move( KURL::fromPathOrURL( f->name() ) , KURL::fromPathOrURL( newlocation ) , -1, true /*overwrite*/ , false /*resume*/ , false /*showProgressInfo*/ );
f->setAutoDelete(false);
delete f;
//let the time to KIO to copy the file
- connect(j, TQT_SIGNAL(result(KIO::Job *)) , this, TQT_SLOT(slotEmitDisplayPictureChanged() ));
+ connect(j, TQT_SIGNAL(result(TDEIO::Job *)) , this, TQT_SLOT(slotEmitDisplayPictureChanged() ));
}
void MSNContact::slotEmitDisplayPictureChanged()
@@ -700,7 +700,7 @@ void MSNContact::setObject(const TQString &obj)
removeProperty( Kopete::Global::Properties::self()->photo() ) ;
emit displayPictureChanged();
- KConfig *config = TDEGlobal::config();
+ TDEConfig *config = TDEGlobal::config();
config->setGroup( "MSN" );
if ( config->readNumEntry( "DownloadPicture", 2 ) >= 2 && !obj.isEmpty()
&& account()->myself()->onlineStatus().status() != Kopete::OnlineStatus::Invisible )
diff --git a/kopete/protocols/msn/msnfiletransfersocket.cpp b/kopete/protocols/msn/msnfiletransfersocket.cpp
index 157209e9..cfe74905 100644
--- a/kopete/protocols/msn/msnfiletransfersocket.cpp
+++ b/kopete/protocols/msn/msnfiletransfersocket.cpp
@@ -155,7 +155,7 @@ void MSNFileTransferSocket::slotSocketClosed()
if(m_kopeteTransfer)
{
if( (m_downsize!=m_size || m_downsize==0 ) )
- m_kopeteTransfer->slotError( KIO::ERR_UNKNOWN , i18n( "An unknown error occurred" ) );
+ m_kopeteTransfer->slotError( TDEIO::ERR_UNKNOWN , i18n( "An unknown error occurred" ) );
else
m_kopeteTransfer->slotComplete();
}
@@ -192,7 +192,7 @@ void MSNFileTransferSocket::setKopeteTransfer(Kopete::Transfer *kt)
void MSNFileTransferSocket::listen(int port)
{
- m_server = new KServerSocket();
+ m_server = new TDEServerSocket();
TQObject::connect( m_server, TQT_SIGNAL(readyAccept()), this, TQT_SLOT(slotAcceptConnection()));
m_server->setAddress(TQString::number(port));
@@ -210,7 +210,7 @@ void MSNFileTransferSocket::slotAcceptConnection()
if(!accept(m_server))
{
if( m_kopeteTransfer)
- m_kopeteTransfer->slotError( KIO::ERR_UNKNOWN , i18n( "An unknown error occurred" ) );
+ m_kopeteTransfer->slotError( TDEIO::ERR_UNKNOWN , i18n( "An unknown error occurred" ) );
emit done(this);
}
}
@@ -222,7 +222,7 @@ void MSNFileTransferSocket::slotTimer()
kdDebug(14140) << "MSNFileTransferSocket::slotTimer: timeout "<< endl;
if( m_kopeteTransfer)
{
- m_kopeteTransfer->slotError( KIO::ERR_CONNECTION_BROKEN , i18n( "Connection timed out" ) );
+ m_kopeteTransfer->slotError( TDEIO::ERR_CONNECTION_BROKEN , i18n( "Connection timed out" ) );
}
MSNChatSession* manager=dynamic_cast<MSNChatSession*>(m_contact->manager());
@@ -248,7 +248,7 @@ void MSNFileTransferSocket::abort()
m_downsize=m_size; //we don't want to send data anymore;
}
//the timer wait one second, the time to send the CCL or the binary header
- //retarding the disconnection keep away from a crash. (in KIO::Job::emitResult when `delete this`)
+ //retarding the disconnection keep away from a crash. (in TDEIO::Job::emitResult when `delete this`)
TQTimer::singleShot( 1000, this, TQT_SLOT(disconnect()) );
ready=false;
}
@@ -410,7 +410,7 @@ void MSNFileTransferSocket::parseInvitation(const TQString& msg)
{
MSNInvitation::parseInvitation(msg);
if( m_kopeteTransfer)
- m_kopeteTransfer->slotError( KIO::ERR_ABORTED , i18n( "The remote user aborted" ) );
+ m_kopeteTransfer->slotError( TDEIO::ERR_ABORTED , i18n( "The remote user aborted" ) );
emit done(this);
}
@@ -447,7 +447,7 @@ void MSNFileTransferSocket::slotFileTransferAccepted(Kopete::Transfer *trans, co
else
{
if( m_kopeteTransfer)
- m_kopeteTransfer->slotError( KIO::ERR_UNKNOWN , i18n( "An unknown error occurred" ) );
+ m_kopeteTransfer->slotError( TDEIO::ERR_UNKNOWN , i18n( "An unknown error occurred" ) );
emit done(this);
}
diff --git a/kopete/protocols/msn/msnfiletransfersocket.h b/kopete/protocols/msn/msnfiletransfersocket.h
index 974dbf5e..5803cd01 100644
--- a/kopete/protocols/msn/msnfiletransfersocket.h
+++ b/kopete/protocols/msn/msnfiletransfersocket.h
@@ -26,7 +26,7 @@
class TQFile;
namespace KNetwork {
- class KServerSocket;
+ class TDEServerSocket;
}
namespace Kopete { class Transfer; }
@@ -108,7 +108,7 @@ private:
TQString m_fileName;
Kopete::Transfer* m_kopeteTransfer;
TQFile *m_file ;
- KNetwork::KServerSocket *m_server;
+ KNetwork::TDEServerSocket *m_server;
bool ready;
diff --git a/kopete/protocols/msn/msnsecureloginhandler.cpp b/kopete/protocols/msn/msnsecureloginhandler.cpp
index 9e28beb2..58f4f66f 100644
--- a/kopete/protocols/msn/msnsecureloginhandler.cpp
+++ b/kopete/protocols/msn/msnsecureloginhandler.cpp
@@ -39,16 +39,16 @@ void MSNSecureLoginHandler::login()
{
// Retrive the login server.
// Do a reload and don't show the progress.
- KIO::Job *getLoginServer = KIO::get(KURL("https://nexus.passport.com/rdr/pprdr.asp"), true, false);
+ TDEIO::Job *getLoginServer = TDEIO::get(KURL("https://nexus.passport.com/rdr/pprdr.asp"), true, false);
getLoginServer->addMetaData("cookies", "manual");
getLoginServer->addMetaData("cache", "reload");
getLoginServer->addMetaData("PropagateHttpHeader", "true");
- connect(getLoginServer, TQT_SIGNAL(result(KIO::Job *)), this, TQT_SLOT(slotLoginServerReceived(KIO::Job* )));
+ connect(getLoginServer, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotLoginServerReceived(TDEIO::Job* )));
}
-void MSNSecureLoginHandler::slotLoginServerReceived(KIO::Job *loginJob)
+void MSNSecureLoginHandler::slotLoginServerReceived(TDEIO::Job *loginJob)
{
if(!loginJob->error())
{
@@ -67,7 +67,7 @@ void MSNSecureLoginHandler::slotLoginServerReceived(KIO::Job *loginJob)
TQString authURL = "https://" + loginUrl;
- KIO::Job *authJob = KIO::get(KURL(authURL), true, false);
+ TDEIO::Job *authJob = TDEIO::get(KURL(authURL), true, false);
authJob->addMetaData("cookies", "manual");
TQString authRequest = "Authorization: Passport1.4 "
@@ -86,7 +86,7 @@ void MSNSecureLoginHandler::slotLoginServerReceived(KIO::Job *loginJob)
authJob->addMetaData("cookies", "manual");
authJob->addMetaData("cache", "reload");
- connect(authJob, TQT_SIGNAL(result(KIO::Job *)), this, TQT_SLOT(slotTweenerReceived(KIO::Job* )));
+ connect(authJob, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotTweenerReceived(TDEIO::Job* )));
}
else
{
@@ -96,7 +96,7 @@ void MSNSecureLoginHandler::slotLoginServerReceived(KIO::Job *loginJob)
}
}
-void MSNSecureLoginHandler::slotTweenerReceived(KIO::Job *authJob)
+void MSNSecureLoginHandler::slotTweenerReceived(TDEIO::Job *authJob)
{
if(!authJob->error())
{
diff --git a/kopete/protocols/msn/msnsecureloginhandler.h b/kopete/protocols/msn/msnsecureloginhandler.h
index 0416a35f..ea7a87b0 100644
--- a/kopete/protocols/msn/msnsecureloginhandler.h
+++ b/kopete/protocols/msn/msnsecureloginhandler.h
@@ -19,7 +19,7 @@
#include <tqobject.h>
-namespace KIO
+namespace TDEIO
{
class Job;
class MetaData;
@@ -51,11 +51,11 @@ signals:
void loginFailed();
private slots:
- void slotLoginServerReceived(KIO::Job *);
+ void slotLoginServerReceived(TDEIO::Job *);
/**
* We have received our ticket to login.
*/
- void slotTweenerReceived(KIO::Job *);
+ void slotTweenerReceived(TDEIO::Job *);
private:
/**
@@ -71,7 +71,7 @@ private:
*/
TQString m_authentification;
- void displayMetaData(KIO::MetaData data);
+ void displayMetaData(TDEIO::MetaData data);
};
#endif
diff --git a/kopete/protocols/msn/msnsocket.cpp b/kopete/protocols/msn/msnsocket.cpp
index e098e27b..f93af5c0 100644
--- a/kopete/protocols/msn/msnsocket.cpp
+++ b/kopete/protocols/msn/msnsocket.cpp
@@ -175,17 +175,17 @@ void MSNSocket::setOnlineStatus( MSNSocket::OnlineStatus status )
void MSNSocket::slotSocketError( int error )
{
- kdWarning( 14140 ) << k_funcinfo << "Error: " << error << " (" << m_socket->KSocketBase::errorString() << ")" << endl;
+ kdWarning( 14140 ) << k_funcinfo << "Error: " << error << " (" << m_socket->TDESocketBase::errorString() << ")" << endl;
- if(!KSocketBase::isFatalError(error))
+ if(!TDESocketBase::isFatalError(error))
return;
//we only care about fatal error
TQString errormsg = i18n( "There was an error while connecting to the MSN server.\nError message:\n" );
- if ( error == KSocketBase::LookupFailure )
+ if ( error == TDESocketBase::LookupFailure )
errormsg += i18n( "Unable to lookup %1" ).arg( m_socket->peerResolver().nodeName() );
else
- errormsg += m_socket->KSocketBase::errorString() ;
+ errormsg += m_socket->TDESocketBase::errorString() ;
//delete m_socket;
m_socket->deleteLater();
@@ -910,7 +910,7 @@ bool MSNSocket::useHttpMethod() const
return m_useHttp;
}
-bool MSNSocket::accept( KServerSocket *server )
+bool MSNSocket::accept( TDEServerSocket *server )
{
if ( m_socket )
{
@@ -952,7 +952,7 @@ TQString MSNSocket::getLocalIP()
if ( !m_socket )
return TQString();
- const KSocketAddress address = m_socket->localAddress();
+ const TDESocketAddress address = m_socket->localAddress();
TQString ip = address.nodeName();
diff --git a/kopete/protocols/msn/msnsocket.h b/kopete/protocols/msn/msnsocket.h
index 42595c25..ad005396 100644
--- a/kopete/protocols/msn/msnsocket.h
+++ b/kopete/protocols/msn/msnsocket.h
@@ -32,7 +32,7 @@
namespace KNetwork {
class KBufferedSocket;
- class KServerSocket;
+ class TDEServerSocket;
}
class MimeMessage;
@@ -201,7 +201,7 @@ protected:
* Used in MSNFileTransferSocket
*/
virtual void bytesReceived( const TQByteArray & );
- bool accept( KNetwork::KServerSocket * );
+ bool accept( KNetwork::TDEServerSocket * );
void sendBytes( const TQByteArray &data );
const TQString &server() { return m_server; }
diff --git a/kopete/protocols/msn/msnswitchboardsocket.cpp b/kopete/protocols/msn/msnswitchboardsocket.cpp
index f2a7e667..7239e54f 100644
--- a/kopete/protocols/msn/msnswitchboardsocket.cpp
+++ b/kopete/protocols/msn/msnswitchboardsocket.cpp
@@ -419,7 +419,7 @@ void MSNSwitchBoardSocket::slotReadMessage( const TQByteArray &bytes )
else if( type== "text/x-mms-emoticon" || type== "text/x-mms-animemoticon")
{
// TODO remove Displatcher.
- KConfig *config = TDEGlobal::config();
+ TDEConfig *config = TDEGlobal::config();
config->setGroup( "MSN" );
if ( config->readBoolEntry( "useCustomEmoticons", true ) )
{
@@ -466,7 +466,7 @@ void MSNSwitchBoardSocket::slotReadMessage( const TQByteArray &bytes )
if(!m_clientcapsSent)
{
- KConfig *config = TDEGlobal::config();
+ TDEConfig *config = TDEGlobal::config();
config->setGroup( "MSN" );
TQString JabberID;
@@ -667,7 +667,7 @@ int MSNSwitchBoardSocket::sendMsg( const Kopete::Message &msg )
}
#endif
- KConfig *config = TDEGlobal::config();
+ TDEConfig *config = TDEGlobal::config();
config->setGroup( "MSN" );
if ( config->readBoolEntry( "exportEmoticons", false ) )
{
diff --git a/kopete/protocols/msn/outgoingtransfer.cpp b/kopete/protocols/msn/outgoingtransfer.cpp
index 604df5d1..c2868ad0 100644
--- a/kopete/protocols/msn/outgoingtransfer.cpp
+++ b/kopete/protocols/msn/outgoingtransfer.cpp
@@ -208,7 +208,7 @@ void OutgoingTransfer::processMessage(const Message& message)
if(m_transfer)
{
// Inform the user of the file transfer cancelation.
- m_transfer->slotError(KIO::ERR_ABORTED, i18n("File transfer canceled."));
+ m_transfer->slotError(TDEIO::ERR_ABORTED, i18n("File transfer canceled."));
}
}
// Dispose of this transfer context.
@@ -315,7 +315,7 @@ void OutgoingTransfer::processMessage(const Message& message)
if(m_transfer)
{
// Inform the user of the file transfer cancelation.
- m_transfer->slotError(KIO::ERR_ABORTED, i18n("File transfer canceled."));
+ m_transfer->slotError(TDEIO::ERR_ABORTED, i18n("File transfer canceled."));
}
if(m_file && m_file->isOpen()){
@@ -401,7 +401,7 @@ void OutgoingTransfer::slotRead()
void OutgoingTransfer::slotSocketError(int)
{
- kdDebug(14140) << k_funcinfo << m_socket->KSocketBase::errorString() << endl;
+ kdDebug(14140) << k_funcinfo << m_socket->TDESocketBase::errorString() << endl;
// If an error has occurred, try to connect
// to another available peer endpoint.
// If there are no more available endpoints,
diff --git a/kopete/protocols/msn/p2p.cpp b/kopete/protocols/msn/p2p.cpp
index 7de59a20..11f308fb 100644
--- a/kopete/protocols/msn/p2p.cpp
+++ b/kopete/protocols/msn/p2p.cpp
@@ -372,7 +372,7 @@ void TransferContext::abort()
kdDebug(14140) << k_funcinfo << endl;
if(m_transfer)
{
- if(m_transfer->error() == KIO::ERR_ABORTED)
+ if(m_transfer->error() == TDEIO::ERR_ABORTED)
{
switch(m_direction)
{
diff --git a/kopete/protocols/msn/ui/msneditaccountwidget.cpp b/kopete/protocols/msn/ui/msneditaccountwidget.cpp
index 60672824..57764d14 100644
--- a/kopete/protocols/msn/ui/msneditaccountwidget.cpp
+++ b/kopete/protocols/msn/ui/msneditaccountwidget.cpp
@@ -105,7 +105,7 @@ MSNEditAccountWidget::MSNEditAccountWidget( MSNProtocol *proto, Kopete::Account
// default fields
if ( account )
{
- KConfigGroup * config=account->configGroup();
+ TDEConfigGroup * config=account->configGroup();
d->ui->m_login->setText( account->accountId() );
d->ui->m_password->load( &static_cast<MSNAccount *>(account)->password() );
@@ -198,7 +198,7 @@ Kopete::Account * MSNEditAccountWidget::apply()
if ( !account() )
setAccount( new MSNAccount( d->protocol, d->ui->m_login->text() ) );
- KConfigGroup *config=account()->configGroup();
+ TDEConfigGroup *config=account()->configGroup();
account()->setExcludeConnect( d->ui->m_autologin->isChecked() );
d->ui->m_password->save( &static_cast<MSNAccount *>(account())->password() );
@@ -332,7 +332,7 @@ void MSNEditAccountWidget::slotSelectImage()
return;
if( !filePath.isLocalFile() ) {
- if(!KIO::NetAccess::download( filePath, path, this )) {
+ if(!TDEIO::NetAccess::download( filePath, path, this )) {
KMessageBox::sorry( this, i18n( "Downloading of display image failed" ), i18n( "MSN Plugin" ) );
return;
}
@@ -355,7 +355,7 @@ void MSNEditAccountWidget::slotSelectImage()
KMessageBox::sorry( this, i18n( "<qt>An error occurred when trying to change the display picture.<br>"
"Make sure that you have selected a correct image file</qt>" ), i18n( "MSN Plugin" ) );
}
- if( remoteFile ) KIO::NetAccess::removeTempFile( path );
+ if( remoteFile ) TDEIO::NetAccess::removeTempFile( path );
}
void MSNEditAccountWidget::slotOpenRegister()
diff --git a/kopete/protocols/msn/webcam.cpp b/kopete/protocols/msn/webcam.cpp
index 43b0f33e..1c5a8e3b 100644
--- a/kopete/protocols/msn/webcam.cpp
+++ b/kopete/protocols/msn/webcam.cpp
@@ -54,7 +54,7 @@ Webcam::Webcam(Who who, const TQString& to, Dispatcher *parent, TQ_UINT32 sessio
m_mimic=0L;
m_widget=0L;
- KConfig *config = TDEGlobal::config();
+ TDEConfig *config = TDEGlobal::config();
config->setGroup( "MSN" );
// Read the configuration to get the number of frame per second to send
@@ -509,7 +509,7 @@ TQString Webcam::xml(uint session , uint rid)
TQString port = TQString::number(getAvailablePort());
- m_listener = new KServerSocket(port, this) ;
+ m_listener = new TDEServerSocket(port, this) ;
return "<" + who + "><version>2.0</version><rid>"+TQString::number(rid)+"</rid><udprid>"+TQString::number(rid+1)+"</udprid><session>"+TQString::number(session)+"</session><ctypes>0</ctypes><cpu>2931</cpu>" +
"<tcp><tcpport>"+port+"</tcpport>\t\t\t\t\t\t\t\t <tcplocalport>"+port+"</tcplocalport>\t\t\t\t\t\t\t\t <tcpexternalport>"+port+"</tcpexternalport>"+ip+"</tcp>"+
@@ -519,7 +519,7 @@ TQString Webcam::xml(uint session , uint rid)
int Webcam::getAvailablePort()
{
- KConfig *config = TDEGlobal::config();
+ TDEConfig *config = TDEGlobal::config();
config->setGroup( "MSN" );
TQString basePort=config->readEntry("WebcamPort");
if(basePort.isEmpty() || basePort == "0" )
@@ -531,14 +531,14 @@ int Webcam::getAvailablePort()
// try to find an available port
//
- KServerSocket *ss = new KServerSocket();
+ TDEServerSocket *ss = new TDEServerSocket();
ss->setFamily(KResolver::InetFamily);
bool found = false;
unsigned int port = firstport;
for( ; port <= lastport; ++port) {
ss->setAddress( TQString::number( port ) );
bool success = ss->listen();
- if( found = ( success && ss->error() == KSocketBase::NoError ) )
+ if( found = ( success && ss->error() == TDESocketBase::NoError ) )
break;
ss->close();
}
@@ -805,7 +805,7 @@ void Webcam::slotSocketClosed()
void Webcam::slotSocketError(int errorCode)
{
KBufferedSocket *socket=const_cast<KBufferedSocket*>(static_cast<const KBufferedSocket*>(sender()));
- kdDebug(14140) << k_funcinfo << socket << " - " << errorCode << " : " << socket->KSocketBase::errorString() << endl;
+ kdDebug(14140) << k_funcinfo << socket << " - " << errorCode << " : " << socket->TDESocketBase::errorString() << endl;
//sendBYEMessage();
}
diff --git a/kopete/protocols/msn/webcam.h b/kopete/protocols/msn/webcam.h
index d11f8b02..64a555c5 100644
--- a/kopete/protocols/msn/webcam.h
+++ b/kopete/protocols/msn/webcam.h
@@ -18,7 +18,7 @@
#if MSN_WEBCAM
-namespace KNetwork{ class KServerSocket; class KBufferedSocket; }
+namespace KNetwork{ class TDEServerSocket; class KBufferedSocket; }
class MimicWrapper;
class TQLabel;
@@ -54,7 +54,7 @@ class Webcam : public TransferContext
int getAvailablePort();
- KNetwork::KServerSocket *m_listener;
+ KNetwork::TDEServerSocket *m_listener;
KNetwork::KBufferedSocket *m_webcamSocket;
enum WebcamStatus { wsNegotiating , wsConnecting, wsConnected, wsTransfer } ;