From cc74f360bb40da3d79f58048f8e8611804980aa6 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 25 Jan 2013 00:30:47 -0600 Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4 --- konqueror/keditbookmarks/testlink.cpp | 18 +++++++++--------- konqueror/keditbookmarks/testlink.h | 6 +++--- konqueror/keditbookmarks/updater.cpp | 18 +++++++++--------- konqueror/keditbookmarks/updater.h | 4 ++-- 4 files changed, 23 insertions(+), 23 deletions(-) (limited to 'konqueror/keditbookmarks') diff --git a/konqueror/keditbookmarks/testlink.cpp b/konqueror/keditbookmarks/testlink.cpp index 0d7d0ddf8..97386a3e7 100644 --- a/konqueror/keditbookmarks/testlink.cpp +++ b/konqueror/keditbookmarks/testlink.cpp @@ -86,14 +86,14 @@ bool TestLinkItr::isApplicable(const KBookmark &bk) const { void TestLinkItr::doAction() { m_errSet = false; - m_job = KIO::get(curBk().url(), true, false); + m_job = TDEIO::get(curBk().url(), true, false); m_job->addMetaData("errorPage", "true"); m_job->addMetaData( TQString("cookies"), TQString("none") ); - connect(m_job, TQT_SIGNAL( result( KIO::Job *)), - this, TQT_SLOT( slotJobResult(KIO::Job *))); - connect(m_job, TQT_SIGNAL( data( KIO::Job *, const TQByteArray &)), - this, TQT_SLOT( slotJobData(KIO::Job *, const TQByteArray &))); + connect(m_job, TQT_SIGNAL( result( TDEIO::Job *)), + this, TQT_SLOT( slotJobResult(TDEIO::Job *))); + connect(m_job, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray &)), + this, TQT_SLOT( slotJobData(TDEIO::Job *, const TQByteArray &))); curItem()->setTmpStatus(i18n("Checking...")); TQString oldModDate = TestLinkItrHolder::self()->getMod(curBk().url().url()); @@ -101,8 +101,8 @@ void TestLinkItr::doAction() { TestLinkItrHolder::self()->setMod(curBk().url().url(), i18n("Checking...")); } -void TestLinkItr::slotJobData(KIO::Job *job, const TQByteArray &data) { - KIO::TransferJob *transfer = (KIO::TransferJob *)job; +void TestLinkItr::slotJobData(TDEIO::Job *job, const TQByteArray &data) { + TDEIO::TransferJob *transfer = (TDEIO::TransferJob *)job; if (transfer->isErrorPage()) { TQStringList lines = TQStringList::split('\n', data); @@ -132,11 +132,11 @@ void TestLinkItr::slotJobData(KIO::Job *job, const TQByteArray &data) { transfer->kill(false); } -void TestLinkItr::slotJobResult(KIO::Job *job) { +void TestLinkItr::slotJobResult(TDEIO::Job *job) { m_job = 0; if ( !curItem() ) return; - KIO::TransferJob *transfer = (KIO::TransferJob *)job; + TDEIO::TransferJob *transfer = (TDEIO::TransferJob *)job; TQString modDate = transfer->queryMetaData("modified"); bool chkErr = true; diff --git a/konqueror/keditbookmarks/testlink.h b/konqueror/keditbookmarks/testlink.h index 7ee84f90b..a808202e1 100644 --- a/konqueror/keditbookmarks/testlink.h +++ b/konqueror/keditbookmarks/testlink.h @@ -61,14 +61,14 @@ public: virtual TestLinkItrHolder* holder() const { return TestLinkItrHolder::self(); } public slots: - void slotJobResult(KIO::Job *job); - void slotJobData(KIO::Job *job, const TQByteArray &data); + void slotJobResult(TDEIO::Job *job); + void slotJobData(TDEIO::Job *job, const TQByteArray &data); private: virtual void doAction(); virtual bool isApplicable(const KBookmark &bk) const; - KIO::TransferJob *m_job; + TDEIO::TransferJob *m_job; bool m_errSet; }; diff --git a/konqueror/keditbookmarks/updater.cpp b/konqueror/keditbookmarks/updater.cpp index 0d9a4cd11..ee2b6d3b6 100644 --- a/konqueror/keditbookmarks/updater.cpp +++ b/konqueror/keditbookmarks/updater.cpp @@ -145,20 +145,20 @@ void FavIconUpdater::notifyChange(bool isHost, TQString hostOrURL, TQString icon FavIconWebGrabber::FavIconWebGrabber(KParts::ReadOnlyPart *part, const KURL &url) : m_part(part), m_url(url) { - // kdDebug() << "FavIconWebGrabber::FavIconWebGrabber starting KIO::get() " << url << endl; + // kdDebug() << "FavIconWebGrabber::FavIconWebGrabber starting TDEIO::get() " << url << endl; // the use of KIO rather than directly using KHTML is to allow silently abort on error - KIO::Job *job = KIO::get(m_url, false, false); + TDEIO::Job *job = TDEIO::get(m_url, false, false); job->addMetaData( TQString("cookies"), TQString("none") ); - connect(job, TQT_SIGNAL( result( KIO::Job *)), - this, TQT_SLOT( slotFinished(KIO::Job *) )); - connect(job, TQT_SIGNAL( mimetype( KIO::Job *, const TQString &) ), - this, TQT_SLOT( slotMimetype(KIO::Job *, const TQString &) )); + connect(job, TQT_SIGNAL( result( TDEIO::Job *)), + this, TQT_SLOT( slotFinished(TDEIO::Job *) )); + connect(job, TQT_SIGNAL( mimetype( TDEIO::Job *, const TQString &) ), + this, TQT_SLOT( slotMimetype(TDEIO::Job *, const TQString &) )); } -void FavIconWebGrabber::slotMimetype(KIO::Job *job, const TQString & /*type*/) { - KIO::SimpleJob *sjob = static_cast(job); +void FavIconWebGrabber::slotMimetype(TDEIO::Job *job, const TQString & /*type*/) { + TDEIO::SimpleJob *sjob = static_cast(job); m_url = sjob->url(); // allow for redirection sjob->putOnHold(); @@ -171,7 +171,7 @@ void FavIconWebGrabber::slotMimetype(KIO::Job *job, const TQString & /*type*/) { m_part->openURL(m_url); } -void FavIconWebGrabber::slotFinished(KIO::Job *job) { +void FavIconWebGrabber::slotFinished(TDEIO::Job *job) { if (job->error()) { // kdDebug() << "FavIconWebGrabber::slotFinished() " << job->errorString() << endl; } diff --git a/konqueror/keditbookmarks/updater.h b/konqueror/keditbookmarks/updater.h index 62e034744..454b51672 100644 --- a/konqueror/keditbookmarks/updater.h +++ b/konqueror/keditbookmarks/updater.h @@ -35,8 +35,8 @@ public: ~FavIconWebGrabber() {} protected slots: - void slotMimetype(KIO::Job *job, const TQString &_type); - void slotFinished(KIO::Job *job); + void slotMimetype(TDEIO::Job *job, const TQString &_type); + void slotFinished(TDEIO::Job *job); private: KParts::ReadOnlyPart *m_part; -- cgit v1.2.1