diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:37:21 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:37:21 -0600 |
commit | 86d8364ac704bdc8ad2dfcf52307d9626cfac567 (patch) | |
tree | 97d3ac2c2f60780d9a1de4f82caac7cb27534501 /kresources/blogging | |
parent | a9bde819f2b421dcc44741156e75eca4bb5fb4f4 (diff) | |
download | tdepim-86d8364ac704bdc8ad2dfcf52307d9626cfac567.tar.gz tdepim-86d8364ac704bdc8ad2dfcf52307d9626cfac567.zip |
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'kresources/blogging')
-rw-r--r-- | kresources/blogging/API_Blog.h | 24 | ||||
-rw-r--r-- | kresources/blogging/API_Blogger.cpp | 42 | ||||
-rw-r--r-- | kresources/blogging/API_Blogger.h | 24 | ||||
-rw-r--r-- | kresources/blogging/bloggingcalendaradaptor.cpp | 22 | ||||
-rw-r--r-- | kresources/blogging/bloggingcalendaradaptor.h | 24 | ||||
-rw-r--r-- | kresources/blogging/kcal_resourceblogging.cpp | 6 | ||||
-rw-r--r-- | kresources/blogging/kcal_resourceblogging.h | 6 | ||||
-rw-r--r-- | kresources/blogging/xmlrpcjob.cpp | 24 | ||||
-rw-r--r-- | kresources/blogging/xmlrpcjob.h | 8 |
9 files changed, 90 insertions, 90 deletions
diff --git a/kresources/blogging/API_Blog.h b/kresources/blogging/API_Blog.h index f690fc422..9425bd5e6 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 0745467b8..69a722e22 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 04950338d..d7d5f43b9 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 bb91edb07..2ed925a88 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 e47e6b13c..ee6d292aa 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 c8b016620..14bb24ca3 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 8eff5062e..4e850d148 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 19582ec35..f2e516308 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 bc830ad2e..1efe79e1d 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 ); |