From d46a1fe34693137bbc38a0a79593af420ea0914b Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 25 Jan 2013 00:12:44 -0600 Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4 --- plugins/search/htmlpart.cpp | 20 ++++++++++---------- plugins/search/htmlpart.h | 10 +++++----- plugins/search/searchprefpage.cpp | 4 ++-- plugins/search/searchwidget.cpp | 2 +- 4 files changed, 18 insertions(+), 18 deletions(-) (limited to 'plugins/search') diff --git a/plugins/search/htmlpart.cpp b/plugins/search/htmlpart.cpp index d4b39e1..ffaeb5d 100644 --- a/plugins/search/htmlpart.cpp +++ b/plugins/search/htmlpart.cpp @@ -74,12 +74,12 @@ namespace kt active_job = 0; } - KIO::TransferJob* j = KIO::get(u,false,false); - connect(j,TQT_SIGNAL(data(KIO::Job*,const TQByteArray &)), - this,TQT_SLOT(dataRecieved(KIO::Job*, const TQByteArray& ))); - connect(j,TQT_SIGNAL(result(KIO::Job*)),this,TQT_SLOT(jobDone(KIO::Job* ))); - connect(j,TQT_SIGNAL(mimetype(KIO::Job*, const TQString &)), - this,TQT_SLOT(mimetype(KIO::Job*, const TQString& ))); + TDEIO::TransferJob* j = TDEIO::get(u,false,false); + connect(j,TQT_SIGNAL(data(TDEIO::Job*,const TQByteArray &)), + this,TQT_SLOT(dataRecieved(TDEIO::Job*, const TQByteArray& ))); + connect(j,TQT_SIGNAL(result(TDEIO::Job*)),this,TQT_SLOT(jobDone(TDEIO::Job* ))); + connect(j,TQT_SIGNAL(mimetype(TDEIO::Job*, const TQString &)), + this,TQT_SLOT(mimetype(TDEIO::Job*, const TQString& ))); active_job = j; curr_data.resize(0); @@ -115,7 +115,7 @@ namespace kt openURL(url()); } - void HTMLPart::dataRecieved(KIO::Job* job,const TQByteArray & data) + void HTMLPart::dataRecieved(TDEIO::Job* job,const TQByteArray & data) { if (job != active_job) { @@ -134,7 +134,7 @@ namespace kt } } - void HTMLPart::mimetype(KIO::Job* job,const TQString & mt) + void HTMLPart::mimetype(TDEIO::Job* job,const TQString & mt) { if (job != active_job) { @@ -145,7 +145,7 @@ namespace kt mime_type = mt; } - void HTMLPart::jobDone(KIO::Job* job) + void HTMLPart::jobDone(TDEIO::Job* job) { if (job != active_job) { @@ -185,7 +185,7 @@ namespace kt else { begin(curr_url); - write(KIO::buildErrorString(job->error(),job->errorText()));/*,&curr_url));**/ + write(TDEIO::buildErrorString(job->error(),job->errorText()));/*,&curr_url));**/ end(); } active_job = 0; diff --git a/plugins/search/htmlpart.h b/plugins/search/htmlpart.h index 433a2e2..f4a3454 100644 --- a/plugins/search/htmlpart.h +++ b/plugins/search/htmlpart.h @@ -22,7 +22,7 @@ #include -namespace KIO +namespace TDEIO { class Job; } @@ -50,9 +50,9 @@ namespace kt private slots: void addToHistory(const KURL & url); - void dataRecieved(KIO::Job* job,const TQByteArray & data); - void mimetype(KIO::Job* job,const TQString & mt); - void jobDone(KIO::Job* job); + void dataRecieved(TDEIO::Job* job,const TQByteArray & data); + void mimetype(TDEIO::Job* job,const TQString & mt); + void jobDone(TDEIO::Job* job); signals: @@ -63,7 +63,7 @@ namespace kt private: KURL::List history; - KIO::Job* active_job; + TDEIO::Job* active_job; TQByteArray curr_data; TQString mime_type; KURL curr_url; diff --git a/plugins/search/searchprefpage.cpp b/plugins/search/searchprefpage.cpp index 8de3e28..d31a037 100644 --- a/plugins/search/searchprefpage.cpp +++ b/plugins/search/searchprefpage.cpp @@ -188,12 +188,12 @@ namespace kt TQString fn = TDEGlobal::dirs()->saveLocation("data","ktorrent") + "search_engines.tmp"; KURL source("http://www.ktorrent.org/downloads/search_engines"); - if (KIO::NetAccess::download(source,fn,NULL)) + if (TDEIO::NetAccess::download(source,fn,NULL)) { //list successfully downloaded, remove temporary file updateList(fn); saveSearchEngines(); - KIO::NetAccess::removeTempFile(fn); + TDEIO::NetAccess::removeTempFile(fn); } } diff --git a/plugins/search/searchwidget.cpp b/plugins/search/searchwidget.cpp index 0cf99a9..f0fefe0 100644 --- a/plugins/search/searchwidget.cpp +++ b/plugins/search/searchwidget.cpp @@ -213,7 +213,7 @@ namespace kt { KURL save_url = fdlg.selectedURL(); // start a copy job - KIO::Job* j = KIO::file_copy(url,save_url,-1,true); + TDEIO::Job* j = TDEIO::file_copy(url,save_url,-1,true); // let it deal with the errors j->setAutoErrorHandlingEnabled(true,0); } -- cgit v1.2.1