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 --- korganizer/freebusymanager.cpp | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) (limited to 'korganizer/freebusymanager.cpp') diff --git a/korganizer/freebusymanager.cpp b/korganizer/freebusymanager.cpp index 59775f070..ee0c38a05 100644 --- a/korganizer/freebusymanager.cpp +++ b/korganizer/freebusymanager.cpp @@ -77,16 +77,16 @@ FreeBusyDownloadJob::FreeBusyDownloadJob( const TQString &email, const KURL &url const char *name ) : TQObject( manager, name ), mManager( manager ), mEmail( email ) { - KIO::TransferJob *job = KIO::get( url, false, false ); + TDEIO::TransferJob *job = TDEIO::get( url, false, false ); //pass the mainwindow to the job so any prompts are active KOrg::MainWindow *korg = ActionManager::findInstance( KURL() ); job->setWindow( korg->topLevelWidget() ); - connect( job, TQT_SIGNAL( result( KIO::Job * ) ), - TQT_SLOT( slotResult( KIO::Job * ) ) ); - connect( job, TQT_SIGNAL( data( KIO::Job *, const TQByteArray & ) ), - TQT_SLOT( slotData( KIO::Job *, const TQByteArray & ) ) ); - KIO::Scheduler::scheduleJob( job ); + connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), + TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), + TQT_SLOT( slotData( TDEIO::Job *, const TQByteArray & ) ) ); + TDEIO::Scheduler::scheduleJob( job ); } FreeBusyDownloadJob::~FreeBusyDownloadJob() @@ -94,7 +94,7 @@ FreeBusyDownloadJob::~FreeBusyDownloadJob() } -void FreeBusyDownloadJob::slotData( KIO::Job *, const TQByteArray &data ) +void FreeBusyDownloadJob::slotData( TDEIO::Job *, const TQByteArray &data ) { TQByteArray tmp = data; tmp.resize( tmp.size() + 1 ); @@ -102,7 +102,7 @@ void FreeBusyDownloadJob::slotData( KIO::Job *, const TQByteArray &data ) mFreeBusyData += tmp; } -void FreeBusyDownloadJob::slotResult( KIO::Job *job ) +void FreeBusyDownloadJob::slotResult( TDEIO::Job *job ) { DEBUG_5850 << "FreeBusyDownloadJob::slotResult() " << mEmail << endl; @@ -331,7 +331,7 @@ void FreeBusyManager::publishFreeBusy() DEBUG_5850 << "FreeBusyManager::publishFreeBusy(): " << targetURL << endl; - KIO::Job * job = KIO::file_copy( src, targetURL, -1, + TDEIO::Job * job = TDEIO::file_copy( src, targetURL, -1, true /*overwrite*/, false /*don't resume*/, false /*don't show progress info*/ ); @@ -339,14 +339,14 @@ void FreeBusyManager::publishFreeBusy() KOrg::MainWindow *korg = ActionManager::findInstance( KURL() ); job->setWindow( korg->topLevelWidget() ); - connect( job, TQT_SIGNAL( result( KIO::Job * ) ), - TQT_SLOT( slotUploadFreeBusyResult( KIO::Job * ) ) ); + connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), + TQT_SLOT( slotUploadFreeBusyResult( TDEIO::Job * ) ) ); } } -void FreeBusyManager::slotUploadFreeBusyResult(KIO::Job *_job) +void FreeBusyManager::slotUploadFreeBusyResult(TDEIO::Job *_job) { - KIO::FileCopyJob* job = static_cast(_job); + TDEIO::FileCopyJob* job = static_cast(_job); if ( job->error() ) KMessageBox::sorry( 0, i18n( "The software could not upload your free/busy list to the " @@ -459,14 +459,14 @@ KURL replaceVariablesURL( const KURL &url, const TQString &email ) bool fbExists( const KURL &url ) { - // We need this function because using KIO::NetAccess::exists() + // We need this function because using TDEIO::NetAccess::exists() // is useless for the http and https protocols. And getting back // arbitrary data is also useless because a server can respond back // with a "no such document" page. So we need smart checking. - KIO::Job *job = KIO::get( url, false, false ); + TDEIO::Job *job = TDEIO::get( url, false, false ); TQByteArray data; - if ( KIO::NetAccess::synchronousRun( job, 0, &data ) ) { + if ( TDEIO::NetAccess::synchronousRun( job, 0, &data ) ) { TQString dataStr ( data ); if ( dataStr.contains( "BEGIN:VCALENDAR" ) ) { return true; @@ -481,7 +481,7 @@ KURL FreeBusyManager::freeBusyUrl( const TQString &email ) // First check if there is a specific FB url for this email TQString configFile = locateLocal( "data", "korganizer/freebusyurls" ); - KConfig cfg( configFile ); + TDEConfig cfg( configFile ); cfg.setGroup( email ); TQString url = cfg.readEntry( "url" ); -- cgit v1.2.1