diff options
Diffstat (limited to 'kresources/slox')
-rw-r--r-- | kresources/slox/kabcresourceslox.cpp | 32 | ||||
-rw-r--r-- | kresources/slox/kabcresourceslox.h | 20 | ||||
-rw-r--r-- | kresources/slox/kcalresourceslox.cpp | 48 | ||||
-rw-r--r-- | kresources/slox/kcalresourceslox.h | 28 | ||||
-rw-r--r-- | kresources/slox/sloxaccounts.cpp | 12 | ||||
-rw-r--r-- | kresources/slox/sloxaccounts.h | 6 | ||||
-rw-r--r-- | kresources/slox/sloxfoldermanager.cpp | 8 | ||||
-rw-r--r-- | kresources/slox/sloxfoldermanager.h | 6 | ||||
-rw-r--r-- | kresources/slox/webdavhandler.cpp | 2 |
9 files changed, 81 insertions, 81 deletions
diff --git a/kresources/slox/kabcresourceslox.cpp b/kresources/slox/kabcresourceslox.cpp index 6412de4a0..b83c0b957 100644 --- a/kresources/slox/kabcresourceslox.cpp +++ b/kresources/slox/kabcresourceslox.cpp @@ -40,7 +40,7 @@ using namespace KABC; -ResourceSlox::ResourceSlox( const KConfig *config ) +ResourceSlox::ResourceSlox( const TDEConfig *config ) : ResourceCached( config ), SloxBase( this ) { init(); @@ -115,12 +115,12 @@ ResourceSlox::~ResourceSlox() kdDebug() << "KABC::~ResourceSlox() done" << endl; } -void ResourceSlox::readConfig( const KConfig * ) +void ResourceSlox::readConfig( const TDEConfig * ) { mPrefs->readConfig(); } -void ResourceSlox::writeConfig( KConfig *config ) +void ResourceSlox::writeConfig( TDEConfig *config ) { kdDebug() << "ResourceSlox::writeConfig() " << endl; kdDebug() << mPrefs->url() << endl; @@ -206,11 +206,11 @@ bool ResourceSlox::asyncLoad() kdDebug() << "REQUEST CONTACTS: \n" << doc.toString( 2 ) << endl; - mDownloadJob = KIO::davPropFind( url, doc, "0", false ); - connect( mDownloadJob, TQT_SIGNAL( result( KIO::Job * ) ), - TQT_SLOT( slotResult( KIO::Job * ) ) ); - connect( mDownloadJob, TQT_SIGNAL( percent( KIO::Job *, unsigned long ) ), - TQT_SLOT( slotProgress( KIO::Job *, unsigned long ) ) ); + mDownloadJob = TDEIO::davPropFind( url, doc, "0", false ); + connect( mDownloadJob, TQT_SIGNAL( result( TDEIO::Job * ) ), + TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( mDownloadJob, TQT_SIGNAL( percent( TDEIO::Job *, unsigned long ) ), + TQT_SLOT( slotProgress( TDEIO::Job *, unsigned long ) ) ); mDownloadProgress = KPIM::ProgressManager::instance()->createProgressItem( KPIM::ProgressManager::getUniqueID(), i18n("Downloading contacts") ); @@ -223,7 +223,7 @@ bool ResourceSlox::asyncLoad() return true; } -void ResourceSlox::slotResult( KIO::Job *job ) +void ResourceSlox::slotResult( TDEIO::Job *job ) { kdDebug() << "ResourceSlox::slotResult()" << endl; @@ -288,7 +288,7 @@ void ResourceSlox::slotResult( KIO::Job *job ) emit loadingFinished( this ); } -void ResourceSlox::slotUploadResult( KIO::Job *job ) +void ResourceSlox::slotUploadResult( TDEIO::Job *job ) { kdDebug() << "ResourceSlox::slotUploadResult()" << endl; @@ -519,11 +519,11 @@ void ResourceSlox::uploadContacts() url.setUser( mPrefs->user() ); url.setPass( mPrefs->password() ); - mUploadJob = KIO::davPropPatch( url, doc, false ); - connect( mUploadJob, TQT_SIGNAL( result( KIO::Job * ) ), - TQT_SLOT( slotUploadResult( KIO::Job * ) ) ); - connect( mUploadJob, TQT_SIGNAL( percent( KIO::Job *, unsigned long ) ), - TQT_SLOT( slotProgress( KIO::Job *, unsigned long ) ) ); + mUploadJob = TDEIO::davPropPatch( url, doc, false ); + connect( mUploadJob, TQT_SIGNAL( result( TDEIO::Job * ) ), + TQT_SLOT( slotUploadResult( TDEIO::Job * ) ) ); + connect( mUploadJob, TQT_SIGNAL( percent( TDEIO::Job *, unsigned long ) ), + TQT_SLOT( slotProgress( TDEIO::Job *, unsigned long ) ) ); mUploadProgress = KPIM::ProgressManager::instance()->createProgressItem( KPIM::ProgressManager::getUniqueID(), i18n("Uploading contacts") ); @@ -641,7 +641,7 @@ void KABC::ResourceSlox::createAddressFields( TQDomDocument &doc, TQDomElement & WebdavHandler::addSloxElement( this, doc, parent, prefix + fieldName( Country ), addr.country() ); } -void ResourceSlox::slotProgress( KIO::Job *job, unsigned long percent ) +void ResourceSlox::slotProgress( TDEIO::Job *job, unsigned long percent ) { if ( mDownloadProgress && job == mDownloadJob ) mDownloadProgress->setProgress( percent ); diff --git a/kresources/slox/kabcresourceslox.h b/kresources/slox/kabcresourceslox.h index 51bec97c1..d5251bdc7 100644 --- a/kresources/slox/kabcresourceslox.h +++ b/kresources/slox/kabcresourceslox.h @@ -30,7 +30,7 @@ #include <tqmap.h> #include <tqdom.h> -namespace KIO { +namespace TDEIO { class DavJob; class Job; } @@ -39,7 +39,7 @@ namespace KPIM { class ProgressItem; } -class KConfig; +class TDEConfig; namespace KABC { @@ -50,13 +50,13 @@ class KDE_EXPORT ResourceSlox : public ResourceCached, public SloxBase Q_OBJECT public: - ResourceSlox( const KConfig * ); + ResourceSlox( const TDEConfig * ); ResourceSlox( const KURL &url, const TQString &user, const TQString &password ); ~ResourceSlox(); - void readConfig( const KConfig * ); - void writeConfig( KConfig * ); + void readConfig( const TDEConfig * ); + void writeConfig( TDEConfig * ); SloxPrefs *prefs() const { return mPrefs; } @@ -87,9 +87,9 @@ class KDE_EXPORT ResourceSlox : public ResourceCached, public SloxBase void uploadContacts(); protected slots: - void slotResult( KIO::Job *job ); - void slotUploadResult( KIO::Job *job ); - void slotProgress( KIO::Job *job, unsigned long percent ); + void slotResult( TDEIO::Job *job ); + void slotUploadResult( TDEIO::Job *job ); + void slotProgress( TDEIO::Job *job, unsigned long percent ); void cancelDownload(); void cancelUpload(); @@ -97,8 +97,8 @@ class KDE_EXPORT ResourceSlox : public ResourceCached, public SloxBase private: SloxPrefs *mPrefs; - KIO::DavJob *mDownloadJob; - KIO::DavJob *mUploadJob; + TDEIO::DavJob *mDownloadJob; + TDEIO::DavJob *mUploadJob; KPIM::ProgressItem *mDownloadProgress; KPIM::ProgressItem *mUploadProgress; diff --git a/kresources/slox/kcalresourceslox.cpp b/kresources/slox/kcalresourceslox.cpp index 0b712b66f..98ca90ea4 100644 --- a/kresources/slox/kcalresourceslox.cpp +++ b/kresources/slox/kcalresourceslox.cpp @@ -61,7 +61,7 @@ using namespace KCal; -KCalResourceSlox::KCalResourceSlox( const KConfig *config ) +KCalResourceSlox::KCalResourceSlox( const TDEConfig *config ) : ResourceCached( config ), SloxBase( this ) { init(); @@ -122,7 +122,7 @@ void KCalResourceSlox::init() enableChangeNotification(); } -void KCalResourceSlox::readConfig( const KConfig *config ) +void KCalResourceSlox::readConfig( const TDEConfig *config ) { mPrefs->readConfig(); @@ -138,7 +138,7 @@ void KCalResourceSlox::readConfig( const KConfig *config ) mAccounts = new SloxAccounts( this, url ); } -void KCalResourceSlox::writeConfig( KConfig *config ) +void KCalResourceSlox::writeConfig( TDEConfig *config ) { kdDebug() << "KCalResourceSlox::writeConfig()" << endl; @@ -225,11 +225,11 @@ void KCalResourceSlox::requestEvents() kdDebug() << "REQUEST CALENDAR: \n" << doc.toString( 2 ) << endl; - mLoadEventsJob = KIO::davPropFind( url, doc, "0", false ); - connect( mLoadEventsJob, TQT_SIGNAL( result( KIO::Job * ) ), - TQT_SLOT( slotLoadEventsResult( KIO::Job * ) ) ); - connect( mLoadEventsJob, TQT_SIGNAL( percent( KIO::Job *, unsigned long ) ), - TQT_SLOT( slotEventsProgress( KIO::Job *, unsigned long ) ) ); + mLoadEventsJob = TDEIO::davPropFind( url, doc, "0", false ); + connect( mLoadEventsJob, TQT_SIGNAL( result( TDEIO::Job * ) ), + TQT_SLOT( slotLoadEventsResult( TDEIO::Job * ) ) ); + connect( mLoadEventsJob, TQT_SIGNAL( percent( TDEIO::Job *, unsigned long ) ), + TQT_SLOT( slotEventsProgress( TDEIO::Job *, unsigned long ) ) ); mLoadEventsProgress = KPIM::ProgressManager::instance()->createProgressItem( KPIM::ProgressManager::getUniqueID(), i18n("Downloading events") ); @@ -270,11 +270,11 @@ void KCalResourceSlox::requestTodos() kdDebug() << "REQUEST TASKS: \n" << doc.toString( 2 ) << endl; - mLoadTodosJob = KIO::davPropFind( url, doc, "0", false ); - connect( mLoadTodosJob, TQT_SIGNAL( result( KIO::Job * ) ), - TQT_SLOT( slotLoadTodosResult( KIO::Job * ) ) ); - connect( mLoadTodosJob, TQT_SIGNAL( percent( KIO::Job *, unsigned long ) ), - TQT_SLOT( slotTodosProgress( KIO::Job *, unsigned long ) ) ); + mLoadTodosJob = TDEIO::davPropFind( url, doc, "0", false ); + connect( mLoadTodosJob, TQT_SIGNAL( result( TDEIO::Job * ) ), + TQT_SLOT( slotLoadTodosResult( TDEIO::Job * ) ) ); + connect( mLoadTodosJob, TQT_SIGNAL( percent( TDEIO::Job *, unsigned long ) ), + TQT_SLOT( slotTodosProgress( TDEIO::Job *, unsigned long ) ) ); mLoadTodosProgress = KPIM::ProgressManager::instance()->createProgressItem( KPIM::ProgressManager::getUniqueID(), i18n("Downloading to-dos") ); @@ -379,11 +379,11 @@ void KCalResourceSlox::uploadIncidences() kdDebug() << "UPLOAD: \n" << doc.toString( 2 ) << endl; - mUploadJob = KIO::davPropPatch( url, doc, false ); - connect( mUploadJob, TQT_SIGNAL( result( KIO::Job * ) ), - TQT_SLOT( slotUploadResult( KIO::Job * ) ) ); - connect( mUploadJob, TQT_SIGNAL( percent( KIO::Job *, unsigned long ) ), - TQT_SLOT( slotUploadProgress( KIO::Job *, unsigned long ) ) ); + mUploadJob = TDEIO::davPropPatch( url, doc, false ); + connect( mUploadJob, TQT_SIGNAL( result( TDEIO::Job * ) ), + TQT_SLOT( slotUploadResult( TDEIO::Job * ) ) ); + connect( mUploadJob, TQT_SIGNAL( percent( TDEIO::Job *, unsigned long ) ), + TQT_SLOT( slotUploadProgress( TDEIO::Job *, unsigned long ) ) ); mUploadProgress = KPIM::ProgressManager::instance()->createProgressItem( KPIM::ProgressManager::getUniqueID(), i18n("Uploading incidence") ); @@ -912,7 +912,7 @@ void KCalResourceSlox::parseTodoAttribute( const TQDomElement &e, } } -void KCalResourceSlox::slotLoadTodosResult( KIO::Job *job ) +void KCalResourceSlox::slotLoadTodosResult( TDEIO::Job *job ) { kdDebug() << "KCalResourceSlox::slotLoadTodosJobResult()" << endl; @@ -986,7 +986,7 @@ void KCalResourceSlox::slotLoadTodosResult( KIO::Job *job ) mLoadTodosProgress = 0; } -void KCalResourceSlox::slotLoadEventsResult( KIO::Job *job ) +void KCalResourceSlox::slotLoadEventsResult( TDEIO::Job *job ) { kdDebug() << "KCalResourceSlox::slotLoadEventsResult() " << long( this ) << endl; @@ -1076,7 +1076,7 @@ void KCalResourceSlox::slotLoadEventsResult( KIO::Job *job ) mLoadEventsProgress = 0; } -void KCalResourceSlox::slotUploadResult( KIO::Job *job ) +void KCalResourceSlox::slotUploadResult( TDEIO::Job *job ) { kdDebug() << "KCalResourceSlox::slotUploadResult()" << endl; @@ -1185,7 +1185,7 @@ void KCalResourceSlox::slotUploadResult( KIO::Job *job ) uploadIncidences(); } -void KCalResourceSlox::slotEventsProgress( KIO::Job *job, +void KCalResourceSlox::slotEventsProgress( TDEIO::Job *job, unsigned long percent ) { #if 0 @@ -1197,7 +1197,7 @@ void KCalResourceSlox::slotEventsProgress( KIO::Job *job, if ( mLoadEventsProgress ) mLoadEventsProgress->setProgress( percent ); } -void KCalResourceSlox::slotTodosProgress( KIO::Job *job, unsigned long percent ) +void KCalResourceSlox::slotTodosProgress( TDEIO::Job *job, unsigned long percent ) { #if 0 kdDebug() << "PROGRESS: todos " << int( job ) << ": " << percent << endl; @@ -1208,7 +1208,7 @@ void KCalResourceSlox::slotTodosProgress( KIO::Job *job, unsigned long percent ) if ( mLoadTodosProgress ) mLoadTodosProgress->setProgress( percent ); } -void KCalResourceSlox::slotUploadProgress( KIO::Job *job, unsigned long percent ) +void KCalResourceSlox::slotUploadProgress( TDEIO::Job *job, unsigned long percent ) { #if 0 kdDebug() << "PROGRESS: upload " << int( job ) << ": " << percent << endl; diff --git a/kresources/slox/kcalresourceslox.h b/kresources/slox/kcalresourceslox.h index ce1fd86cd..6735b9934 100644 --- a/kresources/slox/kcalresourceslox.h +++ b/kresources/slox/kcalresourceslox.h @@ -39,7 +39,7 @@ #include <libkcal/icalformat.h> #include <libkcal/resourcecached.h> -namespace KIO { +namespace TDEIO { class FileCopyJob; class Job; class DavJob; @@ -74,14 +74,14 @@ class KDE_EXPORT KCalResourceSlox : public KCal::ResourceCached, public SloxBase enum { ReloadNever, ReloadOnStartup, ReloadOnceADay, ReloadAlways }; /** - Create resource from configuration information stored in KConfig object. + Create resource from configuration information stored in TDEConfig object. */ - KCalResourceSlox( const KConfig * ); + KCalResourceSlox( const TDEConfig * ); KCalResourceSlox( const KURL &url ); ~KCalResourceSlox(); - void readConfig( const KConfig *config ); - void writeConfig( KConfig *config ); + void readConfig( const TDEConfig *config ); + void writeConfig( TDEConfig *config ); KCal::SloxPrefs *prefs() const { return mPrefs; } @@ -92,13 +92,13 @@ class KDE_EXPORT KCalResourceSlox : public KCal::ResourceCached, public SloxBase void dump() const; protected slots: - void slotLoadEventsResult( KIO::Job * ); - void slotLoadTodosResult( KIO::Job * ); - void slotUploadResult( KIO::Job * ); + void slotLoadEventsResult( TDEIO::Job * ); + void slotLoadTodosResult( TDEIO::Job * ); + void slotUploadResult( TDEIO::Job * ); - void slotEventsProgress( KIO::Job *job, unsigned long percent ); - void slotTodosProgress( KIO::Job *job, unsigned long percent ); - void slotUploadProgress( KIO::Job *job, unsigned long percent ); + void slotEventsProgress( TDEIO::Job *job, unsigned long percent ); + void slotTodosProgress( TDEIO::Job *job, unsigned long percent ); + void slotUploadProgress( TDEIO::Job *job, unsigned long percent ); void cancelLoadEvents(); void cancelLoadTodos(); @@ -147,9 +147,9 @@ class KDE_EXPORT KCalResourceSlox : public KCal::ResourceCached, public SloxBase KCal::SloxPrefs *mPrefs; - KIO::DavJob *mLoadEventsJob; - KIO::DavJob *mLoadTodosJob; - KIO::DavJob *mUploadJob; + TDEIO::DavJob *mLoadEventsJob; + TDEIO::DavJob *mLoadTodosJob; + TDEIO::DavJob *mUploadJob; KPIM::ProgressItem *mLoadEventsProgress; KPIM::ProgressItem *mLoadTodosProgress; diff --git a/kresources/slox/sloxaccounts.cpp b/kresources/slox/sloxaccounts.cpp index 616197936..aa648d1bc 100644 --- a/kresources/slox/sloxaccounts.cpp +++ b/kresources/slox/sloxaccounts.cpp @@ -121,7 +121,7 @@ void SloxAccounts::requestAccounts() kdDebug() << "SloxAccounts::requestAccounts() URL: " << url << endl; - mDownloadJob = KIO::file_copy( url, cacheFile(), -1, true, false, false ); + mDownloadJob = TDEIO::file_copy( url, cacheFile(), -1, true, false, false ); } else if ( mRes->resType() == "ox" ) { KURL url = mBaseUrl; url.setPath( "/servlet/webdav.groupuser/" ); @@ -136,14 +136,14 @@ void SloxAccounts::requestAccounts() kdDebug() << k_funcinfo << doc.toString( 2 ) << endl; - mDownloadJob = KIO::davPropFind( url, doc, "0", false ); + mDownloadJob = TDEIO::davPropFind( url, doc, "0", false ); } - connect( mDownloadJob, TQT_SIGNAL( result( KIO::Job * ) ), - TQT_SLOT( slotResult( KIO::Job * ) ) ); + connect( mDownloadJob, TQT_SIGNAL( result( TDEIO::Job * ) ), + TQT_SLOT( slotResult( TDEIO::Job * ) ) ); } -void SloxAccounts::slotResult( KIO::Job *job ) +void SloxAccounts::slotResult( TDEIO::Job *job ) { kdDebug() << "SloxAccounts::slotResult()" << endl; @@ -157,7 +157,7 @@ void SloxAccounts::slotResult( KIO::Job *job ) return; } TQTextStream stream ( &f ); - stream << static_cast<KIO::DavJob*>( mDownloadJob )->response(); + stream << static_cast<TDEIO::DavJob*>( mDownloadJob )->response(); f.close(); } readAccounts(); diff --git a/kresources/slox/sloxaccounts.h b/kresources/slox/sloxaccounts.h index 85b7625c3..214e3c707 100644 --- a/kresources/slox/sloxaccounts.h +++ b/kresources/slox/sloxaccounts.h @@ -24,7 +24,7 @@ #include <tdepimmacros.h> #include <tqobject.h> -namespace KIO { +namespace TDEIO { class Job; } @@ -51,12 +51,12 @@ class KDE_EXPORT SloxAccounts : public TQObject TQString cacheFile() const; protected slots: - void slotResult( KIO::Job * ); + void slotResult( TDEIO::Job * ); private: TQString mDomain; - KIO::Job *mDownloadJob; + TDEIO::Job *mDownloadJob; TQMap<TQString, KABC::Addressee> mUsers; // map users ids to addressees. diff --git a/kresources/slox/sloxfoldermanager.cpp b/kresources/slox/sloxfoldermanager.cpp index 41864caf8..a60cd7885 100644 --- a/kresources/slox/sloxfoldermanager.cpp +++ b/kresources/slox/sloxfoldermanager.cpp @@ -77,13 +77,13 @@ void SloxFolderManager::requestFolders() kdDebug() << k_funcinfo << doc.toString( 2 ) << endl; - mDownloadJob = KIO::davPropFind( url, doc, "0", false ); + mDownloadJob = TDEIO::davPropFind( url, doc, "0", false ); - connect( mDownloadJob, TQT_SIGNAL( result( KIO::Job * ) ), - TQT_SLOT( slotResult( KIO::Job * ) ) ); + connect( mDownloadJob, TQT_SIGNAL( result( TDEIO::Job * ) ), + TQT_SLOT( slotResult( TDEIO::Job * ) ) ); } -void SloxFolderManager::slotResult( KIO::Job *job ) +void SloxFolderManager::slotResult( TDEIO::Job *job ) { kdDebug() << k_funcinfo << endl; diff --git a/kresources/slox/sloxfoldermanager.h b/kresources/slox/sloxfoldermanager.h index 54008d55a..f31c212c7 100644 --- a/kresources/slox/sloxfoldermanager.h +++ b/kresources/slox/sloxfoldermanager.h @@ -27,7 +27,7 @@ #include <tdepimmacros.h> -namespace KIO { +namespace TDEIO { class Job; class DavJob; } @@ -55,10 +55,10 @@ class KDE_EXPORT SloxFolderManager : public TQObject TQString cacheFile() const; protected slots: - void slotResult( KIO::Job * ); + void slotResult( TDEIO::Job * ); private: - KIO::DavJob *mDownloadJob; + TDEIO::DavJob *mDownloadJob; KURL mBaseUrl; TQMap<TQString, SloxFolder*> mFolders; SloxBase *mRes; diff --git a/kresources/slox/webdavhandler.cpp b/kresources/slox/webdavhandler.cpp index 6b2c733a4..32d3c4167 100644 --- a/kresources/slox/webdavhandler.cpp +++ b/kresources/slox/webdavhandler.cpp @@ -49,7 +49,7 @@ SloxItem::SloxItem() WebdavHandler::WebdavHandler() : mLogCount( 0 ) { - KConfig cfg( "sloxrc" ); + TDEConfig cfg( "sloxrc" ); cfg.setGroup( "General" ); mLogFile = cfg.readEntry( "LogFile" ); |