From 86d8364ac704bdc8ad2dfcf52307d9626cfac567 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 25 Jan 2013 00:37:21 -0600 Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4 --- kmail/kmservertest.cpp | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) (limited to 'kmail/kmservertest.cpp') diff --git a/kmail/kmservertest.cpp b/kmail/kmservertest.cpp index c7f96ce3..8548670a 100644 --- a/kmail/kmservertest.cpp +++ b/kmail/kmservertest.cpp @@ -50,9 +50,9 @@ KMServerTest::KMServerTest( const TQString & protocol, const TQString & host, in mProtocol( protocol ), mHost( host ), mSSL( false ), mJob( 0 ), mSlave( 0 ), mConnectionErrorCount( 0 ) { - KIO::Scheduler::connect( - TQT_SIGNAL(slaveError(KIO::Slave *, int, const TQString &)), - this, TQT_SLOT(slotSlaveResult(KIO::Slave *, int, const TQString &))); + TDEIO::Scheduler::connect( + TQT_SIGNAL(slaveError(TDEIO::Slave *, int, const TQString &)), + this, TQT_SLOT(slotSlaveResult(TDEIO::Slave *, int, const TQString &))); if ( port == 993 || port == 995 || port == 465 ) port = 0; @@ -67,8 +67,8 @@ KMServerTest::~KMServerTest() } -KIO::MetaData KMServerTest::slaveConfig() const { - KIO::MetaData md; +TDEIO::MetaData KMServerTest::slaveConfig() const { + TDEIO::MetaData md; md.insert( "nologin", "on" ); return md; } @@ -80,29 +80,29 @@ void KMServerTest::startOffSlave( int port ) { if ( port ) url.setPort( port ); - mSlave = KIO::Scheduler::getConnectedSlave( url, slaveConfig() ); + mSlave = TDEIO::Scheduler::getConnectedSlave( url, slaveConfig() ); if ( !mSlave ) { slotSlaveResult( 0, 1 ); return; } - connect( mSlave, TQT_SIGNAL(metaData(const KIO::MetaData&)), - TQT_SLOT(slotMetaData(const KIO::MetaData&)) ); + connect( mSlave, TQT_SIGNAL(metaData(const TDEIO::MetaData&)), + TQT_SLOT(slotMetaData(const TDEIO::MetaData&)) ); TQByteArray packedArgs; TQDataStream stream( packedArgs, IO_WriteOnly ); stream << (int) 'c'; - mJob = KIO::special( url, packedArgs, false ); - KIO::Scheduler::assignJobToSlave( mSlave, mJob ); - connect( mJob, TQT_SIGNAL(result(KIO::Job*)), TQT_SLOT(slotResult(KIO::Job*)) ); - connect( mJob, TQT_SIGNAL(infoMessage(KIO::Job*,const TQString&)), - TQT_SLOT(slotData(KIO::Job*,const TQString&)) ); + mJob = TDEIO::special( url, packedArgs, false ); + TDEIO::Scheduler::assignJobToSlave( mSlave, mJob ); + connect( mJob, TQT_SIGNAL(result(TDEIO::Job*)), TQT_SLOT(slotResult(TDEIO::Job*)) ); + connect( mJob, TQT_SIGNAL(infoMessage(TDEIO::Job*,const TQString&)), + TQT_SLOT(slotData(TDEIO::Job*,const TQString&)) ); } //----------------------------------------------------------------------------- -void KMServerTest::slotData(KIO::Job *, const TQString &data) +void KMServerTest::slotData(TDEIO::Job *, const TQString &data) { if ( mSSL ) mListSSL = TQStringList::split(' ', data); @@ -111,8 +111,8 @@ void KMServerTest::slotData(KIO::Job *, const TQString &data) } -void KMServerTest::slotMetaData( const KIO::MetaData & md ) { - KIO::MetaData::const_iterator it = md.find( "PLAIN AUTH METHODS" ); +void KMServerTest::slotMetaData( const TDEIO::MetaData & md ) { + TDEIO::MetaData::const_iterator it = md.find( "PLAIN AUTH METHODS" ); if ( it != md.end() ) { mAuthNone = it.data(); kdDebug(5006) << "mAuthNone: " << mAuthNone << endl; @@ -130,13 +130,13 @@ void KMServerTest::slotMetaData( const KIO::MetaData & md ) { } //----------------------------------------------------------------------------- -void KMServerTest::slotResult(KIO::Job *job) +void KMServerTest::slotResult(TDEIO::Job *job) { slotSlaveResult(mSlave, job->error()); } //----------------------------------------------------------------------------- -void KMServerTest::slotSlaveResult(KIO::Slave *aSlave, int error, +void KMServerTest::slotSlaveResult(TDEIO::Slave *aSlave, int error, const TQString &errorText) { if (aSlave != mSlave) return; @@ -147,13 +147,13 @@ void KMServerTest::slotSlaveResult(KIO::Slave *aSlave, int error, mListSSL.append("SSL"); } - if (error != KIO::ERR_SLAVE_DIED && mSlave) + if (error != TDEIO::ERR_SLAVE_DIED && mSlave) { // disconnect slave after every connect - KIO::Scheduler::disconnectSlave(mSlave); + TDEIO::Scheduler::disconnectSlave(mSlave); mSlave = 0; } - if ( error == KIO::ERR_COULD_NOT_CONNECT ) + if ( error == TDEIO::ERR_COULD_NOT_CONNECT ) { // if one of the two connection tests fails we ignore the error // if both fail the host is probably not correct so we display the error @@ -167,7 +167,7 @@ void KMServerTest::slotSlaveResult(KIO::Slave *aSlave, int error, { mJob = 0; KMessageBox::error( TQT_TQWIDGET(kapp->activeWindow()), - KIO::buildErrorString( error, errorText ), + TDEIO::buildErrorString( error, errorText ), i18n("Error") ); emit capabilities( mListNormal, mListSSL ); emit capabilities( mListNormal, mListSSL, mAuthNone, mAuthSSL, mAuthTLS ); -- cgit v1.2.3