diff options
Diffstat (limited to 'kresources')
128 files changed, 829 insertions, 829 deletions
diff --git a/kresources/birthdays/resourcekabc.cpp b/kresources/birthdays/resourcekabc.cpp index 3a6af941..b98d49e0 100644 --- a/kresources/birthdays/resourcekabc.cpp +++ b/kresources/birthdays/resourcekabc.cpp @@ -66,7 +66,7 @@ extern "C" } } -ResourceKABC::ResourceKABC( const KConfig* config ) +ResourceKABC::ResourceKABC( const TDEConfig* config ) : ResourceCalendar( config ), mCalendar( TQString::fromLatin1( "UTC" ) ), mAlarmDays( 0 ), mAlarm( true ), mUseCategories( false ) { @@ -102,7 +102,7 @@ void ResourceKABC::init() mAddressbook = 0; } -void ResourceKABC::readConfig( const KConfig *config ) +void ResourceKABC::readConfig( const TDEConfig *config ) { mAlarmDays = config->readNumEntry( "AlarmDays", 0 ); mAlarm = config->readBoolEntry( "Alarm", true ); @@ -110,7 +110,7 @@ void ResourceKABC::readConfig( const KConfig *config ) mUseCategories = config->readBoolEntry( "UseCategories", false ); } -void ResourceKABC::writeConfig( KConfig *config ) +void ResourceKABC::writeConfig( TDEConfig *config ) { ResourceCalendar::writeConfig( config ); config->writeEntry( "AlarmDays", mAlarmDays ); diff --git a/kresources/birthdays/resourcekabc.h b/kresources/birthdays/resourcekabc.h index be77c186..169a0294 100644 --- a/kresources/birthdays/resourcekabc.h +++ b/kresources/birthdays/resourcekabc.h @@ -35,7 +35,7 @@ #include "libtdepim/tdepimmacros.h" -namespace KIO { +namespace TDEIO { class FileCopyJob; class Job; } @@ -53,12 +53,12 @@ class KDE_EXPORT ResourceKABC : public ResourceCalendar friend class ResourceKABCConfig; public: - ResourceKABC( const KConfig * ); + ResourceKABC( const TDEConfig * ); ResourceKABC( ); virtual ~ResourceKABC(); - void readConfig( const KConfig *config ); - void writeConfig( KConfig* config ); + void readConfig( const TDEConfig *config ); + void writeConfig( TDEConfig* config ); void setAlarm( bool ); bool alarm(); diff --git a/kresources/blogging/API_Blog.h b/kresources/blogging/API_Blog.h index f690fc42..9425bd5e 100644 --- a/kresources/blogging/API_Blog.h +++ b/kresources/blogging/API_Blog.h @@ -123,18 +123,18 @@ class APIBlog : public TQObject virtual TQString getFunctionName( blogFunctions type ) = 0; virtual TQValueList<TQVariant> defaultArgs( const TQString &id = TQString() ); - virtual KIO::Job *createUserInfoJob() = 0; - virtual KIO::Job *createListFoldersJob() = 0; - virtual KIO::TransferJob *createListItemsJob( const KURL &url ) = 0; - virtual KIO::TransferJob *createDownloadJob( const KURL &url ) = 0; - virtual KIO::TransferJob *createUploadJob( const KURL &url, KBlog::BlogPosting *posting ) = 0; - virtual KIO::TransferJob *createUploadNewJob( KBlog::BlogPosting *posting ) = 0; - virtual KIO::Job *createRemoveJob( const KURL &url, const TQString &postid ) = 0; - - virtual bool interpretUserInfoJob( KIO::Job *job ) = 0; - virtual void interpretListFoldersJob( KIO::Job *job ) = 0; - virtual bool interpretListItemsJob( KIO::Job *job ) = 0; - virtual bool interpretDownloadItemsJob( KIO::Job *job ) = 0; + virtual TDEIO::Job *createUserInfoJob() = 0; + virtual TDEIO::Job *createListFoldersJob() = 0; + virtual TDEIO::TransferJob *createListItemsJob( const KURL &url ) = 0; + virtual TDEIO::TransferJob *createDownloadJob( const KURL &url ) = 0; + virtual TDEIO::TransferJob *createUploadJob( const KURL &url, KBlog::BlogPosting *posting ) = 0; + virtual TDEIO::TransferJob *createUploadNewJob( KBlog::BlogPosting *posting ) = 0; + virtual TDEIO::Job *createRemoveJob( const KURL &url, const TQString &postid ) = 0; + + virtual bool interpretUserInfoJob( TDEIO::Job *job ) = 0; + virtual void interpretListFoldersJob( TDEIO::Job *job ) = 0; + virtual bool interpretListItemsJob( TDEIO::Job *job ) = 0; + virtual bool interpretDownloadItemsJob( TDEIO::Job *job ) = 0; static KCal::Journal *journalFromPosting( KBlog::BlogPosting *post ); static KBlog::BlogPosting *postingFromJournal( KCal::Journal *journal ); diff --git a/kresources/blogging/API_Blogger.cpp b/kresources/blogging/API_Blogger.cpp index 0745467b..69a722e2 100644 --- a/kresources/blogging/API_Blogger.cpp +++ b/kresources/blogging/API_Blogger.cpp @@ -44,53 +44,53 @@ TQString APIBlogger::getFunctionName( blogFunctions type ) -KIO::Job *APIBlogger::createUserInfoJob() +TDEIO::Job *APIBlogger::createUserInfoJob() { kdDebug() << "read user info..." << endl; TQValueList<TQVariant> args( defaultArgs() ); - return KIO::xmlrpcCall( mServerURL, getFunctionName( bloggerGetUserInfo ), args, false ); + return TDEIO::xmlrpcCall( mServerURL, getFunctionName( bloggerGetUserInfo ), args, false ); } -KIO::Job *APIBlogger::createListFoldersJob() +TDEIO::Job *APIBlogger::createListFoldersJob() { // TODO: Check if we're already authenticated. If not, do it! // if ( isValid() ) { kdDebug() << "Fetch List of Blogs..." << endl; TQValueList<TQVariant> args( defaultArgs() ); - return KIO::xmlrpcCall( mServerURL, getFunctionName( bloggerGetUsersBlogs ), args, false ); + return TDEIO::xmlrpcCall( mServerURL, getFunctionName( bloggerGetUsersBlogs ), args, false ); // } else { // warningNotInitialized(); // return 0; // } } -KIO::TransferJob *APIBlogger::createListItemsJob( const KURL &url ) +TDEIO::TransferJob *APIBlogger::createListItemsJob( const KURL &url ) { // TODO: Check if we're already authenticated. If not, do it! // if ( isValid() ) { kdDebug() << "Fetch List of Posts..." << endl; TQValueList<TQVariant> args( defaultArgs( url.url() ) ); args << TQVariant( mDownloadCount ); - return KIO::xmlrpcCall( mServerURL, getFunctionName( bloggerGetRecentPosts ), args, false ); + return TDEIO::xmlrpcCall( mServerURL, getFunctionName( bloggerGetRecentPosts ), args, false ); // } else { // warningNotInitialized(); // return 0; // } } -KIO::TransferJob *APIBlogger::createDownloadJob( const KURL &url ) +TDEIO::TransferJob *APIBlogger::createDownloadJob( const KURL &url ) { // if ( isValid() ){ kdDebug() << "Fetch Posting with url " << url.url() << endl; TQValueList<TQVariant> args( defaultArgs( url.url() ) ); - return KIO::xmlrpcCall( mServerURL, getFunctionName( bloggerGetPost ), args, false ); + return TDEIO::xmlrpcCall( mServerURL, getFunctionName( bloggerGetPost ), args, false ); // } else { // warningNotInitialized(); // return 0; // } } -KIO::TransferJob *APIBlogger::createUploadJob( const KURL &url, KBlog::BlogPosting *posting ) +TDEIO::TransferJob *APIBlogger::createUploadJob( const KURL &url, KBlog::BlogPosting *posting ) { if ( !posting ) { kdDebug() << "APIBlogger::createUploadJob: posting=0" << endl; @@ -101,14 +101,14 @@ KIO::TransferJob *APIBlogger::createUploadJob( const KURL &url, KBlog::BlogPosti TQValueList<TQVariant> args( defaultArgs( posting->postID() ) ); args << TQVariant( posting->content() ); args << TQVariant( /*publish=*/true, 0 ); - return KIO::xmlrpcCall( mServerURL, getFunctionName( bloggerEditPost ), args, false ); + return TDEIO::xmlrpcCall( mServerURL, getFunctionName( bloggerEditPost ), args, false ); // } else { // warningNotInitialized(); // return 0; // } } -KIO::TransferJob *APIBlogger::createUploadNewJob( KBlog::BlogPosting *posting ) +TDEIO::TransferJob *APIBlogger::createUploadNewJob( KBlog::BlogPosting *posting ) { if ( !posting ) { kdDebug() << "APIBlogger::createUploadNewJob: posting=0" << endl; @@ -119,20 +119,20 @@ KIO::TransferJob *APIBlogger::createUploadNewJob( KBlog::BlogPosting *posting ) TQValueList<TQVariant> args( defaultArgs( posting->blogID() ) ); args << TQVariant( posting->content() ); args << TQVariant( /*publish=*/true, 0 ); - return KIO::xmlrpcCall( mServerURL, getFunctionName( bloggerNewPost ), args, false ); + return TDEIO::xmlrpcCall( mServerURL, getFunctionName( bloggerNewPost ), args, false ); // } else { // warningNotInitialized(); // return 0; // } } -KIO::Job *APIBlogger::createRemoveJob( const KURL &/*url*/, const TQString &postid ) +TDEIO::Job *APIBlogger::createRemoveJob( const KURL &/*url*/, const TQString &postid ) { kdDebug() << "APIBlogger::createRemoveJob: postid=" << postid << endl; // if ( isValid() ){ TQValueList<TQVariant> args( defaultArgs( postid ) ); args << TQVariant( /*publish=*/true, 0 ); - return KIO::xmlrpcCall( mServerURL, getFunctionName( bloggerDeletePost ), args, false ); + return TDEIO::xmlrpcCall( mServerURL, getFunctionName( bloggerDeletePost ), args, false ); // } else { // warningNotInitialized(); // return 0; @@ -142,11 +142,11 @@ kdDebug() << "APIBlogger::createRemoveJob: postid=" << postid << endl; -bool APIBlogger::interpretUserInfoJob( KIO::Job *job ) +bool APIBlogger::interpretUserInfoJob( TDEIO::Job *job ) { // TODO: Implement user authentication // isValid = true; - KIO::XmlrpcJob *trfjob = dynamic_cast<KIO::XmlrpcJob*>(job); + TDEIO::XmlrpcJob *trfjob = dynamic_cast<TDEIO::XmlrpcJob*>(job); if ( job->error() || !trfjob ) { // TODO: Error handling return false; @@ -172,10 +172,10 @@ bool APIBlogger::interpretUserInfoJob( KIO::Job *job ) return false; } -void APIBlogger::interpretListFoldersJob( KIO::Job *job ) +void APIBlogger::interpretListFoldersJob( TDEIO::Job *job ) { kdDebug() << "APIBlogger::interpretListFoldersJob" << endl; - KIO::XmlrpcJob *trfjob = dynamic_cast<KIO::XmlrpcJob*>(job); + TDEIO::XmlrpcJob *trfjob = dynamic_cast<TDEIO::XmlrpcJob*>(job); if ( job->error() || !trfjob ) { // TODO: Error handling } else { @@ -204,15 +204,15 @@ kdDebug()<< "Emitting folderInfoRetrieved( id=" << id << ", name=" << name << ") } } -bool APIBlogger::interpretListItemsJob( KIO::Job *job ) +bool APIBlogger::interpretListItemsJob( TDEIO::Job *job ) { return interpretDownloadItemsJob( job ); } -bool APIBlogger::interpretDownloadItemsJob( KIO::Job *job ) +bool APIBlogger::interpretDownloadItemsJob( TDEIO::Job *job ) { kdDebug(5800)<<"APIBlogger::interpretDownloadItemJob"<<endl; - KIO::XmlrpcJob *trfjob = dynamic_cast<KIO::XmlrpcJob*>(job); + TDEIO::XmlrpcJob *trfjob = dynamic_cast<TDEIO::XmlrpcJob*>(job); bool success = false; if ( job->error() || !trfjob ) { // TODO: Error handling diff --git a/kresources/blogging/API_Blogger.h b/kresources/blogging/API_Blogger.h index 04950338..d7d5f43b 100644 --- a/kresources/blogging/API_Blogger.h +++ b/kresources/blogging/API_Blogger.h @@ -37,18 +37,18 @@ class APIBlogger : public APIBlog TQString interfaceName() const { return "Blogger API 1.0"; } - KIO::Job *createUserInfoJob(); - KIO::Job *createListFoldersJob(); - KIO::TransferJob *createListItemsJob( const KURL &url ); - KIO::TransferJob *createDownloadJob( const KURL &url ); - KIO::TransferJob *createUploadJob( const KURL &url, KBlog::BlogPosting *posting ); - KIO::TransferJob *createUploadNewJob( KBlog::BlogPosting *posting ); - KIO::Job *createRemoveJob( const KURL &url, const TQString &postid ); - - bool interpretUserInfoJob( KIO::Job *job ); - void interpretListFoldersJob( KIO::Job *job ); - bool interpretListItemsJob( KIO::Job *job ); - bool interpretDownloadItemsJob( KIO::Job *job ); + TDEIO::Job *createUserInfoJob(); + TDEIO::Job *createListFoldersJob(); + TDEIO::TransferJob *createListItemsJob( const KURL &url ); + TDEIO::TransferJob *createDownloadJob( const KURL &url ); + TDEIO::TransferJob *createUploadJob( const KURL &url, KBlog::BlogPosting *posting ); + TDEIO::TransferJob *createUploadNewJob( KBlog::BlogPosting *posting ); + TDEIO::Job *createRemoveJob( const KURL &url, const TQString &postid ); + + bool interpretUserInfoJob( TDEIO::Job *job ); + void interpretListFoldersJob( TDEIO::Job *job ); + bool interpretListItemsJob( TDEIO::Job *job ); + bool interpretDownloadItemsJob( TDEIO::Job *job ); protected: bool readPostingFromMap( BlogPosting *post, const TQMap<TQString, TQVariant> &postInfo ); }; diff --git a/kresources/blogging/bloggingcalendaradaptor.cpp b/kresources/blogging/bloggingcalendaradaptor.cpp index bb91edb0..2ed925a8 100644 --- a/kresources/blogging/bloggingcalendaradaptor.cpp +++ b/kresources/blogging/bloggingcalendaradaptor.cpp @@ -62,7 +62,7 @@ BloggingUploadItem::~BloggingUploadItem() delete mPosting; } -KIO::TransferJob *BloggingUploadItem::createUploadJob( KPIM::GroupwareDataAdaptor *adaptor, const KURL &baseurl ) +TDEIO::TransferJob *BloggingUploadItem::createUploadJob( KPIM::GroupwareDataAdaptor *adaptor, const KURL &baseurl ) { kdDebug()<<"BloggingUploadItem::createUploadJob, adaptor="<<adaptor<<", URL="<<baseurl.url()<<endl; Q_ASSERT( adaptor ); @@ -72,7 +72,7 @@ kdDebug()<<"BloggingUploadItem::createUploadJob, adaptor="<<adaptor<<", URL="<<b return mAPI->createUploadJob( url(), mPosting ); } -KIO::TransferJob *BloggingUploadItem::createUploadNewJob( KPIM::GroupwareDataAdaptor *adaptor, const KURL &baseurl ) +TDEIO::TransferJob *BloggingUploadItem::createUploadNewJob( KPIM::GroupwareDataAdaptor *adaptor, const KURL &baseurl ) { kdDebug()<<"BloggingUploadItem::createUploadNewJob"<<endl; Q_ASSERT( adaptor ); @@ -167,7 +167,7 @@ void BloggingCalendarAdaptor::setUserPassword( KURL & ) -KIO::Job *BloggingCalendarAdaptor::createLoginJob( const KURL &url, +TDEIO::Job *BloggingCalendarAdaptor::createLoginJob( const KURL &url, const TQString &user, const TQString &password ) { @@ -179,21 +179,21 @@ KIO::Job *BloggingCalendarAdaptor::createLoginJob( const KURL &url, } else return 0; } -KIO::Job *BloggingCalendarAdaptor::createListFoldersJob( const KURL &/*url*/ ) +TDEIO::Job *BloggingCalendarAdaptor::createListFoldersJob( const KURL &/*url*/ ) { if ( mAPI ) { return mAPI->createListFoldersJob(); } else return 0; } -KIO::TransferJob *BloggingCalendarAdaptor::createListItemsJob( const KURL &url ) +TDEIO::TransferJob *BloggingCalendarAdaptor::createListItemsJob( const KURL &url ) { if ( mAPI ) { return mAPI->createListItemsJob( url ); } else return 0; } -KIO::TransferJob *BloggingCalendarAdaptor::createDownloadJob( const KURL &url, +TDEIO::TransferJob *BloggingCalendarAdaptor::createDownloadJob( const KURL &url, KPIM::FolderLister::ContentType ctype ) { if ( mAPI && (ctype & KPIM::FolderLister::Journal) ) { @@ -201,7 +201,7 @@ KIO::TransferJob *BloggingCalendarAdaptor::createDownloadJob( const KURL &url, } else return 0; } -KIO::Job *BloggingCalendarAdaptor::createRemoveJob( const KURL &url, +TDEIO::Job *BloggingCalendarAdaptor::createRemoveJob( const KURL &url, KPIM::GroupwareUploadItem *deleteItem ) { kdDebug()<<"BloggingCalendarAdaptor::createRemoveJob( " << url.url() << ", ..)" << endl; @@ -213,7 +213,7 @@ kdDebug()<<"BloggingCalendarAdaptor::createRemoveJob( " << url.url() << ", ..)" -bool BloggingCalendarAdaptor::interpretLoginJob( KIO::Job *job ) +bool BloggingCalendarAdaptor::interpretLoginJob( TDEIO::Job *job ) { kdDebug()<<"BloggingCalendarAdaptor::interpretLoginJob"<<endl; if ( mAPI && job ) { @@ -226,7 +226,7 @@ kdDebug() << "authenticated=" << mAuthenticated << endl; } -void BloggingCalendarAdaptor::interpretListFoldersJob( KIO::Job *job, KPIM::FolderLister * ) +void BloggingCalendarAdaptor::interpretListFoldersJob( TDEIO::Job *job, KPIM::FolderLister * ) { kdDebug() << "BloggingCalendarAdaptor::interpretListFoldersJob" << endl; if ( mAPI && job ) { @@ -235,7 +235,7 @@ kdDebug() << "BloggingCalendarAdaptor::interpretListFoldersJob" << endl; } -bool BloggingCalendarAdaptor::interpretListItemsJob( KIO::Job *job, +bool BloggingCalendarAdaptor::interpretListItemsJob( TDEIO::Job *job, const TQString &/*jobData*/ ) { if ( mAPI ) { @@ -246,7 +246,7 @@ bool BloggingCalendarAdaptor::interpretListItemsJob( KIO::Job *job, } -bool BloggingCalendarAdaptor::interpretDownloadItemsJob( KIO::Job *job, +bool BloggingCalendarAdaptor::interpretDownloadItemsJob( TDEIO::Job *job, const TQString &/*jobData*/ ) { if ( mAPI ) { diff --git a/kresources/blogging/bloggingcalendaradaptor.h b/kresources/blogging/bloggingcalendaradaptor.h index e47e6b13..ee6d292a 100644 --- a/kresources/blogging/bloggingcalendaradaptor.h +++ b/kresources/blogging/bloggingcalendaradaptor.h @@ -26,7 +26,7 @@ #include "API_Blog.h" #include <kurl.h> -namespace KIO { +namespace TDEIO { class Job; } @@ -37,9 +37,9 @@ class BloggingUploadItem : public KPIM::GroupwareUploadItem public: BloggingUploadItem( KBlog::APIBlog *api, CalendarAdaptor *adaptor, KCal::Incidence *incidence, UploadType type ); virtual ~BloggingUploadItem(); - virtual KIO::TransferJob *createUploadNewJob( + virtual TDEIO::TransferJob *createUploadNewJob( KPIM::GroupwareDataAdaptor *adaptor, const KURL &baseurl ); - virtual KIO::TransferJob *createUploadJob( + virtual TDEIO::TransferJob *createUploadJob( KPIM::GroupwareDataAdaptor *adaptor, const KURL &url ); protected: @@ -73,18 +73,18 @@ Q_OBJECT KBlog::APIBlog *api() const; void setAPI( KBlog::APIBlog *api ); - KIO::Job *createLoginJob( const KURL &url, const TQString &user, + TDEIO::Job *createLoginJob( const KURL &url, const TQString &user, const TQString &password ); - KIO::Job *createListFoldersJob( const KURL &url ); - KIO::TransferJob *createListItemsJob( const KURL &url ); - KIO::TransferJob *createDownloadJob( const KURL &url, + TDEIO::Job *createListFoldersJob( const KURL &url ); + TDEIO::TransferJob *createListItemsJob( const KURL &url ); + TDEIO::TransferJob *createDownloadJob( const KURL &url, KPIM::FolderLister::ContentType ctype ); - KIO::Job *createRemoveJob( const KURL &url, KPIM::GroupwareUploadItem *deleteItem ); + TDEIO::Job *createRemoveJob( const KURL &url, KPIM::GroupwareUploadItem *deleteItem ); - bool interpretLoginJob( KIO::Job *job ); - void interpretListFoldersJob( KIO::Job *job, KPIM::FolderLister * ); - bool interpretListItemsJob( KIO::Job *job, const TQString &jobData ); - bool interpretDownloadItemsJob( KIO::Job *job, const TQString &jobData ); + bool interpretLoginJob( TDEIO::Job *job ); + void interpretListFoldersJob( TDEIO::Job *job, KPIM::FolderLister * ); + bool interpretListItemsJob( TDEIO::Job *job, const TQString &jobData ); + bool interpretDownloadItemsJob( TDEIO::Job *job, const TQString &jobData ); public slots: void slotFolderInfoRetrieved( const TQString &id, const TQString &name ); diff --git a/kresources/blogging/kcal_resourceblogging.cpp b/kresources/blogging/kcal_resourceblogging.cpp index c8b01662..14bb24ca 100644 --- a/kresources/blogging/kcal_resourceblogging.cpp +++ b/kresources/blogging/kcal_resourceblogging.cpp @@ -34,7 +34,7 @@ ResourceBlogging::ResourceBlogging() init(); } -ResourceBlogging::ResourceBlogging( const KConfig *config ) +ResourceBlogging::ResourceBlogging( const TDEConfig *config ) : ResourceGroupwareBase( config ) { init(); @@ -57,7 +57,7 @@ void ResourceBlogging::init() ResourceGroupwareBase::init(); } -void ResourceBlogging::readConfig( const KConfig *config ) +void ResourceBlogging::readConfig( const TDEConfig *config ) { BloggingCalendarAdaptor *ad = dynamic_cast<BloggingCalendarAdaptor*>( adaptor() ); ResourceGroupwareBase::readConfig( config ); @@ -77,7 +77,7 @@ void ResourceBlogging::readConfig( const KConfig *config ) } -void ResourceBlogging::writeConfig( KConfig *config ) +void ResourceBlogging::writeConfig( TDEConfig *config ) { kdDebug(5800) << "ResourceBlogging::writeConfig()" << endl; diff --git a/kresources/blogging/kcal_resourceblogging.h b/kresources/blogging/kcal_resourceblogging.h index 8eff5062..4e850d14 100644 --- a/kresources/blogging/kcal_resourceblogging.h +++ b/kresources/blogging/kcal_resourceblogging.h @@ -39,10 +39,10 @@ class KDE_EXPORT ResourceBlogging : public ResourceGroupwareBase public: ResourceBlogging(); - ResourceBlogging( const KConfig * ); + ResourceBlogging( const TDEConfig * ); - void readConfig( const KConfig *config ); - void writeConfig( KConfig *config ); + void readConfig( const TDEConfig *config ); + void writeConfig( TDEConfig *config ); bool addEvent( Event* ) { return false; } bool addTodo( Todo * ) { return false; } diff --git a/kresources/blogging/xmlrpcjob.cpp b/kresources/blogging/xmlrpcjob.cpp index 19582ec3..f2e51630 100644 --- a/kresources/blogging/xmlrpcjob.cpp +++ b/kresources/blogging/xmlrpcjob.cpp @@ -39,9 +39,9 @@ #define KIO_ARGS TQByteArray packedArgs; \ TQDataStream stream( packedArgs, IO_WriteOnly ); stream -using namespace KIO; +using namespace TDEIO; -namespace KIO { +namespace TDEIO { class XMLRPCResult { friend class XmlrpcJob; @@ -68,7 +68,7 @@ public: XmlrpcJob::XmlrpcJob( const KURL& url, const TQString& method, const TQValueList<TQVariant> ¶ms, bool showProgressInfo) - : TransferJob( url, KIO::CMD_SPECIAL, TQByteArray(), TQByteArray(), + : TransferJob( url, TDEIO::CMD_SPECIAL, TQByteArray(), TQByteArray(), showProgressInfo ) { d = new XmlrpcJobPrivate; @@ -147,10 +147,10 @@ kdDebug() << m_str_response << endl; istream >> s_url; istream >> s_method; // PROPFIND - if ( (s_cmd == 7) && (s_method == (int)KIO::HTTP_POST) ) { + if ( (s_cmd == 7) && (s_method == (int)TDEIO::HTTP_POST) ) { m_packedArgs.truncate(0); TQDataStream stream( m_packedArgs, IO_WriteOnly ); - stream << (int)7 << m_redirectionURL << (int)KIO::HTTP_POST; + stream << (int)7 << m_redirectionURL << (int)TDEIO::HTTP_POST; } } else */ @@ -383,7 +383,7 @@ kdDebug()<<"Demarshalling element \"" << elem.text() <<"\"" << endl; /* Convenience methods */ -XmlrpcJob* KIO::xmlrpcCall( const KURL& url, const TQString &method, const TQValueList<TQVariant> ¶ms, bool showProgressInfo ) +XmlrpcJob* TDEIO::xmlrpcCall( const KURL& url, const TQString &method, const TQValueList<TQVariant> ¶ms, bool showProgressInfo ) { if ( url.isEmpty() ) { kdWarning() << "Cannot execute call to " << method << ": empty server URL" << endl; @@ -395,15 +395,15 @@ XmlrpcJob* KIO::xmlrpcCall( const KURL& url, const TQString &method, const TQVal return job; } -XmlrpcJob* KIO::xmlrpcCall( const KURL& url, const TQString &method, +XmlrpcJob* TDEIO::xmlrpcCall( const KURL& url, const TQString &method, const TQVariant &arg, bool showProgressInfo ) { TQValueList<TQVariant> args; args << arg; - return KIO::xmlrpcCall( url, method, args, showProgressInfo ); + return TDEIO::xmlrpcCall( url, method, args, showProgressInfo ); } -XmlrpcJob* KIO::xmlrpcCall( const KURL& url, const TQString &method, +XmlrpcJob* TDEIO::xmlrpcCall( const KURL& url, const TQString &method, const TQStringList &arg, bool showProgressInfo ) { TQValueList<TQVariant> args; @@ -411,11 +411,11 @@ XmlrpcJob* KIO::xmlrpcCall( const KURL& url, const TQString &method, TQStringList::ConstIterator end = arg.end(); for ( ; it != end; ++it ) args << TQVariant( *it ); - return KIO::xmlrpcCall( url, method, args, showProgressInfo ); + return TDEIO::xmlrpcCall( url, method, args, showProgressInfo ); } template <typename T> -XmlrpcJob* KIO::xmlrpcCall( const KURL& url, const TQString &method, +XmlrpcJob* TDEIO::xmlrpcCall( const KURL& url, const TQString &method, const TQValueList<T>&arg, bool showProgressInfo ) { TQValueList<TQVariant> args; @@ -424,7 +424,7 @@ XmlrpcJob* KIO::xmlrpcCall( const KURL& url, const TQString &method, typename TQValueList<T>::ConstIterator end = arg.end(); for ( ; it != end; ++it ) args << TQVariant( *it ); - return KIO::xmlrpcCall( url, method, args, showProgressInfo ); + return TDEIO::xmlrpcCall( url, method, args, showProgressInfo ); } #include "xmlrpcjob.moc" diff --git a/kresources/blogging/xmlrpcjob.h b/kresources/blogging/xmlrpcjob.h index bc830ad2..1efe79e1 100644 --- a/kresources/blogging/xmlrpcjob.h +++ b/kresources/blogging/xmlrpcjob.h @@ -32,7 +32,7 @@ #include <kio/jobclasses.h> #include <kio/global.h> -namespace KIO { +namespace TDEIO { class XMLRPCResult; @@ -41,7 +41,7 @@ namespace KIO { * Data is sent to the slave on request of the slave ( dataReq ). * If data coming from the slave can not be handled, the * reading of data from the slave should be suspended. - * @see KIO::xmlrpcCall() + * @see TDEIO::xmlrpcCall() * @since 3.4 */ class XmlrpcJob : public TransferJob { @@ -57,8 +57,8 @@ Q_OBJECT XMLRPCUnknownResponse }; /** - * Use KIO::xmlrpcPropFind(), KIO::xmlrpcPropPatch() and - * KIO::xmlrpcSearch() to create a new XmlrpcJob. + * Use TDEIO::xmlrpcPropFind(), TDEIO::xmlrpcPropPatch() and + * TDEIO::xmlrpcSearch() to create a new XmlrpcJob. */ XmlrpcJob( const KURL& url, const TQString& method, const TQValueList<TQVariant> ¶ms, bool showProgressInfo ); diff --git a/kresources/caldav/preferences.cpp b/kresources/caldav/preferences.cpp index 87d9c972..10da60e0 100644 --- a/kresources/caldav/preferences.cpp +++ b/kresources/caldav/preferences.cpp @@ -99,8 +99,8 @@ void CalDavPrefs::removeWallet(bool noWallet) { } void CalDavPrefs::addPrefix(const TQString& prefix) { - KConfigSkeletonItem::List itemList = items(); - KConfigSkeletonItem::List::Iterator it; + TDEConfigSkeletonItem::List itemList = items(); + TDEConfigSkeletonItem::List::Iterator it; for ( it = itemList.begin(); it != itemList.end(); ++it ) { (*it)->setGroup( prefix + ':' + (*it)->group() ); diff --git a/kresources/caldav/preferences.h b/kresources/caldav/preferences.h index d21be84c..fe585406 100644 --- a/kresources/caldav/preferences.h +++ b/kresources/caldav/preferences.h @@ -100,7 +100,7 @@ public: protected: /** - * Add an unique prefix to KConfigGroup, so that different instances of the resource + * Add an unique prefix to TDEConfigGroup, so that different instances of the resource * can use the same config file. * @param prefix Unique prefix of the resource instance. */ diff --git a/kresources/caldav/resource.cpp b/kresources/caldav/resource.cpp index 0ec3ceb6..b9285e61 100644 --- a/kresources/caldav/resource.cpp +++ b/kresources/caldav/resource.cpp @@ -68,7 +68,7 @@ const int ResourceCalDav::DEFAULT_SAVE_POLICY = ResourceCached::SaveDelaye | CONSTRUCTOR / DESTRUCTOR ========================================================================*/ -ResourceCalDav::ResourceCalDav( const KConfig *config ) : +ResourceCalDav::ResourceCalDav( const TDEConfig *config ) : ResourceCached(config) , readLockout(false) , mAllWritesComplete(false) @@ -213,13 +213,13 @@ KABC::Lock* ResourceCalDav::lock() { return &mLock; } -void ResourceCalDav::readConfig( const KConfig *config ) { +void ResourceCalDav::readConfig( const TDEConfig *config ) { log("readConfig"); mPrefs->readConfig(); ResourceCached::readConfig(config); } -void ResourceCalDav::writeConfig( KConfig *config ) { +void ResourceCalDav::writeConfig( TDEConfig *config ) { log("writeConfig()"); ResourceCalendar::writeConfig(config); mPrefs->writeConfig(); diff --git a/kresources/caldav/resource.h b/kresources/caldav/resource.h index 67eaa6c0..ea04ef48 100644 --- a/kresources/caldav/resource.h +++ b/kresources/caldav/resource.h @@ -48,11 +48,11 @@ class KDE_EXPORT ResourceCalDav : public ResourceCached public: - explicit ResourceCalDav( const KConfig *config ); + explicit ResourceCalDav( const TDEConfig *config ); virtual ~ResourceCalDav(); - void readConfig( const KConfig *config ); - void writeConfig( KConfig *config ); + void readConfig( const TDEConfig *config ); + void writeConfig( TDEConfig *config ); /** * @return This resource preferences. diff --git a/kresources/carddav/preferences.cpp b/kresources/carddav/preferences.cpp index 17e0216a..5e46b611 100644 --- a/kresources/carddav/preferences.cpp +++ b/kresources/carddav/preferences.cpp @@ -98,8 +98,8 @@ void CardDavPrefs::removeWallet(bool noWallet) { } void CardDavPrefs::addPrefix(const TQString& prefix) { - KConfigSkeletonItem::List itemList = items(); - KConfigSkeletonItem::List::Iterator it; + TDEConfigSkeletonItem::List itemList = items(); + TDEConfigSkeletonItem::List::Iterator it; for ( it = itemList.begin(); it != itemList.end(); ++it ) { (*it)->setGroup( prefix + ':' + (*it)->group() ); diff --git a/kresources/carddav/preferences.h b/kresources/carddav/preferences.h index 0f074b4d..89a8ac58 100644 --- a/kresources/carddav/preferences.h +++ b/kresources/carddav/preferences.h @@ -91,7 +91,7 @@ public: protected: /** - * Add an unique prefix to KConfigGroup, so that different instances of the resource + * Add an unique prefix to TDEConfigGroup, so that different instances of the resource * can use the same config file. * @param prefix Unique prefix of the resource instance. */ diff --git a/kresources/carddav/resource.cpp b/kresources/carddav/resource.cpp index f416a64b..dae91c32 100644 --- a/kresources/carddav/resource.cpp +++ b/kresources/carddav/resource.cpp @@ -68,7 +68,7 @@ const int ResourceCardDav::DEFAULT_SAVE_POLICY = ResourceCached::SaveDelay | CONSTRUCTOR / DESTRUCTOR ========================================================================*/ -ResourceCardDav::ResourceCardDav( const KConfig *config ) : +ResourceCardDav::ResourceCardDav( const TDEConfig *config ) : ResourceCached(config) , readLockout(false) , mAllWritesComplete(false) @@ -217,14 +217,14 @@ KABC::Lock* ResourceCardDav::lock() { return &mLock; } -void ResourceCardDav::readConfig( const KConfig *config ) { +void ResourceCardDav::readConfig( const TDEConfig *config ) { log("readConfig"); mPrefs->readConfig(); // FIXME KABC //ResourceCached::readConfig(config); } -void ResourceCardDav::writeConfig( KConfig *config ) { +void ResourceCardDav::writeConfig( TDEConfig *config ) { log("writeConfig()"); Resource::writeConfig(config); mPrefs->writeConfig(); diff --git a/kresources/carddav/resource.h b/kresources/carddav/resource.h index ff4c4967..cf5090e5 100644 --- a/kresources/carddav/resource.h +++ b/kresources/carddav/resource.h @@ -47,11 +47,11 @@ class KDE_EXPORT ResourceCardDav : public ResourceCached public: - explicit ResourceCardDav( const KConfig *config ); + explicit ResourceCardDav( const TDEConfig *config ); virtual ~ResourceCardDav(); - void readConfig( const KConfig *config ); - void writeConfig( KConfig *config ); + void readConfig( const TDEConfig *config ); + void writeConfig( TDEConfig *config ); virtual Ticket *requestSaveTicket(); virtual void releaseSaveTicket( Ticket* ); diff --git a/kresources/egroupware/kabc_resourcexmlrpc.cpp b/kresources/egroupware/kabc_resourcexmlrpc.cpp index 222c4f4f..84e78382 100644 --- a/kresources/egroupware/kabc_resourcexmlrpc.cpp +++ b/kresources/egroupware/kabc_resourcexmlrpc.cpp @@ -57,7 +57,7 @@ static int rights( const KABC::Addressee &addr ) return addr.custom( "EGWRESOURCE", "RIGHTS" ).toInt(); } -ResourceXMLRPC::ResourceXMLRPC( const KConfig *config ) +ResourceXMLRPC::ResourceXMLRPC( const TDEConfig *config ) : ResourceCached( config ), mServer( 0 ) { init(); @@ -122,7 +122,7 @@ ResourceXMLRPC::~ResourceXMLRPC() mSynchronizer = 0; } -void ResourceXMLRPC::writeConfig( KConfig *config ) +void ResourceXMLRPC::writeConfig( TDEConfig *config ) { Resource::writeConfig( config ); diff --git a/kresources/egroupware/kabc_resourcexmlrpc.h b/kresources/egroupware/kabc_resourcexmlrpc.h index 93ba6650..d9b745aa 100644 --- a/kresources/egroupware/kabc_resourcexmlrpc.h +++ b/kresources/egroupware/kabc_resourcexmlrpc.h @@ -26,7 +26,7 @@ #include "libtdepim/kabcresourcecached.h" -class KConfig; +class TDEConfig; class Synchronizer; namespace KXMLRPC { @@ -43,12 +43,12 @@ class KDE_EXPORT ResourceXMLRPC : public ResourceCached public: - ResourceXMLRPC( const KConfig* ); + ResourceXMLRPC( const TDEConfig* ); ResourceXMLRPC( const TQString &url, const TQString &domain, const TQString &user, const TQString &password ); ~ResourceXMLRPC(); - virtual void writeConfig( KConfig* ); + virtual void writeConfig( TDEConfig* ); EGroupwarePrefs *prefs() const { return mPrefs; } diff --git a/kresources/egroupware/kcal_resourcexmlrpc.cpp b/kresources/egroupware/kcal_resourcexmlrpc.cpp index 8841da75..1224a27c 100644 --- a/kresources/egroupware/kcal_resourcexmlrpc.cpp +++ b/kresources/egroupware/kcal_resourcexmlrpc.cpp @@ -103,7 +103,7 @@ static int rights( Incidence *incidence ) return incidence->customProperty( "EGWRESOURCE", "RIGHTS" ).toInt(); } -ResourceXMLRPC::ResourceXMLRPC( const KConfig* config ) +ResourceXMLRPC::ResourceXMLRPC( const TDEConfig* config ) : ResourceCached( config ), mServer( 0 ), mLock( 0 ) { init(); @@ -164,14 +164,14 @@ void ResourceXMLRPC::initEGroupware() KURL url( mPrefs->url() ); } -void ResourceXMLRPC::readConfig( const KConfig* config ) +void ResourceXMLRPC::readConfig( const TDEConfig* config ) { mPrefs->readConfig(); ResourceCached::readConfig( config ); } -void ResourceXMLRPC::writeConfig( KConfig* config ) +void ResourceXMLRPC::writeConfig( TDEConfig* config ) { ResourceCalendar::writeConfig( config ); diff --git a/kresources/egroupware/kcal_resourcexmlrpc.h b/kresources/egroupware/kcal_resourcexmlrpc.h index de603307..5253baba 100644 --- a/kresources/egroupware/kcal_resourcexmlrpc.h +++ b/kresources/egroupware/kcal_resourcexmlrpc.h @@ -56,12 +56,12 @@ class KDE_EXPORT ResourceXMLRPC : public ResourceCached public: - ResourceXMLRPC( const KConfig* ); + ResourceXMLRPC( const TDEConfig* ); ResourceXMLRPC(); virtual ~ResourceXMLRPC(); - void readConfig( const KConfig* config ); - void writeConfig( KConfig* config ); + void readConfig( const TDEConfig* config ); + void writeConfig( TDEConfig* config ); EGroupwarePrefs *prefs() const { return mPrefs; } diff --git a/kresources/egroupware/knotes_resourcexmlrpc.cpp b/kresources/egroupware/knotes_resourcexmlrpc.cpp index c9a9a1bf..1b19831b 100644 --- a/kresources/egroupware/knotes_resourcexmlrpc.cpp +++ b/kresources/egroupware/knotes_resourcexmlrpc.cpp @@ -49,7 +49,7 @@ static const TQString AddNoteCommand = "infolog.boinfolog.write"; static const TQString DeleteNoteCommand = "infolog.boinfolog.delete"; static const TQString LoadNoteCategoriesCommand = "infolog.boinfolog.categories"; -ResourceXMLRPC::ResourceXMLRPC( const KConfig* config ) +ResourceXMLRPC::ResourceXMLRPC( const TDEConfig* config ) : ResourceNotes( config ), mCalendar( TQString::fromLatin1("UTC") ), mServer( 0 ) { @@ -94,12 +94,12 @@ void ResourceXMLRPC::init() mSynchronizer = new Synchronizer; } -void ResourceXMLRPC::readConfig( const KConfig* ) +void ResourceXMLRPC::readConfig( const TDEConfig* ) { mPrefs->readConfig(); } -void ResourceXMLRPC::writeConfig( KConfig* config ) +void ResourceXMLRPC::writeConfig( TDEConfig* config ) { ResourceNotes::writeConfig( config ); diff --git a/kresources/egroupware/knotes_resourcexmlrpc.h b/kresources/egroupware/knotes_resourcexmlrpc.h index c7bee901..df8a4dd3 100644 --- a/kresources/egroupware/knotes_resourcexmlrpc.h +++ b/kresources/egroupware/knotes_resourcexmlrpc.h @@ -52,12 +52,12 @@ class KDE_EXPORT ResourceXMLRPC : public ResourceNotes public: - ResourceXMLRPC( const KConfig* ); + ResourceXMLRPC( const TDEConfig* ); ResourceXMLRPC(); virtual ~ResourceXMLRPC(); - void readConfig( const KConfig* config ); - void writeConfig( KConfig* config ); + void readConfig( const TDEConfig* config ); + void writeConfig( TDEConfig* config ); EGroupwarePrefs *prefs() const { return mPrefs; } diff --git a/kresources/egroupware/synchronizer.h b/kresources/egroupware/synchronizer.h index 97270e31..e9183bd2 100644 --- a/kresources/egroupware/synchronizer.h +++ b/kresources/egroupware/synchronizer.h @@ -36,15 +36,15 @@ ... - job = KIO::file_copy( url, file, -1, true ); - connect( job, TQT_SIGNAL( result( KIO::Job * ) ), - TQT_SLOT( slotResult( KIO::Job * ) ) ); + job = TDEIO::file_copy( url, file, -1, true ); + connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), + TQT_SLOT( slotResult( TDEIO::Job * ) ) ); mSynchronizer.start(); // will block here until the slot was called ... - void slotResult( KIO::Job* ) + void slotResult( TDEIO::Job* ) { mSynchronizer.stop(); } diff --git a/kresources/egroupware/xmlrpciface.cpp b/kresources/egroupware/xmlrpciface.cpp index fd12d174..d43613e6 100644 --- a/kresources/egroupware/xmlrpciface.cpp +++ b/kresources/egroupware/xmlrpciface.cpp @@ -69,7 +69,7 @@ void Query::call( const TQString &server, const TQString &method, TQDataStream stream( postData, IO_WriteOnly ); stream.writeRawBytes( xmlMarkup.utf8(), xmlMarkup.utf8().length() ); - KIO::TransferJob *job = KIO::http_post( KURL( server ), postData, false ); + TDEIO::TransferJob *job = TDEIO::http_post( KURL( server ), postData, false ); if ( !job ) { kdWarning() << "Unable to create KIO job for " << server << endl; return; @@ -78,22 +78,22 @@ void Query::call( const TQString &server, const TQString &method, job->addMetaData( "content-type", "Content-Type: text/xml; charset=utf-8" ); job->addMetaData( "ConnectTimeout", "50" ); - connect( job, TQT_SIGNAL( data( KIO::Job *, const TQByteArray & ) ), - this, TQT_SLOT( slotData( KIO::Job *, const TQByteArray & ) ) ); - connect( job, TQT_SIGNAL( result( KIO::Job * ) ), - this, TQT_SLOT( slotResult( KIO::Job * ) ) ); + connect( job, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), + this, TQT_SLOT( slotData( TDEIO::Job *, const TQByteArray & ) ) ); + connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), + this, TQT_SLOT( slotResult( TDEIO::Job * ) ) ); m_pendingJobs.append( job ); } -void Query::slotData( KIO::Job *, const TQByteArray &data ) +void Query::slotData( TDEIO::Job *, const TQByteArray &data ) { unsigned int oldSize = m_buffer.size(); m_buffer.resize( oldSize + data.size() ); memcpy( m_buffer.data() + oldSize, data.data(), data.size() ); } -void Query::slotResult( KIO::Job *job ) +void Query::slotResult( TDEIO::Job *job ) { m_pendingJobs.remove( job ); @@ -316,7 +316,7 @@ Query::Query( const TQVariant &id, TQObject *parent, const char *name ) Query::~Query() { - TQValueList<KIO::Job*>::Iterator it; + TQValueList<TDEIO::Job*>::Iterator it; for ( it = m_pendingJobs.begin(); it != m_pendingJobs.end(); ++it ) (*it)->kill(); } diff --git a/kresources/egroupware/xmlrpciface.h b/kresources/egroupware/xmlrpciface.h index 395cf237..df2f3a6d 100644 --- a/kresources/egroupware/xmlrpciface.h +++ b/kresources/egroupware/xmlrpciface.h @@ -18,7 +18,7 @@ #include <tqvariant.h> #include <tqvaluelist.h> -namespace KIO +namespace TDEIO { class Job; } @@ -51,8 +51,8 @@ namespace KXMLRPC void finished( Query* ); private slots: - void slotData( KIO::Job *job, const TQByteArray &data ); - void slotResult( KIO::Job *job ); + void slotData( TDEIO::Job *job, const TQByteArray &data ); + void slotResult( TDEIO::Job *job ); private: bool isMessageResponse( const TQDomDocument &doc ) const; @@ -72,7 +72,7 @@ namespace KXMLRPC TQByteArray m_buffer; TQVariant m_id; - TQValueList<KIO::Job*> m_pendingJobs; + TQValueList<TDEIO::Job*> m_pendingJobs; }; class Server : public TQObject diff --git a/kresources/exchange/resourceexchange.cpp b/kresources/exchange/resourceexchange.cpp index eb90b8c4..1f6779a8 100644 --- a/kresources/exchange/resourceexchange.cpp +++ b/kresources/exchange/resourceexchange.cpp @@ -72,7 +72,7 @@ public: long updateWatch; }; -ResourceExchange::ResourceExchange( const KConfig *config ) +ResourceExchange::ResourceExchange( const TDEConfig *config ) : ResourceCalendar( config ), mClient(0), mMonitor(0), mCache(0), mDates(0), mEventDates(0), mCacheDates(0) { @@ -106,7 +106,7 @@ ResourceExchange::~ResourceExchange() delete mAccount; mAccount = 0; } -void ResourceExchange::writeConfig( KConfig* config ) +void ResourceExchange::writeConfig( TDEConfig* config ) { ResourceCalendar::writeConfig( config ); config->writeEntry( "ExchangeHost", mAccount->host() ); diff --git a/kresources/exchange/resourceexchange.h b/kresources/exchange/resourceexchange.h index b59b6656..9b414dbb 100644 --- a/kresources/exchange/resourceexchange.h +++ b/kresources/exchange/resourceexchange.h @@ -51,10 +51,10 @@ class ResourceExchange : public ResourceCalendar, public IncidenceBase::Observer public: - ResourceExchange( const KConfig * ); + ResourceExchange( const TDEConfig * ); virtual ~ResourceExchange(); - virtual void writeConfig( KConfig* config ); + virtual void writeConfig( TDEConfig* config ); KABC::Lock *lock(); diff --git a/kresources/featureplan/kcal_resourcefeatureplan.cpp b/kresources/featureplan/kcal_resourcefeatureplan.cpp index 349e4ad5..762bee1f 100644 --- a/kresources/featureplan/kcal_resourcefeatureplan.cpp +++ b/kresources/featureplan/kcal_resourcefeatureplan.cpp @@ -43,7 +43,7 @@ using namespace KCal; -ResourceFeaturePlan::ResourceFeaturePlan( const KConfig *config ) +ResourceFeaturePlan::ResourceFeaturePlan( const TDEConfig *config ) : ResourceCached( config ), mLock( true ) { mPrefs = new Prefs; @@ -60,12 +60,12 @@ Prefs *ResourceFeaturePlan::prefs() return mPrefs; } -void ResourceFeaturePlan::readConfig( const KConfig * ) +void ResourceFeaturePlan::readConfig( const TDEConfig * ) { mPrefs->readConfig(); } -void ResourceFeaturePlan::writeConfig( KConfig *config ) +void ResourceFeaturePlan::writeConfig( TDEConfig *config ) { ResourceCalendar::writeConfig( config ); diff --git a/kresources/featureplan/kcal_resourcefeatureplan.h b/kresources/featureplan/kcal_resourcefeatureplan.h index 0e666704..2808aef7 100644 --- a/kresources/featureplan/kcal_resourcefeatureplan.h +++ b/kresources/featureplan/kcal_resourcefeatureplan.h @@ -42,11 +42,11 @@ class KDE_EXPORT ResourceFeaturePlan : public ResourceCached Q_OBJECT public: - ResourceFeaturePlan( const KConfig * ); + ResourceFeaturePlan( const TDEConfig * ); virtual ~ResourceFeaturePlan(); - void readConfig( const KConfig *config ); - void writeConfig( KConfig *config ); + void readConfig( const TDEConfig *config ); + void writeConfig( TDEConfig *config ); Prefs *prefs(); diff --git a/kresources/groupdav/groupdavaddressbookadaptor.h b/kresources/groupdav/groupdavaddressbookadaptor.h index 7a716800..425c6371 100644 --- a/kresources/groupdav/groupdavaddressbookadaptor.h +++ b/kresources/groupdav/groupdavaddressbookadaptor.h @@ -47,20 +47,20 @@ class GroupDavAddressBookAdaptor : public DavAddressBookAdaptor // Creating Jobs - KIO::Job *createListFoldersJob( const KURL &url ) + TDEIO::Job *createListFoldersJob( const KURL &url ) { return GroupDavGlobals::createListFoldersJob( url ); } - KIO::TransferJob *createListItemsJob( const KURL &url ) + TDEIO::TransferJob *createListItemsJob( const KURL &url ) { return GroupDavGlobals::createListItemsJob( url ); } - KIO::TransferJob *createDownloadJob( const KURL &url, KPIM::FolderLister::ContentType ctype ) + TDEIO::TransferJob *createDownloadJob( const KURL &url, KPIM::FolderLister::ContentType ctype ) { return GroupDavGlobals::createDownloadJob( this, url, ctype ); } - KIO::Job *createRemoveJob( const KURL &uploadurl, KPIM::GroupwareUploadItem *deletedItem ) + TDEIO::Job *createRemoveJob( const KURL &uploadurl, KPIM::GroupwareUploadItem *deletedItem ) { return GroupDavGlobals::createRemoveJob( this, uploadurl, deletedItem ); } // Interpreting Jobs - bool interpretListItemsJob( KIO::Job *job, const TQString &/*jobData*/ ) + bool interpretListItemsJob( TDEIO::Job *job, const TQString &/*jobData*/ ) { return GroupDavGlobals::interpretListItemsJob( this, job ); } - bool interpretDownloadItemsJob( KIO::Job *job, const TQString &jobData ) + bool interpretDownloadItemsJob( TDEIO::Job *job, const TQString &jobData ) { return GroupDavGlobals::interpretAddressBookDownloadItemsJob( this, job, jobData ); } diff --git a/kresources/groupdav/groupdavcalendaradaptor.h b/kresources/groupdav/groupdavcalendaradaptor.h index 15b41de8..b1a0bd36 100644 --- a/kresources/groupdav/groupdavcalendaradaptor.h +++ b/kresources/groupdav/groupdavcalendaradaptor.h @@ -30,7 +30,7 @@ #include <kurl.h> -namespace KIO { +namespace TDEIO { class Job; } @@ -56,20 +56,20 @@ class GroupDavCalendarAdaptor : public DavCalendarAdaptor // Creating Jobs - KIO::Job *createListFoldersJob( const KURL &url ) + TDEIO::Job *createListFoldersJob( const KURL &url ) { return GroupDavGlobals::createListFoldersJob( url ); } - KIO::TransferJob *createListItemsJob( const KURL &url ) + TDEIO::TransferJob *createListItemsJob( const KURL &url ) { return GroupDavGlobals::createListItemsJob( url ); } - KIO::TransferJob *createDownloadJob( const KURL &url, KPIM::FolderLister::ContentType ctype ) + TDEIO::TransferJob *createDownloadJob( const KURL &url, KPIM::FolderLister::ContentType ctype ) { return GroupDavGlobals::createDownloadJob( this, url, ctype ); } - KIO::Job *createRemoveJob( const KURL &uploadurl, KPIM::GroupwareUploadItem *deletedItem ) + TDEIO::Job *createRemoveJob( const KURL &uploadurl, KPIM::GroupwareUploadItem *deletedItem ) { return GroupDavGlobals::createRemoveJob( this, uploadurl, deletedItem ); } // Interpreting Jobs - bool interpretListItemsJob( KIO::Job *job, const TQString &/*jobData*/ ) + bool interpretListItemsJob( TDEIO::Job *job, const TQString &/*jobData*/ ) { return GroupDavGlobals::interpretListItemsJob( this, job ); } - bool interpretDownloadItemsJob( KIO::Job *job, const TQString &jobData ) + bool interpretDownloadItemsJob( TDEIO::Job *job, const TQString &jobData ) { return GroupDavGlobals::interpretCalendarDownloadItemsJob( this, job, jobData ); } diff --git a/kresources/groupdav/groupdavglobals.cpp b/kresources/groupdav/groupdavglobals.cpp index 896680e9..5088bca9 100644 --- a/kresources/groupdav/groupdavglobals.cpp +++ b/kresources/groupdav/groupdavglobals.cpp @@ -37,7 +37,7 @@ #include <kio/davjob.h> #include <kio/job.h> -TQString GroupDavGlobals::extractFingerprint( KIO::Job *job, const TQString &/*jobData*/ ) +TQString GroupDavGlobals::extractFingerprint( TDEIO::Job *job, const TQString &/*jobData*/ ) { const TQString& headers = job->queryMetaData( "HTTP-Headers" ); return WebdavHandler::getEtagFromHeaders( headers ); @@ -93,7 +93,7 @@ bool GroupDavGlobals::getFolderHasSubs( const TQDomNode &folderNode ) -KIO::Job *GroupDavGlobals::createListFoldersJob( const KURL &url ) +TDEIO::Job *GroupDavGlobals::createListFoldersJob( const KURL &url ) { TQDomDocument doc; TQDomElement root = WebdavHandler::addDavElement( doc, doc, "d:propfind" ); @@ -103,11 +103,11 @@ KIO::Job *GroupDavGlobals::createListFoldersJob( const KURL &url ) // WebdavHandler::addElement( doc, prop, "d:hassubs" ); kdDebug(7000) << "props: " << doc.toString() << endl; - return KIO::davPropFind( url, doc, "1", false ); + return TDEIO::davPropFind( url, doc, "1", false ); } -KIO::TransferJob *GroupDavGlobals::createListItemsJob( const KURL &url ) +TDEIO::TransferJob *GroupDavGlobals::createListItemsJob( const KURL &url ) { TQDomDocument doc; TQDomElement root = WebdavHandler::addDavElement( doc, doc, "propfind" ); @@ -115,7 +115,7 @@ KIO::TransferJob *GroupDavGlobals::createListItemsJob( const KURL &url ) WebdavHandler::addDavElement( doc, prop, "getetag" ); // WebdavHandler::addDavElement( doc, prop, "getcontenttype" ); kdDebug(5800) << "props = "<< doc.toString() << endl; - KIO::TransferJob *job = KIO::davPropFind( url, doc, "1", false ); + TDEIO::TransferJob *job = TDEIO::davPropFind( url, doc, "1", false ); if ( job ) { job->addMetaData( "accept", "text/xml" ); job->addMetaData( "customHTTPHeader", "accept-encoding: " ); @@ -124,11 +124,11 @@ KIO::TransferJob *GroupDavGlobals::createListItemsJob( const KURL &url ) } -KIO::TransferJob *GroupDavGlobals::createDownloadJob( KPIM::GroupwareDataAdaptor *adaptor, +TDEIO::TransferJob *GroupDavGlobals::createDownloadJob( KPIM::GroupwareDataAdaptor *adaptor, const KURL &url, KPIM::FolderLister::ContentType /*ctype*/ ) { kdDebug()<<"GroupDavGlobals::createDownloadJob, url="<<url.url()<<endl; - KIO::TransferJob *job = KIO::get( url, false, false ); + TDEIO::TransferJob *job = TDEIO::get( url, false, false ); if ( adaptor ) { TQString mt = adaptor->mimeType(); job->addMetaData( "accept", mt ); @@ -138,7 +138,7 @@ kdDebug()<<"GroupDavGlobals::createDownloadJob, url="<<url.url()<<endl; } -KIO::Job *GroupDavGlobals::createRemoveJob( KPIM::GroupwareDataAdaptor *adaptor, const KURL &/*uploadurl*/, +TDEIO::Job *GroupDavGlobals::createRemoveJob( KPIM::GroupwareDataAdaptor *adaptor, const KURL &/*uploadurl*/, KPIM::GroupwareUploadItem *deletedItem ) { if ( !deletedItem ) return 0; @@ -147,10 +147,10 @@ KIO::Job *GroupDavGlobals::createRemoveJob( KPIM::GroupwareDataAdaptor *adaptor, if ( adaptor ) { adaptor->adaptUploadUrl( url ); } - KIO::Job *delJob = 0; + TDEIO::Job *delJob = 0; if ( !url.isEmpty() ) { kdDebug(5700) << "Delete: " << url.url() << endl; - delJob = KIO::file_delete( url, false ); + delJob = TDEIO::file_delete( url, false ); } if ( delJob && adaptor && adaptor->idMapper() ) { kdDebug(5800 ) << "Adding If-Match metadata: " << adaptor->idMapper()->fingerprint( deletedItem->uid() ) << endl; @@ -176,16 +176,16 @@ kdDebug() << "Deleting item at "<< url.url() << endl; } kdDebug(5700) << "Delete (Mod) : " << url.url() << endl; } - return KIO::file_del( urls, false, false );*/ + return TDEIO::file_del( urls, false, false );*/ } bool GroupDavGlobals::interpretListItemsJob( KPIM::GroupwareDataAdaptor *adaptor, - KIO::Job *job ) + TDEIO::Job *job ) { - KIO::DavJob *davjob = dynamic_cast<KIO::DavJob *>(job); + TDEIO::DavJob *davjob = dynamic_cast<TDEIO::DavJob *>(job); if ( !davjob ) { return false; @@ -225,7 +225,7 @@ bool GroupDavGlobals::interpretListItemsJob( KPIM::GroupwareDataAdaptor *adaptor bool GroupDavGlobals::interpretCalendarDownloadItemsJob( KCal::CalendarAdaptor *adaptor, - KIO::Job *job, const TQString &jobData ) + TDEIO::Job *job, const TQString &jobData ) { kdDebug(5800) << "GroupDavGlobals::interpretCalendarDownloadItemsJob, iCalendar=" << endl; kdDebug(5800) << jobData << endl; @@ -244,7 +244,7 @@ kdDebug(5800) << jobData << endl; KCal::Incidence *inc = (raw.front())->clone(); if ( !inc ) return false; - KIO::SimpleJob *sjob = dynamic_cast<KIO::SimpleJob *>(job); + TDEIO::SimpleJob *sjob = dynamic_cast<TDEIO::SimpleJob *>(job); KURL remoteId; if ( sjob ) remoteId = sjob->url(); TQString fingerprint = extractFingerprint( job, jobData ); @@ -259,7 +259,7 @@ kdDebug(5800) << jobData << endl; bool GroupDavGlobals::interpretAddressBookDownloadItemsJob( - KABC::AddressBookAdaptor *adaptor, KIO::Job *job, const TQString &jobData ) + KABC::AddressBookAdaptor *adaptor, TDEIO::Job *job, const TQString &jobData ) { kdDebug(5800) << "GroupDavGlobals::interpretAddressBookDownloadItemsJob, vCard=" << endl; kdDebug(5800) << jobData << endl; @@ -275,7 +275,7 @@ kdDebug(5800) << jobData << endl; KABC::Addressee a = addrs.first(); - KIO::SimpleJob *sjob = dynamic_cast<KIO::SimpleJob*>(job); + TDEIO::SimpleJob *sjob = dynamic_cast<TDEIO::SimpleJob*>(job); KURL remoteId; if ( sjob ) remoteId = sjob->url(); TQString fingerprint = extractFingerprint( job, jobData ); diff --git a/kresources/groupdav/groupdavglobals.h b/kresources/groupdav/groupdavglobals.h index 14ae7a3c..e7f2b06e 100644 --- a/kresources/groupdav/groupdavglobals.h +++ b/kresources/groupdav/groupdavglobals.h @@ -32,7 +32,7 @@ namespace KPIM { class GroupwareDataAdaptor; class GroupwareUploadItem; } -namespace KIO { +namespace TDEIO { class TransferJob; class Job; } @@ -47,26 +47,26 @@ class GroupDavGlobals { public: GroupDavGlobals() {} - static TQString extractFingerprint( KIO::Job *job, const TQString &/*jobData*/ ); + static TQString extractFingerprint( TDEIO::Job *job, const TQString &/*jobData*/ ); static KPIM::FolderLister::ContentType getContentType( const TQDomElement &prop ); static KPIM::FolderLister::ContentType getContentType( const TQDomNode &folderNode ); static bool getFolderHasSubs( const TQDomNode &folderNode ); - static KIO::Job *createListFoldersJob( const KURL &url ); - static KIO::TransferJob *createListItemsJob( const KURL &url ); - static KIO::TransferJob *createDownloadJob( KPIM::GroupwareDataAdaptor *adaptor, + static TDEIO::Job *createListFoldersJob( const KURL &url ); + static TDEIO::TransferJob *createListItemsJob( const KURL &url ); + static TDEIO::TransferJob *createDownloadJob( KPIM::GroupwareDataAdaptor *adaptor, const KURL &url, KPIM::FolderLister::ContentType ctype ); - static KIO::Job *createRemoveJob( KPIM::GroupwareDataAdaptor *adaptor, const KURL &uploadurl, + static TDEIO::Job *createRemoveJob( KPIM::GroupwareDataAdaptor *adaptor, const KURL &uploadurl, KPIM::GroupwareUploadItem *deletedItems ); static bool interpretListItemsJob( KPIM::GroupwareDataAdaptor *adaptor, - KIO::Job *job ); + TDEIO::Job *job ); static bool interpretCalendarDownloadItemsJob( KCal::CalendarAdaptor *adaptor, - KIO::Job *job, const TQString &jobData ); + TDEIO::Job *job, const TQString &jobData ); static bool interpretAddressBookDownloadItemsJob( KABC::AddressBookAdaptor *adaptor, - KIO::Job *job, const TQString &jobData ); + TDEIO::Job *job, const TQString &jobData ); }; diff --git a/kresources/groupdav/kabc_resourcegroupdav.cpp b/kresources/groupdav/kabc_resourcegroupdav.cpp index 568f6fc5..54a02a0a 100644 --- a/kresources/groupdav/kabc_resourcegroupdav.cpp +++ b/kresources/groupdav/kabc_resourcegroupdav.cpp @@ -27,7 +27,7 @@ using namespace KABC; -ResourceGroupDav::ResourceGroupDav( const KConfig *config ) +ResourceGroupDav::ResourceGroupDav( const TDEConfig *config ) : ResourceGroupwareBase( config ) { init(); diff --git a/kresources/groupdav/kabc_resourcegroupdav.h b/kresources/groupdav/kabc_resourcegroupdav.h index 662af282..ca7ed96d 100644 --- a/kresources/groupdav/kabc_resourcegroupdav.h +++ b/kresources/groupdav/kabc_resourcegroupdav.h @@ -33,7 +33,7 @@ class KDE_EXPORT ResourceGroupDav : public ResourceGroupwareBase public: - ResourceGroupDav( const KConfig * ); + ResourceGroupDav( const TDEConfig * ); // ResourceGroupDav( const KURL &url, // const TQString &user, const TQString &password ); protected: diff --git a/kresources/groupdav/kcal_resourcegroupdav.cpp b/kresources/groupdav/kcal_resourcegroupdav.cpp index eef95c6e..b93ba769 100644 --- a/kresources/groupdav/kcal_resourcegroupdav.cpp +++ b/kresources/groupdav/kcal_resourcegroupdav.cpp @@ -32,7 +32,7 @@ ResourceGroupDav::ResourceGroupDav() init(); } -ResourceGroupDav::ResourceGroupDav( const KConfig *config ) +ResourceGroupDav::ResourceGroupDav( const TDEConfig *config ) : ResourceGroupwareBase( config ) { init(); diff --git a/kresources/groupdav/kcal_resourcegroupdav.h b/kresources/groupdav/kcal_resourcegroupdav.h index 102a5021..dba9bd27 100644 --- a/kresources/groupdav/kcal_resourcegroupdav.h +++ b/kresources/groupdav/kcal_resourcegroupdav.h @@ -37,7 +37,7 @@ class KDE_EXPORT ResourceGroupDav : public ResourceGroupwareBase public: ResourceGroupDav(); - ResourceGroupDav( const KConfig * ); + ResourceGroupDav( const TDEConfig * ); protected: void init(); diff --git a/kresources/groupware/kabc_resourcegroupware.cpp b/kresources/groupware/kabc_resourcegroupware.cpp index c7950bcb..3c9d9792 100644 --- a/kresources/groupware/kabc_resourcegroupware.cpp +++ b/kresources/groupware/kabc_resourcegroupware.cpp @@ -34,7 +34,7 @@ using namespace KABC; -ResourceGroupware::ResourceGroupware( const KConfig *config ) +ResourceGroupware::ResourceGroupware( const TDEConfig *config ) : ResourceCached( config ) { init(); @@ -78,14 +78,14 @@ ResourceGroupware::~ResourceGroupware() mPrefs = 0; } -void ResourceGroupware::readConfig( const KConfig * ) +void ResourceGroupware::readConfig( const TDEConfig * ) { mPrefs->readConfig(); readAddressBooks(); } -void ResourceGroupware::writeConfig( KConfig *config ) +void ResourceGroupware::writeConfig( TDEConfig *config ) { Resource::writeConfig( config ); @@ -244,12 +244,12 @@ bool ResourceGroupware::asyncLoad() mJobData = TQString(); mDownloadJob = KPIM::GroupwareJob::getAddressBook( url ); - connect( mDownloadJob, TQT_SIGNAL( result( KIO::Job * ) ), - TQT_SLOT( slotJobResult( KIO::Job * ) ) ); - connect( mDownloadJob, TQT_SIGNAL( data( KIO::Job *, const TQByteArray & ) ), - TQT_SLOT( slotJobData( KIO::Job *, const TQByteArray & ) ) ); - connect( mDownloadJob, TQT_SIGNAL( percent( KIO::Job *, unsigned long ) ), - TQT_SLOT( slotJobPercent( KIO::Job *, unsigned long ) ) ); + connect( mDownloadJob, TQT_SIGNAL( result( TDEIO::Job * ) ), + TQT_SLOT( slotJobResult( TDEIO::Job * ) ) ); + connect( mDownloadJob, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), + TQT_SLOT( slotJobData( TDEIO::Job *, const TQByteArray & ) ) ); + connect( mDownloadJob, TQT_SIGNAL( percent( TDEIO::Job *, unsigned long ) ), + TQT_SLOT( slotJobPercent( TDEIO::Job *, unsigned long ) ) ); mProgress = KPIM::ProgressManager::instance()->createProgressItem( KPIM::ProgressManager::getUniqueID(), i18n("Downloading addressbook") ); @@ -300,7 +300,7 @@ bool ResourceGroupware::asyncSave( Ticket* ) return true; } -void ResourceGroupware::slotJobResult( KIO::Job *job ) +void ResourceGroupware::slotJobResult( TDEIO::Job *job ) { kdDebug() << "ResourceGroupware::slotJobResult(): " << endl; @@ -341,14 +341,14 @@ void ResourceGroupware::slotJobResult( KIO::Job *job ) mProgress = 0; } -void ResourceGroupware::slotJobData( KIO::Job *, const TQByteArray &data ) +void ResourceGroupware::slotJobData( TDEIO::Job *, const TQByteArray &data ) { // kdDebug() << "ResourceGroupware::slotJobData()" << endl; mJobData.append( data.data() ); } -void ResourceGroupware::slotJobPercent( KIO::Job *, unsigned long percent ) +void ResourceGroupware::slotJobPercent( TDEIO::Job *, unsigned long percent ) { kdDebug() << "ResourceGroupware::slotJobPercent() " << percent << endl; if ( mProgress ) mProgress->setProgress( percent ); diff --git a/kresources/groupware/kabc_resourcegroupware.h b/kresources/groupware/kabc_resourcegroupware.h index 995301fc..53c1d007 100644 --- a/kresources/groupware/kabc_resourcegroupware.h +++ b/kresources/groupware/kabc_resourcegroupware.h @@ -26,7 +26,7 @@ #include <kio/job.h> -class KConfig; +class TDEConfig; namespace KABC { @@ -38,13 +38,13 @@ class ResourceGroupware : public ResourceCached public: - ResourceGroupware( const KConfig * ); + ResourceGroupware( const TDEConfig * ); ResourceGroupware( const KURL &url, const TQString &user, const TQString &password ); ~ResourceGroupware(); - void readConfig( const KConfig * ); - void writeConfig( KConfig * ); + void readConfig( const TDEConfig * ); + void writeConfig( TDEConfig * ); void readAddressBooks(); void writeAddressBooks(); @@ -68,16 +68,16 @@ class ResourceGroupware : public ResourceCached void init(); private slots: - void slotJobResult( KIO::Job * ); - void slotJobData( KIO::Job *, const TQByteArray & ); - void slotJobPercent( KIO::Job *job, unsigned long percent ); + void slotJobResult( TDEIO::Job * ); + void slotJobData( TDEIO::Job *, const TQByteArray & ); + void slotJobPercent( TDEIO::Job *job, unsigned long percent ); void cancelLoad(); private: GroupwarePrefs *mPrefs; - KIO::TransferJob *mDownloadJob; + TDEIO::TransferJob *mDownloadJob; KPIM::ProgressItem *mProgress; TQString mJobData; }; diff --git a/kresources/groupware/kcal_resourcegroupware.cpp b/kresources/groupware/kcal_resourcegroupware.cpp index 6af5dce2..79658bb6 100644 --- a/kresources/groupware/kcal_resourcegroupware.cpp +++ b/kresources/groupware/kcal_resourcegroupware.cpp @@ -55,7 +55,7 @@ ResourceGroupware::ResourceGroupware() mPrefs->addGroupPrefix( identifier() ); } -ResourceGroupware::ResourceGroupware( const KConfig *config ) +ResourceGroupware::ResourceGroupware( const TDEConfig *config ) : ResourceCached( config ), mLock( true ) { init(); @@ -96,7 +96,7 @@ GroupwarePrefsBase *ResourceGroupware::prefs() return mPrefs; } -void ResourceGroupware::readConfig( const KConfig *config ) +void ResourceGroupware::readConfig( const TDEConfig *config ) { kdDebug() << "KCal::ResourceGroupware::readConfig()" << endl; @@ -105,7 +105,7 @@ void ResourceGroupware::readConfig( const KConfig *config ) ResourceCached::readConfig( config ); } -void ResourceGroupware::writeConfig( KConfig *config ) +void ResourceGroupware::writeConfig( TDEConfig *config ) { kdDebug() << "KCal::ResourceGroupware::writeConfig()" << endl; @@ -159,10 +159,10 @@ bool ResourceGroupware::doLoad() mJobData = TQString(); mDownloadJob = KPIM::GroupwareJob::getCalendar( url ); - connect( mDownloadJob, TQT_SIGNAL( result( KIO::Job * ) ), - TQT_SLOT( slotJobResult( KIO::Job * ) ) ); - connect( mDownloadJob, TQT_SIGNAL( data( KIO::Job *, const TQByteArray & ) ), - TQT_SLOT( slotJobData( KIO::Job *, const TQByteArray & ) ) ); + connect( mDownloadJob, TQT_SIGNAL( result( TDEIO::Job * ) ), + TQT_SLOT( slotJobResult( TDEIO::Job * ) ) ); + connect( mDownloadJob, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), + TQT_SLOT( slotJobData( TDEIO::Job *, const TQByteArray & ) ) ); mProgress = KPIM::ProgressManager::instance()->createProgressItem( KPIM::ProgressManager::getUniqueID(), i18n("Downloading calendar") ); @@ -173,7 +173,7 @@ bool ResourceGroupware::doLoad() return true; } -void ResourceGroupware::slotJobResult( KIO::Job *job ) +void ResourceGroupware::slotJobResult( TDEIO::Job *job ) { kdDebug() << "ResourceGroupware::slotJobResult(): " << endl; @@ -221,7 +221,7 @@ void ResourceGroupware::slotJobResult( KIO::Job *job ) mProgress = 0; } -void ResourceGroupware::slotJobData( KIO::Job *, const TQByteArray &data ) +void ResourceGroupware::slotJobData( TDEIO::Job *, const TQByteArray &data ) { // kdDebug() << "ResourceGroupware::slotJobData()" << endl; diff --git a/kresources/groupware/kcal_resourcegroupware.h b/kresources/groupware/kcal_resourcegroupware.h index 9674b0bf..d3c809db 100644 --- a/kresources/groupware/kcal_resourcegroupware.h +++ b/kresources/groupware/kcal_resourcegroupware.h @@ -46,11 +46,11 @@ class ResourceGroupware : public ResourceCached public: ResourceGroupware(); - ResourceGroupware( const KConfig * ); + ResourceGroupware( const TDEConfig * ); virtual ~ResourceGroupware(); - void readConfig( const KConfig *config ); - void writeConfig( KConfig *config ); + void readConfig( const TDEConfig *config ); + void writeConfig( TDEConfig *config ); GroupwarePrefsBase *prefs(); @@ -70,8 +70,8 @@ class ResourceGroupware : public ResourceCached protected slots: void loadFinished(); - void slotJobResult( KIO::Job * ); - void slotJobData( KIO::Job *, const TQByteArray & ); + void slotJobResult( TDEIO::Job * ); + void slotJobData( TDEIO::Job *, const TQByteArray & ); void cancelLoad(); @@ -79,7 +79,7 @@ class ResourceGroupware : public ResourceCached GroupwarePrefsBase *mPrefs; KABC::LockNull mLock; - KIO::TransferJob *mDownloadJob; + TDEIO::TransferJob *mDownloadJob; KPIM::ProgressItem *mProgress; TQString mJobData; diff --git a/kresources/groupwise/kabc_resourcegroupwise.cpp b/kresources/groupwise/kabc_resourcegroupwise.cpp index d14d1a41..b3930bfb 100644 --- a/kresources/groupwise/kabc_resourcegroupwise.cpp +++ b/kresources/groupwise/kabc_resourcegroupwise.cpp @@ -33,7 +33,7 @@ using namespace KABC; -ResourceGroupwise::ResourceGroupwise( const KConfig *config ) +ResourceGroupwise::ResourceGroupwise( const TDEConfig *config ) : ResourceCached( config ) { init(); @@ -95,14 +95,14 @@ ResourceGroupwise::~ResourceGroupwise() mPrefs = 0; } -void ResourceGroupwise::readConfig( const KConfig * ) +void ResourceGroupwise::readConfig( const TDEConfig * ) { mPrefs->readConfig(); readAddressBooks(); } -void ResourceGroupwise::writeConfig( KConfig *config ) +void ResourceGroupwise::writeConfig( TDEConfig *config ) { Resource::writeConfig( config ); @@ -346,18 +346,18 @@ void ResourceGroupwise::fetchAddressBooks( const BookType bookType ) return; } - mJob = KIO::get( url, false, false ); // TODO: make the GW jobs call finished if the URL + mJob = TDEIO::get( url, false, false ); // TODO: make the GW jobs call finished if the URL // contains no address book IDs kdDebug() << " Job address: " << mJob << endl; - connect( mJob, TQT_SIGNAL( data( KIO::Job *, const TQByteArray & ) ), - TQT_SLOT( slotReadJobData( KIO::Job *, const TQByteArray & ) ) ); - connect( mJob, TQT_SIGNAL( percent( KIO::Job *, unsigned long ) ), - TQT_SLOT( slotJobPercent( KIO::Job *, unsigned long ) ) ); + connect( mJob, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), + TQT_SLOT( slotReadJobData( TDEIO::Job *, const TQByteArray & ) ) ); + connect( mJob, TQT_SIGNAL( percent( TDEIO::Job *, unsigned long ) ), + TQT_SLOT( slotJobPercent( TDEIO::Job *, unsigned long ) ) ); if ( bookType == System ) { - connect( mJob, TQT_SIGNAL( result( KIO::Job * ) ), - TQT_SLOT( fetchSABResult( KIO::Job * ) ) ); + connect( mJob, TQT_SIGNAL( result( TDEIO::Job * ) ), + TQT_SLOT( fetchSABResult( TDEIO::Job * ) ) ); mSABProgress = KPIM::ProgressManager::instance()->createProgressItem( mProgress, KPIM::ProgressManager::getUniqueID(), i18n( "Fetching System Address Book" ), TQString(), @@ -366,8 +366,8 @@ void ResourceGroupwise::fetchAddressBooks( const BookType bookType ) } else { - connect( mJob, TQT_SIGNAL( result( KIO::Job * ) ), - TQT_SLOT( fetchUABResult( KIO::Job * ) ) ); + connect( mJob, TQT_SIGNAL( result( TDEIO::Job * ) ), + TQT_SLOT( fetchUABResult( TDEIO::Job * ) ) ); mUABProgress = KPIM::ProgressManager::instance()->createProgressItem( mProgress, KPIM::ProgressManager::getUniqueID(), i18n( "Fetching User Address Books" ), TQString(), @@ -378,7 +378,7 @@ void ResourceGroupwise::fetchAddressBooks( const BookType bookType ) return; } -void ResourceGroupwise::fetchSABResult( KIO::Job *job ) +void ResourceGroupwise::fetchSABResult( TDEIO::Job *job ) { kdDebug() << "ResourceGroupwise::fetchSABResult() " << endl; @@ -402,7 +402,7 @@ void ResourceGroupwise::fetchSABResult( KIO::Job *job ) loadCompleted(); } -void ResourceGroupwise::fetchUABResult( KIO::Job *job ) +void ResourceGroupwise::fetchUABResult( TDEIO::Job *job ) { kdDebug() << "ResourceGroupwise::fetchUABResult() " << endl; @@ -444,19 +444,19 @@ void ResourceGroupwise::updateSystemAddressBook() false /*CannotBeCancelled*/, mPrefs->url().startsWith("https" ) ); - mJob = KIO::get( url, false, false ); + mJob = TDEIO::get( url, false, false ); mJob->setInteractive( false ); - connect( mJob, TQT_SIGNAL( result( KIO::Job * ) ), - TQT_SLOT( updateSABResult( KIO::Job * ) ) ); - connect( mJob, TQT_SIGNAL( data( KIO::Job *, const TQByteArray & ) ), - TQT_SLOT( slotUpdateJobData( KIO::Job *, const TQByteArray & ) ) ); - connect( mJob, TQT_SIGNAL( percent( KIO::Job *, unsigned long ) ), - TQT_SLOT( slotJobPercent( KIO::Job *, unsigned long ) ) ); + connect( mJob, TQT_SIGNAL( result( TDEIO::Job * ) ), + TQT_SLOT( updateSABResult( TDEIO::Job * ) ) ); + connect( mJob, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), + TQT_SLOT( slotUpdateJobData( TDEIO::Job *, const TQByteArray & ) ) ); + connect( mJob, TQT_SIGNAL( percent( TDEIO::Job *, unsigned long ) ), + TQT_SLOT( slotJobPercent( TDEIO::Job *, unsigned long ) ) ); return; } -void ResourceGroupwise::updateSABResult( KIO::Job *job ) +void ResourceGroupwise::updateSABResult( TDEIO::Job *job ) { kdDebug() << "ResourceGroupwise::updateSABResult() " << endl; @@ -467,7 +467,7 @@ void ResourceGroupwise::updateSABResult( KIO::Job *job ) int errorCode = job->error(); if ( errorCode != 0 ) { - if ( errorCode == KIO::ERR_NO_CONTENT ) // we need to refresh the SAB + if ( errorCode == TDEIO::ERR_NO_CONTENT ) // we need to refresh the SAB { kdDebug() << " update SAB failed, fetching all of it again" << endl; mPrefs->setLastSequenceNumber( 0 ); @@ -486,7 +486,7 @@ void ResourceGroupwise::updateSABResult( KIO::Job *job ) loadCompleted(); } -void ResourceGroupwise::slotReadJobData( KIO::Job *job , const TQByteArray &data ) +void ResourceGroupwise::slotReadJobData( TDEIO::Job *job , const TQByteArray &data ) { kdDebug() << "ResourceGroupwise::slotReadJobData()" << endl; Q_UNUSED( job ); @@ -520,7 +520,7 @@ void ResourceGroupwise::slotReadJobData( KIO::Job *job , const TQByteArray &data mJobData = TQString(); } -void ResourceGroupwise::slotUpdateJobData( KIO::Job *job, const TQByteArray &data ) +void ResourceGroupwise::slotUpdateJobData( TDEIO::Job *job, const TQByteArray &data ) { kdDebug() << "ResourceGroupwise::slotUpdateJobData()" << endl; kdDebug() << " Job address: " << job << endl; @@ -585,7 +585,7 @@ void ResourceGroupwise::loadCompleted() addressBook()->emitAddressBookChanged(); } -void ResourceGroupwise::slotJobPercent( KIO::Job *, unsigned long percent ) +void ResourceGroupwise::slotJobPercent( TDEIO::Job *, unsigned long percent ) { // TODO: make this act on the correct progress item kdDebug() << "ResourceGroupwise::slotJobPercent() " << percent << endl; diff --git a/kresources/groupwise/kabc_resourcegroupwise.h b/kresources/groupwise/kabc_resourcegroupwise.h index 23912916..658ddd76 100644 --- a/kresources/groupwise/kabc_resourcegroupwise.h +++ b/kresources/groupwise/kabc_resourcegroupwise.h @@ -29,7 +29,7 @@ #include <kio/job.h> -class KConfig; +class TDEConfig; class GroupwiseServer; @@ -45,15 +45,15 @@ class KDE_EXPORT ResourceGroupwise : public ResourceCached public: - ResourceGroupwise( const KConfig * ); + ResourceGroupwise( const TDEConfig * ); ResourceGroupwise( const KURL &url, const TQString &user, const TQString &password, const TQStringList &readAddressBooks, const TQString &writeAddressBook ); ~ResourceGroupwise(); - void readConfig( const KConfig * ); - void writeConfig( KConfig * ); + void readConfig( const TDEConfig * ); + void writeConfig( TDEConfig * ); void readAddressBooks(); void writeAddressBooks(); @@ -137,14 +137,14 @@ class KDE_EXPORT ResourceGroupwise : public ResourceCached private slots: /** STATE CHANGING SLOTS **/ - void fetchSABResult( KIO::Job * ); - void fetchUABResult( KIO::Job * ); - void updateSABResult( KIO::Job * ); + void fetchSABResult( TDEIO::Job * ); + void fetchUABResult( TDEIO::Job * ); + void updateSABResult( TDEIO::Job * ); /** DATA PROCESSING SLOTS **/ - void slotReadJobData( KIO::Job *, const TQByteArray & ); - void slotUpdateJobData( KIO::Job *, const TQByteArray & ); + void slotReadJobData( TDEIO::Job *, const TQByteArray & ); + void slotUpdateJobData( TDEIO::Job *, const TQByteArray & ); /** HELPER TQT_SLOT **/ - void slotJobPercent( KIO::Job *job, unsigned long percent ); + void slotJobPercent( TDEIO::Job *job, unsigned long percent ); void cancelLoad(); private: @@ -153,7 +153,7 @@ class KDE_EXPORT ResourceGroupwise : public ResourceCached GroupwiseServer *mServer; - KIO::TransferJob *mJob; + TDEIO::TransferJob *mJob; KPIM::ProgressItem *mProgress; KPIM::ProgressItem *mSABProgress; KPIM::ProgressItem *mUABProgress; diff --git a/kresources/groupwise/kcal_resourcegroupwise.cpp b/kresources/groupwise/kcal_resourcegroupwise.cpp index 060fe5f2..ed5fd3ae 100644 --- a/kresources/groupwise/kcal_resourcegroupwise.cpp +++ b/kresources/groupwise/kcal_resourcegroupwise.cpp @@ -55,7 +55,7 @@ ResourceGroupwise::ResourceGroupwise() mPrefs->addGroupPrefix( identifier() ); } -ResourceGroupwise::ResourceGroupwise( const KConfig *config ) +ResourceGroupwise::ResourceGroupwise( const TDEConfig *config ) : ResourceCached( config ), mLock( true ) { init(); @@ -92,7 +92,7 @@ GroupwisePrefsBase *ResourceGroupwise::prefs() return mPrefs; } -void ResourceGroupwise::readConfig( const KConfig *config ) +void ResourceGroupwise::readConfig( const TDEConfig *config ) { kdDebug() << "KCal::ResourceGroupwise::readConfig()" << endl; @@ -101,7 +101,7 @@ void ResourceGroupwise::readConfig( const KConfig *config ) ResourceCached::readConfig( config ); } -void ResourceGroupwise::writeConfig( KConfig *config ) +void ResourceGroupwise::writeConfig( TDEConfig *config ) { kdDebug() << "KCal::ResourceGroupwise::writeConfig()" << endl; @@ -157,11 +157,11 @@ bool ResourceGroupwise::doLoad() mJobData = TQString(); - mDownloadJob = KIO::get( url, false, false ); - connect( mDownloadJob, TQT_SIGNAL( result( KIO::Job * ) ), - TQT_SLOT( slotJobResult( KIO::Job * ) ) ); - connect( mDownloadJob, TQT_SIGNAL( data( KIO::Job *, const TQByteArray & ) ), - TQT_SLOT( slotJobData( KIO::Job *, const TQByteArray & ) ) ); + mDownloadJob = TDEIO::get( url, false, false ); + connect( mDownloadJob, TQT_SIGNAL( result( TDEIO::Job * ) ), + TQT_SLOT( slotJobResult( TDEIO::Job * ) ) ); + connect( mDownloadJob, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), + TQT_SLOT( slotJobData( TDEIO::Job *, const TQByteArray & ) ) ); mProgress = KPIM::ProgressManager::instance()->createProgressItem( KPIM::ProgressManager::getUniqueID(), i18n("Downloading calendar") ); @@ -172,7 +172,7 @@ bool ResourceGroupwise::doLoad() return true; } -void ResourceGroupwise::slotJobResult( KIO::Job *job ) +void ResourceGroupwise::slotJobResult( TDEIO::Job *job ) { kdDebug() << "ResourceGroupwise::slotJobResult(): " << endl; @@ -220,7 +220,7 @@ void ResourceGroupwise::slotJobResult( KIO::Job *job ) mProgress = 0; } -void ResourceGroupwise::slotJobData( KIO::Job *, const TQByteArray &data ) +void ResourceGroupwise::slotJobData( TDEIO::Job *, const TQByteArray &data ) { // kdDebug() << "ResourceGroupwise::slotJobData()" << endl; diff --git a/kresources/groupwise/kcal_resourcegroupwise.h b/kresources/groupwise/kcal_resourcegroupwise.h index 09e0b6d4..088e624a 100644 --- a/kresources/groupwise/kcal_resourcegroupwise.h +++ b/kresources/groupwise/kcal_resourcegroupwise.h @@ -49,11 +49,11 @@ class KDE_EXPORT ResourceGroupwise : public ResourceCached public: ResourceGroupwise(); - ResourceGroupwise( const KConfig * ); + ResourceGroupwise( const TDEConfig * ); virtual ~ResourceGroupwise(); - void readConfig( const KConfig *config ); - void writeConfig( KConfig *config ); + void readConfig( const TDEConfig *config ); + void writeConfig( TDEConfig *config ); GroupwisePrefsBase *prefs(); @@ -73,8 +73,8 @@ class KDE_EXPORT ResourceGroupwise : public ResourceCached bool confirmSave(); protected slots: - void slotJobResult( KIO::Job * ); - void slotJobData( KIO::Job *, const TQByteArray & ); + void slotJobResult( TDEIO::Job * ); + void slotJobData( TDEIO::Job *, const TQByteArray & ); void cancelLoad(); @@ -82,7 +82,7 @@ class KDE_EXPORT ResourceGroupwise : public ResourceCached GroupwisePrefsBase *mPrefs; KABC::LockNull mLock; - KIO::TransferJob *mDownloadJob; + TDEIO::TransferJob *mDownloadJob; KPIM::ProgressItem *mProgress; TQString mJobData; diff --git a/kresources/groupwise/kioslave/groupwise.cpp b/kresources/groupwise/kioslave/groupwise.cpp index e22d95dd..c3addd3b 100644 --- a/kresources/groupwise/kioslave/groupwise.cpp +++ b/kresources/groupwise/kioslave/groupwise.cpp @@ -381,7 +381,7 @@ void Groupwise::updateAddressbook( const KURL &url ) kdDebug() << " Updating Addressbook" << endl; if ( !server.updateAddressBooks( ids, lastSequenceNumber + 1, lastPORebuildTime ) ) { - error( KIO::ERR_NO_CONTENT, server.errorText() ); + error( TDEIO::ERR_NO_CONTENT, server.errorText() ); //errorMessage( i18n("Unable to update addressbook data: ") + server.errorText() ); } kdDebug() << " Logout" << endl; @@ -393,7 +393,7 @@ void Groupwise::updateAddressbook( const KURL &url ) void Groupwise::errorMessage( const TQString &msg ) { - error( KIO::ERR_SLAVE_DEFINED, msg ); + error( TDEIO::ERR_SLAVE_DEFINED, msg ); } void Groupwise::debugMessage( const TQString &msg ) diff --git a/kresources/groupwise/kioslave/groupwise.h b/kresources/groupwise/kioslave/groupwise.h index 3d110af8..c5f109d3 100644 --- a/kresources/groupwise/kioslave/groupwise.h +++ b/kresources/groupwise/kioslave/groupwise.h @@ -24,7 +24,7 @@ #include <tqobject.h> -class Groupwise : public TQObject, public KIO::SlaveBase +class Groupwise : public TQObject, public TDEIO::SlaveBase { Q_OBJECT diff --git a/kresources/groupwise/soap/groupwiseserver.cpp b/kresources/groupwise/soap/groupwiseserver.cpp index 9a2f4427..9112fdea 100644 --- a/kresources/groupwise/soap/groupwiseserver.cpp +++ b/kresources/groupwise/soap/groupwiseserver.cpp @@ -284,7 +284,7 @@ GroupwiseServer::GroupwiseServer( const TQString &url, const TQString &user, mSoap->frecv = myReceiveCallback; mSoap->fclose = myClose; - KConfig cfg( "groupwiserc" ); + TDEConfig cfg( "groupwiserc" ); cfg.setGroup( "Debug" ); mLogFile = cfg.readEntry( "LogFile" ); diff --git a/kresources/groupwise/soap/ksslsocket.cpp b/kresources/groupwise/soap/ksslsocket.cpp index cd66fc50..90ccf83d 100644 --- a/kresources/groupwise/soap/ksslsocket.cpp +++ b/kresources/groupwise/soap/ksslsocket.cpp @@ -161,14 +161,14 @@ TQString KSSLSocket::metaData( const TQString &key ) } /* -I basically copied the below from tcpKIO::SlaveBase.hpp, with some modificaions and formatting. +I basically copied the below from tcpTDEIO::SlaveBase.hpp, with some modificaions and formatting. * Copyright (C) 2000 Alex Zepeda <zipzippy@sonic.net * Copyright (C) 2001-2003 George Staikos <staikos@kde.org> * Copyright (C) 2001 Dawit Alemayehu <adawit@kde.org> */ -int KSSLSocket::messageBox( KIO::SlaveBase::MessageBoxType type, const TQString &text, const TQString &caption, +int KSSLSocket::messageBox( TDEIO::SlaveBase::MessageBoxType type, const TQString &text, const TQString &caption, const TQString &buttonYes, const TQString &buttonNo ) { kdDebug(0) << "messageBox " << type << " " << text << " - " << caption << buttonYes << buttonNo << endl; @@ -324,7 +324,7 @@ int KSSLSocket::verifyCertificate() TQString msg = i18n("The IP address of the host %1 " "does not match the one the " "certificate was issued to."); - result = messageBox( KIO::SlaveBase::WarningYesNoCancel, + result = messageBox( TDEIO::SlaveBase::WarningYesNoCancel, msg.arg(ourHost), i18n("Server Authentication"), i18n("&Details"), @@ -334,7 +334,7 @@ int KSSLSocket::verifyCertificate() { TQString msg = i18n("The server certificate failed the " "authenticity test (%1)."); - result = messageBox( KIO::SlaveBase::WarningYesNoCancel, + result = messageBox( TDEIO::SlaveBase::WarningYesNoCancel, msg.arg(ourHost), i18n("Server Authentication"), i18n("&Details"), @@ -348,7 +348,7 @@ int KSSLSocket::verifyCertificate() rc = 1; cp = KSSLCertificateCache::Accept; doAddHost = true; - result = messageBox( KIO::SlaveBase::WarningYesNo, + result = messageBox( TDEIO::SlaveBase::WarningYesNo, i18n("Would you like to accept this " "certificate forever without " "being prompted?"), diff --git a/kresources/groupwise/soap/ksslsocket.h b/kresources/groupwise/soap/ksslsocket.h index a8367236..c19b440a 100644 --- a/kresources/groupwise/soap/ksslsocket.h +++ b/kresources/groupwise/soap/ksslsocket.h @@ -46,7 +46,7 @@ class KSSLSocket : public KExtendedSocket private: int verifyCertificate(); - int messageBox( KIO::SlaveBase::MessageBoxType type, const TQString &text, + int messageBox( TDEIO::SlaveBase::MessageBoxType type, const TQString &text, const TQString &caption, const TQString &buttonYes, const TQString &buttonNo ); diff --git a/kresources/kolab/kabc/contact.cpp b/kresources/kolab/kabc/contact.cpp index a17c340b..ff8f869b 100644 --- a/kresources/kolab/kabc/contact.cpp +++ b/kresources/kolab/kabc/contact.cpp @@ -1276,9 +1276,9 @@ TQImage Contact::loadPictureFromAddressee( const KABC::Picture& picture ) TQImage img; if ( !picture.isIntern() && !picture.url().isEmpty() ) { TQString tmpFile; - if ( KIO::NetAccess::download( picture.url(), tmpFile, 0 /*no widget known*/ ) ) { + if ( TDEIO::NetAccess::download( picture.url(), tmpFile, 0 /*no widget known*/ ) ) { img.load( tmpFile ); - KIO::NetAccess::removeTempFile( tmpFile ); + TDEIO::NetAccess::removeTempFile( tmpFile ); } } else img = picture.data(); @@ -1305,13 +1305,13 @@ TQByteArray Kolab::Contact::loadSoundFromAddressee( const KABC::Sound& sound ) TQByteArray data; if ( !sound.isIntern() && !sound.url().isEmpty() ) { TQString tmpFile; - if ( KIO::NetAccess::download( sound.url(), tmpFile, 0 /*no widget known*/ ) ) { + if ( TDEIO::NetAccess::download( sound.url(), tmpFile, 0 /*no widget known*/ ) ) { TQFile f( tmpFile ); if ( f.open( IO_ReadOnly ) ) { data = f.readAll(); f.close(); } - KIO::NetAccess::removeTempFile( tmpFile ); + TDEIO::NetAccess::removeTempFile( tmpFile ); } } else data = sound.data(); diff --git a/kresources/kolab/kabc/resourcekolab.cpp b/kresources/kolab/kabc/resourcekolab.cpp index 43869641..ce7c18c4 100644 --- a/kresources/kolab/kabc/resourcekolab.cpp +++ b/kresources/kolab/kabc/resourcekolab.cpp @@ -58,7 +58,7 @@ using namespace Kolab; class KolabFactory : public KRES::PluginFactoryBase { public: - KRES::Resource *resource( const KConfig *config ) + KRES::Resource *resource( const TDEConfig *config ) { return new KABC::ResourceKolab( config ); } @@ -76,7 +76,7 @@ static const char* s_attachmentMimeTypeContact = "application/x-vnd.kolab.contac static const char* s_attachmentMimeTypeDistList = "application/x-vnd.kolab.contact.distlist"; static const char* s_inlineMimeType = "text/x-vcard"; -KABC::ResourceKolab::ResourceKolab( const KConfig *config ) +KABC::ResourceKolab::ResourceKolab( const TDEConfig *config ) : KPIM::ResourceABC( config ), Kolab::ResourceKolabBase( "ResourceKolab-KABC" ), mCachedSubresource( TQString() ), mCachedSubresourceNotFound( false ), mLocked( false ) @@ -96,12 +96,12 @@ KABC::ResourceKolab::~ResourceKolab() } } -void KABC::ResourceKolab::loadSubResourceConfig( KConfig& config, +void KABC::ResourceKolab::loadSubResourceConfig( TDEConfig& config, const TQString& name, const TQString& label, bool writable ) { - KConfigGroup group( &config, name ); + TDEConfigGroup group( &config, name ); bool active = group.readBoolEntry( "Active", true ); int completionWeight = group.readNumEntry( "CompletionWeight", 80 ); mSubResources.insert( name, Kolab::SubResource( active, writable, label, @@ -110,7 +110,7 @@ void KABC::ResourceKolab::loadSubResourceConfig( KConfig& config, bool KABC::ResourceKolab::doOpen() { - KConfig config( configFile() ); + TDEConfig config( configFile() ); // Read the calendar entries TQValueList<KMailICalIface::SubResource> subResources; @@ -527,7 +527,7 @@ void KABC::ResourceKolab::fromKMailAddSubresource( const TQString& type, // Already registered return; - KConfig config( configFile() ); + TDEConfig config( configFile() ); config.setGroup( "Contact" ); loadSubResourceConfig( config, subResource, label, writable ); loadSubResource( subResource ); @@ -547,7 +547,7 @@ void KABC::ResourceKolab::fromKMailDelSubresource( const TQString& type, // Ok, it's our job, and we have it here mSubResources.erase( subResource ); - KConfig config( configFile() ); + TDEConfig config( configFile() ); config.deleteGroup( subResource ); config.sync(); @@ -681,7 +681,7 @@ bool KABC::ResourceKolab::removeSubresource( const TQString& id ) void KABC::ResourceKolab::writeConfig() { - KConfig config( configFile() ); + TDEConfig config( configFile() ); Kolab::ResourceMap::ConstIterator it; for ( it = mSubResources.constBegin(); it != mSubResources.constEnd(); ++it ) { diff --git a/kresources/kolab/kabc/resourcekolab.h b/kresources/kolab/kabc/resourcekolab.h index d27a97c9..3a142b20 100644 --- a/kresources/kolab/kabc/resourcekolab.h +++ b/kresources/kolab/kabc/resourcekolab.h @@ -59,7 +59,7 @@ public: /** * Constructor */ - ResourceKolab( const KConfig* ); + ResourceKolab( const TDEConfig* ); /** * Destructor. @@ -155,7 +155,7 @@ protected: void doClose(); - void loadSubResourceConfig( KConfig& config, const TQString& name, + void loadSubResourceConfig( TDEConfig& config, const TQString& name, const TQString& label, bool writable ); bool loadSubResource( const TQString& subResource ); TQString loadContact( const TQString& contactData, const TQString& subResource, diff --git a/kresources/kolab/kabc/resourcekolab_plugin.cpp b/kresources/kolab/kabc/resourcekolab_plugin.cpp index db69b896..55ac6420 100644 --- a/kresources/kolab/kabc/resourcekolab_plugin.cpp +++ b/kresources/kolab/kabc/resourcekolab_plugin.cpp @@ -37,7 +37,7 @@ using namespace Kolab; class KolabFactory : public KRES::PluginFactoryBase { public: - KRES::Resource *resource( const KConfig *config ) + KRES::Resource *resource( const TDEConfig *config ) { return new KABC::ResourceKolab( config ); } diff --git a/kresources/kolab/kcal/resourcekolab.cpp b/kresources/kolab/kcal/resourcekolab.cpp index edd94303..44c13fd2 100644 --- a/kresources/kolab/kcal/resourcekolab.cpp +++ b/kresources/kolab/kcal/resourcekolab.cpp @@ -68,7 +68,7 @@ static const char* journalAttachmentMimeType = "application/x-vnd.kolab.journal" static const char* incidenceInlineMimeType = "text/calendar"; -ResourceKolab::ResourceKolab( const KConfig *config ) +ResourceKolab::ResourceKolab( const TDEConfig *config ) : ResourceCalendar( config ), ResourceKolabBase( "ResourceKolab-libkcal" ), mCalendar( TQString::fromLatin1("UTC") ), mOpen( false ),mResourceChangedTimer( 0, "mResourceChangedTimer" ), mBatchAddingInProgress( false ) @@ -90,20 +90,20 @@ ResourceKolab::~ResourceKolab() } } -void ResourceKolab::loadSubResourceConfig( KConfig& config, +void ResourceKolab::loadSubResourceConfig( TDEConfig& config, const TQString& name, const TQString& label, bool writable, bool alarmRelevant, ResourceMap& subResource ) { - KConfigGroup group( &config, name ); + TDEConfigGroup group( &config, name ); bool active = group.readBoolEntry( "Active", true ); subResource.insert( name, Kolab::SubResource( active, writable, alarmRelevant, label ) ); } -bool ResourceKolab::openResource( KConfig& config, const char* contentType, +bool ResourceKolab::openResource( TDEConfig& config, const char* contentType, ResourceMap& map ) { // Read the subresource entries from KMail @@ -125,7 +125,7 @@ bool ResourceKolab::doOpen() return true; mOpen = true; - KConfig config( configFile() ); + TDEConfig config( configFile() ); config.setGroup( "General" ); mProgressDialogIncidenceLimit = config.readNumEntry("ProgressDialogIncidenceLimit", 200); @@ -134,7 +134,7 @@ bool ResourceKolab::doOpen() && openResource( config, kmailJournalContentsType, mJournalSubResources ); } -static void writeResourceConfig( KConfig& config, ResourceMap& map ) +static void writeResourceConfig( TDEConfig& config, ResourceMap& map ) { ResourceMap::ConstIterator it; for ( it = map.begin(); it != map.end(); ++it ) { @@ -1077,7 +1077,7 @@ void ResourceKolab::fromKMailAddSubresource( const TQString& type, // Already registered return; - KConfig config( configFile() ); + TDEConfig config( configFile() ); config.setGroup( subResource ); bool active = config.readBoolEntry( subResource, true ); @@ -1100,7 +1100,7 @@ void ResourceKolab::fromKMailDelSubresource( const TQString& type, return; // Delete from the config file - KConfig config( configFile() ); + TDEConfig config( configFile() ); config.deleteGroup( subResource ); config.sync(); @@ -1322,7 +1322,7 @@ TQString ResourceKolab::subresourceType( const TQString &resource ) void ResourceKolab::writeConfig() { - KConfig config( configFile() ); + TDEConfig config( configFile() ); writeResourceConfig( config, mEventSubResources ); writeResourceConfig( config, mTodoSubResources ); writeResourceConfig( config, mJournalSubResources ); diff --git a/kresources/kolab/kcal/resourcekolab.h b/kresources/kolab/kcal/resourcekolab.h index e639d260..fdf952cc 100644 --- a/kresources/kolab/kcal/resourcekolab.h +++ b/kresources/kolab/kcal/resourcekolab.h @@ -56,7 +56,7 @@ class KDE_EXPORT ResourceKolab : public KCal::ResourceCalendar, friend struct TemporarySilencer; public: - ResourceKolab( const KConfig* ); + ResourceKolab( const TDEConfig* ); virtual ~ResourceKolab(); /// Load resource data. @@ -195,9 +195,9 @@ private: void incidenceUpdated( KCal::IncidenceBase* ); void incidenceUpdatedSilent( KCal::IncidenceBase* incidencebase); - bool openResource( KConfig& config, const char* contentType, + bool openResource( TDEConfig& config, const char* contentType, Kolab::ResourceMap& map ); - void loadSubResourceConfig( KConfig& config, const TQString& name, + void loadSubResourceConfig( TDEConfig& config, const TQString& name, const TQString& label, bool writable, bool alarmRelevant, Kolab::ResourceMap& subResource ); bool loadSubResource( const TQString& subResource, const char* mimetype ); diff --git a/kresources/kolab/kcal/resourcekolab_plugin.cpp b/kresources/kolab/kcal/resourcekolab_plugin.cpp index 151fa9f3..eb56897a 100644 --- a/kresources/kolab/kcal/resourcekolab_plugin.cpp +++ b/kresources/kolab/kcal/resourcekolab_plugin.cpp @@ -35,7 +35,7 @@ class KolabFactory : public KRES::PluginFactoryBase { public: - KRES::Resource *resource( const KConfig *config ) + KRES::Resource *resource( const TDEConfig *config ) { return new KCal::ResourceKolab( config ); } diff --git a/kresources/kolab/knotes/resourcekolab.cpp b/kresources/kolab/knotes/resourcekolab.cpp index b92a723a..a28a51b2 100644 --- a/kresources/kolab/knotes/resourcekolab.cpp +++ b/kresources/kolab/knotes/resourcekolab.cpp @@ -50,7 +50,7 @@ static const char* kmailContentsType = "Note"; static const char* attachmentMimeType = "application/x-vnd.kolab.note"; static const char* inlineMimeType = "text/calendar"; -ResourceKolab::ResourceKolab( const KConfig *config ) +ResourceKolab::ResourceKolab( const TDEConfig *config ) : ResourceNotes( config ), ResourceKolabBase( "ResourceKolab-KNotes" ), mCalendar( TQString::fromLatin1("UTC") ) { @@ -66,7 +66,7 @@ ResourceKolab::~ResourceKolab() bool ResourceKolab::doOpen() { - KConfig config( configFile() ); + TDEConfig config( configFile() ); config.setGroup( configGroupName ); // Get the list of Notes folders from KMail @@ -88,7 +88,7 @@ bool ResourceKolab::doOpen() void ResourceKolab::doClose() { - KConfig config( configFile() ); + TDEConfig config( configFile() ); config.setGroup( configGroupName ); Kolab::ResourceMap::ConstIterator it; for ( it = mSubResources.constBegin(); it != mSubResources.constEnd(); ++it ) @@ -356,7 +356,7 @@ void ResourceKolab::fromKMailAddSubresource( const TQString& type, // Already registered return; - KConfig config( configFile() ); + TDEConfig config( configFile() ); config.setGroup( configGroupName ); bool active = config.readBoolEntry( subResource, true ); @@ -379,7 +379,7 @@ void ResourceKolab::fromKMailDelSubresource( const TQString& type, // Ok, it's our job, and we have it here mSubResources.erase( subResource ); - KConfig config( configFile() ); + TDEConfig config( configFile() ); config.setGroup( configGroupName ); config.deleteEntry( subResource ); config.sync(); diff --git a/kresources/kolab/knotes/resourcekolab.h b/kresources/kolab/knotes/resourcekolab.h index f596d8f7..fb0d191b 100644 --- a/kresources/kolab/knotes/resourcekolab.h +++ b/kresources/kolab/knotes/resourcekolab.h @@ -57,7 +57,7 @@ class KDE_EXPORT ResourceKolab : public ResourceNotes, public: - ResourceKolab( const KConfig* ); + ResourceKolab( const TDEConfig* ); virtual ~ResourceKolab(); /// Load resource data. diff --git a/kresources/kolab/knotes/resourcekolab_plugin.cpp b/kresources/kolab/knotes/resourcekolab_plugin.cpp index fa187d2b..f589986c 100644 --- a/kresources/kolab/knotes/resourcekolab_plugin.cpp +++ b/kresources/kolab/knotes/resourcekolab_plugin.cpp @@ -35,7 +35,7 @@ class KolabFactory : public KRES::PluginFactoryBase { public: - KRES::Resource *resource( const KConfig *config ) + KRES::Resource *resource( const TDEConfig *config ) { return new Kolab::ResourceKolab( config ); } diff --git a/kresources/lib/Makefile.am b/kresources/lib/Makefile.am index 10719ed5..37d08bed 100644 --- a/kresources/lib/Makefile.am +++ b/kresources/lib/Makefile.am @@ -24,7 +24,7 @@ METASOURCES = AUTO ### We use three (or more) namespaces here in here - KPIM, KABC and KCal. ### When using multiple "using namespace foo" declarations, namespaced ### definitions cannot be resolved properly; we could use namespace foo { } -### instead, but this breaks on KConfigXT generated code, which still uses +### instead, but this breaks on TDEConfigXT generated code, which still uses ### "using namespace" and can't be fixed due to our backwards-compatibility ### requirements. This is only fatal when doing --enable-final, since only ### then do all the namespaces get mixed together. diff --git a/kresources/lib/davaddressbookadaptor.cpp b/kresources/lib/davaddressbookadaptor.cpp index f96e353d..5b4a0a52 100644 --- a/kresources/lib/davaddressbookadaptor.cpp +++ b/kresources/lib/davaddressbookadaptor.cpp @@ -36,9 +36,9 @@ using namespace KABC; -void DavAddressBookAdaptor::interpretListFoldersJob( KIO::Job *job, KPIM::FolderLister */*folderLister*/ ) +void DavAddressBookAdaptor::interpretListFoldersJob( TDEIO::Job *job, KPIM::FolderLister */*folderLister*/ ) { - KIO::DavJob *davjob = dynamic_cast<KIO::DavJob*>( job ); + TDEIO::DavJob *davjob = dynamic_cast<TDEIO::DavJob*>( job ); Q_ASSERT( davjob ); if ( !davjob ) return; diff --git a/kresources/lib/davaddressbookadaptor.h b/kresources/lib/davaddressbookadaptor.h index 55bb1819..f0f6f39d 100644 --- a/kresources/lib/davaddressbookadaptor.h +++ b/kresources/lib/davaddressbookadaptor.h @@ -38,7 +38,7 @@ class KDE_EXPORT DavAddressBookAdaptor : public AddressBookAdaptor the job describes a folder of the appropriate type, by emitting folderInfoRetrieved( href, displayName, type ). If the folder has subfolders, just emit retrieveSubfolder( href ) for each of them. */ - virtual void interpretListFoldersJob( KIO::Job *job, KPIM::FolderLister *folderLister ); + virtual void interpretListFoldersJob( TDEIO::Job *job, KPIM::FolderLister *folderLister ); /** Returns the type of folder retrieved in the dom node. Typically, you'll compare the DAV:resourcetype property with some values. */ virtual KPIM::FolderLister::ContentType getContentType( const TQDomNode &folderNode ) = 0; diff --git a/kresources/lib/davcalendaradaptor.cpp b/kresources/lib/davcalendaradaptor.cpp index 206bb7e9..5d6be2da 100644 --- a/kresources/lib/davcalendaradaptor.cpp +++ b/kresources/lib/davcalendaradaptor.cpp @@ -31,9 +31,9 @@ using namespace KCal; // TODO: This is exactly the same code as for the DavAddressBookAdaptor::interpretListFoldersJob! // But as this emits a signal, it needs to be located inside a TQObject -void DavCalendarAdaptor::interpretListFoldersJob( KIO::Job *job, KPIM::FolderLister */*folderLister*/ ) +void DavCalendarAdaptor::interpretListFoldersJob( TDEIO::Job *job, KPIM::FolderLister */*folderLister*/ ) { - KIO::DavJob *davjob = dynamic_cast<KIO::DavJob*>( job ); + TDEIO::DavJob *davjob = dynamic_cast<TDEIO::DavJob*>( job ); Q_ASSERT( davjob ); if ( !davjob ) return; diff --git a/kresources/lib/davcalendaradaptor.h b/kresources/lib/davcalendaradaptor.h index 00134eda..998a9cc7 100644 --- a/kresources/lib/davcalendaradaptor.h +++ b/kresources/lib/davcalendaradaptor.h @@ -38,7 +38,7 @@ class KDE_EXPORT DavCalendarAdaptor : public CalendarAdaptor the job describes a folder of the appropriate type, by emitting folderInfoRetrieved( href, displayName, type ). If the folder has subfolders, just emit retrieveSubfolder( href ) for each of them. */ - virtual void interpretListFoldersJob( KIO::Job *job, KPIM::FolderLister *folderLister ); + virtual void interpretListFoldersJob( TDEIO::Job *job, KPIM::FolderLister *folderLister ); /** Returns the type of folder retrieved in the dom node. Typically, you'll compare the DAV:resourcetype property with some values. */ virtual KPIM::FolderLister::ContentType getContentType( const TQDomNode &folderNode ) = 0; diff --git a/kresources/lib/folderlister.cpp b/kresources/lib/folderlister.cpp index affc6af5..eb91243b 100644 --- a/kresources/lib/folderlister.cpp +++ b/kresources/lib/folderlister.cpp @@ -177,7 +177,7 @@ void FolderLister::writeConfig( GroupwarePrefsBase *newprefs ) TQStringList names; TQStringList active; -// KConfigGroup cfgg( newprefs->config(), "Folders" ); +// TDEConfigGroup cfgg( newprefs->config(), "Folders" ); int nr = 0; Entry::List::ConstIterator it; for( it = mFolders.begin(); it != mFolders.end(); ++it ) { @@ -266,14 +266,14 @@ void FolderLister::doRetrieveFolder( const KURL &u ) kdDebug()<<"Item "<<u.path(-1)<<" is already being downloaded "<<endl; } else { - KIO::Job *listjob = createListFoldersJob( url ); + TDEIO::Job *listjob = createListFoldersJob( url ); if ( listjob ) { mUrls.append( url ); kdDebug(7000) << "FolderLister::retrieveFolders: adjustedURL=" << url.prettyURL() << endl; - connect( listjob, TQT_SIGNAL( result( KIO::Job * ) ), - TQT_SLOT( slotListJobResult( KIO::Job * ) ) ); + connect( listjob, TQT_SIGNAL( result( TDEIO::Job * ) ), + TQT_SLOT( slotListJobResult( TDEIO::Job * ) ) ); } else { // TODO: Indicate a problem to the user! kdWarning() << "Unable to create the folder list job for the url " @@ -319,13 +319,13 @@ kdDebug() << "Folder "<< href << " is not of correct type ("<<type<<")"<<endl; } } -void FolderLister::slotListJobResult( KIO::Job *job ) +void FolderLister::slotListJobResult( TDEIO::Job *job ) { kdDebug(7000) << "OpenGroupware::slotListJobResult(): " << endl; kdDebug() << "URLS (" << mUrls.count() << "): " << mUrls.toStringList().join(" | ") << endl; kdDebug() << "Processed URLS (" << mProcessedPathes.count() << "): " << mProcessedPathes.join(" | ") << endl; - KIO::SimpleJob *j = dynamic_cast<KIO::SimpleJob*>(job); + TDEIO::SimpleJob *j = dynamic_cast<TDEIO::SimpleJob*>(job); if ( j ) { mUrls.remove( j->url() ); mProcessedPathes.append( j->url().path(-1) ); @@ -346,7 +346,7 @@ void FolderLister::slotListJobResult( KIO::Job *job ) } } -void FolderLister::interpretListFoldersJob( KIO::Job *job ) +void FolderLister::interpretListFoldersJob( TDEIO::Job *job ) { if ( adaptor() ) { adaptor()->interpretListFoldersJob( job, this ); @@ -357,7 +357,7 @@ void FolderLister::interpretListFoldersJob( KIO::Job *job ) } } -KIO::Job *FolderLister::createListFoldersJob( const KURL &url ) +TDEIO::Job *FolderLister::createListFoldersJob( const KURL &url ) { if ( adaptor() ) { return adaptor()->createListFoldersJob( url ); diff --git a/kresources/lib/folderlister.h b/kresources/lib/folderlister.h index 746c99a2..8248ec22 100644 --- a/kresources/lib/folderlister.h +++ b/kresources/lib/folderlister.h @@ -33,11 +33,11 @@ #include <tqstringlist.h> #include <tqobject.h> -namespace KIO { +namespace TDEIO { class Job; } -class KConfig; +class TDEConfig; namespace KPIM { @@ -100,7 +100,7 @@ class KDE_EXPORT FolderLister : public TQObject void foldersRead(); protected slots: - void slotListJobResult( KIO::Job * ); + void slotListJobResult( TDEIO::Job * ); /** Adds the folder with the given url and display name to the folder * tree (if is has an appropriate type) */ virtual void processFolderResult( const KURL &href, @@ -117,7 +117,7 @@ class KDE_EXPORT FolderLister : public TQObject /** Creates the job to retrieve information about the folder at the given url. It's results will be interpreted by interpretFolderResult */ - virtual KIO::Job *createListFoldersJob( const KURL &url ); + virtual TDEIO::Job *createListFoldersJob( const KURL &url ); /** Interprets the results returned by the liste job (created by * createJob(url) ). The default implementation calls * interpretFolderListJob of the GroupwareDataAdaptor. Typically, @@ -125,7 +125,7 @@ class KDE_EXPORT FolderLister : public TQObject * folder of the appropriate type, by calling processsFolderResult. * If the folder has subfolders, just call doRetrieveFolder(url) * recursively. */ - virtual void interpretListFoldersJob( KIO::Job *job ); + virtual void interpretListFoldersJob( TDEIO::Job *job ); /** List of folders that will always be included (subfolders won't!). * Usually this is not needed as you should traverse the whole folder * tree starting from the user's root dir. */ diff --git a/kresources/lib/groupwaredataadaptor.cpp b/kresources/lib/groupwaredataadaptor.cpp index da012b15..85dacdaa 100644 --- a/kresources/lib/groupwaredataadaptor.cpp +++ b/kresources/lib/groupwaredataadaptor.cpp @@ -49,7 +49,7 @@ kdDebug() << "Final Path for new item: " << u.url() << endl; } else return baseurl; } -KIO::TransferJob *GroupwareUploadItem::createRawUploadJob( +TDEIO::TransferJob *GroupwareUploadItem::createRawUploadJob( GroupwareDataAdaptor *adaptor, const KURL &/*baseurl*/ ) { Q_ASSERT( adaptor ); @@ -60,7 +60,7 @@ KIO::TransferJob *GroupwareUploadItem::createRawUploadJob( if ( adaptor ) adaptor->adaptUploadUrl( upUrl ); kdDebug(7000) << "Uploading to: " << upUrl.prettyURL() << endl; - KIO::TransferJob *job = KIO::storedPut( dta.utf8(), upUrl, -1, true, + TDEIO::TransferJob *job = TDEIO::storedPut( dta.utf8(), upUrl, -1, true, false, false ); job->addMetaData( "PropagateHttpHeader", "true" ); if ( adaptor ) { @@ -69,12 +69,12 @@ KIO::TransferJob *GroupwareUploadItem::createRawUploadJob( return job; } -KIO::TransferJob *GroupwareUploadItem::createUploadNewJob( +TDEIO::TransferJob *GroupwareUploadItem::createUploadNewJob( GroupwareDataAdaptor *adaptor, const KURL &baseurl ) { kdDebug()<<"GroupwareUploadItem::createUploadNewJob, baseurl=" << baseurl.url() << endl; setUrl( adaptNewItemUrl( adaptor, baseurl ) ); - KIO::TransferJob *job = createRawUploadJob( adaptor, baseurl ); + TDEIO::TransferJob *job = createRawUploadJob( adaptor, baseurl ); if ( job ) { kdDebug() << "Adding If-None-Match " << endl; TQString header; @@ -88,11 +88,11 @@ kdDebug()<<"GroupwareUploadItem::createUploadNewJob, baseurl=" << baseurl.url() return job; } -KIO::TransferJob *GroupwareUploadItem::createUploadJob( +TDEIO::TransferJob *GroupwareUploadItem::createUploadJob( GroupwareDataAdaptor *adaptor, const KURL &baseurl ) { kdDebug()<<"GroupwareUploadItem::createUploadJob" << endl; - KIO::TransferJob *job = createRawUploadJob( adaptor, baseurl ); + TDEIO::TransferJob *job = createRawUploadJob( adaptor, baseurl ); if ( job && adaptor ) { kdDebug()<<"Adding If-Match header: " << adaptor->idMapper()->fingerprint( uid() ) << endl; TQString header; @@ -131,22 +131,22 @@ FolderLister::Entry::List GroupwareDataAdaptor::defaultFolders() return FolderLister::Entry::List(); } -KIO::TransferJob *GroupwareDataAdaptor::createUploadJob( const KURL &url, +TDEIO::TransferJob *GroupwareDataAdaptor::createUploadJob( const KURL &url, GroupwareUploadItem *item ) { if ( item ) { - KIO::TransferJob *job = item->createUploadJob( this, url ); + TDEIO::TransferJob *job = item->createUploadJob( this, url ); setUidForJob( job, item->uid() ); return job; } else return 0; } -KIO::TransferJob *GroupwareDataAdaptor::createUploadNewJob( const KURL &url, +TDEIO::TransferJob *GroupwareDataAdaptor::createUploadNewJob( const KURL &url, GroupwareUploadItem *item ) { kdDebug()<<"GroupwareDataAdaptor::createUploadNewJob, url=" << url.url() << endl; if ( item ) { - KIO::TransferJob *job = item->createUploadNewJob( this, url ); + TDEIO::TransferJob *job = item->createUploadNewJob( this, url ); setUidForJob( job, item->uid() ); return job; } else return 0; @@ -190,10 +190,10 @@ void GroupwareDataAdaptor::processDownloadListItem( const KURL &entry, } } -bool GroupwareDataAdaptor::interpretRemoveJob( KIO::Job *job, const TQString &/*jobData*/ ) +bool GroupwareDataAdaptor::interpretRemoveJob( TDEIO::Job *job, const TQString &/*jobData*/ ) { if ( !job ) return false; - KIO::DeleteJob *deljob = dynamic_cast<KIO::DeleteJob*>(job); + TDEIO::DeleteJob *deljob = dynamic_cast<TDEIO::DeleteJob*>(job); bool error = job->error(); const TQString err = job->errorString(); @@ -214,10 +214,10 @@ bool GroupwareDataAdaptor::interpretRemoveJob( KIO::Job *job, const TQString &/* } -bool GroupwareDataAdaptor::interpretUploadJob( KIO::Job *job, const TQString &/*jobData*/ ) +bool GroupwareDataAdaptor::interpretUploadJob( TDEIO::Job *job, const TQString &/*jobData*/ ) { kdDebug(7000) << "GroupwareDataAdaptor::interpretUploadJob " << endl; - KIO::TransferJob *trfjob = dynamic_cast<KIO::TransferJob*>(job); + TDEIO::TransferJob *trfjob = dynamic_cast<TDEIO::TransferJob*>(job); bool error = job->error(); const TQString err = job->errorString(); @@ -236,11 +236,11 @@ bool GroupwareDataAdaptor::interpretUploadJob( KIO::Job *job, const TQString &/* } } -bool GroupwareDataAdaptor::interpretUploadNewJob( KIO::Job *job, const TQString &/*jobData*/ ) +bool GroupwareDataAdaptor::interpretUploadNewJob( TDEIO::Job *job, const TQString &/*jobData*/ ) { // TODO: How does the incidence mapper know the old/new ids??? kdDebug(7000) << "GroupwareDataAdaptor::interpretUploadNewJob " << endl; - KIO::TransferJob *trfjob = dynamic_cast<KIO::TransferJob*>(job); + TDEIO::TransferJob *trfjob = dynamic_cast<TDEIO::TransferJob*>(job); bool error = job->error(); const TQString err = job->errorString(); @@ -259,7 +259,7 @@ bool GroupwareDataAdaptor::interpretUploadNewJob( KIO::Job *job, const TQString } } -TQString GroupwareDataAdaptor::uidFromJob( KIO::Job *job ) const +TQString GroupwareDataAdaptor::uidFromJob( TDEIO::Job *job ) const { kdDebug()<<"GroupwareDataAdaptor::uidFromJob( "<<job<<")"<<endl; if ( mJobUIDMap.contains( job ) ) { @@ -270,7 +270,7 @@ kdDebug()<<"GroupwareDataAdaptor::uidFromJob( "<<job<<")"<<endl; } } -void GroupwareDataAdaptor::setUidForJob( KIO::Job *job, const TQString &uid ) +void GroupwareDataAdaptor::setUidForJob( TDEIO::Job *job, const TQString &uid ) { if ( uid.isEmpty() ) { mJobUIDMap.remove( job ); diff --git a/kresources/lib/groupwaredataadaptor.h b/kresources/lib/groupwaredataadaptor.h index 5cd72419..b7bd6e33 100644 --- a/kresources/lib/groupwaredataadaptor.h +++ b/kresources/lib/groupwaredataadaptor.h @@ -32,7 +32,7 @@ #include <tdepimmacros.h> -namespace KIO { +namespace TDEIO { class TransferJob; class Job; } @@ -70,11 +70,11 @@ class KDE_EXPORT GroupwareUploadItem virtual KURL adaptNewItemUrl( GroupwareDataAdaptor *adaptor, const KURL &url ); - virtual KIO::TransferJob *createRawUploadJob( + virtual TDEIO::TransferJob *createRawUploadJob( GroupwareDataAdaptor *adaptor, const KURL &url ); - virtual KIO::TransferJob *createUploadNewJob( + virtual TDEIO::TransferJob *createUploadNewJob( GroupwareDataAdaptor *adaptor, const KURL &url ); - virtual KIO::TransferJob *createUploadJob( GroupwareDataAdaptor *adaptor, + virtual TDEIO::TransferJob *createUploadJob( GroupwareDataAdaptor *adaptor, const KURL &url ); virtual KPIM::FolderLister::ContentType itemType() { return mItemType; } protected: @@ -246,43 +246,43 @@ Q_OBJECT // Creating jobs - /** Creates the KIO::Job for logging in to the server. This is only + /** Creates the TDEIO::Job for logging in to the server. This is only * called if the GroupwareDataAdaptor::GWResNeedsLogin flag is set * for the resource. */ - virtual KIO::Job *createLoginJob( const KURL &, const TQString &/*user*/, + virtual TDEIO::Job *createLoginJob( const KURL &, const TQString &/*user*/, const TQString &/*password*/ ) { return 0; } - /** Creates the KIO::Job for logging off the server. This is only + /** Creates the TDEIO::Job for logging off the server. This is only * called if the GroupwareDataAdaptor::GWResNeedsLogoff flag is set * for the resource. */ - virtual KIO::Job *createLogoffJob( const KURL &, const TQString &/*user*/, + virtual TDEIO::Job *createLogoffJob( const KURL &, const TQString &/*user*/, const TQString &/*password*/ ) { return 0; } - /** Creates the KIO::Job for listing all subfolders of the given url. */ - virtual KIO::Job *createListFoldersJob ( const KURL & ) = 0; - /** Creates the KIO::TransferJob for listing all items in the given url. */ - virtual KIO::TransferJob *createListItemsJob( const KURL & ) = 0; - /** Creates the KIO::TransferJob for downloading one given item. */ - virtual KIO::TransferJob *createDownloadJob( const KURL &, + /** Creates the TDEIO::Job for listing all subfolders of the given url. */ + virtual TDEIO::Job *createListFoldersJob ( const KURL & ) = 0; + /** Creates the TDEIO::TransferJob for listing all items in the given url. */ + virtual TDEIO::TransferJob *createListItemsJob( const KURL & ) = 0; + /** Creates the TDEIO::TransferJob for downloading one given item. */ + virtual TDEIO::TransferJob *createDownloadJob( const KURL &, FolderLister::ContentType ) = 0; - /** Creates the KIO::TransferJob for downloading a list of items items. */ - virtual KIO::TransferJob *createDownloadJob( const TQMap<KURL,FolderLister::ContentType> & ) { return 0; } + /** Creates the TDEIO::TransferJob for downloading a list of items items. */ + virtual TDEIO::TransferJob *createDownloadJob( const TQMap<KURL,FolderLister::ContentType> & ) { return 0; } /** Create the job to remove the deletedItems from the server. The base URL of the server is passed as uploadurl. */ - virtual KIO::Job *createRemoveJob( const KURL &, + virtual TDEIO::Job *createRemoveJob( const KURL &, const KPIM::GroupwareUploadItem::List &/*deletedItems*/ ) { return 0; } /** Create the job to remove the item from the server. The base URL of the server is passed as uploadurl. */ - virtual KIO::Job *createRemoveJob( const KURL &, + virtual TDEIO::Job *createRemoveJob( const KURL &, KPIM::GroupwareUploadItem */*deletedItem*/ ) { return 0; } /** Create the job to change the item on the server (at the given URL) */ - virtual KIO::TransferJob *createUploadJob( const KURL &, + virtual TDEIO::TransferJob *createUploadJob( const KURL &, GroupwareUploadItem *item ); /** Create the job to change the items on the server (at the given URL) */ - virtual KIO::TransferJob *createUploadJob( const KURL &, const GroupwareUploadItem::List &/*items*/ ) { return 0; } + virtual TDEIO::TransferJob *createUploadJob( const KURL &, const GroupwareUploadItem::List &/*items*/ ) { return 0; } /** Create the job to add the item to the server (at the given baseURL) */ - virtual KIO::TransferJob *createUploadNewJob( const KURL &, + virtual TDEIO::TransferJob *createUploadNewJob( const KURL &, GroupwareUploadItem *item ); /** Create the job to add the items to the server (at the given baseURL) */ - virtual KIO::TransferJob *createUploadNewJob( const KURL &, const GroupwareUploadItem::List &/*items*/ ) { return 0; } + virtual TDEIO::TransferJob *createUploadNewJob( const KURL &, const GroupwareUploadItem::List &/*items*/ ) { return 0; } // Interpreting the result of the jobs @@ -290,20 +290,20 @@ Q_OBJECT * createLoginJob. Return true, if the login was successfull, or false * if the user could not be authenticated or something else went wrong. * In that case the resource will not be marked as open. */ - virtual bool interpretLoginJobResult( KIO::Job * ) { return true; } + virtual bool interpretLoginJobResult( TDEIO::Job * ) { return true; } /** Extract the success information from the logoff job, created by * createLogoffJob. */ - virtual bool interpretLogoffJobResult( KIO::Job * ) { return true; } + virtual bool interpretLogoffJobResult( TDEIO::Job * ) { return true; } - virtual void interpretListFoldersJob( KIO::Job *, FolderLister *) = 0; + virtual void interpretListFoldersJob( TDEIO::Job *, FolderLister *) = 0; /** Extract the list of items on the server and the list of items to be downloaded from the results of the job (the job was created by createListitemsJob). */ - virtual bool interpretListItemsJob( KIO::Job *, const TQString &jobData ) = 0; - virtual bool interpretDownloadItemsJob( KIO::Job *job, const TQString &jobData ) = 0; - virtual bool interpretRemoveJob( KIO::Job *job, const TQString &jobData ); - virtual bool interpretUploadJob( KIO::Job *job, const TQString &/*jobData*/ ); - virtual bool interpretUploadNewJob( KIO::Job *job, const TQString &/*jobData*/ ); + virtual bool interpretListItemsJob( TDEIO::Job *, const TQString &jobData ) = 0; + virtual bool interpretDownloadItemsJob( TDEIO::Job *job, const TQString &jobData ) = 0; + virtual bool interpretRemoveJob( TDEIO::Job *job, const TQString &jobData ); + virtual bool interpretUploadJob( TDEIO::Job *job, const TQString &/*jobData*/ ); + virtual bool interpretUploadNewJob( TDEIO::Job *job, const TQString &/*jobData*/ ); virtual void processDownloadListItem( const KURL &entry, const TQString &newFingerprint, KPIM::FolderLister::ContentType type ); @@ -312,8 +312,8 @@ Q_OBJECT { return TQString(); } - virtual TQString uidFromJob( KIO::Job *job ) const; - virtual void setUidForJob( KIO::Job *job, const TQString &uid ); + virtual TQString uidFromJob( TDEIO::Job *job ) const; + virtual void setUidForJob( TDEIO::Job *job, const TQString &uid ); enum { @@ -356,7 +356,7 @@ Q_OBJECT TQString mUser; TQString mPassword; KPIM::IdMapper *mIdMapper; - TQMap<KIO::Job*,TQString> mJobUIDMap; + TQMap<TDEIO::Job*,TQString> mJobUIDMap; }; } diff --git a/kresources/lib/groupwaredownloadjob.cpp b/kresources/lib/groupwaredownloadjob.cpp index 3bdead67..9104da84 100644 --- a/kresources/lib/groupwaredownloadjob.cpp +++ b/kresources/lib/groupwaredownloadjob.cpp @@ -105,15 +105,15 @@ void GroupwareDownloadJob::listItems() mListItemsData = TQString(); mListEventsJob = adaptor()->createListItemsJob( url ); - connect( mListEventsJob, TQT_SIGNAL( result( KIO::Job * ) ), - TQT_SLOT( slotListItemsResult( KIO::Job * ) ) ); - connect( mListEventsJob, TQT_SIGNAL( data( KIO::Job *, const TQByteArray & ) ), - TQT_SLOT( slotListItemsData( KIO::Job *, const TQByteArray & ) ) ); + connect( mListEventsJob, TQT_SIGNAL( result( TDEIO::Job * ) ), + TQT_SLOT( slotListItemsResult( TDEIO::Job * ) ) ); + connect( mListEventsJob, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), + TQT_SLOT( slotListItemsData( TDEIO::Job *, const TQByteArray & ) ) ); } } -void GroupwareDownloadJob::slotListItemsData( KIO::Job *, const TQByteArray &data ) +void GroupwareDownloadJob::slotListItemsData( TDEIO::Job *, const TQByteArray &data ) { kdDebug(5800) << "OpenGroupware::slotListItemsData()" << endl; @@ -121,7 +121,7 @@ void GroupwareDownloadJob::slotListItemsData( KIO::Job *, const TQByteArray &dat } -void GroupwareDownloadJob::slotListItemsResult( KIO::Job *job ) +void GroupwareDownloadJob::slotListItemsResult( TDEIO::Job *job ) { kdDebug(5800) << "GroupwareDownloadJob::slotListItemsResult(): " << endl; @@ -187,18 +187,18 @@ void GroupwareDownloadJob::downloadItem() mDownloadJob = adaptor()->createDownloadJob( href, ctype ); } - connect( mDownloadJob, TQT_SIGNAL( result( KIO::Job * ) ), - TQT_SLOT( slotDownloadItemResult( KIO::Job * ) ) ); - connect( mDownloadJob, TQT_SIGNAL( data( KIO::Job *, const TQByteArray & ) ), - TQT_SLOT( slotDownloadItemData( KIO::Job *, const TQByteArray & ) ) ); + connect( mDownloadJob, TQT_SIGNAL( result( TDEIO::Job * ) ), + TQT_SLOT( slotDownloadItemResult( TDEIO::Job * ) ) ); + connect( mDownloadJob, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), + TQT_SLOT( slotDownloadItemData( TDEIO::Job *, const TQByteArray & ) ) ); } } -void GroupwareDownloadJob::slotDownloadItemResult( KIO::Job *job ) +void GroupwareDownloadJob::slotDownloadItemResult( TDEIO::Job *job ) { kdDebug(5800) << "GroupwareDownloadJob::slotDownloadItemResult(): " << endl; - KIO::TransferJob *trfjob = dynamic_cast<KIO::TransferJob*>(job); + TDEIO::TransferJob *trfjob = dynamic_cast<TDEIO::TransferJob*>(job); if ( !trfjob ) return; if ( job->error() ) { @@ -217,7 +217,7 @@ void GroupwareDownloadJob::slotDownloadItemResult( KIO::Job *job ) downloadItem(); } -void GroupwareDownloadJob::slotDownloadItemData( KIO::Job *, const TQByteArray &data ) +void GroupwareDownloadJob::slotDownloadItemData( TDEIO::Job *, const TQByteArray &data ) { kdDebug(5800) << "OpenGroupware::slotDownloadItemData()" << endl; diff --git a/kresources/lib/groupwaredownloadjob.h b/kresources/lib/groupwaredownloadjob.h index b2788295..6cf3bf24 100644 --- a/kresources/lib/groupwaredownloadjob.h +++ b/kresources/lib/groupwaredownloadjob.h @@ -26,7 +26,7 @@ #include "groupwareresourcejob.h" #include <tqstringlist.h> -namespace KIO { +namespace TDEIO { class Job; class TransferJob; } @@ -58,10 +58,10 @@ class GroupwareDownloadJob : public GroupwareJob void cancelLoad(); - void slotListItemsResult( KIO::Job * ); - void slotListItemsData( KIO::Job *, const TQByteArray & ); - void slotDownloadItemResult( KIO::Job * ); - void slotDownloadItemData( KIO::Job *, const TQByteArray & ); + void slotListItemsResult( TDEIO::Job * ); + void slotListItemsData( TDEIO::Job *, const TQByteArray & ); + void slotDownloadItemResult( TDEIO::Job * ); + void slotDownloadItemData( TDEIO::Job *, const TQByteArray & ); void slotItemToDownload( const KURL &remoteURL, KPIM::FolderLister::ContentType type ); @@ -83,8 +83,8 @@ class GroupwareDownloadJob : public GroupwareJob KPIM::ProgressItem *mProgress; - KIO::TransferJob *mDownloadJob; - KIO::TransferJob *mListEventsJob; + TDEIO::TransferJob *mDownloadJob; + TDEIO::TransferJob *mListEventsJob; TQString mListItemsData; TQString mDownloadItemsData; diff --git a/kresources/lib/groupwareuploadjob.cpp b/kresources/lib/groupwareuploadjob.cpp index 60e4a53e..cf46571f 100644 --- a/kresources/lib/groupwareuploadjob.cpp +++ b/kresources/lib/groupwareuploadjob.cpp @@ -102,10 +102,10 @@ kdDebug() << "Not using batch delete " << endl; if ( mDeletionJob ) { mDeletionJobData = TQString(); - connect( mDeletionJob, TQT_SIGNAL( result( KIO::Job* ) ), - TQT_SLOT( slotDeletionJobResult( KIO::Job* ) ) ); -// connect( mDeletionJob, TQT_SIGNAL( data( KIO::Job *, const TQByteArray & ) ), -// TQT_SLOT( slotDeletionJobData( KIO::Job *, const TQByteArray & ) ) ); + connect( mDeletionJob, TQT_SIGNAL( result( TDEIO::Job* ) ), + TQT_SLOT( slotDeletionJobResult( TDEIO::Job* ) ) ); +// connect( mDeletionJob, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), +// TQT_SLOT( slotDeletionJobData( TDEIO::Job *, const TQByteArray & ) ) ); } else { deleteItem(); } @@ -114,7 +114,7 @@ kdDebug() << "Not using batch delete " << endl; -void GroupwareUploadJob::slotDeletionJobData( KIO::Job *, const TQByteArray &data ) +void GroupwareUploadJob::slotDeletionJobData( TDEIO::Job *, const TQByteArray &data ) { kdDebug(5800) << "OpenGroupware::slotDeletionData()" << endl; @@ -123,7 +123,7 @@ void GroupwareUploadJob::slotDeletionJobData( KIO::Job *, const TQByteArray &dat -void GroupwareUploadJob::slotDeletionJobResult( KIO::Job *job ) +void GroupwareUploadJob::slotDeletionJobResult( TDEIO::Job *job ) { if ( job && adaptor() ) { adaptor()->interpretRemoveJob( job, mDeletionJobData ); @@ -159,10 +159,10 @@ kdDebug() << "Not using batch upload " << endl; if ( mUploadJob ) { mUploadJobData = TQString(); - connect( mUploadJob, TQT_SIGNAL( result( KIO::Job* ) ), - TQT_SLOT( slotUploadJobResult( KIO::Job* ) ) ); - connect( mUploadJob, TQT_SIGNAL( data( KIO::Job *, const TQByteArray & ) ), - TQT_SLOT( slotUploadJobData( KIO::Job *, const TQByteArray & ) ) ); + connect( mUploadJob, TQT_SIGNAL( result( TDEIO::Job* ) ), + TQT_SLOT( slotUploadJobResult( TDEIO::Job* ) ) ); + connect( mUploadJob, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), + TQT_SLOT( slotUploadJobData( TDEIO::Job *, const TQByteArray & ) ) ); } else { uploadItem(); } @@ -170,7 +170,7 @@ kdDebug() << "Not using batch upload " << endl; } -void GroupwareUploadJob::slotUploadJobData( KIO::Job *, const TQByteArray &data ) +void GroupwareUploadJob::slotUploadJobData( TDEIO::Job *, const TQByteArray &data ) { kdDebug(5800) << "OpenGroupware::slotUploadData()" << endl; @@ -179,7 +179,7 @@ void GroupwareUploadJob::slotUploadJobData( KIO::Job *, const TQByteArray &data -void GroupwareUploadJob::slotUploadJobResult( KIO::Job *job ) +void GroupwareUploadJob::slotUploadJobResult( TDEIO::Job *job ) { if ( job && adaptor() ) { adaptor()->interpretUploadJob( job, mUploadJobData ); @@ -217,10 +217,10 @@ kdDebug() << "Not using batch create to " << url.url() << " for item of type " < if ( mUploadJob ) { mUploadNewJobData = TQString(); - connect( mUploadJob, TQT_SIGNAL( result( KIO::Job* ) ), - TQT_SLOT( slotUploadNewJobResult( KIO::Job* ) ) ); - connect( mUploadJob, TQT_SIGNAL( data( KIO::Job *, const TQByteArray & ) ), - TQT_SLOT( slotUploadNewJobData( KIO::Job *, const TQByteArray & ) ) ); + connect( mUploadJob, TQT_SIGNAL( result( TDEIO::Job* ) ), + TQT_SLOT( slotUploadNewJobResult( TDEIO::Job* ) ) ); + connect( mUploadJob, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), + TQT_SLOT( slotUploadNewJobData( TDEIO::Job *, const TQByteArray & ) ) ); } else { uploadNewItem(); } @@ -231,7 +231,7 @@ kdDebug() << "Not using batch create to " << url.url() << " for item of type " < } } -void GroupwareUploadJob::slotUploadNewJobData( KIO::Job *, const TQByteArray &data ) +void GroupwareUploadJob::slotUploadNewJobData( TDEIO::Job *, const TQByteArray &data ) { kdDebug(5800) << "OpenGroupware::slotUploadNewJobData()" << endl; @@ -240,7 +240,7 @@ void GroupwareUploadJob::slotUploadNewJobData( KIO::Job *, const TQByteArray &da -void GroupwareUploadJob::slotUploadNewJobResult( KIO::Job *job ) +void GroupwareUploadJob::slotUploadNewJobResult( TDEIO::Job *job ) { if ( job && adaptor() ) { adaptor()->interpretUploadNewJob( job, mUploadNewJobData ); diff --git a/kresources/lib/groupwareuploadjob.h b/kresources/lib/groupwareuploadjob.h index 7d3c973c..b3a0ff75 100644 --- a/kresources/lib/groupwareuploadjob.h +++ b/kresources/lib/groupwareuploadjob.h @@ -29,7 +29,7 @@ #include <tqstringlist.h> #include <groupwaredataadaptor.h> -namespace KIO { +namespace TDEIO { class Job; class TransferJob; class DeleteJob; @@ -88,12 +88,12 @@ class GroupwareUploadJob : public GroupwareJob void cancelSave(); - void slotDeletionJobResult( KIO::Job *job ); - void slotDeletionJobData( KIO::Job *, const TQByteArray & ); - void slotUploadJobResult( KIO::Job *job ); - void slotUploadJobData( KIO::Job *, const TQByteArray & ); - void slotUploadNewJobResult( KIO::Job *job ); - void slotUploadNewJobData( KIO::Job *, const TQByteArray & ); + void slotDeletionJobResult( TDEIO::Job *job ); + void slotDeletionJobData( TDEIO::Job *, const TQByteArray & ); + void slotUploadJobResult( TDEIO::Job *job ); + void slotUploadJobData( TDEIO::Job *, const TQByteArray & ); + void slotUploadNewJobResult( TDEIO::Job *job ); + void slotUploadNewJobData( TDEIO::Job *, const TQByteArray & ); void slotItemDeleted( const TQString &localID, const KURL &remoteURL ); void slotItemUploaded( const TQString &localID, const KURL &remoteURL ); @@ -118,8 +118,8 @@ class GroupwareUploadJob : public GroupwareJob TQString mUploadJobData; TQString mUploadNewJobData; - KIO::TransferJob *mUploadJob; - KIO::Job *mDeletionJob; + TDEIO::TransferJob *mUploadJob; + TDEIO::Job *mDeletionJob; KPIM::ProgressItem *mUploadProgress; }; diff --git a/kresources/lib/kabc_resourcegroupwarebase.cpp b/kresources/lib/kabc_resourcegroupwarebase.cpp index 0d8f197c..4700dd1f 100644 --- a/kresources/lib/kabc_resourcegroupwarebase.cpp +++ b/kresources/lib/kabc_resourcegroupwarebase.cpp @@ -34,7 +34,7 @@ using namespace KABC; -ResourceGroupwareBase::ResourceGroupwareBase( const KConfig *config ) +ResourceGroupwareBase::ResourceGroupwareBase( const TDEConfig *config ) : ResourceCached( config ), mPrefs(0), mFolderLister(0), mAdaptor(0), mDownloadJob(0), mUploadJob(0) { @@ -112,7 +112,7 @@ KPIM::GroupwarePrefsBase *ResourceGroupwareBase::createPrefs() -void ResourceGroupwareBase::readConfig( const KConfig */*config*/ ) +void ResourceGroupwareBase::readConfig( const TDEConfig */*config*/ ) { kdDebug(5700) << "KABC::ResourceGroupwareBase::readConfig()" << endl; // ResourceCached::readConfig( config ); @@ -123,7 +123,7 @@ void ResourceGroupwareBase::readConfig( const KConfig */*config*/ ) } } -void ResourceGroupwareBase::writeConfig( KConfig *config ) +void ResourceGroupwareBase::writeConfig( TDEConfig *config ) { Resource::writeConfig( config ); diff --git a/kresources/lib/kabc_resourcegroupwarebase.h b/kresources/lib/kabc_resourcegroupwarebase.h index 0785709c..28ce5199 100644 --- a/kresources/lib/kabc_resourcegroupwarebase.h +++ b/kresources/lib/kabc_resourcegroupwarebase.h @@ -26,7 +26,7 @@ #include <kabcresourcecached.h> #include <tdepimmacros.h> -class KConfig; +class TDEConfig; namespace KPIM { class GroupwareJob; @@ -46,11 +46,11 @@ class KDE_EXPORT ResourceGroupwareBase : public ResourceCached public: - ResourceGroupwareBase( const KConfig * ); + ResourceGroupwareBase( const TDEConfig * ); ~ResourceGroupwareBase(); - void readConfig( const KConfig * ); - void writeConfig( KConfig * ); + void readConfig( const TDEConfig * ); + void writeConfig( TDEConfig * ); KPIM::GroupwarePrefsBase *prefs() const { return mPrefs; } void setPrefs( KPIM::GroupwarePrefsBase *prefs ); diff --git a/kresources/lib/kcal_resourcegroupwarebase.cpp b/kresources/lib/kcal_resourcegroupwarebase.cpp index d52e0eab..118fc662 100644 --- a/kresources/lib/kcal_resourcegroupwarebase.cpp +++ b/kresources/lib/kcal_resourcegroupwarebase.cpp @@ -44,7 +44,7 @@ ResourceGroupwareBase::ResourceGroupwareBase() { } -ResourceGroupwareBase::ResourceGroupwareBase( const KConfig *config ) +ResourceGroupwareBase::ResourceGroupwareBase( const TDEConfig *config ) : ResourceCached( config ), mPrefs(0), mFolderLister(0), mLock( true ), mAdaptor(0), mDownloadJob(0), mUploadJob(0) { @@ -160,7 +160,7 @@ KPIM::GroupwarePrefsBase *ResourceGroupwareBase::prefs() return mPrefs; } -void ResourceGroupwareBase::readConfig( const KConfig *config ) +void ResourceGroupwareBase::readConfig( const TDEConfig *config ) { kdDebug(5800) << "KCal::ResourceGroupwareBase::readConfig()" << endl; ResourceCached::readConfig( config ); @@ -171,7 +171,7 @@ void ResourceGroupwareBase::readConfig( const KConfig *config ) } } -void ResourceGroupwareBase::writeConfig( KConfig *config ) +void ResourceGroupwareBase::writeConfig( TDEConfig *config ) { kdDebug(5800) << "KCal::ResourceGroupwareBase::writeConfig()" << endl; @@ -190,13 +190,13 @@ bool ResourceGroupwareBase::doOpen() if ( !adaptor() ) return false; if ( adaptor()->flags() & KPIM::GroupwareDataAdaptor::GWResNeedsLogon ) { - KIO::Job *loginJob = adaptor()->createLoginJob( prefs()->url(), prefs()->user(), prefs()->password() ); + TDEIO::Job *loginJob = adaptor()->createLoginJob( prefs()->url(), prefs()->user(), prefs()->password() ); if ( !loginJob ) { return false; } else { mLoginFinished = false; - connect( loginJob, TQT_SIGNAL( result( KIO::Job * ) ), - TQT_SLOT( slotLoginJobResult( KIO::Job* ) ) ); + connect( loginJob, TQT_SIGNAL( result( TDEIO::Job * ) ), + TQT_SLOT( slotLoginJobResult( TDEIO::Job* ) ) ); enter_loop(); return mLoginFinished; } @@ -205,7 +205,7 @@ bool ResourceGroupwareBase::doOpen() } // BEGIN:COPIED -// TODO: Get rid of this hack, which is copied from KIO::NetAccess, which is +// TODO: Get rid of this hack, which is copied from TDEIO::NetAccess, which is // LGPL'ed and // Copyright (C) 1997 Torben Weis (weis@kde.org) // Copyright (C) 1998 Matthias Ettrich (ettrich@kde.org) @@ -224,7 +224,7 @@ void ResourceGroupwareBase::enter_loop() } // END:COPIED -void ResourceGroupwareBase::slotLoginJobResult( KIO::Job *job ) +void ResourceGroupwareBase::slotLoginJobResult( TDEIO::Job *job ) { if ( !adaptor() ) return; mLoginFinished = adaptor()->interpretLoginJobResult( job ); @@ -238,15 +238,15 @@ void ResourceGroupwareBase::doClose() if ( adaptor() && adaptor()->flags() & KPIM::GroupwareDataAdaptor::GWResNeedsLogoff ) { - KIO::Job *logoffJob = adaptor()->createLogoffJob( prefs()->url(), prefs()->user(), prefs()->password() ); - connect( logoffJob, TQT_SIGNAL( result( KIO::Job * ) ), - TQT_SLOT( slotLogoffJobResult( KIO::Job* ) ) ); + TDEIO::Job *logoffJob = adaptor()->createLogoffJob( prefs()->url(), prefs()->user(), prefs()->password() ); + connect( logoffJob, TQT_SIGNAL( result( TDEIO::Job * ) ), + TQT_SLOT( slotLogoffJobResult( TDEIO::Job* ) ) ); // TODO: Do we really need to block while waiting for the job to return? enter_loop(); } } -void ResourceGroupwareBase::slotLogoffJobResult( KIO::Job *job ) +void ResourceGroupwareBase::slotLogoffJobResult( TDEIO::Job *job ) { if ( !adaptor() ) return; adaptor()->interpretLogoffJobResult( job ); diff --git a/kresources/lib/kcal_resourcegroupwarebase.h b/kresources/lib/kcal_resourcegroupwarebase.h index 5691c19d..f6b46dbf 100644 --- a/kresources/lib/kcal_resourcegroupwarebase.h +++ b/kresources/lib/kcal_resourcegroupwarebase.h @@ -28,7 +28,7 @@ #include <tdepimmacros.h> #include <kabc/locknull.h> -namespace KIO { +namespace TDEIO { class Job; } @@ -56,11 +56,11 @@ class KDE_EXPORT ResourceGroupwareBase : public ResourceCached public: ResourceGroupwareBase(); - ResourceGroupwareBase( const KConfig * ); + ResourceGroupwareBase( const TDEConfig * ); virtual ~ResourceGroupwareBase(); - void readConfig( const KConfig *config ); - void writeConfig( KConfig *config ); + void readConfig( const TDEConfig *config ); + void writeConfig( TDEConfig *config ); KPIM::GroupwarePrefsBase *prefs(); KPIM::FolderLister *folderLister() { return mFolderLister; } @@ -92,8 +92,8 @@ class KDE_EXPORT ResourceGroupwareBase : public ResourceCached virtual KPIM::GroupwareUploadJob *createUploadJob( CalendarAdaptor *adaptor ); protected slots: - void slotLoginJobResult( KIO::Job *job ); - void slotLogoffJobResult( KIO::Job *job ); + void slotLoginJobResult( TDEIO::Job *job ); + void slotLogoffJobResult( TDEIO::Job *job ); void slotDownloadJobResult( KPIM::GroupwareJob * ); void slotUploadJobResult( KPIM::GroupwareJob * ); diff --git a/kresources/newexchange/exchangeaddressbookadaptor.cpp b/kresources/newexchange/exchangeaddressbookadaptor.cpp index bd22858a..7e8ae8bb 100644 --- a/kresources/newexchange/exchangeaddressbookadaptor.cpp +++ b/kresources/newexchange/exchangeaddressbookadaptor.cpp @@ -43,7 +43,7 @@ ExchangeAddressBookUploadItem::ExchangeAddressBookUploadItem( AddressBookAdaptor } } -KIO::TransferJob *ExchangeAddressBookUploadItem::createUploadJob( KPIM::GroupwareDataAdaptor *adaptor, const KURL &/*baseurl*/ ) +TDEIO::TransferJob *ExchangeAddressBookUploadItem::createUploadJob( KPIM::GroupwareDataAdaptor *adaptor, const KURL &/*baseurl*/ ) { kdDebug()<<"ExchangeAddressBookUploadItem::createUploadJob"<<endl; Q_ASSERT( adaptor ); @@ -51,11 +51,11 @@ kdDebug()<<"ExchangeAddressBookUploadItem::createUploadJob"<<endl; KURL upUrl( url() ); adaptor->adaptUploadUrl( upUrl ); kdDebug() << "Uploading to: " << upUrl.prettyURL() << endl; - KIO::DavJob *job = KIO::davPropPatch( upUrl, mDavData, false ); + TDEIO::DavJob *job = TDEIO::davPropPatch( upUrl, mDavData, false ); return job; } -KIO::TransferJob *ExchangeAddressBookUploadItem::createUploadNewJob( KPIM::GroupwareDataAdaptor *adaptor, const KURL &baseurl ) +TDEIO::TransferJob *ExchangeAddressBookUploadItem::createUploadNewJob( KPIM::GroupwareDataAdaptor *adaptor, const KURL &baseurl ) { kdDebug()<<"ExchangeAddressBookUploadItem::createUploadNewJob"<<endl; KURL url( baseurl ); diff --git a/kresources/newexchange/exchangeaddressbookadaptor.h b/kresources/newexchange/exchangeaddressbookadaptor.h index 57642764..cbf5ac6f 100644 --- a/kresources/newexchange/exchangeaddressbookadaptor.h +++ b/kresources/newexchange/exchangeaddressbookadaptor.h @@ -40,9 +40,9 @@ class ExchangeAddressBookUploadItem : public KPIM::GroupwareUploadItem public: ExchangeAddressBookUploadItem( AddressBookAdaptor *adaptor, KABC::Addressee addr, UploadType type ); virtual ~ExchangeAddressBookUploadItem() {} -/**/ virtual KIO::TransferJob *createUploadJob( +/**/ virtual TDEIO::TransferJob *createUploadJob( KPIM::GroupwareDataAdaptor *adaptor, const KURL &baseurl ); -/**/ virtual KIO::TransferJob *createUploadNewJob( +/**/ virtual TDEIO::TransferJob *createUploadNewJob( KPIM::GroupwareDataAdaptor *adaptor, const KURL &baseurl ); protected: @@ -65,21 +65,21 @@ class ExchangeAddressBookAdaptor : public DavAddressBookAdaptor // Creating Jobs - KIO::Job *createListFoldersJob( const KURL &url ) + TDEIO::Job *createListFoldersJob( const KURL &url ) { return ExchangeGlobals::createListFoldersJob( url ); } - KIO::TransferJob *createListItemsJob( const KURL &url ) + TDEIO::TransferJob *createListItemsJob( const KURL &url ) { return ExchangeGlobals::createListItemsJob( url ); } - KIO::TransferJob *createDownloadJob( const KURL &url, KPIM::FolderLister::ContentType ctype ) + TDEIO::TransferJob *createDownloadJob( const KURL &url, KPIM::FolderLister::ContentType ctype ) { return ExchangeGlobals::createDownloadJob( this, url, ctype ); } - KIO::Job *createRemoveJob( const KURL &uploadurl, const KPIM::GroupwareUploadItem::List &deletedItems ) + TDEIO::Job *createRemoveJob( const KURL &uploadurl, const KPIM::GroupwareUploadItem::List &deletedItems ) { return ExchangeGlobals::createRemoveJob( uploadurl, deletedItems ); } // Interpreting Jobs - bool interpretListItemsJob( KIO::Job *job, const TQString &jobData ) + bool interpretListItemsJob( TDEIO::Job *job, const TQString &jobData ) { return ExchangeGlobals::interpretListItemsJob( this, job, jobData ); } - bool interpretDownloadItemsJob( KIO::Job *job, const TQString &jobData ) + bool interpretDownloadItemsJob( TDEIO::Job *job, const TQString &jobData ) { return ExchangeGlobals::interpretAddressBookDownloadItemsJob( this, job, jobData ); } diff --git a/kresources/newexchange/exchangecalendaradaptor.cpp b/kresources/newexchange/exchangecalendaradaptor.cpp index c0882ab1..89c9b742 100644 --- a/kresources/newexchange/exchangecalendaradaptor.cpp +++ b/kresources/newexchange/exchangecalendaradaptor.cpp @@ -50,7 +50,7 @@ kdDebug()<<"mItemType=="<<mItemType<<endl; } } -KIO::TransferJob *ExchangeCalendarUploadItem::createUploadJob( KPIM::GroupwareDataAdaptor *adaptor, const KURL &baseUrl ) +TDEIO::TransferJob *ExchangeCalendarUploadItem::createUploadJob( KPIM::GroupwareDataAdaptor *adaptor, const KURL &baseUrl ) { kdDebug()<<"ExchangeCalendarUploadItem::createUploadJob, adaptor="<<adaptor<<", URL="<<baseUrl.url()<<endl; Q_ASSERT( adaptor ); @@ -59,11 +59,11 @@ kdDebug()<<"ExchangeCalendarUploadItem::createUploadJob, adaptor="<<adaptor<<", adaptor->adaptUploadUrl( upUrl ); kdDebug() << "Uploading to: " << upUrl.prettyURL() << endl; - KIO::DavJob *job = KIO::davPropPatch( upUrl, mDavData, false ); + TDEIO::DavJob *job = TDEIO::davPropPatch( upUrl, mDavData, false ); return job; } -KIO::TransferJob *ExchangeCalendarUploadItem::createUploadNewJob( KPIM::GroupwareDataAdaptor *adaptor, const KURL &baseurl ) +TDEIO::TransferJob *ExchangeCalendarUploadItem::createUploadNewJob( KPIM::GroupwareDataAdaptor *adaptor, const KURL &baseurl ) { kdDebug()<<"ExchangeCalendarUploadItem::createUploadNewJob"<<endl; KURL url( baseurl ); @@ -107,9 +107,9 @@ void ExchangeDelete::findUidSingleMaster( TQString const& uid ) " AND (\"urn:schemas:calendar:instancetype\" = 0\r\n" " OR \"urn:schemas:calendar:instancetype\" = 1)\r\n"; - KIO::DavJob* job = KIO::davSearch( mAccount->calendarURL(), "DAV:", "sql", query, false ); + TDEIO::DavJob* job = TDEIO::davSearch( mAccount->calendarURL(), "DAV:", "sql", query, false ); job->setWindow( mWindow ); - connect(job, TQT_SIGNAL(result( KIO::Job * )), this, TQT_SLOT(slotFindUidResult(KIO::Job *))); + connect(job, TQT_SIGNAL(result( TDEIO::Job * )), this, TQT_SLOT(slotFindUidResult(TDEIO::Job *))); } */ @@ -126,10 +126,10 @@ KPIM::GroupwareUploadItem *ExchangeCalendarAdaptor::newUploadItem( KCal::Inciden return new ExchangeCalendarUploadItem( this, it, type ); } -bool ExchangeCalendarAdaptor::interpretUploadJob( KIO::Job *job, const TQString &/*jobData*/ ) +bool ExchangeCalendarAdaptor::interpretUploadJob( TDEIO::Job *job, const TQString &/*jobData*/ ) { kdDebug(7000) << "ExchangeCalendarAdaptor::interpretUploadJob " << endl; - KIO::DavJob *davjob = dynamic_cast<KIO::DavJob*>(job); + TDEIO::DavJob *davjob = dynamic_cast<TDEIO::DavJob*>(job); bool error = job->error(); const TQString err = job->errorString(); @@ -153,11 +153,11 @@ bool ExchangeCalendarAdaptor::interpretUploadJob( KIO::Job *job, const TQString } } -bool ExchangeCalendarAdaptor::interpretUploadNewJob( KIO::Job *job, const TQString &/*jobData*/ ) +bool ExchangeCalendarAdaptor::interpretUploadNewJob( TDEIO::Job *job, const TQString &/*jobData*/ ) { // TODO: How does the incidence mapper know the old/new ids??? kdDebug(7000) << "ExchangeCalendarAdaptor::interpretUploadNewJob " << endl; - KIO::DavJob *davjob = dynamic_cast<KIO::DavJob*>(job); + TDEIO::DavJob *davjob = dynamic_cast<TDEIO::DavJob*>(job); bool error = job->error(); const TQString err = job->errorString(); diff --git a/kresources/newexchange/exchangecalendaradaptor.h b/kresources/newexchange/exchangecalendaradaptor.h index 3a4acab9..4f8d1da2 100644 --- a/kresources/newexchange/exchangecalendaradaptor.h +++ b/kresources/newexchange/exchangecalendaradaptor.h @@ -38,9 +38,9 @@ class ExchangeCalendarUploadItem : public KPIM::GroupwareUploadItem public: ExchangeCalendarUploadItem( CalendarAdaptor *adaptor, KCal::Incidence *incidence, UploadType type ); virtual ~ExchangeCalendarUploadItem() {} - virtual KIO::TransferJob *createUploadNewJob( + virtual TDEIO::TransferJob *createUploadNewJob( KPIM::GroupwareDataAdaptor *adaptor, const KURL &baseurl ); - virtual KIO::TransferJob *createUploadJob( + virtual TDEIO::TransferJob *createUploadJob( KPIM::GroupwareDataAdaptor *adaptor, const KURL &url ); protected: @@ -63,23 +63,23 @@ class ExchangeCalendarAdaptor : public DavCalendarAdaptor // Creating Jobs - KIO::Job *createListFoldersJob( const KURL &url ) + TDEIO::Job *createListFoldersJob( const KURL &url ) { return ExchangeGlobals::createListFoldersJob( url ); } - KIO::TransferJob *createListItemsJob( const KURL &url ) + TDEIO::TransferJob *createListItemsJob( const KURL &url ) { return ExchangeGlobals::createListItemsJob( url ); } - KIO::TransferJob *createDownloadJob( const KURL &url, KPIM::FolderLister::ContentType ctype ) + TDEIO::TransferJob *createDownloadJob( const KURL &url, KPIM::FolderLister::ContentType ctype ) { return ExchangeGlobals::createDownloadJob( this, url, ctype ); } - KIO::Job *createRemoveJob( const KURL &uploadurl, const KPIM::GroupwareUploadItem::List &deletedItems ) + TDEIO::Job *createRemoveJob( const KURL &uploadurl, const KPIM::GroupwareUploadItem::List &deletedItems ) { return ExchangeGlobals::createRemoveJob( uploadurl, deletedItems ); } // Interpreting Jobs - bool interpretListItemsJob( KIO::Job *job, const TQString &jobData ) + bool interpretListItemsJob( TDEIO::Job *job, const TQString &jobData ) { return ExchangeGlobals::interpretListItemsJob( this, job, jobData ); } - bool interpretDownloadItemsJob( KIO::Job *job, const TQString &jobData ) + bool interpretDownloadItemsJob( TDEIO::Job *job, const TQString &jobData ) { return ExchangeGlobals::interpretCalendarDownloadItemsJob( this, job, jobData ); } - bool interpretUploadJob( KIO::Job *job, const TQString &/*jobData*/ ); - bool interpretUploadNewJob( KIO::Job *job, const TQString &/*jobData*/ ); + bool interpretUploadJob( TDEIO::Job *job, const TQString &/*jobData*/ ); + bool interpretUploadNewJob( TDEIO::Job *job, const TQString &/*jobData*/ ); diff --git a/kresources/newexchange/exchangeconvertercalendar.cpp b/kresources/newexchange/exchangeconvertercalendar.cpp index 52940936..bf2a66db 100644 --- a/kresources/newexchange/exchangeconvertercalendar.cpp +++ b/kresources/newexchange/exchangeconvertercalendar.cpp @@ -310,12 +310,12 @@ void ExchangeDownload::handleRecurrence( TQString uid ) // kdDebug() << "Exchange master query: " << endl << query << endl; - 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 * ) ) ); } */ diff --git a/kresources/newexchange/exchangeglobals.cpp b/kresources/newexchange/exchangeglobals.cpp index 5cb2eee7..f2d90cd6 100644 --- a/kresources/newexchange/exchangeglobals.cpp +++ b/kresources/newexchange/exchangeglobals.cpp @@ -87,7 +87,7 @@ bool ExchangeGlobals::getFolderHasSubs( const TQDomNode &folderNode ) -KIO::Job *ExchangeGlobals::createListFoldersJob( const KURL &url ) +TDEIO::Job *ExchangeGlobals::createListFoldersJob( const KURL &url ) { TQDomDocument doc; TQDomElement root = WebdavHandler::addDavElement( doc, doc, "d:propfind" ); @@ -97,11 +97,11 @@ KIO::Job *ExchangeGlobals::createListFoldersJob( const KURL &url ) WebdavHandler::addElement( doc, prop, "d:hassubs" ); kdDebug(7000) << "props: " << doc.toString() << endl; - return KIO::davPropFind( url, doc, "1", false ); + return TDEIO::davPropFind( url, doc, "1", false ); } -KIO::TransferJob *ExchangeGlobals::createListItemsJob( const KURL &url ) +TDEIO::TransferJob *ExchangeGlobals::createListItemsJob( const KURL &url ) { TQDomDocument doc; TQDomElement root = WebdavHandler::addDavElement( doc, doc, "d:propfind" ); @@ -109,11 +109,11 @@ KIO::TransferJob *ExchangeGlobals::createListItemsJob( const KURL &url ) WebdavHandler::addElement( doc, prop, "d:getetag" ); WebdavHandler::addElement( doc, prop, "d:contentclass" ); kdDebug(5800) << "props = "<< doc.toString() << endl; - return KIO::davPropFind( url, doc, "1", false ); + return TDEIO::davPropFind( url, doc, "1", false ); } -KIO::TransferJob *ExchangeGlobals::createDownloadJob( KPIM::GroupwareDataAdaptor *adaptor, +TDEIO::TransferJob *ExchangeGlobals::createDownloadJob( KPIM::GroupwareDataAdaptor *adaptor, const KURL &url, KPIM::FolderLister::ContentType ctype ) { kdDebug() << "ExchangeGlobals::createDownloadJob()" << endl; @@ -156,18 +156,18 @@ kdDebug() << "Person=" << KPIM::FolderLister::Contact << ", " kdDebug(7000) << "doc: " << doc.toString() << endl; KURL authURL = url; - KIO::DavJob *job = KIO::davPropFind( authURL, doc, "0", false ); + TDEIO::DavJob *job = TDEIO::davPropFind( authURL, doc, "0", false ); /* KURL httpurl( url ); TQString proto("http"); httpurl.setProtocol( proto ); - KIO::TransferJob *job = KIO::get(httpurl, false, false); + TDEIO::TransferJob *job = TDEIO::get(httpurl, false, false); job->addMetaData("customHTTPHeader", "Translate: f"); job->addMetaData("cache", "reload");*/ return job; } -KIO::Job *ExchangeGlobals::createRemoveJob( const KURL &uploadurl, +TDEIO::Job *ExchangeGlobals::createRemoveJob( const KURL &uploadurl, const KPIM::GroupwareUploadItem::List &deletedItems ) { TQStringList urls; @@ -182,7 +182,7 @@ KIO::Job *ExchangeGlobals::createRemoveJob( const KURL &uploadurl, urls << url.url(); kdDebug() << "Delete (Mod) : " << url.url() << endl; } - return KIO::del( urls, false, false ); + return TDEIO::del( urls, false, false ); } @@ -192,10 +192,10 @@ KIO::Job *ExchangeGlobals::createRemoveJob( const KURL &uploadurl, // it calls getContentType of the ExchangeGlobals class, instead of the one // from OGoGlobals!!!! bool ExchangeGlobals::interpretListItemsJob( KPIM::GroupwareDataAdaptor *adaptor, - KIO::Job *job, const TQString &/*jobData*/ ) + TDEIO::Job *job, const TQString &/*jobData*/ ) { kdDebug()<<"ExchangeGlobals::interpretListItemsJob"<<endl; - KIO::DavJob *davjob = dynamic_cast<KIO::DavJob *>(job); + TDEIO::DavJob *davjob = dynamic_cast<TDEIO::DavJob *>(job); if ( !davjob ) { return false; @@ -237,9 +237,9 @@ kdDebug()<<"ExchangeGlobals::interpretListItemsJob"<<endl; bool ExchangeGlobals::interpretCalendarDownloadItemsJob( KCal::CalendarAdaptor *adaptor, - KIO::Job *job, const TQString &/*jobData*/ ) + TDEIO::Job *job, const TQString &/*jobData*/ ) { - KIO::DavJob *davjob = dynamic_cast<KIO::DavJob*>(job); + TDEIO::DavJob *davjob = dynamic_cast<TDEIO::DavJob*>(job); if ( !davjob || !adaptor ) return false; kdDebug() << "ExchangeGlobals::interpretCalendarDownloadItemsJob(): TQDomDocument=" @@ -261,9 +261,9 @@ kdDebug() << "ExchangeGlobals::interpretCalendarDownloadItemsJob(): TQDomDocumen bool ExchangeGlobals::interpretAddressBookDownloadItemsJob( - KABC::AddressBookAdaptor *adaptor, KIO::Job *job, const TQString &/*jobData*/ ) + KABC::AddressBookAdaptor *adaptor, TDEIO::Job *job, const TQString &/*jobData*/ ) { - KIO::DavJob *davjob = dynamic_cast<KIO::DavJob*>(job); + TDEIO::DavJob *davjob = dynamic_cast<TDEIO::DavJob*>(job); if ( !davjob || !adaptor ) return false; kdDebug() << "ExchangeGlobals::interpretAddressBookDownloadItemsJob(): TQDomDocument=" diff --git a/kresources/newexchange/exchangeglobals.h b/kresources/newexchange/exchangeglobals.h index a1e12f4c..5d75bc42 100644 --- a/kresources/newexchange/exchangeglobals.h +++ b/kresources/newexchange/exchangeglobals.h @@ -25,7 +25,7 @@ #include <groupwareuploadjob.h> #include <tqdom.h> -namespace KIO { +namespace TDEIO { class Job; class TransferJob; } @@ -51,20 +51,20 @@ class ExchangeGlobals static bool getFolderHasSubs( const TQDomNode &folderNode ); - static KIO::Job *createListFoldersJob( const KURL &url ); - static KIO::TransferJob *createListItemsJob( const KURL &url ); - static KIO::TransferJob *createDownloadJob( KPIM::GroupwareDataAdaptor *adaptor, + static TDEIO::Job *createListFoldersJob( const KURL &url ); + static TDEIO::TransferJob *createListItemsJob( const KURL &url ); + static TDEIO::TransferJob *createDownloadJob( KPIM::GroupwareDataAdaptor *adaptor, const KURL &url, KPIM::FolderLister::ContentType ctype ); - static KIO::Job *createRemoveJob( const KURL &uploadurl, + static TDEIO::Job *createRemoveJob( const KURL &uploadurl, const KPIM::GroupwareUploadItem::List &deletedItems ); static bool interpretListItemsJob( KPIM::GroupwareDataAdaptor *adaptor, - KIO::Job *job, const TQString &jobData ); + TDEIO::Job *job, const TQString &jobData ); static bool interpretCalendarDownloadItemsJob( KCal::CalendarAdaptor *adaptor, - KIO::Job *job, const TQString &jobData ); + TDEIO::Job *job, const TQString &jobData ); static bool interpretAddressBookDownloadItemsJob( KABC::AddressBookAdaptor *adaptor, - KIO::Job *job, const TQString &jobData ); + TDEIO::Job *job, const TQString &jobData ); }; #endif diff --git a/kresources/newexchange/kabc_resourceexchange.cpp b/kresources/newexchange/kabc_resourceexchange.cpp index db773f2f..8c3ca2d1 100644 --- a/kresources/newexchange/kabc_resourceexchange.cpp +++ b/kresources/newexchange/kabc_resourceexchange.cpp @@ -30,7 +30,7 @@ using namespace KABC; -ResourceExchange::ResourceExchange( const KConfig *config ) +ResourceExchange::ResourceExchange( const TDEConfig *config ) : ResourceGroupwareBase( config ) { init(); diff --git a/kresources/newexchange/kabc_resourceexchange.h b/kresources/newexchange/kabc_resourceexchange.h index 2afad9da..941f9179 100644 --- a/kresources/newexchange/kabc_resourceexchange.h +++ b/kresources/newexchange/kabc_resourceexchange.h @@ -31,7 +31,7 @@ class KDE_EXPORT ResourceExchange : public ResourceGroupwareBase public: - ResourceExchange( const KConfig * ); + ResourceExchange( const TDEConfig * ); /* ResourceExchange( const KURL &url, const TQString &user, const TQString &password );*/ protected: diff --git a/kresources/newexchange/kcal_resourceexchange.cpp b/kresources/newexchange/kcal_resourceexchange.cpp index 953e30c3..eff1fa6b 100644 --- a/kresources/newexchange/kcal_resourceexchange.cpp +++ b/kresources/newexchange/kcal_resourceexchange.cpp @@ -35,7 +35,7 @@ ResourceExchange::ResourceExchange() init(); } -ResourceExchange::ResourceExchange( const KConfig *config ) +ResourceExchange::ResourceExchange( const TDEConfig *config ) : ResourceGroupwareBase( config ) { init(); diff --git a/kresources/newexchange/kcal_resourceexchange.h b/kresources/newexchange/kcal_resourceexchange.h index ded903a2..823ed9a7 100644 --- a/kresources/newexchange/kcal_resourceexchange.h +++ b/kresources/newexchange/kcal_resourceexchange.h @@ -35,7 +35,7 @@ class KDE_EXPORT ResourceExchange : public ResourceGroupwareBase public: ResourceExchange(); - ResourceExchange( const KConfig * ); + ResourceExchange( const TDEConfig * ); protected: void init(); diff --git a/kresources/remote/resourceremote.cpp b/kresources/remote/resourceremote.cpp index 229dd86b..3803ecbe 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 656fa9e3..2c3fd5fa 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; diff --git a/kresources/scalix/kabc/resourcescalix.cpp b/kresources/scalix/kabc/resourcescalix.cpp index 94cec32a..42aef92d 100644 --- a/kresources/scalix/kabc/resourcescalix.cpp +++ b/kresources/scalix/kabc/resourcescalix.cpp @@ -59,7 +59,7 @@ using namespace Scalix; class ScalixFactory : public KRES::PluginFactoryBase { public: - KRES::Resource *resource( const KConfig *config ) + KRES::Resource *resource( const TDEConfig *config ) { return new KABC::ResourceScalix( config ); } @@ -77,7 +77,7 @@ static const char* s_attachmentMimeTypeContact = "application/x-vnd.kolab.contac static const char* s_attachmentMimeTypeDistList = "application/x-vnd.kolab.contact.distlist"; static const char* s_inlineMimeType = "application/scalix-properties"; -KABC::ResourceScalix::ResourceScalix( const KConfig *config ) +KABC::ResourceScalix::ResourceScalix( const TDEConfig *config ) : KPIM::ResourceABC( config ), Scalix::ResourceScalixBase( "ResourceScalix-KABC" ), mCachedSubresource( TQString() ), mLocked( false ) @@ -94,12 +94,12 @@ KABC::ResourceScalix::~ResourceScalix() } } -void KABC::ResourceScalix::loadSubResourceConfig( KConfig& config, +void KABC::ResourceScalix::loadSubResourceConfig( TDEConfig& config, const TQString& name, const TQString& label, bool writable ) { - KConfigGroup group( &config, name ); + TDEConfigGroup group( &config, name ); bool active = group.readBoolEntry( "Active", true ); int completionWeight = group.readNumEntry( "CompletionWeight", 80 ); mSubResources.insert( name, Scalix::SubResource( active, writable, label, @@ -108,7 +108,7 @@ void KABC::ResourceScalix::loadSubResourceConfig( KConfig& config, bool KABC::ResourceScalix::doOpen() { - KConfig config( configFile() ); + TDEConfig config( configFile() ); // Read the calendar entries TQValueList<KMailICalIface::SubResource> subResources; @@ -125,7 +125,7 @@ bool KABC::ResourceScalix::doOpen() void KABC::ResourceScalix::doClose() { - KConfig config( configFile() ); + TDEConfig config( configFile() ); Scalix::ResourceMap::ConstIterator it; for ( it = mSubResources.begin(); it != mSubResources.end(); ++it ) { @@ -487,7 +487,7 @@ void KABC::ResourceScalix::fromKMailAddSubresource( const TQString& type, // Already registered return; - KConfig config( configFile() ); + TDEConfig config( configFile() ); config.setGroup( "Contact" ); loadSubResourceConfig( config, subResource, label, writable ); loadSubResource( subResource ); @@ -507,7 +507,7 @@ void KABC::ResourceScalix::fromKMailDelSubresource( const TQString& type, // Ok, it's our job, and we have it here mSubResources.erase( subResource ); - KConfig config( configFile() ); + TDEConfig config( configFile() ); config.deleteGroup( subResource ); config.sync(); diff --git a/kresources/scalix/kabc/resourcescalix.h b/kresources/scalix/kabc/resourcescalix.h index 82c23819..dbb0b93c 100644 --- a/kresources/scalix/kabc/resourcescalix.h +++ b/kresources/scalix/kabc/resourcescalix.h @@ -60,7 +60,7 @@ public: /** * Constructor */ - ResourceScalix( const KConfig* ); + ResourceScalix( const TDEConfig* ); /** * Destructor. @@ -149,7 +149,7 @@ protected: void doClose(); - void loadSubResourceConfig( KConfig& config, const TQString& name, + void loadSubResourceConfig( TDEConfig& config, const TQString& name, const TQString& label, bool writable ); bool loadSubResource( const TQString& subResource ); bool loadSubResourceHelper( const TQString& subResource, const char* mimetype, KMailICalIface::StorageFormat format ); diff --git a/kresources/scalix/kabc/resourcescalix_plugin.cpp b/kresources/scalix/kabc/resourcescalix_plugin.cpp index c6fe224c..bbf7a436 100644 --- a/kresources/scalix/kabc/resourcescalix_plugin.cpp +++ b/kresources/scalix/kabc/resourcescalix_plugin.cpp @@ -38,7 +38,7 @@ using namespace Scalix; class ScalixFactory : public KRES::PluginFactoryBase { public: - KRES::Resource *resource( const KConfig *config ) + KRES::Resource *resource( const TDEConfig *config ) { return new KABC::ResourceScalix( config ); } diff --git a/kresources/scalix/kcal/resourcescalix.cpp b/kresources/scalix/kcal/resourcescalix.cpp index eeebb32f..a757c81f 100644 --- a/kresources/scalix/kcal/resourcescalix.cpp +++ b/kresources/scalix/kcal/resourcescalix.cpp @@ -61,7 +61,7 @@ static const char* journalAttachmentMimeType = "application/x-vnd.kolab.journal" static const char* incidenceInlineMimeType = "text/calendar"; -ResourceScalix::ResourceScalix( const KConfig *config ) +ResourceScalix::ResourceScalix( const TDEConfig *config ) : ResourceCalendar( config ), ResourceScalixBase( "ResourceScalix-libkcal" ), mCalendar( TQString::fromLatin1("UTC") ), mOpen( false ) { @@ -79,18 +79,18 @@ ResourceScalix::~ResourceScalix() } } -void ResourceScalix::loadSubResourceConfig( KConfig& config, +void ResourceScalix::loadSubResourceConfig( TDEConfig& config, const TQString& name, const TQString& label, bool writable, ResourceMap& subResource ) { - KConfigGroup group( &config, name ); + TDEConfigGroup group( &config, name ); bool active = group.readBoolEntry( "Active", true ); subResource.insert( name, Scalix::SubResource( active, writable, label ) ); } -bool ResourceScalix::openResource( KConfig& config, const char* contentType, +bool ResourceScalix::openResource( TDEConfig& config, const char* contentType, ResourceMap& map ) { // Read the subresource entries from KMail @@ -111,7 +111,7 @@ bool ResourceScalix::doOpen() return true; mOpen = true; - KConfig config( configFile() ); + TDEConfig config( configFile() ); config.setGroup( "General" ); mProgressDialogIncidenceLimit = config.readNumEntry("ProgressDialogIncidenceLimit", 200); @@ -120,7 +120,7 @@ bool ResourceScalix::doOpen() && openResource( config, kmailJournalContentsType, mJournalSubResources ); } -static void closeResource( KConfig& config, ResourceMap& map ) +static void closeResource( TDEConfig& config, ResourceMap& map ) { ResourceMap::ConstIterator it; for ( it = map.begin(); it != map.end(); ++it ) { @@ -136,7 +136,7 @@ void ResourceScalix::doClose() return; mOpen = false; - KConfig config( configFile() ); + TDEConfig config( configFile() ); closeResource( config, mEventSubResources ); closeResource( config, mTodoSubResources ); closeResource( config, mJournalSubResources ); @@ -745,7 +745,7 @@ void ResourceScalix::fromKMailAddSubresource( const TQString& type, // Already registered return; - KConfig config( configFile() ); + TDEConfig config( configFile() ); config.setGroup( subResource ); bool active = config.readBoolEntry( subResource, true ); @@ -767,7 +767,7 @@ void ResourceScalix::fromKMailDelSubresource( const TQString& type, return; // Delete from the config file - KConfig config( configFile() ); + TDEConfig config( configFile() ); config.deleteGroup( subResource ); config.sync(); diff --git a/kresources/scalix/kcal/resourcescalix.h b/kresources/scalix/kcal/resourcescalix.h index cfcf7140..dcd78397 100644 --- a/kresources/scalix/kcal/resourcescalix.h +++ b/kresources/scalix/kcal/resourcescalix.h @@ -55,7 +55,7 @@ class KDE_EXPORT ResourceScalix : public KCal::ResourceCalendar, friend struct TemporarySilencer; public: - ResourceScalix( const KConfig* ); + ResourceScalix( const TDEConfig* ); virtual ~ResourceScalix(); /// Load resource data. @@ -167,9 +167,9 @@ private: /// Reimplemented from IncidenceBase::Observer to know when an incidence was changed void incidenceUpdated( KCal::IncidenceBase* ); - bool openResource( KConfig& config, const char* contentType, + bool openResource( TDEConfig& config, const char* contentType, Scalix::ResourceMap& map ); - void loadSubResourceConfig( KConfig& config, const TQString& name, + void loadSubResourceConfig( TDEConfig& config, const TQString& name, const TQString& label, bool writable, Scalix::ResourceMap& subResource ); bool loadSubResource( const TQString& subResource, const char* mimetype ); diff --git a/kresources/scalix/kcal/resourcescalix_plugin.cpp b/kresources/scalix/kcal/resourcescalix_plugin.cpp index 728dc280..036c2f45 100644 --- a/kresources/scalix/kcal/resourcescalix_plugin.cpp +++ b/kresources/scalix/kcal/resourcescalix_plugin.cpp @@ -36,7 +36,7 @@ class ScalixFactory : public KRES::PluginFactoryBase { public: - KRES::Resource *resource( const KConfig *config ) + KRES::Resource *resource( const TDEConfig *config ) { return new KCal::ResourceScalix( config ); } diff --git a/kresources/scalix/kioslave/scalix.cpp b/kresources/scalix/kioslave/scalix.cpp index 52384afa..1b4cc7b8 100644 --- a/kresources/scalix/kioslave/scalix.cpp +++ b/kresources/scalix/kioslave/scalix.cpp @@ -76,7 +76,7 @@ void Scalix::get( const KURL &url ) if ( path.contains( "/freebusy/" ) ) { retrieveFreeBusy( url ); } else { - error( KIO::ERR_SLAVE_DEFINED, i18n( "Unknown path. Known path is '/freebusy/'" ) ); + error( TDEIO::ERR_SLAVE_DEFINED, i18n( "Unknown path. Known path is '/freebusy/'" ) ); } } @@ -87,7 +87,7 @@ void Scalix::put( const KURL& url, int, bool, bool ) if ( path.contains( "/freebusy/" ) ) { publishFreeBusy( url ); } else { - error( KIO::ERR_SLAVE_DEFINED, i18n( "Unknown path. Known path is '/freebusy/'" ) ); + error( TDEIO::ERR_SLAVE_DEFINED, i18n( "Unknown path. Known path is '/freebusy/'" ) ); } } @@ -115,11 +115,11 @@ void Scalix::retrieveFreeBusy( const KURL &url ) mFreeBusyData = TQString(); - KIO::SimpleJob *job = KIO::special( imapUrl, packedArgs, false ); - connect( job, TQT_SIGNAL( infoMessage( KIO::Job*, const TQString& ) ), - this, TQT_SLOT( slotInfoMessage( KIO::Job*, const TQString& ) ) ); - connect( job, TQT_SIGNAL( result( KIO::Job* ) ), - this, TQT_SLOT( slotRetrieveResult( KIO::Job* ) ) ); + TDEIO::SimpleJob *job = TDEIO::special( imapUrl, packedArgs, false ); + connect( job, TQT_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ), + this, TQT_SLOT( slotInfoMessage( TDEIO::Job*, const TQString& ) ) ); + connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), + this, TQT_SLOT( slotRetrieveResult( TDEIO::Job* ) ) ); tqApp->eventLoop()->enterLoop(); } @@ -144,7 +144,7 @@ void Scalix::publishFreeBusy( const KURL &url ) calendar = path.mid( secondSlash + 1, lastSlash - secondSlash - 1 ); if ( requestUser.isEmpty() || calendar.isEmpty() ) { - error( KIO::ERR_SLAVE_DEFINED, i18n( "No user or calendar given!" ) ); + error( TDEIO::ERR_SLAVE_DEFINED, i18n( "No user or calendar given!" ) ); return; }; @@ -157,7 +157,7 @@ void Scalix::publishFreeBusy( const KURL &url ) const int newSize = readData(buffer); if ( newSize < 0 ) { // read error: network in unknown state so disconnect - error( KIO::ERR_COULD_NOT_READ, i18n("KIO data supply error.") ); + error( TDEIO::ERR_COULD_NOT_READ, i18n("KIO data supply error.") ); return; } @@ -181,14 +181,14 @@ void Scalix::publishFreeBusy( const KURL &url ) url.user() : url.user() + ":" + url.pass() ) .arg( url.host() ); - KIO::SimpleJob *job = KIO::special( imapUrl, packedArgs, false ); - connect( job, TQT_SIGNAL( result( KIO::Job* ) ), - this, TQT_SLOT( slotPublishResult( KIO::Job* ) ) ); + TDEIO::SimpleJob *job = TDEIO::special( imapUrl, packedArgs, false ); + connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), + this, TQT_SLOT( slotPublishResult( TDEIO::Job* ) ) ); tqApp->eventLoop()->enterLoop(); } -void Scalix::slotInfoMessage( KIO::Job *job, const TQString &data ) +void Scalix::slotInfoMessage( TDEIO::Job *job, const TQString &data ) { if ( job->error() ) { // error is handled in slotResult @@ -199,10 +199,10 @@ void Scalix::slotInfoMessage( KIO::Job *job, const TQString &data ) } -void Scalix::slotRetrieveResult( KIO::Job *job ) +void Scalix::slotRetrieveResult( TDEIO::Job *job ) { if ( job->error() ) { - error( KIO::ERR_SLAVE_DEFINED, job->errorString() ); + error( TDEIO::ERR_SLAVE_DEFINED, job->errorString() ); } else { data( mFreeBusyData.utf8() ); finished(); @@ -211,10 +211,10 @@ void Scalix::slotRetrieveResult( KIO::Job *job ) tqApp->eventLoop()->exitLoop(); } -void Scalix::slotPublishResult( KIO::Job *job ) +void Scalix::slotPublishResult( TDEIO::Job *job ) { if ( job->error() ) { - error( KIO::ERR_SLAVE_DEFINED, job->errorString() ); + error( TDEIO::ERR_SLAVE_DEFINED, job->errorString() ); } else { finished(); } diff --git a/kresources/scalix/kioslave/scalix.h b/kresources/scalix/kioslave/scalix.h index 62c2428b..dc034b7b 100644 --- a/kresources/scalix/kioslave/scalix.h +++ b/kresources/scalix/kioslave/scalix.h @@ -26,7 +26,7 @@ #include <tqobject.h> -class Scalix : public TQObject, public KIO::SlaveBase +class Scalix : public TQObject, public TDEIO::SlaveBase { Q_OBJECT @@ -38,9 +38,9 @@ class Scalix : public TQObject, public KIO::SlaveBase void put( const KURL &url, int permissions, bool overwrite, bool resume ); private slots: - void slotRetrieveResult( KIO::Job* ); - void slotPublishResult( KIO::Job* ); - void slotInfoMessage( KIO::Job*, const TQString& ); + void slotRetrieveResult( TDEIO::Job* ); + void slotPublishResult( TDEIO::Job* ); + void slotInfoMessage( TDEIO::Job*, const TQString& ); private: void retrieveFreeBusy( const KURL& ); diff --git a/kresources/scalix/knotes/resourcescalix.cpp b/kresources/scalix/knotes/resourcescalix.cpp index 0289fab0..62b0daf4 100644 --- a/kresources/scalix/knotes/resourcescalix.cpp +++ b/kresources/scalix/knotes/resourcescalix.cpp @@ -47,7 +47,7 @@ static const char* kmailContentsType = "Note"; static const char* attachmentMimeType = "application/x-vnd.kolab.note"; static const char* inlineMimeType = "text/calendar"; -ResourceScalix::ResourceScalix( const KConfig *config ) +ResourceScalix::ResourceScalix( const TDEConfig *config ) : ResourceNotes( config ), ResourceScalixBase( "ResourceScalix-KNotes" ), mCalendar( TQString::fromLatin1("UTC") ) { @@ -60,7 +60,7 @@ ResourceScalix::~ResourceScalix() bool ResourceScalix::doOpen() { - KConfig config( configFile() ); + TDEConfig config( configFile() ); config.setGroup( configGroupName ); // Get the list of Notes folders from KMail @@ -82,7 +82,7 @@ bool ResourceScalix::doOpen() void ResourceScalix::doClose() { - KConfig config( configFile() ); + TDEConfig config( configFile() ); config.setGroup( configGroupName ); Scalix::ResourceMap::ConstIterator it; for ( it = mSubResources.begin(); it != mSubResources.end(); ++it ) @@ -331,7 +331,7 @@ void ResourceScalix::fromKMailAddSubresource( const TQString& type, // Already registered return; - KConfig config( configFile() ); + TDEConfig config( configFile() ); config.setGroup( configGroupName ); bool active = config.readBoolEntry( subResource, true ); @@ -354,7 +354,7 @@ void ResourceScalix::fromKMailDelSubresource( const TQString& type, // Ok, it's our job, and we have it here mSubResources.erase( subResource ); - KConfig config( configFile() ); + TDEConfig config( configFile() ); config.setGroup( configGroupName ); config.deleteEntry( subResource ); config.sync(); diff --git a/kresources/scalix/knotes/resourcescalix.h b/kresources/scalix/knotes/resourcescalix.h index 000b2e91..6a3676c1 100644 --- a/kresources/scalix/knotes/resourcescalix.h +++ b/kresources/scalix/knotes/resourcescalix.h @@ -56,7 +56,7 @@ class KDE_EXPORT ResourceScalix : public ResourceNotes, public: - ResourceScalix( const KConfig* ); + ResourceScalix( const TDEConfig* ); virtual ~ResourceScalix(); /// Load resource data. diff --git a/kresources/scalix/knotes/resourcescalix_plugin.cpp b/kresources/scalix/knotes/resourcescalix_plugin.cpp index 1cb83556..925c27b0 100644 --- a/kresources/scalix/knotes/resourcescalix_plugin.cpp +++ b/kresources/scalix/knotes/resourcescalix_plugin.cpp @@ -36,7 +36,7 @@ class ScalixFactory : public KRES::PluginFactoryBase { public: - KRES::Resource *resource( const KConfig *config ) + KRES::Resource *resource( const TDEConfig *config ) { return new Scalix::ResourceScalix( config ); } diff --git a/kresources/scalix/scalixadmin/delegatepage.cpp b/kresources/scalix/scalixadmin/delegatepage.cpp index 03347290..169ff085 100644 --- a/kresources/scalix/scalixadmin/delegatepage.cpp +++ b/kresources/scalix/scalixadmin/delegatepage.cpp @@ -69,7 +69,7 @@ void DelegatePage::loadAllDelegates() { Scalix::GetDelegatesJob *job = Scalix::getDelegates( Settings::self()->globalSlave(), Settings::self()->accountUrl() ); - connect( job, TQT_SIGNAL( result( KIO::Job* ) ), TQT_SLOT( allDelegates( KIO::Job* ) ) ); + connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), TQT_SLOT( allDelegates( TDEIO::Job* ) ) ); } void DelegatePage::addDelegate() @@ -88,7 +88,7 @@ void DelegatePage::addDelegate() Scalix::SetDelegateJob *job = Scalix::setDelegate( Settings::self()->globalSlave(), Settings::self()->accountUrl(), delegate.email(), delegate.rights() ); - connect( job, TQT_SIGNAL( result( KIO::Job* ) ), TQT_SLOT( delegateAdded( KIO::Job* ) ) ); + connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), TQT_SLOT( delegateAdded( TDEIO::Job* ) ) ); } void DelegatePage::editDelegate() @@ -113,7 +113,7 @@ void DelegatePage::editDelegate() Scalix::SetDelegateJob *job = Scalix::setDelegate( Settings::self()->globalSlave(), Settings::self()->accountUrl(), delegate.email(), delegate.rights() ); - connect( job, TQT_SIGNAL( result( KIO::Job* ) ), TQT_SLOT( delegateAdded( KIO::Job* ) ) ); + connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), TQT_SLOT( delegateAdded( TDEIO::Job* ) ) ); } void DelegatePage::removeDelegate() @@ -124,10 +124,10 @@ void DelegatePage::removeDelegate() Scalix::DeleteDelegateJob *job = Scalix::deleteDelegate( Settings::self()->globalSlave(), Settings::self()->accountUrl(), delegate.email() ); - connect( job, TQT_SIGNAL( result( KIO::Job* ) ), TQT_SLOT( delegateRemoved( KIO::Job* ) ) ); + connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), TQT_SLOT( delegateRemoved( TDEIO::Job* ) ) ); } -void DelegatePage::allDelegates( KIO::Job *job ) +void DelegatePage::allDelegates( TDEIO::Job *job ) { if ( job->error() ) KMessageBox::error( this, job->errorString() ); @@ -143,7 +143,7 @@ void DelegatePage::allDelegates( KIO::Job *job ) selectionChanged(); } -void DelegatePage::delegateAdded( KIO::Job *job ) +void DelegatePage::delegateAdded( TDEIO::Job *job ) { if ( job->error() ) KMessageBox::error( this, job->errorString() ); @@ -151,7 +151,7 @@ void DelegatePage::delegateAdded( KIO::Job *job ) loadAllDelegates(); // update the GUI } -void DelegatePage::delegateRemoved( KIO::Job *job ) +void DelegatePage::delegateRemoved( TDEIO::Job *job ) { if ( job->error() ) KMessageBox::error( this, job->errorString() ); diff --git a/kresources/scalix/scalixadmin/delegatepage.h b/kresources/scalix/scalixadmin/delegatepage.h index 0f1b9c79..0523effe 100644 --- a/kresources/scalix/scalixadmin/delegatepage.h +++ b/kresources/scalix/scalixadmin/delegatepage.h @@ -43,9 +43,9 @@ class DelegatePage : public TQWidget void editDelegate(); void removeDelegate(); - void delegateAdded( KIO::Job* ); - void delegateRemoved( KIO::Job* ); - void allDelegates( KIO::Job* ); + void delegateAdded( TDEIO::Job* ); + void delegateRemoved( TDEIO::Job* ); + void allDelegates( TDEIO::Job* ); void selectionChanged(); diff --git a/kresources/scalix/scalixadmin/jobs.cpp b/kresources/scalix/scalixadmin/jobs.cpp index f1bce9f2..49b0a8fe 100644 --- a/kresources/scalix/scalixadmin/jobs.cpp +++ b/kresources/scalix/scalixadmin/jobs.cpp @@ -67,7 +67,7 @@ TQString Delegate::rightsAsString( int rights ) } -SetPasswordJob* Scalix::setPassword( KIO::Slave* slave, const KURL& url, +SetPasswordJob* Scalix::setPassword( TDEIO::Slave* slave, const KURL& url, const TQString &oldPassword, const TQString& newPassword ) { TQByteArray packedArgs; @@ -76,11 +76,11 @@ SetPasswordJob* Scalix::setPassword( KIO::Slave* slave, const KURL& url, << TQString( "X-SCALIX-PASSWORD" ) << TQString( "%1 %2" ).arg( oldPassword ).arg( newPassword ); SetPasswordJob* job = new SetPasswordJob( url, packedArgs, false ); - KIO::Scheduler::assignJobToSlave( slave, job ); + TDEIO::Scheduler::assignJobToSlave( slave, job ); return job; } -SetDelegateJob* Scalix::setDelegate( KIO::Slave* slave, const KURL& url, const TQString& email, int params ) +SetDelegateJob* Scalix::setDelegate( TDEIO::Slave* slave, const KURL& url, const TQString& email, int params ) { TQStringList types; if ( params & SendOnBehalfOf ) @@ -98,11 +98,11 @@ SetDelegateJob* Scalix::setDelegate( KIO::Slave* slave, const KURL& url, const T << TQString( "X-SET-DELEGATE" ) << TQString( "%1 %2" ).arg( email ).arg( types.join( " " ) ); SetDelegateJob* job = new SetDelegateJob( url, packedArgs, false ); - KIO::Scheduler::assignJobToSlave( slave, job ); + TDEIO::Scheduler::assignJobToSlave( slave, job ); return job; } -DeleteDelegateJob* Scalix::deleteDelegate( KIO::Slave* slave, const KURL& url, const TQString& email ) +DeleteDelegateJob* Scalix::deleteDelegate( TDEIO::Slave* slave, const KURL& url, const TQString& email ) { TQByteArray packedArgs; TQDataStream stream( packedArgs, IO_WriteOnly ); @@ -110,22 +110,22 @@ DeleteDelegateJob* Scalix::deleteDelegate( KIO::Slave* slave, const KURL& url, c << TQString( "X-DELETE-DELEGATE" ) << email; DeleteDelegateJob* job = new DeleteDelegateJob( url, packedArgs, false ); - KIO::Scheduler::assignJobToSlave( slave, job ); + TDEIO::Scheduler::assignJobToSlave( slave, job ); return job; } -GetDelegatesJob* Scalix::getDelegates( KIO::Slave* slave, const KURL& url ) +GetDelegatesJob* Scalix::getDelegates( TDEIO::Slave* slave, const KURL& url ) { TQByteArray packedArgs; TQDataStream stream( packedArgs, IO_WriteOnly ); stream << (int)'X' << (int)'N' << TQString( "X-GET-DELEGATES" ) << TQString(); GetDelegatesJob* job = new GetDelegatesJob( url, packedArgs, false ); - KIO::Scheduler::assignJobToSlave( slave, job ); + TDEIO::Scheduler::assignJobToSlave( slave, job ); return job; } -AddOtherUserJob* Scalix::addOtherUser( KIO::Slave* slave, const KURL& url, const TQString& email ) +AddOtherUserJob* Scalix::addOtherUser( TDEIO::Slave* slave, const KURL& url, const TQString& email ) { TQByteArray packedArgs; TQDataStream stream( packedArgs, IO_WriteOnly ); @@ -133,11 +133,11 @@ AddOtherUserJob* Scalix::addOtherUser( KIO::Slave* slave, const KURL& url, const << TQString( "X-ADD-OTHER-USER" ) << email; AddOtherUserJob* job = new AddOtherUserJob( url, packedArgs, false ); - KIO::Scheduler::assignJobToSlave( slave, job ); + TDEIO::Scheduler::assignJobToSlave( slave, job ); return job; } -DeleteOtherUserJob* Scalix::deleteOtherUser( KIO::Slave* slave, const KURL& url, const TQString& email ) +DeleteOtherUserJob* Scalix::deleteOtherUser( TDEIO::Slave* slave, const KURL& url, const TQString& email ) { TQByteArray packedArgs; TQDataStream stream( packedArgs, IO_WriteOnly ); @@ -145,11 +145,11 @@ DeleteOtherUserJob* Scalix::deleteOtherUser( KIO::Slave* slave, const KURL& url, << TQString( "X-DELETE-OTHER-USER" ) << email; DeleteOtherUserJob* job = new DeleteOtherUserJob( url, packedArgs, false ); - KIO::Scheduler::assignJobToSlave( slave, job ); + TDEIO::Scheduler::assignJobToSlave( slave, job ); return job; } -GetOtherUsersJob* Scalix::getOtherUsers( KIO::Slave* slave, const KURL& url ) +GetOtherUsersJob* Scalix::getOtherUsers( TDEIO::Slave* slave, const KURL& url ) { TQByteArray packedArgs; TQDataStream stream( packedArgs, IO_WriteOnly ); @@ -157,11 +157,11 @@ GetOtherUsersJob* Scalix::getOtherUsers( KIO::Slave* slave, const KURL& url ) << TQString( "X-GET-OTHER-USERS" ) << TQString(); GetOtherUsersJob* job = new GetOtherUsersJob( url, packedArgs, false ); - KIO::Scheduler::assignJobToSlave( slave, job ); + TDEIO::Scheduler::assignJobToSlave( slave, job ); return job; } -SetOutOfOfficeJob* Scalix::setOutOfOffice( KIO::Slave* slave, const KURL& url, bool enabled, const TQString& msg ) +SetOutOfOfficeJob* Scalix::setOutOfOffice( TDEIO::Slave* slave, const KURL& url, bool enabled, const TQString& msg ) { const TQString argument = msg; const TQString command = TQString( "X-SET-OUT-OF-OFFICE %1 %2 {%3}" ).arg( enabled ? "ENABLED" : "DISABLED" ) @@ -173,11 +173,11 @@ SetOutOfOfficeJob* Scalix::setOutOfOffice( KIO::Slave* slave, const KURL& url, b stream << (int) 'X' << (int)'E' << command << argument; SetOutOfOfficeJob* job = new SetOutOfOfficeJob( url, packedArgs, false ); - KIO::Scheduler::assignJobToSlave( slave, job ); + TDEIO::Scheduler::assignJobToSlave( slave, job ); return job; } -GetOutOfOfficeJob* Scalix::getOutOfOffice( KIO::Slave* slave, const KURL& url ) +GetOutOfOfficeJob* Scalix::getOutOfOffice( TDEIO::Slave* slave, const KURL& url ) { TQByteArray packedArgs; TQDataStream stream( packedArgs, IO_WriteOnly ); @@ -185,30 +185,30 @@ GetOutOfOfficeJob* Scalix::getOutOfOffice( KIO::Slave* slave, const KURL& url ) << TQString( "X-GET-OUT-OF-OFFICE" ) << TQString(); GetOutOfOfficeJob* job = new GetOutOfOfficeJob( url, packedArgs, false ); - KIO::Scheduler::assignJobToSlave( slave, job ); + TDEIO::Scheduler::assignJobToSlave( slave, job ); return job; } SetPasswordJob::SetPasswordJob( const KURL& url, const TQByteArray &packedArgs, bool showProgressInfo ) - : KIO::SimpleJob( url, KIO::CMD_SPECIAL, packedArgs, showProgressInfo ) + : TDEIO::SimpleJob( url, TDEIO::CMD_SPECIAL, packedArgs, showProgressInfo ) { } SetDelegateJob::SetDelegateJob( const KURL& url, const TQByteArray &packedArgs, bool showProgressInfo ) - : KIO::SimpleJob( url, KIO::CMD_SPECIAL, packedArgs, showProgressInfo ) + : TDEIO::SimpleJob( url, TDEIO::CMD_SPECIAL, packedArgs, showProgressInfo ) { } DeleteDelegateJob::DeleteDelegateJob( const KURL& url, const TQByteArray &packedArgs, bool showProgressInfo ) - : KIO::SimpleJob( url, KIO::CMD_SPECIAL, packedArgs, showProgressInfo ) + : TDEIO::SimpleJob( url, TDEIO::CMD_SPECIAL, packedArgs, showProgressInfo ) { } GetDelegatesJob::GetDelegatesJob( const KURL& url, const TQByteArray &packedArgs, bool showProgressInfo ) - : KIO::SimpleJob( url, KIO::CMD_SPECIAL, packedArgs, showProgressInfo ) + : TDEIO::SimpleJob( url, TDEIO::CMD_SPECIAL, packedArgs, showProgressInfo ) { - connect( this, TQT_SIGNAL( infoMessage( KIO::Job*, const TQString& ) ), - this, TQT_SLOT( slotInfoMessage( KIO::Job*, const TQString& ) ) ); + connect( this, TQT_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ), + this, TQT_SLOT( slotInfoMessage( TDEIO::Job*, const TQString& ) ) ); } Delegate::List GetDelegatesJob::delegates() const @@ -216,7 +216,7 @@ Delegate::List GetDelegatesJob::delegates() const return mDelegates; } -void GetDelegatesJob::slotInfoMessage( KIO::Job*, const TQString &data ) +void GetDelegatesJob::slotInfoMessage( TDEIO::Job*, const TQString &data ) { /** * The passed data have the following form: @@ -247,20 +247,20 @@ void GetDelegatesJob::slotInfoMessage( KIO::Job*, const TQString &data ) } AddOtherUserJob::AddOtherUserJob( const KURL& url, const TQByteArray &packedArgs, bool showProgressInfo ) - : KIO::SimpleJob( url, KIO::CMD_SPECIAL, packedArgs, showProgressInfo ) + : TDEIO::SimpleJob( url, TDEIO::CMD_SPECIAL, packedArgs, showProgressInfo ) { } DeleteOtherUserJob::DeleteOtherUserJob( const KURL& url, const TQByteArray &packedArgs, bool showProgressInfo ) - : KIO::SimpleJob( url, KIO::CMD_SPECIAL, packedArgs, showProgressInfo ) + : TDEIO::SimpleJob( url, TDEIO::CMD_SPECIAL, packedArgs, showProgressInfo ) { } GetOtherUsersJob::GetOtherUsersJob( const KURL& url, const TQByteArray &packedArgs, bool showProgressInfo ) - : KIO::SimpleJob( url, KIO::CMD_SPECIAL, packedArgs, showProgressInfo ) + : TDEIO::SimpleJob( url, TDEIO::CMD_SPECIAL, packedArgs, showProgressInfo ) { - connect( this, TQT_SIGNAL( infoMessage( KIO::Job*, const TQString& ) ), - this, TQT_SLOT( slotInfoMessage( KIO::Job*, const TQString& ) ) ); + connect( this, TQT_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ), + this, TQT_SLOT( slotInfoMessage( TDEIO::Job*, const TQString& ) ) ); } TQStringList GetOtherUsersJob::otherUsers() const @@ -268,21 +268,21 @@ TQStringList GetOtherUsersJob::otherUsers() const return mOtherUsers; } -void GetOtherUsersJob::slotInfoMessage( KIO::Job*, const TQString &data ) +void GetOtherUsersJob::slotInfoMessage( TDEIO::Job*, const TQString &data ) { mOtherUsers = TQStringList::split( ' ', data ); } SetOutOfOfficeJob::SetOutOfOfficeJob( const KURL& url, const TQByteArray &packedArgs, bool showProgressInfo ) - : KIO::SimpleJob( url, KIO::CMD_SPECIAL, packedArgs, showProgressInfo ) + : TDEIO::SimpleJob( url, TDEIO::CMD_SPECIAL, packedArgs, showProgressInfo ) { } GetOutOfOfficeJob::GetOutOfOfficeJob( const KURL& url, const TQByteArray &packedArgs, bool showProgressInfo ) - : KIO::SimpleJob( url, KIO::CMD_SPECIAL, packedArgs, showProgressInfo ) + : TDEIO::SimpleJob( url, TDEIO::CMD_SPECIAL, packedArgs, showProgressInfo ) { - connect( this, TQT_SIGNAL( infoMessage( KIO::Job*, const TQString& ) ), - this, TQT_SLOT( slotInfoMessage( KIO::Job*, const TQString& ) ) ); + connect( this, TQT_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ), + this, TQT_SLOT( slotInfoMessage( TDEIO::Job*, const TQString& ) ) ); } bool GetOutOfOfficeJob::enabled() const @@ -295,7 +295,7 @@ TQString GetOutOfOfficeJob::message() const return mMessage; } -void GetOutOfOfficeJob::slotInfoMessage( KIO::Job*, const TQString &data ) +void GetOutOfOfficeJob::slotInfoMessage( TDEIO::Job*, const TQString &data ) { const TQStringList fields = TQStringList::split( '^', data ); diff --git a/kresources/scalix/scalixadmin/jobs.h b/kresources/scalix/scalixadmin/jobs.h index 27efbb72..0c73fb50 100644 --- a/kresources/scalix/scalixadmin/jobs.h +++ b/kresources/scalix/scalixadmin/jobs.h @@ -66,37 +66,37 @@ namespace Scalix { /** * Sets/Changes the password of the user encoded in @p url. */ - SetPasswordJob* setPassword( KIO::Slave* slave, const KURL& url, const TQString& oldPassword, const TQString& newPassword ); + SetPasswordJob* setPassword( TDEIO::Slave* slave, const KURL& url, const TQString& oldPassword, const TQString& newPassword ); /** * Adds a delegate represented by @p email with the given @p params for the user encoded in @p url. */ - SetDelegateJob* setDelegate( KIO::Slave* slave, const KURL& url, const TQString& email, int params ); + SetDelegateJob* setDelegate( TDEIO::Slave* slave, const KURL& url, const TQString& email, int params ); /** * Deletes the delegate represented by @p email for the user encoded in @p url. */ - DeleteDelegateJob* deleteDelegate( KIO::Slave* slave, const KURL& url, const TQString& email ); + DeleteDelegateJob* deleteDelegate( TDEIO::Slave* slave, const KURL& url, const TQString& email ); /** * Retrieves the delegates for the user encoded in @p url. */ - GetDelegatesJob* getDelegates( KIO::Slave* slave, const KURL& url ); + GetDelegatesJob* getDelegates( TDEIO::Slave* slave, const KURL& url ); /** * Adds the mailbox of another user represented by @p email to the users 'Other Users' namespace. */ - AddOtherUserJob* addOtherUser( KIO::Slave* slave, const KURL& url, const TQString& email ); + AddOtherUserJob* addOtherUser( TDEIO::Slave* slave, const KURL& url, const TQString& email ); /** * Deletes the mailbox of another user represented by @p email from the users 'Other Users' namespace. */ - DeleteOtherUserJob* deleteOtherUser( KIO::Slave* slave, const KURL& url, const TQString& email ); + DeleteOtherUserJob* deleteOtherUser( TDEIO::Slave* slave, const KURL& url, const TQString& email ); /** * Retrieves the list of all other users. */ - GetOtherUsersJob* getOtherUsers( KIO::Slave* slave, const KURL& url ); + GetOtherUsersJob* getOtherUsers( TDEIO::Slave* slave, const KURL& url ); /** * Sets the out-of-office data. @@ -104,33 +104,33 @@ namespace Scalix { * @param enabled Whether the out-of-office functionality is enabled. * @param msg The out-of-office message. */ - SetOutOfOfficeJob* setOutOfOffice( KIO::Slave* slave, const KURL& url, bool enabled, const TQString& msg ); + SetOutOfOfficeJob* setOutOfOffice( TDEIO::Slave* slave, const KURL& url, bool enabled, const TQString& msg ); /** * Retrieves the out-of-office data. */ - GetOutOfOfficeJob* getOutOfOffice( KIO::Slave* slave, const KURL& url ); + GetOutOfOfficeJob* getOutOfOffice( TDEIO::Slave* slave, const KURL& url ); - class SetPasswordJob : public KIO::SimpleJob + class SetPasswordJob : public TDEIO::SimpleJob { public: SetPasswordJob( const KURL& url, const TQByteArray &packedArgs, bool showProgressInfo ); }; - class SetDelegateJob : public KIO::SimpleJob + class SetDelegateJob : public TDEIO::SimpleJob { public: SetDelegateJob( const KURL& url, const TQByteArray &packedArgs, bool showProgressInfo ); }; - class DeleteDelegateJob : public KIO::SimpleJob + class DeleteDelegateJob : public TDEIO::SimpleJob { public: DeleteDelegateJob( const KURL& url, const TQByteArray &packedArgs, bool showProgressInfo ); }; - class GetDelegatesJob : public KIO::SimpleJob + class GetDelegatesJob : public TDEIO::SimpleJob { Q_OBJECT @@ -141,25 +141,25 @@ namespace Scalix { Delegate::List delegates() const; private slots: - void slotInfoMessage( KIO::Job*, const TQString& ); + void slotInfoMessage( TDEIO::Job*, const TQString& ); private: Delegate::List mDelegates; }; - class AddOtherUserJob : public KIO::SimpleJob + class AddOtherUserJob : public TDEIO::SimpleJob { public: AddOtherUserJob( const KURL& url, const TQByteArray &packedArgs, bool showProgressInfo ); }; - class DeleteOtherUserJob : public KIO::SimpleJob + class DeleteOtherUserJob : public TDEIO::SimpleJob { public: DeleteOtherUserJob( const KURL& url, const TQByteArray &packedArgs, bool showProgressInfo ); }; - class GetOtherUsersJob : public KIO::SimpleJob + class GetOtherUsersJob : public TDEIO::SimpleJob { Q_OBJECT @@ -170,19 +170,19 @@ namespace Scalix { TQStringList otherUsers() const; private slots: - void slotInfoMessage( KIO::Job*, const TQString& ); + void slotInfoMessage( TDEIO::Job*, const TQString& ); private: TQStringList mOtherUsers; }; - class SetOutOfOfficeJob : public KIO::SimpleJob + class SetOutOfOfficeJob : public TDEIO::SimpleJob { public: SetOutOfOfficeJob( const KURL& url, const TQByteArray &packedArgs, bool showProgressInfo ); }; - class GetOutOfOfficeJob : public KIO::SimpleJob + class GetOutOfOfficeJob : public TDEIO::SimpleJob { Q_OBJECT @@ -194,7 +194,7 @@ namespace Scalix { TQString message() const; private slots: - void slotInfoMessage( KIO::Job*, const TQString& ); + void slotInfoMessage( TDEIO::Job*, const TQString& ); private: bool mEnabled; diff --git a/kresources/scalix/scalixadmin/otheruserpage.cpp b/kresources/scalix/scalixadmin/otheruserpage.cpp index 98b7b226..3aac47c9 100644 --- a/kresources/scalix/scalixadmin/otheruserpage.cpp +++ b/kresources/scalix/scalixadmin/otheruserpage.cpp @@ -67,7 +67,7 @@ void OtherUserPage::loadAllUsers() { Scalix::GetOtherUsersJob *job = Scalix::getOtherUsers( Settings::self()->globalSlave(), Settings::self()->accountUrl() ); - connect( job, TQT_SIGNAL( result( KIO::Job* ) ), TQT_SLOT( allUsers( KIO::Job* ) ) ); + connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), TQT_SLOT( allUsers( TDEIO::Job* ) ) ); } void OtherUserPage::addUser() @@ -82,7 +82,7 @@ void OtherUserPage::addUser() Scalix::AddOtherUserJob *job = Scalix::addOtherUser( Settings::self()->globalSlave(), Settings::self()->accountUrl(), email ); - connect( job, TQT_SIGNAL( result( KIO::Job* ) ), TQT_SLOT( userAdded( KIO::Job* ) ) ); + connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), TQT_SLOT( userAdded( TDEIO::Job* ) ) ); } void OtherUserPage::removeUser() @@ -93,10 +93,10 @@ void OtherUserPage::removeUser() Scalix::DeleteOtherUserJob *job = Scalix::deleteOtherUser( Settings::self()->globalSlave(), Settings::self()->accountUrl(), email ); - connect( job, TQT_SIGNAL( result( KIO::Job* ) ), TQT_SLOT( userRemoved( KIO::Job* ) ) ); + connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), TQT_SLOT( userRemoved( TDEIO::Job* ) ) ); } -void OtherUserPage::allUsers( KIO::Job *job ) +void OtherUserPage::allUsers( TDEIO::Job *job ) { if ( job->error() ) KMessageBox::error( this, job->errorString() ); @@ -112,7 +112,7 @@ void OtherUserPage::allUsers( KIO::Job *job ) selectionChanged(); } -void OtherUserPage::userAdded( KIO::Job *job ) +void OtherUserPage::userAdded( TDEIO::Job *job ) { if ( job->error() ) KMessageBox::error( this, job->errorString() ); @@ -122,7 +122,7 @@ void OtherUserPage::userAdded( KIO::Job *job ) updateKmail(); } -void OtherUserPage::userRemoved( KIO::Job *job ) +void OtherUserPage::userRemoved( TDEIO::Job *job ) { if ( job->error() ) KMessageBox::error( this, job->errorString() ); diff --git a/kresources/scalix/scalixadmin/otheruserpage.h b/kresources/scalix/scalixadmin/otheruserpage.h index 67ec4fe9..e8c5e269 100644 --- a/kresources/scalix/scalixadmin/otheruserpage.h +++ b/kresources/scalix/scalixadmin/otheruserpage.h @@ -42,9 +42,9 @@ class OtherUserPage : public TQWidget void addUser(); void removeUser(); - void userAdded( KIO::Job* ); - void userRemoved( KIO::Job* ); - void allUsers( KIO::Job* ); + void userAdded( TDEIO::Job* ); + void userRemoved( TDEIO::Job* ); + void allUsers( TDEIO::Job* ); void selectionChanged(); diff --git a/kresources/scalix/scalixadmin/outofofficepage.cpp b/kresources/scalix/scalixadmin/outofofficepage.cpp index e1e331fc..4e34a914 100644 --- a/kresources/scalix/scalixadmin/outofofficepage.cpp +++ b/kresources/scalix/scalixadmin/outofofficepage.cpp @@ -71,10 +71,10 @@ void OutOfOfficePage::load() { Scalix::GetOutOfOfficeJob *job = Scalix::getOutOfOffice( Settings::self()->globalSlave(), Settings::self()->accountUrl() ); - connect( job, TQT_SIGNAL( result( KIO::Job* ) ), TQT_SLOT( loaded( KIO::Job* ) ) ); + connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), TQT_SLOT( loaded( TDEIO::Job* ) ) ); } -void OutOfOfficePage::loaded( KIO::Job* job ) +void OutOfOfficePage::loaded( TDEIO::Job* job ) { if ( job->error() ) { KMessageBox::error( this, job->errorString() ); @@ -98,12 +98,12 @@ void OutOfOfficePage::store() mEnabled->isChecked(), mMessage->text() ); - connect( job, TQT_SIGNAL( result( KIO::Job* ) ), TQT_SLOT( stored( KIO::Job* ) ) ); + connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), TQT_SLOT( stored( TDEIO::Job* ) ) ); mSaveButton->setEnabled( false ); } -void OutOfOfficePage::stored( KIO::Job* job ) +void OutOfOfficePage::stored( TDEIO::Job* job ) { if ( job->error() ) KMessageBox::error( this, job->errorString() ); diff --git a/kresources/scalix/scalixadmin/outofofficepage.h b/kresources/scalix/scalixadmin/outofofficepage.h index dbd845ba..f9863fa1 100644 --- a/kresources/scalix/scalixadmin/outofofficepage.h +++ b/kresources/scalix/scalixadmin/outofofficepage.h @@ -39,9 +39,9 @@ class OutOfOfficePage : public TQWidget private slots: void load(); - void loaded( KIO::Job* ); + void loaded( TDEIO::Job* ); void store(); - void stored( KIO::Job* ); + void stored( TDEIO::Job* ); void statusChanged(); void changed(); diff --git a/kresources/scalix/scalixadmin/passwordpage.cpp b/kresources/scalix/scalixadmin/passwordpage.cpp index 23f4304c..120de86f 100644 --- a/kresources/scalix/scalixadmin/passwordpage.cpp +++ b/kresources/scalix/scalixadmin/passwordpage.cpp @@ -77,7 +77,7 @@ void PasswordPage::buttonClicked() mJob = Scalix::setPassword( Settings::self()->globalSlave(), Settings::self()->accountUrl(), Settings::self()->accountPassword(), mPassword->text() ); - connect( mJob, TQT_SIGNAL( result( KIO::Job* ) ), this, TQT_SLOT( finished( KIO::Job* ) ) ); + connect( mJob, TQT_SIGNAL( result( TDEIO::Job* ) ), this, TQT_SLOT( finished( TDEIO::Job* ) ) ); updateState( true ); } else { @@ -107,7 +107,7 @@ void PasswordPage::textChanged() !mPasswordRetype->text().isEmpty() ); } -void PasswordPage::finished( KIO::Job* job ) +void PasswordPage::finished( TDEIO::Job* job ) { mJob = 0; @@ -123,26 +123,26 @@ void PasswordPage::finished( KIO::Job* job ) const TQString newPassword = mPassword->text(); { // ScalixAdmin config - KConfig config( "scalixadminrc" ); - KConfigGroup group( &config, "Account" ); + TDEConfig config( "scalixadminrc" ); + TDEConfigGroup group( &config, "Account" ); group.writeEntry( "pass", KStringHandler::obscure( newPassword ) ); } { // ScalixWizard config - KConfig config( "scalixrc" ); - KConfigGroup group( &config, "General" ); + TDEConfig config( "scalixrc" ); + TDEConfigGroup group( &config, "General" ); group.writeEntry( "Password", KStringHandler::obscure( newPassword ) ); } { // KMail config - KConfig config( "kmailrc" ); + TDEConfig config( "kmailrc" ); // Try to find account group for Scalix TQString scalixAccount; const TQStringList groupList = config.groupList(); for ( uint i = 0; i < groupList.count(); ++i ) { if ( groupList[ i ].startsWith( "Account " ) ) { - KConfigGroup group( &config, groupList[ i ] ); + TDEConfigGroup group( &config, groupList[ i ] ); if ( group.hasKey( "groupwareType" ) && group.readNumEntry( "groupwareType" ) == 2 ) { scalixAccount = groupList[ i ]; break; @@ -157,7 +157,7 @@ void PasswordPage::finished( KIO::Job* job ) const int accountId = scalixAccount.mid( 8 ).toInt(); - KConfigGroup group( &config, scalixAccount ); + TDEConfigGroup group( &config, scalixAccount ); // Save only if the user choose it before bool storePassword = group.readBoolEntry( "store-passwd", false ); @@ -179,7 +179,7 @@ void PasswordPage::finished( KIO::Job* job ) group.writeEntry( "pass", KStringHandler::obscure( newPassword ) ); } - KConfigGroup fileGroup( &config, TQString( "Folder-%1" ).arg( group.readNumEntry( "Folder" ) ) ); + TDEConfigGroup fileGroup( &config, TQString( "Folder-%1" ).arg( group.readNumEntry( "Folder" ) ) ); fileGroup.writeEntry( "pass", KStringHandler::obscure( newPassword ) ); } } diff --git a/kresources/scalix/scalixadmin/passwordpage.h b/kresources/scalix/scalixadmin/passwordpage.h index 450bde67..5255193e 100644 --- a/kresources/scalix/scalixadmin/passwordpage.h +++ b/kresources/scalix/scalixadmin/passwordpage.h @@ -26,7 +26,7 @@ class TQLineEdit; class TQPushButton; -namespace KIO { +namespace TDEIO { class Job; } @@ -40,7 +40,7 @@ class PasswordPage : public TQWidget private slots: void buttonClicked(); - void finished( KIO::Job* ); + void finished( TDEIO::Job* ); void textChanged(); private: @@ -50,7 +50,7 @@ class PasswordPage : public TQWidget TQLineEdit *mPasswordRetype; TQPushButton *mButton; - KIO::Job *mJob; + TDEIO::Job *mJob; }; #endif diff --git a/kresources/scalix/scalixadmin/settings.cpp b/kresources/scalix/scalixadmin/settings.cpp index 52f72296..279491c5 100644 --- a/kresources/scalix/scalixadmin/settings.cpp +++ b/kresources/scalix/scalixadmin/settings.cpp @@ -28,7 +28,7 @@ Settings* Settings::mSelf = 0; Settings::Settings() { - mSlave = KIO::Scheduler::getConnectedSlave( accountUrl(), + mSlave = TDEIO::Scheduler::getConnectedSlave( accountUrl(), accountData() ); } @@ -44,12 +44,12 @@ Settings* Settings::self() return mSelf; } -KIO::MetaData Settings::accountData() const +TDEIO::MetaData Settings::accountData() const { - KConfig config( "scalixadminrc" ); - KConfigGroup group( &config, "Account" ); + TDEConfig config( "scalixadminrc" ); + TDEConfigGroup group( &config, "Account" ); - KIO::MetaData data; + TDEIO::MetaData data; data.insert( "auth", group.readEntry( "auth" ) ); data.insert( "tls", group.readBoolEntry( "use-tls" ) ? "on" : "off" ); @@ -58,8 +58,8 @@ KIO::MetaData Settings::accountData() const KURL Settings::accountUrl() const { - KConfig config( "scalixadminrc" ); - KConfigGroup group( &config, "Account" ); + TDEConfig config( "scalixadminrc" ); + TDEConfigGroup group( &config, "Account" ); KURL url; url.setProtocol( group.readBoolEntry( "use-ssl" ) ? "imaps" : "imap" ); @@ -73,25 +73,25 @@ KURL Settings::accountUrl() const TQString Settings::accountPassword() const { - KConfig config( "scalixadminrc" ); - KConfigGroup group( &config, "Account" ); + TDEConfig config( "scalixadminrc" ); + TDEConfigGroup group( &config, "Account" ); return KStringHandler::obscure( group.readEntry( "pass" ) ); } -KIO::Slave* Settings::globalSlave() const +TDEIO::Slave* Settings::globalSlave() const { return mSlave; } TQString Settings::rulesWizardUrl() const { - KConfig config( "scalixadminrc" ); - KConfigGroup group( &config, "Misc" ); + TDEConfig config( "scalixadminrc" ); + TDEConfigGroup group( &config, "Misc" ); TQString url = group.readEntry( "rulesWizardUrl" ); if ( url.isEmpty() ) { - KConfigGroup group( &config, "Account" ); + TDEConfigGroup group( &config, "Account" ); url = TQString( "http://%1/Scalix/rw/?username=%2" ).arg( group.readEntry( "host" ) ) .arg( group.readEntry( "user" ) ); } @@ -101,36 +101,36 @@ TQString Settings::rulesWizardUrl() const TQString Settings::ldapHost() const { - KConfig config( "scalixadminrc" ); - KConfigGroup group( &config, "LDAP" ); + TDEConfig config( "scalixadminrc" ); + TDEConfigGroup group( &config, "LDAP" ); return group.readEntry( "host" ); } TQString Settings::ldapPort() const { - KConfig config( "scalixadminrc" ); - KConfigGroup group( &config, "LDAP" ); + TDEConfig config( "scalixadminrc" ); + TDEConfigGroup group( &config, "LDAP" ); return group.readEntry( "port" ); } TQString Settings::ldapBase() const { - KConfig config( "scalixadminrc" ); - KConfigGroup group( &config, "LDAP" ); + TDEConfig config( "scalixadminrc" ); + TDEConfigGroup group( &config, "LDAP" ); return group.readEntry( "base" ); } TQString Settings::ldapBindDn() const { - KConfig config( "scalixadminrc" ); - KConfigGroup group( &config, "LDAP" ); + TDEConfig config( "scalixadminrc" ); + TDEConfigGroup group( &config, "LDAP" ); return group.readEntry( "bindDn" ); } TQString Settings::ldapPassword() const { - KConfig config( "scalixadminrc" ); - KConfigGroup group( &config, "LDAP" ); + TDEConfig config( "scalixadminrc" ); + TDEConfigGroup group( &config, "LDAP" ); return group.readEntry( "password" ); } diff --git a/kresources/scalix/scalixadmin/settings.h b/kresources/scalix/scalixadmin/settings.h index 1e36833a..29028f3b 100644 --- a/kresources/scalix/scalixadmin/settings.h +++ b/kresources/scalix/scalixadmin/settings.h @@ -32,11 +32,11 @@ class Settings static Settings* self(); - KIO::MetaData accountData() const; + TDEIO::MetaData accountData() const; KURL accountUrl() const; TQString accountPassword() const; - KIO::Slave *globalSlave() const; + TDEIO::Slave *globalSlave() const; TQString rulesWizardUrl() const; @@ -48,7 +48,7 @@ class Settings private: Settings(); - KIO::Slave *mSlave; + TDEIO::Slave *mSlave; static Settings* mSelf; }; diff --git a/kresources/slox/kabcresourceslox.cpp b/kresources/slox/kabcresourceslox.cpp index 6412de4a..b83c0b95 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 51bec97c..d5251bdc 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 0b712b66..98ca90ea 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 ce1fd86c..6735b993 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 61619793..aa648d1b 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 85b7625c..214e3c70 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 41864caf..a60cd788 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 54008d55..f31c212c 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 6b2c733a..32d3c416 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" ); diff --git a/kresources/tvanytime/kcal_resourcetvanytime.cpp b/kresources/tvanytime/kcal_resourcetvanytime.cpp index 4933768a..e447008c 100644 --- a/kresources/tvanytime/kcal_resourcetvanytime.cpp +++ b/kresources/tvanytime/kcal_resourcetvanytime.cpp @@ -59,7 +59,7 @@ ResourceTVAnytime::ResourceTVAnytime() mPrefs->addGroupPrefix( identifier() ); } -ResourceTVAnytime::ResourceTVAnytime( const KConfig *config ) +ResourceTVAnytime::ResourceTVAnytime( const TDEConfig *config ) : ResourceCached( config ), mLock( true ) { init(); @@ -102,7 +102,7 @@ TVAnytimePrefsBase *ResourceTVAnytime::prefs() return mPrefs; } -void ResourceTVAnytime::readConfig( const KConfig *config ) +void ResourceTVAnytime::readConfig( const TDEConfig *config ) { kdDebug() << "KCal::ResourceTVAnytime::readConfig()" << endl; @@ -116,7 +116,7 @@ void ResourceTVAnytime::readConfig( const KConfig *config ) } -void ResourceTVAnytime::writeConfig( KConfig *config ) +void ResourceTVAnytime::writeConfig( TDEConfig *config ) { kdDebug() << "KCal::ResourceTVAnytime::writeConfig()" << endl; @@ -178,9 +178,9 @@ bool ResourceTVAnytime::doLoad() kdDebug(5850) << " DESTINATION: " << destination.url() << endl; // TODO: find out if the file to download is fresh. if not, just work with the cache. - mDownloadJob = KIO::file_copy( url, destination, -1, true ); - connect( mDownloadJob, TQT_SIGNAL( result( KIO::Job * ) ), - TQT_SLOT( slotJobResult( KIO::Job * ) ) ); + mDownloadJob = TDEIO::file_copy( url, destination, -1, true ); + connect( mDownloadJob, TQT_SIGNAL( result( TDEIO::Job * ) ), + TQT_SLOT( slotJobResult( TDEIO::Job * ) ) ); mProgress = KPIM::ProgressManager::instance()->createProgressItem( KPIM::ProgressManager::getUniqueID(), i18n("Downloading program schedule") ); @@ -192,7 +192,7 @@ bool ResourceTVAnytime::doLoad() return true; } -void ResourceTVAnytime::slotJobResult( KIO::Job *job ) +void ResourceTVAnytime::slotJobResult( TDEIO::Job *job ) { kdDebug() << "ResourceTVAnytime::slotJobResult(): " << endl; diff --git a/kresources/tvanytime/kcal_resourcetvanytime.h b/kresources/tvanytime/kcal_resourcetvanytime.h index 526d1f18..1c8bd9c9 100644 --- a/kresources/tvanytime/kcal_resourcetvanytime.h +++ b/kresources/tvanytime/kcal_resourcetvanytime.h @@ -56,11 +56,11 @@ class KDE_EXPORT ResourceTVAnytime : public ResourceCached public: ResourceTVAnytime(); - ResourceTVAnytime( const KConfig * ); + ResourceTVAnytime( const TDEConfig * ); virtual ~ResourceTVAnytime(); - void readConfig( const KConfig *config ); - void writeConfig( KConfig *config ); + void readConfig( const TDEConfig *config ); + void writeConfig( TDEConfig *config ); TVAnytimePrefsBase *prefs(); @@ -101,7 +101,7 @@ class KDE_EXPORT ResourceTVAnytime : public ResourceCached bool readProgrammeInformation( const TQDomDocument & ); protected slots: - void slotJobResult( KIO::Job * ); + void slotJobResult( TDEIO::Job * ); void cancelLoad(); void slotEmitResourceChanged(); @@ -109,7 +109,7 @@ class KDE_EXPORT ResourceTVAnytime : public ResourceCached TVAnytimePrefsBase *mPrefs; KABC::LockNull mLock; - KIO::FileCopyJob *mDownloadJob; + TDEIO::FileCopyJob *mDownloadJob; KPIM::ProgressItem *mProgress; bool mIsShowingError; diff --git a/kresources/tvanytime/kcal_resourcetvanytimeconfig.cpp b/kresources/tvanytime/kcal_resourcetvanytimeconfig.cpp index 110a62f9..f9ec2a49 100644 --- a/kresources/tvanytime/kcal_resourcetvanytimeconfig.cpp +++ b/kresources/tvanytime/kcal_resourcetvanytimeconfig.cpp @@ -70,7 +70,7 @@ void ResourceTVAnytimeConfig::loadSettings( KRES::Resource *resource ) kdError() << "No PREF" << endl; return; } - KConfigSkeleton::ItemInt * daysItem = res->prefs()->daysItem(); + TDEConfigSkeleton::ItemInt * daysItem = res->prefs()->daysItem(); mDays->setMinValue( daysItem->minValue().toInt() ); mDays->setMaxValue( daysItem->maxValue().toInt() ); TQWhatsThis::add( mDays, daysItem->whatsThis() ); |