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 --- libkpimexchange/core/exchangedownload.cpp | 48 +++++++++++++++---------------- 1 file changed, 24 insertions(+), 24 deletions(-) (limited to 'libkpimexchange/core/exchangedownload.cpp') diff --git a/libkpimexchange/core/exchangedownload.cpp b/libkpimexchange/core/exchangedownload.cpp index 60879d26..75b5f100 100644 --- a/libkpimexchange/core/exchangedownload.cpp +++ b/libkpimexchange/core/exchangedownload.cpp @@ -108,12 +108,12 @@ void ExchangeDownload::download( KCal::Calendar *calendar, const TQDate &start, kdDebug() << "ExchangeDownload::download() davSearch URL: " << mAccount->calendarURL() << endl; - KIO::DavJob *job = KIO::davSearch( mAccount->calendarURL(), "DAV:", "sql", + TDEIO::DavJob *job = TDEIO::davSearch( mAccount->calendarURL(), "DAV:", "sql", sql, false ); - KIO::Scheduler::scheduleJob( job ); + TDEIO::Scheduler::scheduleJob( job ); job->setWindow( mWindow ); - connect( job, TQT_SIGNAL( result( KIO::Job * ) ), - TQT_SLOT( slotSearchResult( KIO::Job *) ) ); + connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), + TQT_SLOT( slotSearchResult( TDEIO::Job *) ) ); } void ExchangeDownload::download( const TQDate& start, const TQDate& end, bool showProgress ) @@ -134,11 +134,11 @@ void ExchangeDownload::download( const TQDate& start, const TQDate& end, bool sh increaseDownloads(); - KIO::DavJob *job = KIO::davSearch( mAccount->calendarURL(), "DAV:", "sql", sql, false ); - KIO::Scheduler::scheduleJob(job); + TDEIO::DavJob *job = TDEIO::davSearch( mAccount->calendarURL(), "DAV:", "sql", sql, false ); + TDEIO::Scheduler::scheduleJob(job); job->setWindow( mWindow ); - connect( job, TQT_SIGNAL( result( KIO::Job * ) ), - TQT_SLOT( slotSearchResult( KIO::Job * ) ) ); + connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), + TQT_SLOT( slotSearchResult( TDEIO::Job * ) ) ); } // Original query TODO: make query configurable @@ -176,7 +176,7 @@ TQString ExchangeDownload::dateSelectQuery( const TQDate& start, const TQDate& e } #endif -void ExchangeDownload::slotSearchResult( KIO::Job *job ) +void ExchangeDownload::slotSearchResult( TDEIO::Job *job ) { if ( job->error() ) { kdError() << "ExchangeDownload::slotSearchResult() error: " @@ -188,7 +188,7 @@ void ExchangeDownload::slotSearchResult( KIO::Job *job ) finishUp( ExchangeClient::CommunicationError, job ); return; } - TQDomDocument &response = static_cast( job )->response(); + TQDomDocument &response = static_cast( job )->response(); kdDebug() << "Search result: " << endl << response.toString() << endl; @@ -197,7 +197,7 @@ void ExchangeDownload::slotSearchResult( KIO::Job *job ) decreaseDownloads(); } -void ExchangeDownload::slotMasterResult( KIO::Job *job ) +void ExchangeDownload::slotMasterResult( TDEIO::Job *job ) { if ( job->error() ) { kdError() << "Error result for Master search: " << job->error() << endl; @@ -205,7 +205,7 @@ void ExchangeDownload::slotMasterResult( KIO::Job *job ) finishUp( ExchangeClient::CommunicationError, job ); return; } - TQDomDocument &response = static_cast( job )->response(); + TQDomDocument &response = static_cast( job )->response(); kdDebug() << "Search (master) result: " << endl << response.toString() << endl; @@ -297,12 +297,12 @@ void ExchangeDownload::handleRecurrence( TQString uid ) increaseDownloads(); - KIO::DavJob* job = KIO::davSearch( mAccount->calendarURL(), "DAV:", "sql", + TDEIO::DavJob* job = TDEIO::davSearch( mAccount->calendarURL(), "DAV:", "sql", query, false ); - KIO::Scheduler::scheduleJob( job ); + TDEIO::Scheduler::scheduleJob( job ); job->setWindow( mWindow ); - connect( job, TQT_SIGNAL( result( KIO::Job * ) ), - TQT_SLOT( slotMasterResult( KIO::Job * ) ) ); + connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), + TQT_SLOT( slotMasterResult( TDEIO::Job * ) ) ); } void ExchangeDownload::readAppointment( const KURL& url ) @@ -345,15 +345,15 @@ void ExchangeDownload::readAppointment( const KURL& url ) increaseDownloads(); - KIO::DavJob* job = KIO::davPropFind( url, doc, "0", false ); - KIO::Scheduler::scheduleJob( job ); + TDEIO::DavJob* job = TDEIO::davPropFind( url, doc, "0", false ); + TDEIO::Scheduler::scheduleJob( job ); job->setWindow( mWindow ); job->addMetaData( "errorPage", "false" ); - connect( job, TQT_SIGNAL( result( KIO::Job * ) ), - TQT_SLOT( slotPropFindResult( KIO::Job * ) ) ); + connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), + TQT_SLOT( slotPropFindResult( TDEIO::Job * ) ) ); } -void ExchangeDownload::slotPropFindResult( KIO::Job *job ) +void ExchangeDownload::slotPropFindResult( TDEIO::Job *job ) { kdDebug() << "slotPropFindResult" << endl; @@ -364,7 +364,7 @@ void ExchangeDownload::slotPropFindResult( KIO::Job *job ) return; } - TQDomDocument response = static_cast( job )->response(); + TQDomDocument response = static_cast( job )->response(); kdDebug() << "Response: " << endl; kdDebug() << response.toString() << endl; @@ -589,7 +589,7 @@ void ExchangeDownload::slotPropFindResult( KIO::Job *job ) mCalendar->addEvent( event ); } else { kdDebug() << "EMIT gotEvent" << endl; - emit gotEvent( event, static_cast( job )->url() ); + emit gotEvent( event, static_cast( job )->url() ); // mEvents->append( event ); } @@ -633,7 +633,7 @@ void ExchangeDownload::finishUp( int result, const TQString &moreInfo ) // } } -void ExchangeDownload::finishUp( int result, KIO::Job *job ) +void ExchangeDownload::finishUp( int result, TDEIO::Job *job ) { finishUp( result, TQString("WebDAV job error code = ") + TQString::number( job->error() ) + ";\n" + "\"" + -- cgit v1.2.3