diff options
Diffstat (limited to 'kresources/remote')
-rw-r--r-- | kresources/remote/resourceremote.cpp | 28 | ||||
-rw-r--r-- | kresources/remote/resourceremote.h | 20 |
2 files changed, 24 insertions, 24 deletions
diff --git a/kresources/remote/resourceremote.cpp b/kresources/remote/resourceremote.cpp index 229dd86bf..3803ecbef 100644 --- a/kresources/remote/resourceremote.cpp +++ b/kresources/remote/resourceremote.cpp @@ -51,7 +51,7 @@ using namespace KCal; -ResourceRemote::ResourceRemote( const KConfig *config ) +ResourceRemote::ResourceRemote( const TDEConfig *config ) : ResourceCached( config ), mUseProgressManager( true ), mUseCacheFile( true ) { if ( config ) { @@ -101,7 +101,7 @@ void ResourceRemote::init() enableChangeNotification(); } -void ResourceRemote::readConfig( const KConfig *config ) +void ResourceRemote::readConfig( const TDEConfig *config ) { TQString url = config->readEntry( "DownloadUrl" ); mDownloadUrl = KURL( url ); @@ -112,7 +112,7 @@ void ResourceRemote::readConfig( const KConfig *config ) ResourceCached::readConfig( config ); } -void ResourceRemote::writeConfig( KConfig *config ) +void ResourceRemote::writeConfig( TDEConfig *config ) { kdDebug(5800) << "ResourceRemote::writeConfig()" << endl; @@ -195,13 +195,13 @@ bool ResourceRemote::doLoad() { kdDebug() << "Download from: " << mDownloadUrl << endl; - mDownloadJob = KIO::file_copy( mDownloadUrl, KURL( cacheFile() ), -1, true, + mDownloadJob = TDEIO::file_copy( mDownloadUrl, KURL( cacheFile() ), -1, true, false, !mUseProgressManager ); - connect( mDownloadJob, TQT_SIGNAL( result( KIO::Job * ) ), - TQT_SLOT( slotLoadJobResult( KIO::Job * ) ) ); + connect( mDownloadJob, TQT_SIGNAL( result( TDEIO::Job * ) ), + TQT_SLOT( slotLoadJobResult( TDEIO::Job * ) ) ); if ( mUseProgressManager ) { - connect( mDownloadJob, TQT_SIGNAL( percent( KIO::Job *, unsigned long ) ), - TQT_SLOT( slotPercent( KIO::Job *, unsigned long ) ) ); + connect( mDownloadJob, TQT_SIGNAL( percent( TDEIO::Job *, unsigned long ) ), + TQT_SLOT( slotPercent( TDEIO::Job *, unsigned long ) ) ); mProgress = KPIM::ProgressManager::createProgressItem( KPIM::ProgressManager::getUniqueID(), i18n("Downloading Calendar") ); @@ -213,14 +213,14 @@ bool ResourceRemote::doLoad() return true; } -void ResourceRemote::slotPercent( KIO::Job *, unsigned long percent ) +void ResourceRemote::slotPercent( TDEIO::Job *, unsigned long percent ) { kdDebug() << "ResourceRemote::slotPercent(): " << percent << endl; mProgress->setProgress( percent ); } -void ResourceRemote::slotLoadJobResult( KIO::Job *job ) +void ResourceRemote::slotLoadJobResult( TDEIO::Job *job ) { if ( job->error() ) { // TODO: Should detect 404, 401 etc. vs host not found and prompt to create new resource only when 404 is returned @@ -282,9 +282,9 @@ bool ResourceRemote::doSave() saveCache(); - mUploadJob = KIO::file_copy( KURL( cacheFile() ), mUploadUrl, -1, true ); - connect( mUploadJob, TQT_SIGNAL( result( KIO::Job * ) ), - TQT_SLOT( slotSaveJobResult( KIO::Job * ) ) ); + mUploadJob = TDEIO::file_copy( KURL( cacheFile() ), mUploadUrl, -1, true ); + connect( mUploadJob, TQT_SIGNAL( result( TDEIO::Job * ) ), + TQT_SLOT( slotSaveJobResult( TDEIO::Job * ) ) ); return true; } @@ -294,7 +294,7 @@ bool ResourceRemote::isSaving() return mUploadJob; } -void ResourceRemote::slotSaveJobResult( KIO::Job *job ) +void ResourceRemote::slotSaveJobResult( TDEIO::Job *job ) { if ( job->error() ) { job->showErrorDialog( 0 ); diff --git a/kresources/remote/resourceremote.h b/kresources/remote/resourceremote.h index 656fa9e34..2c3fd5fad 100644 --- a/kresources/remote/resourceremote.h +++ b/kresources/remote/resourceremote.h @@ -38,7 +38,7 @@ #include <libkcal/resourcecached.h> -namespace KIO { +namespace TDEIO { class FileCopyJob; class Job; } @@ -57,9 +57,9 @@ class KDE_EXPORT ResourceRemote : public ResourceCached public: /** - Create resource from configuration information stored in KConfig object. + Create resource from configuration information stored in TDEConfig object. */ - ResourceRemote( const KConfig * ); + ResourceRemote( const TDEConfig * ); /** Create remote resource. @@ -69,8 +69,8 @@ class KDE_EXPORT ResourceRemote : public ResourceCached ResourceRemote( const KURL &downloadUrl, const KURL &uploadUrl = KURL() ); virtual ~ResourceRemote(); - void readConfig( const KConfig *config ); - void writeConfig( KConfig *config ); + void readConfig( const TDEConfig *config ); + void writeConfig( TDEConfig *config ); void setDownloadUrl( const KURL & ); KURL downloadUrl() const; @@ -94,10 +94,10 @@ class KDE_EXPORT ResourceRemote : public ResourceCached protected slots: - void slotLoadJobResult( KIO::Job * ); - void slotSaveJobResult( KIO::Job * ); + void slotLoadJobResult( TDEIO::Job * ); + void slotSaveJobResult( TDEIO::Job * ); - void slotPercent( KIO::Job *, unsigned long percent ); + void slotPercent( TDEIO::Job *, unsigned long percent ); protected: bool doLoad(); @@ -114,8 +114,8 @@ class KDE_EXPORT ResourceRemote : public ResourceCached bool mUseProgressManager; bool mUseCacheFile; - KIO::FileCopyJob *mDownloadJob; - KIO::FileCopyJob *mUploadJob; + TDEIO::FileCopyJob *mDownloadJob; + TDEIO::FileCopyJob *mUploadJob; KPIM::ProgressItem *mProgress; |