diff options
Diffstat (limited to 'kopete/protocols')
69 files changed, 283 insertions, 283 deletions
diff --git a/kopete/protocols/gadu/gaduaccount.cpp b/kopete/protocols/gadu/gaduaccount.cpp index 76ec8b4f..c60f4051 100644 --- a/kopete/protocols/gadu/gaduaccount.cpp +++ b/kopete/protocols/gadu/gaduaccount.cpp @@ -88,7 +88,7 @@ public: TQTimer* exportTimer_; bool exportUserlist; - KConfigGroup* config; + TDEConfigGroup* config; Kopete::OnlineStatus status; TQValueList<unsigned int> servers; KGaduLoginParams loginInfo; @@ -940,14 +940,14 @@ GaduAccount::slotExportContactsListToFile() (*tempStream) << list.data(); tempFile.close(); - bool res = KIO::NetAccess::upload( + bool res = TDEIO::NetAccess::upload( tempFile.name() , p->saveListDialog->selectedURL() , Kopete::UI::Global::mainWidget() ); if ( !res ) { // say it failed - error( KIO::NetAccess::lastErrorString(), i18n( "Save Contacts List Failed" ) ); + error( TDEIO::NetAccess::lastErrorString(), i18n( "Save Contacts List Failed" ) ); } } @@ -977,12 +977,12 @@ GaduAccount::slotImportContactsFromFile() if ( p->loadListDialog->exec() == TQDialog::Accepted ) { url = p->loadListDialog->selectedURL(); kdDebug(14100) << "a:" << url << "\nb:" << oname << endl; - if ( KIO::NetAccess::download( url, oname, Kopete::UI::Global::mainWidget() ) ) { + if ( TDEIO::NetAccess::download( url, oname, Kopete::UI::Global::mainWidget() ) ) { TQFile tempFile( oname ); if ( tempFile.open( IO_ReadOnly ) ) { list = tempFile.readAll(); tempFile.close(); - KIO::NetAccess::removeTempFile( oname ); + TDEIO::NetAccess::removeTempFile( oname ); // and store it kdDebug( 14100 ) << "loaded list:" << endl; kdDebug( 14100 ) << list << endl; @@ -996,7 +996,7 @@ GaduAccount::slotImportContactsFromFile() } else { // say, it failed misourably - error( KIO::NetAccess::lastErrorString(), + error( TDEIO::NetAccess::lastErrorString(), i18n( "Contacts List Load Has Failed" ) ); } diff --git a/kopete/protocols/gadu/gadudcctransaction.cpp b/kopete/protocols/gadu/gadudcctransaction.cpp index 75e71748..a6568ff6 100644 --- a/kopete/protocols/gadu/gadudcctransaction.cpp +++ b/kopete/protocols/gadu/gadudcctransaction.cpp @@ -271,7 +271,7 @@ GaduDCCTransaction::slotIncomingTransferAccepted ( Kopete::Transfer* transfer, c else { // overwrite by default if ( localFile_.open( IO_ReadWrite ) == FALSE ) { - transfer->slotError ( KIO::ERR_COULD_NOT_WRITE, fileName ); + transfer->slotError ( TDEIO::ERR_COULD_NOT_WRITE, fileName ); closeDCC(); deleteLater (); return; @@ -280,7 +280,7 @@ GaduDCCTransaction::slotIncomingTransferAccepted ( Kopete::Transfer* transfer, c dccSock_->file_fd = localFile_.handle(); } - connect ( transfer, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotTransferResult() ) ); + connect ( transfer, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotTransferResult() ) ); // reenable notifiers enableNotifiers( dccSock_->check ); @@ -290,7 +290,7 @@ GaduDCCTransaction::slotIncomingTransferAccepted ( Kopete::Transfer* transfer, c void GaduDCCTransaction::slotTransferResult() { - if ( transfer_->error() == KIO::ERR_USER_CANCELED ) { + if ( transfer_->error() == TDEIO::ERR_USER_CANCELED ) { closeDCC(); deleteLater(); } @@ -405,24 +405,24 @@ GaduDCCTransaction::watcher() { switch( dccEvent->event.dcc_error ) { case GG_ERROR_DCC_REFUSED: - transfer_->slotError( KIO::ERR_SLAVE_DEFINED, i18n( "Connection to peer was refused; it possibly does not listen for incoming connections." ) ); + transfer_->slotError( TDEIO::ERR_SLAVE_DEFINED, i18n( "Connection to peer was refused; it possibly does not listen for incoming connections." ) ); break; case GG_ERROR_DCC_EOF: - transfer_->slotError( KIO::ERR_SLAVE_DEFINED, i18n( "File transfer transaction was not agreed by peer." ) ); + transfer_->slotError( TDEIO::ERR_SLAVE_DEFINED, i18n( "File transfer transaction was not agreed by peer." ) ); break; case GG_ERROR_DCC_HANDSHAKE: - transfer_->slotError( KIO::ERR_SLAVE_DEFINED, i18n( "File-transfer handshake failure." ) ); + transfer_->slotError( TDEIO::ERR_SLAVE_DEFINED, i18n( "File-transfer handshake failure." ) ); break; case GG_ERROR_DCC_FILE: - transfer_->slotError( KIO::ERR_SLAVE_DEFINED, i18n( "File transfer had problems with the file." ) ); + transfer_->slotError( TDEIO::ERR_SLAVE_DEFINED, i18n( "File transfer had problems with the file." ) ); break; case GG_ERROR_DCC_NET: - transfer_->slotError( KIO::ERR_SLAVE_DEFINED, i18n( "There was network error during file transfer." ) ); + transfer_->slotError( TDEIO::ERR_SLAVE_DEFINED, i18n( "There was network error during file transfer." ) ); break; default: - transfer_->slotError( KIO::ERR_SLAVE_DEFINED, i18n( "Unknown File-Transfer error." ) ); + transfer_->slotError( TDEIO::ERR_SLAVE_DEFINED, i18n( "Unknown File-Transfer error." ) ); break; } } diff --git a/kopete/protocols/groupwise/gwbytestream.cpp b/kopete/protocols/groupwise/gwbytestream.cpp index e9c04a21..e12284cf 100644 --- a/kopete/protocols/groupwise/gwbytestream.cpp +++ b/kopete/protocols/groupwise/gwbytestream.cpp @@ -113,7 +113,7 @@ void KNetworkByteStream::slotConnectionClosed () if ( mClosing ) { kdDebug ( GROUPWISE_DEBUG_GLOBAL ) << "..by ourselves!" << endl; - kdDebug( GROUPWISE_DEBUG_GLOBAL ) << "socket error is \"" << socket()->KSocketBase::errorString( socket()->error() ) << "\"" << endl; + kdDebug( GROUPWISE_DEBUG_GLOBAL ) << "socket error is \"" << socket()->TDESocketBase::errorString( socket()->error() ) << "\"" << endl; emit connectionClosed (); } else diff --git a/kopete/protocols/groupwise/gwconnector.cpp b/kopete/protocols/groupwise/gwconnector.cpp index e5daa9d7..c5a073e3 100644 --- a/kopete/protocols/groupwise/gwconnector.cpp +++ b/kopete/protocols/groupwise/gwconnector.cpp @@ -30,7 +30,7 @@ KNetworkConnector::KNetworkConnector ( TQObject *parent, const char */*name*/ ) { kdDebug ( GROUPWISE_DEBUG_GLOBAL ) << k_funcinfo << "New KNetwork connector." << endl; - mErrorCode = KNetwork::KSocketBase::NoError; + mErrorCode = KNetwork::TDESocketBase::NoError; mByteStream = new KNetworkByteStream ( this ); @@ -58,7 +58,7 @@ void KNetworkConnector::connectToServer ( const TQString &server ) * For XMPP 1.0, we need to enable this! */ - mErrorCode = KNetwork::KSocketBase::NoError; + mErrorCode = KNetwork::TDESocketBase::NoError; if ( !mByteStream->connect ( mHost, TQString::number ( mPort ) ) ) { diff --git a/kopete/protocols/groupwise/ui/gweditaccountwidget.cpp b/kopete/protocols/groupwise/ui/gweditaccountwidget.cpp index 7f049d7c..de50ba19 100644 --- a/kopete/protocols/groupwise/ui/gweditaccountwidget.cpp +++ b/kopete/protocols/groupwise/ui/gweditaccountwidget.cpp @@ -55,7 +55,7 @@ GroupWiseEditAccountWidget::GroupWiseEditAccountWidget( TQWidget* parent, Kopete else { // look for a default server and port setting - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup("GroupWise Messenger"); m_preferencesDialog->m_server->setText( config->readEntry( "DefaultServer" ) ); m_preferencesDialog->m_port->setValue( config->readNumEntry( "DefaultPort", 8300 ) ); diff --git a/kopete/protocols/irc/ircaccount.cpp b/kopete/protocols/irc/ircaccount.cpp index ffede29f..46e325ac 100644 --- a/kopete/protocols/irc/ircaccount.cpp +++ b/kopete/protocols/irc/ircaccount.cpp @@ -115,7 +115,7 @@ IRCAccount::IRCAccount(IRCProtocol *protocol, const TQString &accountId, const T currentHost = 0; - KConfigGroup *config = configGroup(); + TDEConfigGroup *config = configGroup(); TQString networkName = netName; if (networkName.isNull()) @@ -402,7 +402,7 @@ const TQStringList IRCAccount::connectCommands() const void IRCAccount::setMessageDestinations( int serverNotices, int serverMessages, int informationReplies, int errorMessages ) { - KConfigGroup *config = configGroup(); + TDEConfigGroup *config = configGroup(); config->writeEntry( "ServerNotices", serverNotices ); config->writeEntry( "ServerMessages", serverMessages ); config->writeEntry( "InformationReplies", informationReplies ); diff --git a/kopete/protocols/irc/irccontactmanager.cpp b/kopete/protocols/irc/irccontactmanager.cpp index fb49e08e..84c88f39 100644 --- a/kopete/protocols/irc/irccontactmanager.cpp +++ b/kopete/protocols/irc/irccontactmanager.cpp @@ -70,7 +70,7 @@ IRCContactManager::IRCContactManager(const TQString &nickName, IRCAccount *accou TQString timeoutPath = locate( "config", "kioslaverc" ); if( !timeoutPath.isEmpty() ) { - KConfig config( timeoutPath ); + TDEConfig config( timeoutPath ); socketTimeout = config.readNumEntry( "ReadTimeout", 15 ) * 1000; } diff --git a/kopete/protocols/irc/irctransferhandler.cpp b/kopete/protocols/irc/irctransferhandler.cpp index e579e94a..5c676e52 100644 --- a/kopete/protocols/irc/irctransferhandler.cpp +++ b/kopete/protocols/irc/irctransferhandler.cpp @@ -138,14 +138,14 @@ void IRCTransferHandler::connectKopeteTransfer(Kopete::Transfer *kt, KIRC::Trans // connect(kt, TQT_SIGNAL(destroyed()), // t, TQT_SLOT(slotKopeteTransferDestroyed())); - connect(kt, TQT_SIGNAL(result(KIO::Job *)), - this , TQT_SLOT(kioresult(KIO::Job *))); + connect(kt, TQT_SIGNAL(result(TDEIO::Job *)), + this , TQT_SLOT(kioresult(TDEIO::Job *))); t->initiate(); } } -void IRCTransferHandler::kioresult(KIO::Job *job) +void IRCTransferHandler::kioresult(TDEIO::Job *job) { Kopete::Transfer *kt= (Kopete::Transfer *)job; // FIXME: move to *_cast if(!kt) @@ -158,9 +158,9 @@ void IRCTransferHandler::kioresult(KIO::Job *job) { case 0: // 0 means no error break; - case KIO::ERR_USER_CANCELED: + case TDEIO::ERR_USER_CANCELED: kdDebug(14120) << k_funcinfo << "User canceled transfer." << endl; - // KIO::buildErrorString form error don't provide a result string ... + // TDEIO::buildErrorString form error don't provide a result string ... // if (t->) // kt->userAbort(i18n("User canceled transfer.")); // else @@ -168,7 +168,7 @@ void IRCTransferHandler::kioresult(KIO::Job *job) break; default: kdDebug(14120) << k_funcinfo << "Transfer halted:" << kt->error() << endl; -// kt->userAbort(KIO::buildErrorString(kt->error(), kt->fileName())); +// kt->userAbort(TDEIO::buildErrorString(kt->error(), kt->fileName())); break; } } diff --git a/kopete/protocols/irc/irctransferhandler.h b/kopete/protocols/irc/irctransferhandler.h index 60235e57..32618120 100644 --- a/kopete/protocols/irc/irctransferhandler.h +++ b/kopete/protocols/irc/irctransferhandler.h @@ -47,7 +47,7 @@ private slots: void transferAccepted(Kopete::Transfer *kt, const TQString&file); void transferRefused(const Kopete::FileTransferInfo &info); - void kioresult(KIO::Job *job); + void kioresult(TDEIO::Job *job); private: IRCTransferHandler(); diff --git a/kopete/protocols/irc/libkirc/ksslsocket.cpp b/kopete/protocols/irc/libkirc/ksslsocket.cpp index dbe0bfb2..153b8ba8 100644 --- a/kopete/protocols/irc/libkirc/ksslsocket.cpp +++ b/kopete/protocols/irc/libkirc/ksslsocket.cpp @@ -194,7 +194,7 @@ void KSSLSocket::showInfoDialog() TQDataStream arg(data, IO_WriteOnly); arg << "irc://" + peerAddress()->pretty() + ":" + port() << d->metaData; d->dcc->call("kio_uiserver", "UIServer", - "showSSLInfoDialog(TQString,KIO::MetaData)", data, ignoretype, ignore); + "showSSLInfoDialog(TQString,TDEIO::MetaData)", data, ignoretype, ignore); } } @@ -217,14 +217,14 @@ TQString KSSLSocket::metaData( const TQString &key ) } /* -I basically copied the below from tcpKIO::SlaveBase.hpp, with some modificaions and formatting. +I basically copied the below from tcpTDEIO::SlaveBase.hpp, with some modificaions and formatting. * Copyright (C) 2000 Alex Zepeda <zipzippy@sonic.net * Copyright (C) 2001-2003 George Staikos <staikos@kde.org> * Copyright (C) 2001 Dawit Alemayehu <adawit@kde.org> */ -int KSSLSocket::messageBox( KIO::SlaveBase::MessageBoxType type, const TQString &text, const TQString &caption, +int KSSLSocket::messageBox( TDEIO::SlaveBase::MessageBoxType type, const TQString &text, const TQString &caption, const TQString &buttonYes, const TQString &buttonNo ) { kdDebug(14120) << "messageBox " << type << " " << text << " - " << caption << buttonYes << buttonNo << endl; @@ -371,7 +371,7 @@ int KSSLSocket::verifyCertificate() TQString msg = i18n("The IP address of the host %1 " "does not match the one the " "certificate was issued to."); - result = messageBox( KIO::SlaveBase::WarningYesNoCancel, + result = messageBox( TDEIO::SlaveBase::WarningYesNoCancel, msg.arg(ourHost), i18n("Server Authentication"), i18n("&Details"), @@ -381,7 +381,7 @@ int KSSLSocket::verifyCertificate() { TQString msg = i18n("The server certificate failed the " "authenticity test (%1)."); - result = messageBox( KIO::SlaveBase::WarningYesNoCancel, + result = messageBox( TDEIO::SlaveBase::WarningYesNoCancel, msg.arg(ourHost), i18n("Server Authentication"), i18n("&Details"), @@ -400,7 +400,7 @@ int KSSLSocket::verifyCertificate() rc = 1; cp = KSSLCertificateCache::Accept; doAddHost = true; - result = messageBox( KIO::SlaveBase::WarningYesNo, + result = messageBox( TDEIO::SlaveBase::WarningYesNo, i18n("Would you like to accept this " "certificate forever without " "being prompted?"), diff --git a/kopete/protocols/irc/libkirc/ksslsocket.h b/kopete/protocols/irc/libkirc/ksslsocket.h index 68196538..a036a71d 100644 --- a/kopete/protocols/irc/libkirc/ksslsocket.h +++ b/kopete/protocols/irc/libkirc/ksslsocket.h @@ -58,7 +58,7 @@ class KSSLSocket : public KExtendedSocket private: int verifyCertificate(); - int messageBox( KIO::SlaveBase::MessageBoxType type, const TQString &text, + int messageBox( TDEIO::SlaveBase::MessageBoxType type, const TQString &text, const TQString &caption, const TQString &buttonYes, const TQString &buttonNo ); diff --git a/kopete/protocols/irc/ui/irceditaccountwidget.cpp b/kopete/protocols/irc/ui/irceditaccountwidget.cpp index 1b268027..f09ea21e 100644 --- a/kopete/protocols/irc/ui/irceditaccountwidget.cpp +++ b/kopete/protocols/irc/ui/irceditaccountwidget.cpp @@ -75,7 +75,7 @@ IRCEditAccountWidget::IRCEditAccountWidget(IRCProtocol *proto, IRCAccount *ident autoShowServerWindow->setChecked( account()->configGroup()->readBoolEntry("AutoShowServerWindow") ); autoConnect->setChecked( static_cast<Kopete::Account*>(account())->excludeConnect() ); - KConfigGroup *config = account()->configGroup(); + TDEConfigGroup *config = account()->configGroup(); serverNotices->setCurrentItem( config->readNumEntry( "ServerNotices", IRCAccount::ServerWindow ) - 1 ); serverMessages->setCurrentItem( config->readNumEntry( "ServerMessages", IRCAccount::ServerWindow ) - 1 ); @@ -208,7 +208,7 @@ void IRCEditAccountWidget::slotAddCtcp() TQString IRCEditAccountWidget::generateAccountId( const TQString &network ) { - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); TQString nextId = network; uint accountNumber = 1; diff --git a/kopete/protocols/jabber/jabberaccount.cpp b/kopete/protocols/jabber/jabberaccount.cpp index bb4766e8..0a803927 100644 --- a/kopete/protocols/jabber/jabberaccount.cpp +++ b/kopete/protocols/jabber/jabberaccount.cpp @@ -793,50 +793,50 @@ void JabberAccount::handleStreamError (int streamError, int streamCondition, int case XMPP::ClientStream::ErrConnection: switch(connectorCode) { - case KNetwork::KSocketBase::LookupFailure: + case KNetwork::TDESocketBase::LookupFailure: errorClass = Kopete::Account::InvalidHost; errorCondition = i18n("Host not found."); break; - case KNetwork::KSocketBase::AddressInUse: + case KNetwork::TDESocketBase::AddressInUse: errorCondition = i18n("Address is already in use."); break; - case KNetwork::KSocketBase::AlreadyCreated: + case KNetwork::TDESocketBase::AlreadyCreated: errorCondition = i18n("Cannot recreate the socket."); break; - case KNetwork::KSocketBase::AlreadyBound: + case KNetwork::TDESocketBase::AlreadyBound: errorCondition = i18n("Cannot bind the socket again."); break; - case KNetwork::KSocketBase::AlreadyConnected: + case KNetwork::TDESocketBase::AlreadyConnected: errorCondition = i18n("Socket is already connected."); break; - case KNetwork::KSocketBase::NotConnected: + case KNetwork::TDESocketBase::NotConnected: errorCondition = i18n("Socket is not connected."); break; - case KNetwork::KSocketBase::NotBound: + case KNetwork::TDESocketBase::NotBound: errorCondition = i18n("Socket is not bound."); break; - case KNetwork::KSocketBase::NotCreated: + case KNetwork::TDESocketBase::NotCreated: errorCondition = i18n("Socket has not been created."); break; - case KNetwork::KSocketBase::WouldBlock: + case KNetwork::TDESocketBase::WouldBlock: errorCondition = i18n("Socket operation would block. You should not see this error, please use \"Report Bug\" from the Help menu."); break; - case KNetwork::KSocketBase::ConnectionRefused: + case KNetwork::TDESocketBase::ConnectionRefused: errorCondition = i18n("Connection refused."); break; - case KNetwork::KSocketBase::ConnectionTimedOut: + case KNetwork::TDESocketBase::ConnectionTimedOut: errorCondition = i18n("Connection timed out."); break; - case KNetwork::KSocketBase::InProgress: + case KNetwork::TDESocketBase::InProgress: errorCondition = i18n("Connection attempt already in progress."); break; - case KNetwork::KSocketBase::NetFailure: + case KNetwork::TDESocketBase::NetFailure: errorCondition = i18n("Network failure."); break; - case KNetwork::KSocketBase::NotSupported: + case KNetwork::TDESocketBase::NotSupported: errorCondition = i18n("Operation is not supported."); break; - case KNetwork::KSocketBase::Timeout: + case KNetwork::TDESocketBase::Timeout: errorCondition = i18n("Socket timed out."); break; default: diff --git a/kopete/protocols/jabber/jabberbasecontact.cpp b/kopete/protocols/jabber/jabberbasecontact.cpp index 6ed0bcfd..d994487f 100644 --- a/kopete/protocols/jabber/jabberbasecontact.cpp +++ b/kopete/protocols/jabber/jabberbasecontact.cpp @@ -646,7 +646,7 @@ void JabberBaseContact::setPropertiesFromVCard ( const XMPP::VCard &vCard ) TQString tempPhotoPath = 0; // Downalod photo from URI. - if( !KIO::NetAccess::download( vCard.photoURI(), tempPhotoPath, 0) ) + if( !TDEIO::NetAccess::download( vCard.photoURI(), tempPhotoPath, 0) ) { KMessageBox::queuedMessageBox( Kopete::UI::Global::mainWidget (), KMessageBox::Sorry, i18n( "Downloading of Jabber contact photo failed!" ) ); return; @@ -656,7 +656,7 @@ void JabberBaseContact::setPropertiesFromVCard ( const XMPP::VCard &vCard ) contactPhoto = TQImage( tempPhotoPath ); - KIO::NetAccess::removeTempFile( tempPhotoPath ); + TDEIO::NetAccess::removeTempFile( tempPhotoPath ); } // Save the image to the disk, then set the property. diff --git a/kopete/protocols/jabber/jabberconnector.cpp b/kopete/protocols/jabber/jabberconnector.cpp index f2d74eab..6d43d305 100644 --- a/kopete/protocols/jabber/jabberconnector.cpp +++ b/kopete/protocols/jabber/jabberconnector.cpp @@ -27,7 +27,7 @@ JabberConnector::JabberConnector ( TQObject *parent, const char */*name*/ ) { kdDebug ( JABBER_DEBUG_GLOBAL ) << k_funcinfo << "New Jabber connector." << endl; - mErrorCode = KNetwork::KSocketBase::NoError; + mErrorCode = KNetwork::TDESocketBase::NoError; mByteStream = new JabberByteStream ( this ); @@ -54,7 +54,7 @@ void JabberConnector::connectToServer ( const TQString &server ) * For XMPP 1.0, we need to enable this! */ - mErrorCode = KNetwork::KSocketBase::NoError; + mErrorCode = KNetwork::TDESocketBase::NoError; if ( !mByteStream->connect ( mHost, TQString::number ( mPort ) ) ) { diff --git a/kopete/protocols/jabber/jabberfiletransfer.cpp b/kopete/protocols/jabber/jabberfiletransfer.cpp index d49d846c..00ecd535 100644 --- a/kopete/protocols/jabber/jabberfiletransfer.cpp +++ b/kopete/protocols/jabber/jabberfiletransfer.cpp @@ -90,7 +90,7 @@ JabberFileTransfer::JabberFileTransfer ( JabberAccount *account, JabberBaseConta contact->contactId (), Kopete::FileTransferInfo::Outgoing ); - connect ( mKopeteTransfer, TQT_SIGNAL ( result ( KIO::Job * ) ), this, TQT_SLOT ( slotTransferResult () ) ); + connect ( mKopeteTransfer, TQT_SIGNAL ( result ( TDEIO::Job * ) ), this, TQT_SLOT ( slotTransferResult () ) ); mXMPPTransfer = mAccount->client()->fileTransferManager()->createTransfer (); @@ -182,13 +182,13 @@ void JabberFileTransfer::slotIncomingTransferAccepted ( Kopete::Transfer *transf if ( !couldOpen ) { - transfer->slotError ( KIO::ERR_COULD_NOT_WRITE, fileName ); + transfer->slotError ( TDEIO::ERR_COULD_NOT_WRITE, fileName ); deleteLater (); } else { - connect ( mKopeteTransfer, TQT_SIGNAL ( result ( KIO::Job * ) ), this, TQT_SLOT ( slotTransferResult () ) ); + connect ( mKopeteTransfer, TQT_SIGNAL ( result ( TDEIO::Job * ) ), this, TQT_SLOT ( slotTransferResult () ) ); connect ( mXMPPTransfer, TQT_SIGNAL ( readyRead ( const TQByteArray& ) ), this, TQT_SLOT ( slotIncomingDataReady ( const TQByteArray & ) ) ); connect ( mXMPPTransfer, TQT_SIGNAL ( error ( int ) ), this, TQT_SLOT ( slotTransferError ( int ) ) ); mXMPPTransfer->accept ( offset, length ); @@ -211,7 +211,7 @@ void JabberFileTransfer::slotTransferRefused ( const Kopete::FileTransferInfo &t void JabberFileTransfer::slotTransferResult () { - if ( mKopeteTransfer->error () == KIO::ERR_USER_CANCELED ) + if ( mKopeteTransfer->error () == TDEIO::ERR_USER_CANCELED ) { kdDebug(JABBER_DEBUG_GLOBAL) << k_funcinfo << "Transfer with " << mXMPPTransfer->peer().full () << " has been canceled." << endl; mXMPPTransfer->close (); @@ -227,31 +227,31 @@ void JabberFileTransfer::slotTransferError ( int errorCode ) { case XMPP::FileTransfer::ErrReject: // user rejected the transfer request - mKopeteTransfer->slotError ( KIO::ERR_ACCESS_DENIED, + mKopeteTransfer->slotError ( TDEIO::ERR_ACCESS_DENIED, mXMPPTransfer->peer().full () ); break; case XMPP::FileTransfer::ErrNeg: // unable to negotiate a suitable connection for the file transfer with the user - mKopeteTransfer->slotError ( KIO::ERR_COULD_NOT_LOGIN, + mKopeteTransfer->slotError ( TDEIO::ERR_COULD_NOT_LOGIN, mXMPPTransfer->peer().full () ); break; case XMPP::FileTransfer::ErrConnect: // could not connect to the user - mKopeteTransfer->slotError ( KIO::ERR_COULD_NOT_CONNECT, + mKopeteTransfer->slotError ( TDEIO::ERR_COULD_NOT_CONNECT, mXMPPTransfer->peer().full () ); break; case XMPP::FileTransfer::ErrStream: // data stream was disrupted, probably cancelled - mKopeteTransfer->slotError ( KIO::ERR_CONNECTION_BROKEN, + mKopeteTransfer->slotError ( TDEIO::ERR_CONNECTION_BROKEN, mXMPPTransfer->peer().full () ); break; default: // unknown error - mKopeteTransfer->slotError ( KIO::ERR_UNKNOWN, + mKopeteTransfer->slotError ( TDEIO::ERR_UNKNOWN, mXMPPTransfer->peer().full () ); break; } diff --git a/kopete/protocols/jabber/kioslave/jabberdisco.cpp b/kopete/protocols/jabber/kioslave/jabberdisco.cpp index 2dc7f5ff..311cfafd 100644 --- a/kopete/protocols/jabber/kioslave/jabberdisco.cpp +++ b/kopete/protocols/jabber/kioslave/jabberdisco.cpp @@ -33,7 +33,7 @@ #include "jabberclient.h" JabberDiscoProtocol::JabberDiscoProtocol ( const TQCString &pool_socket, const TQCString &app_socket ) - : KIO::SlaveBase ( "kio_jabberdisco", pool_socket, app_socket ) + : TDEIO::SlaveBase ( "kio_jabberdisco", pool_socket, app_socket ) { kdDebug ( JABBER_DISCO_DEBUG ) << k_funcinfo << "Slave launched." << endl; @@ -106,7 +106,7 @@ void JabberDiscoProtocol::openConnection () { case JabberClient::NoTLS: // no SSL support, at the connecting stage this means the problem is client-side - error ( KIO::ERR_UPGRADE_REQUIRED, i18n ( "TLS" ) ); + error ( TDEIO::ERR_UPGRADE_REQUIRED, i18n ( "TLS" ) ); break; case JabberClient::Ok: @@ -184,7 +184,7 @@ void JabberDiscoProtocol::slotHandleTLSWarning ( int validityResult ) { kdDebug ( JABBER_DISCO_DEBUG ) << k_funcinfo << "Handling TLS warning..." << endl; - if ( messageBox ( KIO::SlaveBase::WarningContinueCancel, + if ( messageBox ( TDEIO::SlaveBase::WarningContinueCancel, i18n ( "The server certificate is invalid. Do you want to continue? " ), i18n ( "Certificate Warning" ) ) == KMessageBox::Continue ) { @@ -207,7 +207,7 @@ void JabberDiscoProtocol::slotClientError ( JabberClient::ErrorCode errorCode ) { case JabberClient::NoTLS: default: - error ( KIO::ERR_UPGRADE_REQUIRED, i18n ( "TLS" ) ); + error ( TDEIO::ERR_UPGRADE_REQUIRED, i18n ( "TLS" ) ); closeConnection (); break; } @@ -252,33 +252,33 @@ void JabberDiscoProtocol::slotQueryFinished () if (!task->success ()) { - error ( KIO::ERR_COULD_NOT_READ, "" ); + error ( TDEIO::ERR_COULD_NOT_READ, "" ); return; } XMPP::DiscoList::const_iterator itemsEnd = task->items().end (); for (XMPP::DiscoList::const_iterator it = task->items().begin (); it != itemsEnd; ++it) { - KIO::UDSAtom atom; - KIO::UDSEntry entry; + TDEIO::UDSAtom atom; + TDEIO::UDSEntry entry; - atom.m_uds = KIO::UDS_NAME; + atom.m_uds = TDEIO::UDS_NAME; atom.m_str = (*it).jid().userHost (); entry.prepend ( atom ); - atom.m_uds = KIO::UDS_SIZE; + atom.m_uds = TDEIO::UDS_SIZE; atom.m_long = 0; entry.prepend ( atom ); - atom.m_uds = KIO::UDS_LINK_DEST; + atom.m_uds = TDEIO::UDS_LINK_DEST; atom.m_str = (*it).name (); entry.prepend ( atom ); - atom.m_uds = KIO::UDS_MIME_TYPE; + atom.m_uds = TDEIO::UDS_MIME_TYPE; atom.m_str = "inode/directory"; entry.prepend ( atom ); - atom.m_uds = KIO::UDS_SIZE; + atom.m_uds = TDEIO::UDS_SIZE; atom.m_long = 0; entry.prepend ( atom ); @@ -286,7 +286,7 @@ void JabberDiscoProtocol::slotQueryFinished () } - listEntry ( KIO::UDSEntry(), true ); + listEntry ( TDEIO::UDSEntry(), true ); finished (); @@ -314,7 +314,7 @@ void JabberDiscoProtocol::slotCSError ( int errorCode ) { kdDebug ( JABBER_DISCO_DEBUG ) << k_funcinfo << "Incorrect password, retrying." << endl; - KIO::AuthInfo authInfo; + TDEIO::AuthInfo authInfo; authInfo.username = m_user; authInfo.password = m_password; if ( openPassDlg ( authInfo, i18n ( "The login details are incorrect. Do you want to try again?" ) ) ) @@ -327,13 +327,13 @@ void JabberDiscoProtocol::slotCSError ( int errorCode ) else { closeConnection (); - error ( KIO::ERR_COULD_NOT_AUTHENTICATE, "" ); + error ( TDEIO::ERR_COULD_NOT_AUTHENTICATE, "" ); } } else { closeConnection (); - error ( KIO::ERR_CONNECTION_BROKEN, "" ); + error ( TDEIO::ERR_CONNECTION_BROKEN, "" ); } } diff --git a/kopete/protocols/jabber/kioslave/jabberdisco.h b/kopete/protocols/jabber/kioslave/jabberdisco.h index 9b8f5be0..660ba269 100644 --- a/kopete/protocols/jabber/kioslave/jabberdisco.h +++ b/kopete/protocols/jabber/kioslave/jabberdisco.h @@ -33,7 +33,7 @@ class JabberClient; -class JabberDiscoProtocol : public TQObject, public KIO::SlaveBase +class JabberDiscoProtocol : public TQObject, public TDEIO::SlaveBase { Q_OBJECT diff --git a/kopete/protocols/jabber/ui/dlgjabbervcard.cpp b/kopete/protocols/jabber/ui/dlgjabbervcard.cpp index 7682aee7..2da7740e 100644 --- a/kopete/protocols/jabber/ui/dlgjabbervcard.cpp +++ b/kopete/protocols/jabber/ui/dlgjabbervcard.cpp @@ -475,7 +475,7 @@ void dlgJabberVCard::slotSelectPhoto() if( !filePath.isLocalFile() ) { - if( !KIO::NetAccess::download( filePath, path, this ) ) + if( !TDEIO::NetAccess::download( filePath, path, this ) ) { KMessageBox::queuedMessageBox( this, KMessageBox::Sorry, i18n( "Downloading of Jabber contact photo failed!" ) ); return; @@ -536,7 +536,7 @@ void dlgJabberVCard::slotSelectPhoto() "Make sure that you have selected a correct image file</qt>" ) ); } if( remoteFile ) - KIO::NetAccess::removeTempFile( path ); + TDEIO::NetAccess::removeTempFile( path ); } void dlgJabberVCard::slotClearPhoto() diff --git a/kopete/protocols/jabber/ui/jabberchooseserver.cpp b/kopete/protocols/jabber/ui/jabberchooseserver.cpp index 63339158..a9a00689 100644 --- a/kopete/protocols/jabber/ui/jabberchooseserver.cpp +++ b/kopete/protocols/jabber/ui/jabberchooseserver.cpp @@ -46,10 +46,10 @@ JabberChooseServer::JabberChooseServer ( JabberRegisterAccount *parent, const ch mMainWidget->listServers->setLeftMargin ( 0 ); // retrieve server list - mTransferJob = KIO::get ( "http://www.jabber.org/servers.xml" ); + mTransferJob = TDEIO::get ( "http://www.jabber.org/servers.xml" ); - connect ( mTransferJob, TQT_SIGNAL ( result ( KIO::Job* ) ), this, TQT_SLOT ( slotTransferResult ( KIO::Job* ) ) ); - connect ( mTransferJob, TQT_SIGNAL ( data ( KIO::Job*, const TQByteArray& ) ), this, TQT_SLOT ( slotTransferData ( KIO::Job*, const TQByteArray& ) ) ); + connect ( mTransferJob, TQT_SIGNAL ( result ( TDEIO::Job* ) ), this, TQT_SLOT ( slotTransferResult ( TDEIO::Job* ) ) ); + connect ( mTransferJob, TQT_SIGNAL ( data ( TDEIO::Job*, const TQByteArray& ) ), this, TQT_SLOT ( slotTransferData ( TDEIO::Job*, const TQByteArray& ) ) ); connect ( mMainWidget->listServers, TQT_SIGNAL ( pressed ( int, int, int, const TQPoint & ) ), this, TQT_SLOT ( slotSetSelection ( int ) ) ); connect ( mMainWidget->listServers, TQT_SIGNAL ( doubleClicked ( int, int, int, const TQPoint & ) ), this, TQT_SLOT ( slotOk () ) ); @@ -90,7 +90,7 @@ void JabberChooseServer::slotSetSelection ( int row ) } -void JabberChooseServer::slotTransferData ( KIO::Job */*job*/, const TQByteArray &data ) +void JabberChooseServer::slotTransferData ( TDEIO::Job */*job*/, const TQByteArray &data ) { unsigned oldSize = xmlServerList.size (); @@ -103,7 +103,7 @@ void JabberChooseServer::slotTransferData ( KIO::Job */*job*/, const TQByteArray } -void JabberChooseServer::slotTransferResult ( KIO::Job *job ) +void JabberChooseServer::slotTransferResult ( TDEIO::Job *job ) { if ( job->error () || mTransferJob->isErrorPage () ) diff --git a/kopete/protocols/jabber/ui/jabberchooseserver.h b/kopete/protocols/jabber/ui/jabberchooseserver.h index 8523a0dc..d6109a33 100644 --- a/kopete/protocols/jabber/ui/jabberchooseserver.h +++ b/kopete/protocols/jabber/ui/jabberchooseserver.h @@ -26,7 +26,7 @@ class JabberRegisterAccount; class DlgJabberChooseServer; -namespace KIO +namespace TDEIO { class Job; class TransferJob; @@ -49,14 +49,14 @@ public: private slots: void slotOk (); void slotCancel (); - void slotTransferData ( KIO::Job *job, const TQByteArray &data ); - void slotTransferResult ( KIO::Job *job ); + void slotTransferData ( TDEIO::Job *job, const TQByteArray &data ); + void slotTransferResult ( TDEIO::Job *job ); void slotSetSelection ( int row ); private: DlgJabberChooseServer *mMainWidget; JabberRegisterAccount *mParentWidget; - KIO::TransferJob *mTransferJob; + TDEIO::TransferJob *mTransferJob; TQByteArray xmlServerList; int mSelectedRow; 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 } ; diff --git a/kopete/protocols/oscar/liboscar/oscarbytestream.cpp b/kopete/protocols/oscar/liboscar/oscarbytestream.cpp index c3a39253..cffb672f 100644 --- a/kopete/protocols/oscar/liboscar/oscarbytestream.cpp +++ b/kopete/protocols/oscar/liboscar/oscarbytestream.cpp @@ -102,7 +102,7 @@ void KNetworkByteStream::slotConnectionClosed() if ( mClosing ) { kdDebug( 14151 ) << "..by ourselves!" << endl; - kdDebug( 14151 ) << "socket error is " << socket()->KSocketBase::errorString( socket()->error() ) << endl; + kdDebug( 14151 ) << "socket error is " << socket()->TDESocketBase::errorString( socket()->error() ) << endl; emit connectionClosed (); } else diff --git a/kopete/protocols/oscar/liboscar/oscarconnector.cpp b/kopete/protocols/oscar/liboscar/oscarconnector.cpp index 98d56237..16fcaff1 100644 --- a/kopete/protocols/oscar/liboscar/oscarconnector.cpp +++ b/kopete/protocols/oscar/liboscar/oscarconnector.cpp @@ -29,7 +29,7 @@ KNetworkConnector::KNetworkConnector( TQObject *parent, const char */*name*/ ) { kdDebug( 14151 ) << k_funcinfo << "New KNetwork connector." << endl; - mErrorCode = KNetwork::KSocketBase::NoError; + mErrorCode = KNetwork::TDESocketBase::NoError; mByteStream = new KNetworkByteStream( this ); @@ -49,7 +49,7 @@ void KNetworkConnector::connectToServer( const TQString &server ) Q_ASSERT( !mHost.isNull() ); Q_ASSERT( mPort ); - mErrorCode = KNetwork::KSocketBase::NoError; + mErrorCode = KNetwork::TDESocketBase::NoError; if ( !mByteStream->connect ( mHost, TQString::number ( mPort ) ) ) { diff --git a/kopete/protocols/oscar/oscarversionupdater.cpp b/kopete/protocols/oscar/oscarversionupdater.cpp index d79e47fc..bcaf454e 100644 --- a/kopete/protocols/oscar/oscarversionupdater.cpp +++ b/kopete/protocols/oscar/oscarversionupdater.cpp @@ -66,15 +66,15 @@ bool OscarVersionUpdater::update( unsigned int stamp ) { mVersionData.resize( 0 ); - KConfigGroup config( TDEGlobal::config(), "Oscar" ); + TDEConfigGroup config( TDEGlobal::config(), "Oscar" ); TQString url = config.readEntry( "NewVersionURL", "http://kopete.kde.org/oscarversions.xml" ); - mTransferJob = KIO::get ( url ); + mTransferJob = TDEIO::get ( url ); kdDebug(OSCAR_GEN_DEBUG) << k_funcinfo << "Download version info from server."<< endl; - connect ( mTransferJob, TQT_SIGNAL ( result ( KIO::Job* ) ), - this, TQT_SLOT ( slotTransferResult ( KIO::Job* ) ) ); - connect ( mTransferJob, TQT_SIGNAL ( data ( KIO::Job*, const TQByteArray& ) ), - this, TQT_SLOT ( slotTransferData ( KIO::Job*, const TQByteArray& ) ) ); + connect ( mTransferJob, TQT_SIGNAL ( result ( TDEIO::Job* ) ), + this, TQT_SLOT ( slotTransferResult ( TDEIO::Job* ) ) ); + connect ( mTransferJob, TQT_SIGNAL ( data ( TDEIO::Job*, const TQByteArray& ) ), + this, TQT_SLOT ( slotTransferData ( TDEIO::Job*, const TQByteArray& ) ) ); } return isUpdating; } @@ -87,7 +87,7 @@ unsigned int OscarVersionUpdater::stamp() const void OscarVersionUpdater::initICQVersionInfo() { kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << endl; - KConfigGroup config( TDEGlobal::config(), "ICQVersion" ); + TDEConfigGroup config( TDEGlobal::config(), "ICQVersion" ); mICQVersion.clientString = config.readEntry( "ClientString", "ICQ Client" ); mICQVersion.clientId = config.readEntry( "ClientId", "0x010A" ).toUShort( 0, 0 ); @@ -104,7 +104,7 @@ void OscarVersionUpdater::initAIMVersionInfo() { kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << endl; - KConfigGroup config( TDEGlobal::config(), "AIMVersion" ); + TDEConfigGroup config( TDEGlobal::config(), "AIMVersion" ); mAIMVersion.clientString = config.readEntry( "ClientString", "AOL Instant Messenger (SM), version 5.1.3036/WIN32" ); mAIMVersion.clientId = config.readEntry( "ClientId", "0x0109" ).toUShort( 0, 0 ); @@ -144,7 +144,7 @@ void OscarVersionUpdater::printDebug() kdDebug(OSCAR_RAW_DEBUG) << "************************************************" << endl; } -void OscarVersionUpdater::slotTransferData ( KIO::Job */*job*/, const TQByteArray &data ) +void OscarVersionUpdater::slotTransferData ( TDEIO::Job */*job*/, const TQByteArray &data ) { unsigned oldSize = mVersionData.size(); mVersionData.resize ( oldSize + data.size() ); @@ -153,7 +153,7 @@ void OscarVersionUpdater::slotTransferData ( KIO::Job */*job*/, const TQByteArra kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "Data size " << mVersionData.size() << endl; } -void OscarVersionUpdater::slotTransferResult ( KIO::Job *job ) +void OscarVersionUpdater::slotTransferResult ( TDEIO::Job *job ) { bool bUpdate = false; if ( job->error() || mTransferJob->isErrorPage() ) @@ -264,7 +264,7 @@ bool OscarVersionUpdater::parseVersion( Oscar::ClientVersion& version, TQDomElem void OscarVersionUpdater::storeVersionInfo( const TQString& group, const Oscar::ClientVersion& version ) const { kdDebug(OSCAR_GEN_DEBUG) << k_funcinfo << "Storing version info to group: " << group << endl; - KConfigGroup config( TDEGlobal::config(), group ); + TDEConfigGroup config( TDEGlobal::config(), group ); config.writeEntry( "ClientString", version.clientString ); config.writeEntry( "ClientId", version.clientId ); diff --git a/kopete/protocols/oscar/oscarversionupdater.h b/kopete/protocols/oscar/oscarversionupdater.h index 117734c8..de2a2fea 100644 --- a/kopete/protocols/oscar/oscarversionupdater.h +++ b/kopete/protocols/oscar/oscarversionupdater.h @@ -21,7 +21,7 @@ #include <oscartypes.h> -namespace KIO +namespace TDEIO { class Job; class TransferJob; @@ -85,15 +85,15 @@ public: void printDebug(); private slots: - void slotTransferData( KIO::Job *job, const TQByteArray &data ); - void slotTransferResult( KIO::Job *job ); + void slotTransferData( TDEIO::Job *job, const TQByteArray &data ); + void slotTransferResult( TDEIO::Job *job ); private: void parseDocument( TQDomDocument& doc ); bool parseVersion( Oscar::ClientVersion& version, TQDomElement& element ); /** - * Store version info structure to KConfigGroup + * Store version info structure to TDEConfigGroup * @param group is the group name. * @param version is version info structure. */ @@ -111,7 +111,7 @@ private: Oscar::ClientVersion mICQVersion; Oscar::ClientVersion mAIMVersion; - KIO::TransferJob *mTransferJob; + TDEIO::TransferJob *mTransferJob; TQByteArray mVersionData; unsigned int mStamp; diff --git a/kopete/protocols/sms/services/gsmlib.cpp b/kopete/protocols/sms/services/gsmlib.cpp index 5c86903a..45ade4c1 100644 --- a/kopete/protocols/sms/services/gsmlib.cpp +++ b/kopete/protocols/sms/services/gsmlib.cpp @@ -306,7 +306,7 @@ void GSMLib::saveConfig() { if( m_account != NULL ) { - KConfigGroup* c = m_account->configGroup(); + TDEConfigGroup* c = m_account->configGroup(); c->writeEntry(TQString("%1:%2").arg("GSMLib").arg("Device"), m_device); } @@ -318,7 +318,7 @@ void GSMLib::loadConfig() if( m_account != NULL ) { TQString temp; - KConfigGroup* c = m_account->configGroup(); + TDEConfigGroup* c = m_account->configGroup(); temp = c->readEntry(TQString("%1:%2").arg("GSMLib").arg("Device"), TQString()); if( temp != TQString() ) diff --git a/kopete/protocols/sms/services/smsclient.cpp b/kopete/protocols/sms/services/smsclient.cpp index 9a1898a8..6b303104 100644 --- a/kopete/protocols/sms/services/smsclient.cpp +++ b/kopete/protocols/sms/services/smsclient.cpp @@ -58,7 +58,7 @@ void SMSClient::send(const Kopete::Message& msg) m_msg = msg; - KConfigGroup* c = m_account->configGroup(); + TDEConfigGroup* c = m_account->configGroup(); TQString provider = c->readEntry(TQString("%1:%2").arg("SMSClient").arg("ProviderName")); if (provider.isNull()) @@ -133,7 +133,7 @@ void SMSClient::savePreferences() if (prefWidget != 0L && m_account != 0L) { - KConfigGroup* c = m_account->configGroup(); + TDEConfigGroup* c = m_account->configGroup(); c->writeEntry(TQString("%1:%2").arg("SMSClient").arg("ProgramName"), prefWidget->program->url()); c->writeEntry(TQString("%1:%2").arg("SMSClient").arg("ConfigDir"), prefWidget->configDir->url()); diff --git a/kopete/protocols/sms/smseditaccountwidget.cpp b/kopete/protocols/sms/smseditaccountwidget.cpp index c355c287..c2a1fb1e 100644 --- a/kopete/protocols/sms/smseditaccountwidget.cpp +++ b/kopete/protocols/sms/smseditaccountwidget.cpp @@ -98,7 +98,7 @@ Kopete::Account* SMSEditAccountWidget::apply() if (service) service->setAccount(account()); - KConfigGroup *c = account()->configGroup(); + TDEConfigGroup *c = account()->configGroup(); c->writeEntry("ServiceName", preferencesDialog->serviceName->currentText()); c->writeEntry("SubEnable", preferencesDialog->subEnable->isChecked() ? "true" : "false"); c->writeEntry("SubCode", preferencesDialog->subCode->text()); diff --git a/kopete/protocols/yahoo/libkyahoo/client.cpp b/kopete/protocols/yahoo/libkyahoo/client.cpp index d293f646..2a5967f8 100644 --- a/kopete/protocols/yahoo/libkyahoo/client.cpp +++ b/kopete/protocols/yahoo/libkyahoo/client.cpp @@ -231,7 +231,7 @@ void Client::streamError( int error ) if( error == ClientStream::ErrConnection && m_connector ) // Ask Connector in this case { d->error = m_connector->errorCode(); - d->errorString = KSocketBase::errorString( (KSocketBase::SocketError)d->error ); + d->errorString = TDESocketBase::errorString( (TDESocketBase::SocketError)d->error ); } else if( d->stream ) { diff --git a/kopete/protocols/yahoo/libkyahoo/logintask.cpp b/kopete/protocols/yahoo/libkyahoo/logintask.cpp index f6b8a47e..b3c3f297 100644 --- a/kopete/protocols/yahoo/libkyahoo/logintask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/logintask.cpp @@ -214,20 +214,20 @@ void LoginTask::sendAuthSixteenStage1(const TQString& sn, const TQString& seed) TQByteArray encodedUrl; TQString fullUrl = YahooTokenUrl.arg(sn, client()->password(), seed); KURL tokenUrl(fullUrl); - KIO::Job* job = KIO::get(tokenUrl, true, false); - connect(job, TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)), - this, TQT_SLOT(handleAuthSixteenStage1Data(KIO::Job*, const TQByteArray&))); - connect(job, TQT_SIGNAL(result(KIO::Job*)), - this, TQT_SLOT(handleAuthSixteenStage1Result(KIO::Job*))); + TDEIO::Job* job = TDEIO::get(tokenUrl, true, false); + connect(job, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), + this, TQT_SLOT(handleAuthSixteenStage1Data(TDEIO::Job*, const TQByteArray&))); + connect(job, TQT_SIGNAL(result(TDEIO::Job*)), + this, TQT_SLOT(handleAuthSixteenStage1Result(TDEIO::Job*))); } -void LoginTask::handleAuthSixteenStage1Data(KIO::Job* job, const TQByteArray& data) +void LoginTask::handleAuthSixteenStage1Data(TDEIO::Job* job, const TQByteArray& data) { kdDebug(YAHOO_RAW_DEBUG) << "data:" << data << endl; m_stage1Data.append(data); } -void LoginTask::handleAuthSixteenStage1Result(KIO::Job* job) +void LoginTask::handleAuthSixteenStage1Result(TDEIO::Job* job) { int responseNumber = -1; TQString token; @@ -294,20 +294,20 @@ void LoginTask::sendAuthSixteenStage2(const TQString& token) m_stage2Data = TQString(); TQString fullUrl = YahooLoginUrl.arg(token); KURL loginUrl(fullUrl); - KIO::Job* job = KIO::get(loginUrl, true, false); - connect(job, TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)), - this, TQT_SLOT(handleAuthSixteenStage2Data(KIO::Job*, const TQByteArray&))); - connect(job, TQT_SIGNAL(result(KIO::Job*)), - this, TQT_SLOT(handleAuthSixteenStage2Result(KIO::Job*))); + TDEIO::Job* job = TDEIO::get(loginUrl, true, false); + connect(job, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), + this, TQT_SLOT(handleAuthSixteenStage2Data(TDEIO::Job*, const TQByteArray&))); + connect(job, TQT_SIGNAL(result(TDEIO::Job*)), + this, TQT_SLOT(handleAuthSixteenStage2Result(TDEIO::Job*))); } -void LoginTask::handleAuthSixteenStage2Data(KIO::Job*, const TQByteArray& data) +void LoginTask::handleAuthSixteenStage2Data(TDEIO::Job*, const TQByteArray& data) { kdDebug(YAHOO_RAW_DEBUG) << "data:" << data << endl; m_stage2Data.append(data); } -void LoginTask::handleAuthSixteenStage2Result(KIO::Job* job) +void LoginTask::handleAuthSixteenStage2Result(TDEIO::Job* job) { TQString crumb; int responseNumber = -1; diff --git a/kopete/protocols/yahoo/libkyahoo/logintask.h b/kopete/protocols/yahoo/libkyahoo/logintask.h index 33ce4db6..46ff5dc9 100644 --- a/kopete/protocols/yahoo/libkyahoo/logintask.h +++ b/kopete/protocols/yahoo/libkyahoo/logintask.h @@ -27,7 +27,7 @@ class TQString; class YMSGTransfer; -namespace KIO +namespace TDEIO { class Job; } @@ -68,10 +68,10 @@ protected: void sendAuthSixteenStage2(const TQString& token); void sendAuthSixteenStage3(const TQString& cryptString); protected slots: - void handleAuthSixteenStage1Data(KIO::Job*, const TQByteArray& data); - void handleAuthSixteenStage1Result(KIO::Job*); - void handleAuthSixteenStage2Data(KIO::Job*, const TQByteArray& data); - void handleAuthSixteenStage2Result(KIO::Job*); + void handleAuthSixteenStage1Data(TDEIO::Job*, const TQByteArray& data); + void handleAuthSixteenStage1Result(TDEIO::Job*); + void handleAuthSixteenStage2Data(TDEIO::Job*, const TQByteArray& data); + void handleAuthSixteenStage2Result(TDEIO::Job*); signals: void haveSessionID( uint ); diff --git a/kopete/protocols/yahoo/libkyahoo/modifyyabtask.cpp b/kopete/protocols/yahoo/libkyahoo/modifyyabtask.cpp index 4dd00d90..543d0b5d 100644 --- a/kopete/protocols/yahoo/libkyahoo/modifyyabtask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/modifyyabtask.cpp @@ -91,7 +91,7 @@ void ModifyYABTask::connectFailed( int i) { m_socket->close(); client()->notifyError( i18n( "An error occurred while saving the address book entry." ), - TQString( "%1 - %2").arg(i).arg(static_cast<const KBufferedSocket*>( sender() )->KSocketBase::errorString()), Client::Error ); + TQString( "%1 - %2").arg(i).arg(static_cast<const KBufferedSocket*>( sender() )->TDESocketBase::errorString()), Client::Error ); } void ModifyYABTask::connectSucceeded() @@ -118,7 +118,7 @@ void ModifyYABTask::connectSucceeded() kdDebug(YAHOO_RAW_DEBUG) << "Upload Successful. Waiting for confirmation..." << endl; else { - client()->notifyError( i18n( "An error occurred while saving the address book entry." ), m_socket->KSocketBase::errorString(), Client::Error ); + client()->notifyError( i18n( "An error occurred while saving the address book entry." ), m_socket->TDESocketBase::errorString(), Client::Error ); setError(); return; } diff --git a/kopete/protocols/yahoo/libkyahoo/modifyyabtask.h b/kopete/protocols/yahoo/libkyahoo/modifyyabtask.h index 4194fcca..3f1da297 100644 --- a/kopete/protocols/yahoo/libkyahoo/modifyyabtask.h +++ b/kopete/protocols/yahoo/libkyahoo/modifyyabtask.h @@ -21,7 +21,7 @@ #include "task.h" #include "yabentry.h" -namespace KIO { +namespace TDEIO { class Job; class TransferJob; } @@ -53,7 +53,7 @@ private slots: void connectFailed( int ); void slotRead(); private: - KIO::TransferJob *m_transferJob; + TDEIO::TransferJob *m_transferJob; KNetwork::KBufferedSocket *m_socket; TQString m_postData; TQString m_data; diff --git a/kopete/protocols/yahoo/libkyahoo/receivefiletask.cpp b/kopete/protocols/yahoo/libkyahoo/receivefiletask.cpp index ec2e9f5f..4528612b 100644 --- a/kopete/protocols/yahoo/libkyahoo/receivefiletask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/receivefiletask.cpp @@ -52,14 +52,14 @@ void ReceiveFileTask::onGo() m_file = new TQFile( m_localUrl.path() ); if( !m_file->open( IO_WriteOnly ) ) { - emit error( m_transferId, KIO::ERR_CANNOT_OPEN_FOR_WRITING, i18n("Could not open file for writing.") ); + emit error( m_transferId, TDEIO::ERR_CANNOT_OPEN_FOR_WRITING, i18n("Could not open file for writing.") ); setError(); delete t; return; } - m_transferJob = KIO::get( m_remoteUrl, false, false ); - TQObject::connect( m_transferJob, TQT_SIGNAL( result( KIO::Job* ) ), this, TQT_SLOT( slotComplete( KIO::Job* ) ) ); - TQObject::connect( m_transferJob, TQT_SIGNAL( data( KIO::Job*, const TQByteArray & ) ), this, TQT_SLOT( slotData( KIO::Job*, const TQByteArray & ) ) ); + m_transferJob = TDEIO::get( m_remoteUrl, false, false ); + TQObject::connect( m_transferJob, TQT_SIGNAL( result( TDEIO::Job* ) ), this, TQT_SLOT( slotComplete( TDEIO::Job* ) ) ); + TQObject::connect( m_transferJob, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray & ) ), this, TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray & ) ) ); delete t; break; case FileTransfer7Accept: @@ -120,7 +120,7 @@ bool ReceiveFileTask::forMe( const Transfer *transfer ) const return false; } -void ReceiveFileTask::slotData( KIO::Job *job, const TQByteArray& data ) +void ReceiveFileTask::slotData( TDEIO::Job *job, const TQByteArray& data ) { Q_UNUSED( job ); kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl; @@ -130,17 +130,17 @@ void ReceiveFileTask::slotData( KIO::Job *job, const TQByteArray& data ) m_file->writeBlock( data.data() , data.size() ); } -void ReceiveFileTask::slotComplete( KIO::Job *job ) +void ReceiveFileTask::slotComplete( TDEIO::Job *job ) { kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl; - KIO::TransferJob *transfer = static_cast< KIO::TransferJob * >(job); + TDEIO::TransferJob *transfer = static_cast< TDEIO::TransferJob * >(job); if( m_file ) m_file->close(); if ( job->error () || transfer->isErrorPage () ) { - emit error( m_transferId, KIO::ERR_ABORTED, i18n("An error occurred while downloading the file.") ); + emit error( m_transferId, TDEIO::ERR_ABORTED, i18n("An error occurred while downloading the file.") ); setError(); } else @@ -171,7 +171,7 @@ void ReceiveFileTask::parseFileTransfer7Info( YMSGTransfer *transfer ) m_file = new TQFile( m_localUrl.path() ); if( !m_file->open( IO_WriteOnly ) ) { - emit error( m_transferId, KIO::ERR_CANNOT_OPEN_FOR_WRITING, i18n("Could not open file for writing.") ); + emit error( m_transferId, TDEIO::ERR_CANNOT_OPEN_FOR_WRITING, i18n("Could not open file for writing.") ); setError(); return; } @@ -187,17 +187,17 @@ void ReceiveFileTask::parseFileTransfer7Info( YMSGTransfer *transfer ) send( t ); // The server expects a HTTP HEAD command prior to the GET - m_mimetypeJob = KIO::mimetype(TQString::fromLatin1("http://%1/relay?token=%2&sender=%3&recver=%4") + m_mimetypeJob = TDEIO::mimetype(TQString::fromLatin1("http://%1/relay?token=%2&sender=%3&recver=%4") .arg( TQString(transfer->firstParam( 250 )) ).arg( TQString(transfer->firstParam( 251 )) ).arg(m_userId).arg(client()->userId()), false); m_mimetypeJob->addMetaData("cookies", "manual"); m_mimetypeJob->addMetaData("setcookies", TQString::fromLatin1("Cookie: T=%1; path=/; domain=.yahoo.com; Y=%2; C=%3;") .arg(client()->tCookie()).arg(client()->yCookie()).arg(client()->cCookie()) ); - m_transferJob = KIO::get( TQString::fromLatin1("http://%1/relay?token=%2&sender=%3&recver=%4") + m_transferJob = TDEIO::get( TQString::fromLatin1("http://%1/relay?token=%2&sender=%3&recver=%4") .arg( TQString(transfer->firstParam( 250 )) ).arg( TQString(transfer->firstParam( 251 )) ).arg(m_userId).arg(client()->userId()), false, false ); - TQObject::connect( m_transferJob, TQT_SIGNAL( result( KIO::Job* ) ), this, TQT_SLOT( slotComplete( KIO::Job* ) ) ); - TQObject::connect( m_transferJob, TQT_SIGNAL( data( KIO::Job*, const TQByteArray & ) ), this, TQT_SLOT( slotData( KIO::Job*, const TQByteArray & ) ) ); + TQObject::connect( m_transferJob, TQT_SIGNAL( result( TDEIO::Job* ) ), this, TQT_SLOT( slotComplete( TDEIO::Job* ) ) ); + TQObject::connect( m_transferJob, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray & ) ), this, TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray & ) ) ); m_transferJob->addMetaData("cookies", "manual"); m_transferJob->addMetaData("setcookies", TQString::fromLatin1("Cookie: T=%1; path=/; domain=.yahoo.com; Y=%2; path=/; domain=.yahoo.com;") .arg(client()->tCookie()).arg(client()->yCookie()) ); diff --git a/kopete/protocols/yahoo/libkyahoo/receivefiletask.h b/kopete/protocols/yahoo/libkyahoo/receivefiletask.h index 63d6db07..22c2a37f 100644 --- a/kopete/protocols/yahoo/libkyahoo/receivefiletask.h +++ b/kopete/protocols/yahoo/libkyahoo/receivefiletask.h @@ -22,7 +22,7 @@ class TQString; class TQFile; -namespace KIO { +namespace TDEIO { class Job; class TransferJob; class MimetypeJob; @@ -62,8 +62,8 @@ signals: void error( unsigned int, int, const TQString & ); private slots: - void slotData( KIO::Job *job, const TQByteArray &data ); - void slotComplete( KIO::Job *job ); + void slotData( TDEIO::Job *job, const TQByteArray &data ); + void slotComplete( TDEIO::Job *job ); void canceled( unsigned int ); private: @@ -74,8 +74,8 @@ private: TQString m_fileName; TQString m_userId; TQFile *m_file; - KIO::TransferJob *m_transferJob; - KIO::MimetypeJob *m_mimetypeJob; + TDEIO::TransferJob *m_transferJob; + TDEIO::MimetypeJob *m_mimetypeJob; unsigned int m_transferId; unsigned int m_transmitted; Type m_type; diff --git a/kopete/protocols/yahoo/libkyahoo/sendfiletask.cpp b/kopete/protocols/yahoo/libkyahoo/sendfiletask.cpp index 4b5ca8a7..e435f568 100644 --- a/kopete/protocols/yahoo/libkyahoo/sendfiletask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/sendfiletask.cpp @@ -186,7 +186,7 @@ void SendFileTask::parseTransferAccept(const Transfer *transfer) void SendFileTask::connectFailed( int i ) { - TQString err = KSocketBase::errorString(m_socket->error()); + TQString err = TDESocketBase::errorString(m_socket->error()); kdDebug(YAHOO_RAW_DEBUG) << i << ": " << err << endl; emit error( m_transferId, i, err ); setError(); @@ -227,7 +227,7 @@ void SendFileTask::connectSucceeded() if( !m_socket->writeBlock( buffer, buffer.size() ) ) { - emit error( m_transferId, m_socket->error(), m_socket->KSocketBase::errorString() ); + emit error( m_transferId, m_socket->error(), m_socket->TDESocketBase::errorString() ); m_socket->close(); } else @@ -255,7 +255,7 @@ void SendFileTask::transmitData() if( written != read ) { kdDebug(YAHOO_RAW_DEBUG) << k_funcinfo << "Upload Failed!" << endl; - emit error( m_transferId, m_socket->error(), m_socket->KSocketBase::errorString() ); + emit error( m_transferId, m_socket->error(), m_socket->TDESocketBase::errorString() ); setError(); return; } diff --git a/kopete/protocols/yahoo/libkyahoo/sendpicturetask.cpp b/kopete/protocols/yahoo/libkyahoo/sendpicturetask.cpp index 04673c62..8c61daa7 100644 --- a/kopete/protocols/yahoo/libkyahoo/sendpicturetask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/sendpicturetask.cpp @@ -74,9 +74,9 @@ void SendPictureTask::initiateUpload() void SendPictureTask::connectFailed( int i) { - kdDebug(YAHOO_RAW_DEBUG) << i << ": " << static_cast<const KBufferedSocket*>( sender() )->KSocketBase::errorString() << endl; + kdDebug(YAHOO_RAW_DEBUG) << i << ": " << static_cast<const KBufferedSocket*>( sender() )->TDESocketBase::errorString() << endl; - client()->notifyError(i18n("The picture was not successfully uploaded"), TQString("%1 - %2").arg(i).arg(static_cast<const KBufferedSocket*>( sender() )->KSocketBase::errorString()), Client::Error ); + client()->notifyError(i18n("The picture was not successfully uploaded"), TQString("%1 - %2").arg(i).arg(static_cast<const KBufferedSocket*>( sender() )->TDESocketBase::errorString()), Client::Error ); setError(); } diff --git a/kopete/protocols/yahoo/libkyahoo/sendpicturetask.h b/kopete/protocols/yahoo/libkyahoo/sendpicturetask.h index dad47858..6a985665 100644 --- a/kopete/protocols/yahoo/libkyahoo/sendpicturetask.h +++ b/kopete/protocols/yahoo/libkyahoo/sendpicturetask.h @@ -21,7 +21,7 @@ class TQString; class TQFile; -namespace KIO { +namespace TDEIO { class Job; class TransferJob; } diff --git a/kopete/protocols/yahoo/libkyahoo/webcamtask.cpp b/kopete/protocols/yahoo/libkyahoo/webcamtask.cpp index e90b45f2..8a14b354 100644 --- a/kopete/protocols/yahoo/libkyahoo/webcamtask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/webcamtask.cpp @@ -195,9 +195,9 @@ void WebcamTask::slotConnectionStage2Established() void WebcamTask::slotConnectionFailed( int error ) { KStreamSocket* socket = const_cast<KStreamSocket*>( dynamic_cast<const KStreamSocket*>( sender() ) ); - kdDebug(YAHOO_RAW_DEBUG) << "Webcam connection to the user " << socketMap[socket].sender << " failed. Error " << error << " - " << socket->KSocketBase::errorString() << endl; + kdDebug(YAHOO_RAW_DEBUG) << "Webcam connection to the user " << socketMap[socket].sender << " failed. Error " << error << " - " << socket->TDESocketBase::errorString() << endl; client()->notifyError( i18n("Webcam connection to the user %1 could not be established.\n\nPlease relogin and try again.") - .arg(socketMap[socket].sender), TQString("%1 - %2").arg(error).arg( socket->KSocketBase::errorString()), Client::Error ); + .arg(socketMap[socket].sender), TQString("%1 - %2").arg(error).arg( socket->TDESocketBase::errorString()), Client::Error ); socketMap.remove( socket ); socket->deleteLater(); } diff --git a/kopete/protocols/yahoo/libkyahoo/yabtask.cpp b/kopete/protocols/yahoo/libkyahoo/yabtask.cpp index 951f88d8..4eb82cc4 100644 --- a/kopete/protocols/yahoo/libkyahoo/yabtask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/yabtask.cpp @@ -97,21 +97,21 @@ void YABTask::getAllEntries( long lastMerge, long lastRemoteRevision ) TQString url = TQString::fromLatin1("http://address.yahoo.com/yab/us?v=XM&prog=ymsgr&.intl=us&diffs=1&t=%1&tags=short&rt=%2&prog-ver=%3") .arg( lastMerge ).arg( lastRemoteRevision ).arg( YMSG_PROGRAM_VERSION_STRING ); - m_transferJob = KIO::get( url , false, false ); + m_transferJob = TDEIO::get( url , false, false ); m_transferJob->addMetaData("cookies", "manual"); m_transferJob->addMetaData("setcookies", TQString::fromLatin1("Cookie: Y=%1; T=%2; C=%3;") .arg(client()->yCookie()).arg(client()->tCookie()).arg(client()->cCookie()) ); - connect( m_transferJob, TQT_SIGNAL( data( KIO::Job *, const TQByteArray & ) ), this, TQT_SLOT( slotData( KIO::Job*, const TQByteArray & ) ) ); - connect( m_transferJob, TQT_SIGNAL( result( KIO::Job *) ), this, TQT_SLOT( slotResult( KIO::Job* ) ) ); + connect( m_transferJob, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), this, TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray & ) ) ); + connect( m_transferJob, TQT_SIGNAL( result( TDEIO::Job *) ), this, TQT_SLOT( slotResult( TDEIO::Job* ) ) ); } -void YABTask::slotData( KIO::Job* /*job*/, const TQByteArray &info ) +void YABTask::slotData( TDEIO::Job* /*job*/, const TQByteArray &info ) { kdDebug(YAHOO_RAW_DEBUG) ; m_data += info; } -void YABTask::slotResult( KIO::Job* job ) +void YABTask::slotResult( TDEIO::Job* job ) { if( job->error () || m_transferJob->isErrorPage () ) { diff --git a/kopete/protocols/yahoo/libkyahoo/yabtask.h b/kopete/protocols/yahoo/libkyahoo/yabtask.h index 1194829c..4d5d5659 100644 --- a/kopete/protocols/yahoo/libkyahoo/yabtask.h +++ b/kopete/protocols/yahoo/libkyahoo/yabtask.h @@ -23,7 +23,7 @@ class YMSGTransfer; -namespace KIO { +namespace TDEIO { class Job; class TransferJob; } @@ -50,10 +50,10 @@ protected: virtual bool forMe( const Transfer* transfer ) const; void parseContactDetails( YMSGTransfer* t ); private slots: - void slotData( KIO::Job*, const TQByteArray & ); - void slotResult( KIO::Job* ); + void slotData( TDEIO::Job*, const TQByteArray & ); + void slotResult( TDEIO::Job* ); private: - KIO::TransferJob *m_transferJob; + TDEIO::TransferJob *m_transferJob; TQString m_data; }; diff --git a/kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.cpp b/kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.cpp index 025386f0..b9a270f8 100644 --- a/kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.cpp +++ b/kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.cpp @@ -43,14 +43,14 @@ YahooBuddyIconLoader::~YahooBuddyIconLoader() void YahooBuddyIconLoader::fetchBuddyIcon( const TQString &who, KURL url, int checksum ) { kdDebug(YAHOO_RAW_DEBUG) << k_funcinfo << url << endl; - KIO::TransferJob *transfer; + TDEIO::TransferJob *transfer; TQString Url = url.url(); TQString ext = Url.left( Url.findRev( "?" ) ); ext = ext.right( ext.length() - ext.findRev( "." ) ); - transfer = KIO::get( url, false, false ); - connect( transfer, TQT_SIGNAL( result( KIO::Job* ) ), this, TQT_SLOT( slotComplete( KIO::Job* ) ) ); - connect( transfer, TQT_SIGNAL( data( KIO::Job*, const TQByteArray& ) ), this, TQT_SLOT( slotData( KIO::Job*, const TQByteArray& ) ) ); + transfer = TDEIO::get( url, false, false ); + connect( transfer, TQT_SIGNAL( result( TDEIO::Job* ) ), this, TQT_SLOT( slotComplete( TDEIO::Job* ) ) ); + connect( transfer, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), this, TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) ); m_jobs[transfer].url = url; m_jobs[transfer].who = who; @@ -58,11 +58,11 @@ void YahooBuddyIconLoader::fetchBuddyIcon( const TQString &who, KURL url, int ch } -void YahooBuddyIconLoader::slotData( KIO::Job *job, const TQByteArray& data ) +void YahooBuddyIconLoader::slotData( TDEIO::Job *job, const TQByteArray& data ) { kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl; - KIO::TransferJob *transfer = static_cast< KIO::TransferJob * >(job); + TDEIO::TransferJob *transfer = static_cast< TDEIO::TransferJob * >(job); // FIXME need to check //m_jobs[transfer].icon.append( data ); @@ -71,11 +71,11 @@ void YahooBuddyIconLoader::slotData( KIO::Job *job, const TQByteArray& data ) memcpy( m_jobs[transfer].icon.data() + oldsize, data.data(), data.size() ); } -void YahooBuddyIconLoader::slotComplete( KIO::Job *job ) +void YahooBuddyIconLoader::slotComplete( TDEIO::Job *job ) { kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl; - KIO::TransferJob *transfer = static_cast< KIO::TransferJob * >(job); + TDEIO::TransferJob *transfer = static_cast< TDEIO::TransferJob * >(job); if ( job->error () || transfer->isErrorPage () ) { diff --git a/kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.h b/kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.h index 7961b393..78bd1248 100644 --- a/kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.h +++ b/kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.h @@ -26,7 +26,7 @@ class KJob; class Client; -namespace KIO { +namespace TDEIO { class Job; class TransferJob; } @@ -66,11 +66,11 @@ signals: void fetchedBuddyIcon( const TQString &who, const TQByteArray &icon, int checksum ); private slots: - void slotData( KIO::Job *job, const TQByteArray &data ); - void slotComplete( KIO::Job *job ); + void slotData( TDEIO::Job *job, const TQByteArray &data ); + void slotComplete( TDEIO::Job *job ); private: - typedef TQMap< KIO::TransferJob *, IconLoadJob > TransferJobMap; + typedef TQMap< TDEIO::TransferJob *, IconLoadJob > TransferJobMap; TransferJobMap m_jobs; Client *m_client; }; diff --git a/kopete/protocols/yahoo/libkyahoo/yahoobytestream.cpp b/kopete/protocols/yahoo/libkyahoo/yahoobytestream.cpp index 3e2c4a19..e1f5fd8c 100644 --- a/kopete/protocols/yahoo/libkyahoo/yahoobytestream.cpp +++ b/kopete/protocols/yahoo/libkyahoo/yahoobytestream.cpp @@ -99,7 +99,7 @@ void KNetworkByteStream::slotConnectionClosed() if ( mClosing ) { kdDebug( 14181 ) << "..by ourselves!" << endl; - kdDebug( 14181 ) << "socket error is " << socket()->KSocketBase::errorString() << endl; + kdDebug( 14181 ) << "socket error is " << socket()->TDESocketBase::errorString() << endl; emit connectionClosed (); } else diff --git a/kopete/protocols/yahoo/libkyahoo/yahoochattask.cpp b/kopete/protocols/yahoo/libkyahoo/yahoochattask.cpp index 1c9528ff..3f8650f5 100644 --- a/kopete/protocols/yahoo/libkyahoo/yahoochattask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/yahoochattask.cpp @@ -89,49 +89,49 @@ void YahooChatTask::onGo() void YahooChatTask::getYahooChatCategories() { kdDebug(YAHOO_RAW_DEBUG) ; - KIO::TransferJob *transfer; + TDEIO::TransferJob *transfer; - transfer = KIO::get( KURL("http://insider.msg.yahoo.com/ycontent/?chatcat=0"), false, false ); + transfer = TDEIO::get( KURL("http://insider.msg.yahoo.com/ycontent/?chatcat=0"), false, false ); transfer->addMetaData( "UserAgent", "Mozilla/4.0 (compatible; MSIE 5.5)"); transfer->addMetaData( "no-cache", "true" ); transfer->addMetaData( "cookies", "manual" ); transfer->addMetaData("setcookies", TQString("Cookie: %1; %2; %3").arg(client()->tCookie(), client()->yCookie()) ); - connect( transfer, TQT_SIGNAL( result( KIO::Job* ) ), this, TQT_SLOT( slotCategoriesComplete( KIO::Job* ) ) ); - connect( transfer, TQT_SIGNAL( data( KIO::Job*, const TQByteArray& ) ), this, TQT_SLOT( slotData( KIO::Job*, const TQByteArray& ) ) ); + connect( transfer, TQT_SIGNAL( result( TDEIO::Job* ) ), this, TQT_SLOT( slotCategoriesComplete( TDEIO::Job* ) ) ); + connect( transfer, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), this, TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) ); } void YahooChatTask::getYahooChatRooms( const Yahoo::ChatCategory &category ) { kdDebug(YAHOO_RAW_DEBUG) << "Category Id: " << category.id << endl; - KIO::TransferJob *transfer; + TDEIO::TransferJob *transfer; - transfer = KIO::get( KURL(TQString("http://insider.msg.yahoo.com/ycontent/?chatroom_%1=0").arg( category.id )), false, false ); + transfer = TDEIO::get( KURL(TQString("http://insider.msg.yahoo.com/ycontent/?chatroom_%1=0").arg( category.id )), false, false ); transfer->addMetaData( "UserAgent", "Mozilla/4.0 (compatible; MSIE 5.5)"); transfer->addMetaData( "no-cache", "true" ); transfer->addMetaData( "cookies", "manual" ); transfer->addMetaData("setcookies", TQString("Cookie: %1; %2; %3").arg(client()->tCookie(), client()->yCookie()) ); - connect( transfer, TQT_SIGNAL( result( KIO::Job* ) ), this, TQT_SLOT( slotChatRoomsComplete( KIO::Job* ) ) ); - connect( transfer, TQT_SIGNAL( data( KIO::Job*, const TQByteArray& ) ), this, TQT_SLOT( slotData( KIO::Job*, const TQByteArray& ) ) ); + connect( transfer, TQT_SIGNAL( result( TDEIO::Job* ) ), this, TQT_SLOT( slotChatRoomsComplete( TDEIO::Job* ) ) ); + connect( transfer, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), this, TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) ); m_jobs[ transfer ].category = category; } -void YahooChatTask::slotData( KIO::Job *job, const TQByteArray& data) +void YahooChatTask::slotData( TDEIO::Job *job, const TQByteArray& data) { kdDebug(YAHOO_RAW_DEBUG) ; // FIXME (same) //m_jobs[job].data.append( data ); } -void YahooChatTask::slotCategoriesComplete( KIO::Job *job ) +void YahooChatTask::slotCategoriesComplete( TDEIO::Job *job ) { kdDebug(YAHOO_RAW_DEBUG) ; - KIO::TransferJob *transfer = static_cast< KIO::TransferJob * >(job); + TDEIO::TransferJob *transfer = static_cast< TDEIO::TransferJob * >(job); if ( job->error () || transfer->isErrorPage () ) { @@ -147,11 +147,11 @@ void YahooChatTask::slotCategoriesComplete( KIO::Job *job ) m_jobs.remove( transfer ); } -void YahooChatTask::slotChatRoomsComplete( KIO::Job *job ) +void YahooChatTask::slotChatRoomsComplete( TDEIO::Job *job ) { kdDebug(YAHOO_RAW_DEBUG) ; - KIO::TransferJob *transfer = static_cast< KIO::TransferJob * >(job); + TDEIO::TransferJob *transfer = static_cast< TDEIO::TransferJob * >(job); if ( job->error () || transfer->isErrorPage () ) { diff --git a/kopete/protocols/yahoo/libkyahoo/yahoochattask.h b/kopete/protocols/yahoo/libkyahoo/yahoochattask.h index 2a90016f..d15b9905 100644 --- a/kopete/protocols/yahoo/libkyahoo/yahoochattask.h +++ b/kopete/protocols/yahoo/libkyahoo/yahoochattask.h @@ -26,7 +26,7 @@ class TQDomDocument; class YMSGTransfer; -namespace KIO { +namespace TDEIO { class Job; } @@ -76,11 +76,11 @@ private: void parseLogout( YMSGTransfer * ); private slots: - void slotData( KIO::Job *, const TQByteArray & ); - void slotCategoriesComplete( KIO::Job * ); - void slotChatRoomsComplete( KIO::Job * ); + void slotData( TDEIO::Job *, const TQByteArray & ); + void slotCategoriesComplete( TDEIO::Job * ); + void slotChatRoomsComplete( TDEIO::Job * ); private: - TQMap< KIO::Job *, YahooChatJob > m_jobs; + TQMap< TDEIO::Job *, YahooChatJob > m_jobs; TQValueList< Yahoo::ChatRoom > m_pendingJoins; bool m_loggedIn; }; diff --git a/kopete/protocols/yahoo/libkyahoo/yahooconnector.cpp b/kopete/protocols/yahoo/libkyahoo/yahooconnector.cpp index af485840..48221871 100644 --- a/kopete/protocols/yahoo/libkyahoo/yahooconnector.cpp +++ b/kopete/protocols/yahoo/libkyahoo/yahooconnector.cpp @@ -30,7 +30,7 @@ KNetworkConnector::KNetworkConnector( TQObject *parent ) { kdDebug( YAHOO_RAW_DEBUG ) << "New KNetwork connector." << endl; - mErrorCode = KNetwork::KSocketBase::NoError; + mErrorCode = KNetwork::TDESocketBase::NoError; mByteStream = new KNetworkByteStream( this ); @@ -51,7 +51,7 @@ void KNetworkConnector::connectToServer( const TQString &server ) Q_ASSERT( !mHost.isNull() ); Q_ASSERT( mPort ); - mErrorCode = KNetwork::KSocketBase::NoError; + mErrorCode = KNetwork::TDESocketBase::NoError; if ( !mByteStream->connect( mHost, TQString::number (mPort) ) ) { diff --git a/kopete/protocols/yahoo/yahooaccount.cpp b/kopete/protocols/yahoo/yahooaccount.cpp index a38feccb..53f7c2b4 100644 --- a/kopete/protocols/yahoo/yahooaccount.cpp +++ b/kopete/protocols/yahoo/yahooaccount.cpp @@ -698,7 +698,7 @@ void YahooAccount::sendFile( YahooContact *to, const KURL &url ) url.fileName(), file.size(), to->userId(), Kopete::FileTransferInfo::Outgoing ); m_session->sendFile( transfer->info().transferId(), to->userId(), TQString(), url ); - TQObject::connect( transfer, TQT_SIGNAL(result( KIO::Job * )), this, TQT_SLOT(slotFileTransferResult( KIO::Job * )) ); + TQObject::connect( transfer, TQT_SIGNAL(result( TDEIO::Job * )), this, TQT_SLOT(slotFileTransferResult( TDEIO::Job * )) ); m_fileTransfers.insert( transfer->info().transferId(), transfer ); } @@ -1541,7 +1541,7 @@ void YahooAccount::slotReceiveFileAccepted(Kopete::Transfer *transfer, const TQS m_session->receiveFile( transfer->info().transferId(), transfer->info().contact()->contactId(), transfer->info().internalId(), fileName ); m_fileTransfers.insert( transfer->info().transferId(), transfer ); - TQObject::connect( transfer, TQT_SIGNAL(result( KIO::Job * )), this, TQT_SLOT(slotFileTransferResult( KIO::Job * )) ); + TQObject::connect( transfer, TQT_SIGNAL(result( TDEIO::Job * )), this, TQT_SLOT(slotFileTransferResult( TDEIO::Job * )) ); if( m_pendingFileTransfers.empty() ) { @@ -1601,7 +1601,7 @@ void YahooAccount::slotFileTransferError( unsigned int transferId, int error, co m_fileTransfers.remove( transferId ); } -void YahooAccount::slotFileTransferResult( KIO::Job *job ) +void YahooAccount::slotFileTransferResult( TDEIO::Job *job ) { kdDebug(YAHOO_GEN_DEBUG) ; const Kopete::Transfer *t = dynamic_cast< const Kopete::Transfer * >( job ); @@ -1609,7 +1609,7 @@ void YahooAccount::slotFileTransferResult( KIO::Job *job ) if( !t ) return; - if( t->error() == KIO::ERR_USER_CANCELED ) + if( t->error() == TDEIO::ERR_USER_CANCELED ) { m_session->cancelFileTransfer( t->info().transferId() ); m_fileTransfers.remove( t->info().transferId() ); diff --git a/kopete/protocols/yahoo/yahooaccount.h b/kopete/protocols/yahoo/yahooaccount.h index 7a127f26..9f8d1d22 100644 --- a/kopete/protocols/yahoo/yahooaccount.h +++ b/kopete/protocols/yahoo/yahooaccount.h @@ -57,7 +57,7 @@ class FileTransferInfo; class Client; struct YABEntry; class KJob; -namespace KIO{ +namespace TDEIO{ class Job; } @@ -244,7 +244,7 @@ protected slots: void slotFileTransferComplete( unsigned int id ); void slotFileTransferError( unsigned int id, int error, const TQString &desc ); void slotFileTransferBytesProcessed( unsigned int id, unsigned int bytes ); - void slotFileTransferResult( KIO::Job * ); + void slotFileTransferResult( TDEIO::Job * ); void slotError( int level ); private: diff --git a/kopete/protocols/yahoo/yahooverifyaccount.cpp b/kopete/protocols/yahoo/yahooverifyaccount.cpp index 7d50e900..14912167 100644 --- a/kopete/protocols/yahoo/yahooverifyaccount.cpp +++ b/kopete/protocols/yahoo/yahooverifyaccount.cpp @@ -58,12 +58,12 @@ void YahooVerifyAccount::setUrl( KURL url ) { mFile = new KTempFile( locateLocal( "tmp", url.fileName() ) ); mFile->setAutoDelete( true ); - KIO::TransferJob *transfer = KIO::get( url, false, false ); - connect( transfer, TQT_SIGNAL( result( KIO::Job* ) ), this, TQT_SLOT( slotComplete( KIO::Job* ) ) ); - connect( transfer, TQT_SIGNAL( data( KIO::Job*, const TQByteArray& ) ), this, TQT_SLOT( slotData( KIO::Job*, const TQByteArray& ) ) ); + TDEIO::TransferJob *transfer = TDEIO::get( url, false, false ); + connect( transfer, TQT_SIGNAL( result( TDEIO::Job* ) ), this, TQT_SLOT( slotComplete( TDEIO::Job* ) ) ); + connect( transfer, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), this, TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) ); } -void YahooVerifyAccount::slotData( KIO::Job */*job*/, const TQByteArray& data ) +void YahooVerifyAccount::slotData( TDEIO::Job */*job*/, const TQByteArray& data ) { kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl; @@ -71,7 +71,7 @@ void YahooVerifyAccount::slotData( KIO::Job */*job*/, const TQByteArray& data ) mFile->file()->writeBlock( data.data() , data.size() ); } -void YahooVerifyAccount::slotComplete( KIO::Job */*job*/ ) +void YahooVerifyAccount::slotComplete( TDEIO::Job */*job*/ ) { kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl; diff --git a/kopete/protocols/yahoo/yahooverifyaccount.h b/kopete/protocols/yahoo/yahooverifyaccount.h index 26dcf320..7eeba87e 100644 --- a/kopete/protocols/yahoo/yahooverifyaccount.h +++ b/kopete/protocols/yahoo/yahooverifyaccount.h @@ -48,8 +48,8 @@ protected slots: virtual void slotClose(); virtual void slotApply(); public slots: - void slotData( KIO::Job *job, const TQByteArray& data ); - void slotComplete( KIO::Job *job ); + void slotData( TDEIO::Job *job, const TQByteArray& data ); + void slotComplete( TDEIO::Job *job ); }; #endif |