From f9ced3b3f13f3136ef63c33ef163042010d6e80b Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 25 Jan 2013 00:39:24 -0600 Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4 --- klinkstatus/src/engine/linkchecker.cpp | 48 +++++++++++++++++----------------- klinkstatus/src/engine/linkchecker.h | 12 ++++----- klinkstatus/src/klinkstatus.cpp | 4 +-- klinkstatus/src/klinkstatus.h | 6 ++--- klinkstatus/src/klinkstatus_part.cpp | 2 +- klinkstatus/src/ui/klshistorycombo.h | 2 +- klinkstatus/src/ui/sessionwidget.cpp | 6 ++--- klinkstatus/src/ui/sessionwidget.h | 2 +- 8 files changed, 41 insertions(+), 41 deletions(-) (limited to 'klinkstatus/src') diff --git a/klinkstatus/src/engine/linkchecker.cpp b/klinkstatus/src/engine/linkchecker.cpp index 8186bda8..2168b0b6 100644 --- a/klinkstatus/src/engine/linkchecker.cpp +++ b/klinkstatus/src/engine/linkchecker.cpp @@ -80,7 +80,7 @@ void LinkChecker::check() } } - t_job_ = KIO::get(url, false, false); + t_job_ = TDEIO::get(url, false, false); t_job_->addMetaData("PropagateHttpHeader", "true"); // to have the http header @@ -97,14 +97,14 @@ void LinkChecker::check() t_job_->addMetaData("SendUserAgent", "false"); - TQObject::connect(t_job_, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)), - this, TQT_SLOT(slotData(KIO::Job *, const TQByteArray &))); - TQObject::connect(t_job_, TQT_SIGNAL(mimetype(KIO::Job *, const TQString &)), - this, TQT_SLOT(slotMimetype(KIO::Job *, const TQString &))); - TQObject::connect(t_job_, TQT_SIGNAL(result(KIO::Job *)), - this, TQT_SLOT(slotResult(KIO::Job *))); - TQObject::connect(t_job_, TQT_SIGNAL(redirection(KIO::Job *, const KURL &)), - this, TQT_SLOT(slotRedirection(KIO::Job *, const KURL &))); + TQObject::connect(t_job_, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), + this, TQT_SLOT(slotData(TDEIO::Job *, const TQByteArray &))); + TQObject::connect(t_job_, TQT_SIGNAL(mimetype(TDEIO::Job *, const TQString &)), + this, TQT_SLOT(slotMimetype(TDEIO::Job *, const TQString &))); + TQObject::connect(t_job_, TQT_SIGNAL(result(TDEIO::Job *)), + this, TQT_SLOT(slotResult(TDEIO::Job *))); + TQObject::connect(t_job_, TQT_SIGNAL(redirection(TDEIO::Job *, const KURL &)), + this, TQT_SLOT(slotRedirection(TDEIO::Job *, const KURL &))); TQTimer::singleShot( time_out_ * 1000, this, TQT_SLOT(slotTimeOut()) ); @@ -123,7 +123,7 @@ void LinkChecker::slotTimeOut() // Q_ASSERT(t_job_); // can happen: e.g. bad result signal - if(t_job_->error() != KIO::ERR_USER_CANCELED) + if(t_job_->error() != TDEIO::ERR_USER_CANCELED) { linkstatus_->setErrorOccurred(true); linkstatus_->setChecked(true); @@ -136,7 +136,7 @@ void LinkChecker::slotTimeOut() } } -void LinkChecker::slotMimetype (KIO::Job* /*job*/, const TQString &type) +void LinkChecker::slotMimetype (TDEIO::Job* /*job*/, const TQString &type) { if(finnished_) return; @@ -196,7 +196,7 @@ void LinkChecker::slotMimetype (KIO::Job* /*job*/, const TQString &type) } } -void LinkChecker::slotData(KIO::Job* /*job*/, const TQByteArray& data) +void LinkChecker::slotData(TDEIO::Job* /*job*/, const TQByteArray& data) { if(finnished_) return; @@ -305,7 +305,7 @@ void LinkChecker::findDocumentCharset(TQString const& doc) // only comes here if an error happened or in case of a clean html page // if onlyCheckHeader is false -void LinkChecker::slotResult(KIO::Job* /*job*/) +void LinkChecker::slotResult(TDEIO::Job* /*job*/) { if(finnished_) return; @@ -325,12 +325,12 @@ void LinkChecker::slotResult(KIO::Job* /*job*/) } } - KIO::TransferJob* job = t_job_; + TDEIO::TransferJob* job = t_job_; t_job_ = 0; emit jobFinnished(this); - if(job->error() == KIO::ERR_USER_CANCELED) + if(job->error() == TDEIO::ERR_USER_CANCELED) { // FIXME This can happen! If the job is non interactive... kdWarning(23100) << endl << "Job killed quietly, yet signal result was emited..." << endl; @@ -363,7 +363,7 @@ void LinkChecker::slotResult(KIO::Job* /*job*/) kdDebug(23100) << "Job error: " << job->errorString() << endl; kdDebug(23100) << "Job error code: " << job->error() << endl; - if(job->error() == KIO::ERR_IS_DIRECTORY) + if(job->error() == TDEIO::ERR_IS_DIRECTORY) { ls->setStatusText("OK"); ls->setStatus(LinkStatus::SUCCESSFULL); @@ -371,14 +371,14 @@ void LinkChecker::slotResult(KIO::Job* /*job*/) else { ls->setErrorOccurred(true); - if(job->error() == KIO::ERR_SERVER_TIMEOUT) + if(job->error() == TDEIO::ERR_SERVER_TIMEOUT) ls->setStatus(LinkStatus::TIMEOUT); else ls->setStatus(LinkStatus::BROKEN); if(job->errorString().isEmpty()) kdWarning(23100) << "\n\nError string is empty, error = " << job->error() << "\n\n\n"; - if(job->error() != KIO::ERR_NO_CONTENT) + if(job->error() != TDEIO::ERR_NO_CONTENT) ls->setError(job->errorString()); else ls->setError(i18n("No Content")); @@ -425,7 +425,7 @@ void LinkChecker::slotResult(KIO::Job* /*job*/) } -void LinkChecker::slotRedirection (KIO::Job* /*job*/, const KURL &url) +void LinkChecker::slotRedirection (TDEIO::Job* /*job*/, const KURL &url) { kdDebug(23100) << "LinkChecker::slotRedirection -> " << linkstatus_->absoluteUrl().url() << " -> " << url.url() << endl; @@ -506,7 +506,7 @@ void LinkChecker::finnish() } } -HttpResponseHeader LinkChecker::getHttpHeader(KIO::Job* /*job*/, bool remember_check) +HttpResponseHeader LinkChecker::getHttpHeader(TDEIO::Job* /*job*/, bool remember_check) { //kdDebug(23100) << "LinkChecker::getHttpHeader -> " << linkstatus_->absoluteUrl().url() << endl; @@ -586,18 +586,18 @@ void LinkChecker::checkRef(KURL const& url) html_part->setOnlyLocalReferences(true); TQString tmpFile; - if(KIO::NetAccess::download(url, tmpFile, 0)) + if(TDEIO::NetAccess::download(url, tmpFile, 0)) { TQString doc_html = FileManager::read(tmpFile); html_part->begin(); html_part->write(doc_html); html_part->end(); - KIO::NetAccess::removeTempFile(tmpFile); + TDEIO::NetAccess::removeTempFile(tmpFile); } else { - kdDebug(23100) << KIO::NetAccess::lastErrorString() << endl; + kdDebug(23100) << TDEIO::NetAccess::lastErrorString() << endl; } search_manager_->addHtmlPart(url_string, html_part); @@ -678,7 +678,7 @@ void LinkChecker::killJob() if(!t_job_) return; - KIO::TransferJob* aux = t_job_; + TDEIO::TransferJob* aux = t_job_; t_job_ = 0; aux->disconnect(this); aux->kill(true); // quietly diff --git a/klinkstatus/src/engine/linkchecker.h b/klinkstatus/src/engine/linkchecker.h index e24d2037..a28d66bb 100644 --- a/klinkstatus/src/engine/linkchecker.h +++ b/klinkstatus/src/engine/linkchecker.h @@ -62,16 +62,16 @@ signals: protected slots: - void slotData(KIO::Job *, const TQByteArray &data); - void slotRedirection (KIO::Job *, const KURL &url); - void slotMimetype(KIO::Job *, const TQString &type); - void slotResult(KIO::Job* job); + void slotData(TDEIO::Job *, const TQByteArray &data); + void slotRedirection (TDEIO::Job *, const KURL &url); + void slotMimetype(TDEIO::Job *, const TQString &type); + void slotResult(TDEIO::Job* job); void slotTimeOut(); protected: void finnish(); - HttpResponseHeader getHttpHeader(KIO::Job* job, bool remember_check = true); + HttpResponseHeader getHttpHeader(TDEIO::Job* job, bool remember_check = true); void checkRef(); // #... private: @@ -92,7 +92,7 @@ private: SearchManager* search_manager_; LinkStatus* const linkstatus_; - KIO::TransferJob* t_job_; + TDEIO::TransferJob* t_job_; int time_out_; LinkChecker* checker_; TQString document_charset_; diff --git a/klinkstatus/src/klinkstatus.cpp b/klinkstatus/src/klinkstatus.cpp index 42d65a66..2efde62e 100644 --- a/klinkstatus/src/klinkstatus.cpp +++ b/klinkstatus/src/klinkstatus.cpp @@ -144,14 +144,14 @@ void KLinkStatus::removeDuplicatedActions() part_action_collection->remove(part_report_action); } -void KLinkStatus::saveProperties(KConfig* /*config*/) +void KLinkStatus::saveProperties(TDEConfig* /*config*/) { // the 'config' object points to the session managed // config file. anything you write here will be available // later when this app is restored } -void KLinkStatus::readProperties(KConfig* /*config*/) +void KLinkStatus::readProperties(TDEConfig* /*config*/) { // the 'config' object points to the session managed // config file. this function is automatically called whenever diff --git a/klinkstatus/src/klinkstatus.h b/klinkstatus/src/klinkstatus.h index 47bef3f7..f12ad736 100644 --- a/klinkstatus/src/klinkstatus.h +++ b/klinkstatus/src/klinkstatus.h @@ -54,14 +54,14 @@ protected: * This method is called when it is time for the app to save its * properties for session management purposes. */ - void saveProperties(KConfig *); + void saveProperties(TDEConfig *); /** - * This method is called when this app is restored. The KConfig + * This method is called when this app is restored. The TDEConfig * object points to the session management config file that was saved * with @ref saveProperties */ - void readProperties(KConfig *); + void readProperties(TDEConfig *); private slots: void optionsShowToolbar(); diff --git a/klinkstatus/src/klinkstatus_part.cpp b/klinkstatus/src/klinkstatus_part.cpp index b152fc0a..2b1ea9a4 100644 --- a/klinkstatus/src/klinkstatus_part.cpp +++ b/klinkstatus/src/klinkstatus_part.cpp @@ -147,7 +147,7 @@ void KLinkStatusPart::slotClose() void KLinkStatusPart::slotConfigureKLinkStatus() { - KConfigDialog *dialog = new KConfigDialog(tabwidget_, "klsconfig", KLSConfig::self()); + TDEConfigDialog *dialog = new TDEConfigDialog(tabwidget_, "klsconfig", KLSConfig::self()); dialog->addPage(new ConfigSearchDialog(0, "config_search_dialog"), i18n("Check"), "viewmag"); dialog->addPage(new ConfigResultsDialog(0, "config_results_dialog"), i18n("Results"), "player_playlist"); dialog->addPage(new ConfigIdentificationDialog(0), i18n("Identification"), diff --git a/klinkstatus/src/ui/klshistorycombo.h b/klinkstatus/src/ui/klshistorycombo.h index 501c7474..06973616 100644 --- a/klinkstatus/src/ui/klshistorycombo.h +++ b/klinkstatus/src/ui/klshistorycombo.h @@ -13,7 +13,7 @@ #define KLSHISTORYCOMBO_H #include -class KConfig; +class TDEConfig; /** @author Paulo Moura Guedes diff --git a/klinkstatus/src/ui/sessionwidget.cpp b/klinkstatus/src/ui/sessionwidget.cpp index 7c611bc0..e6a96f61 100644 --- a/klinkstatus/src/ui/sessionwidget.cpp +++ b/klinkstatus/src/ui/sessionwidget.cpp @@ -228,7 +228,7 @@ void SessionWidget::slotCheck() paused_ = false; stopped_ = false; - slotLoadSettings(false); // it seems that KConfigDialogManager is not trigering this slot + slotLoadSettings(false); // it seems that TDEConfigDialogManager is not trigering this slot newSearchManager(); @@ -631,7 +631,7 @@ void SessionWidget::slotPauseSearch() search_manager_->resume(); emit signalSearchStarted(); - slotLoadSettings(isEmpty()); // it seems that KConfigDialogManager is not trigering this slot + slotLoadSettings(isEmpty()); // it seems that TDEConfigDialogManager is not trigering this slot resetPendingActions(); } @@ -716,7 +716,7 @@ void SessionWidget::slotExportAsHTML( ) if (url.isLocalFile()) return; - KIO::NetAccess::upload(filename, url, 0); + TDEIO::NetAccess::upload(filename, url, 0); } diff --git a/klinkstatus/src/ui/sessionwidget.h b/klinkstatus/src/ui/sessionwidget.h index 368a7964..111b059d 100644 --- a/klinkstatus/src/ui/sessionwidget.h +++ b/klinkstatus/src/ui/sessionwidget.h @@ -35,7 +35,7 @@ class TQStringList; class TQListViewItem; class KURL; -class KConfig; +class TDEConfig; class KToggleAction; #include -- cgit v1.2.3