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 --- lib/qextfileinfo.cpp | 100 +++++++++++++++++++++++++-------------------------- 1 file changed, 50 insertions(+), 50 deletions(-) (limited to 'lib/qextfileinfo.cpp') diff --git a/lib/qextfileinfo.cpp b/lib/qextfileinfo.cpp index f701fb5a..3aaf5e1b 100644 --- a/lib/qextfileinfo.cpp +++ b/lib/qextfileinfo.cpp @@ -214,7 +214,7 @@ bool QExtFileInfo::createDir(const KURL& path, TQWidget *window) } dir3 = dir2; dir3.adjustPath(-1); //some servers refuse to create directories ending with a slash - result = KIO::NetAccess::mkdir(dir3, window); + result = TDEIO::NetAccess::mkdir(dir3, window); if (dir2.path() == "/" || !result) break; i++; @@ -259,7 +259,7 @@ bool QExtFileInfo::exists(const KURL& a_url, bool readingOnly, TQWidget *window) { // Andras: Don't use it now, as it brings up an extra dialog and need manual // intervention when usign fish -// return KIO::NetAccess::exists(a_url, false); +// return TDEIO::NetAccess::exists(a_url, false); // No dialog when stating. if (a_url.isLocalFile()) @@ -297,13 +297,13 @@ KURL::List QExtFileInfo::allFilesInternal(const KURL& startURL, const TQString& lstFilters.append( new TQRegExp(*it, false, true ) ); bJobOK = true; - KIO::ListJob *job = KIO::listRecursive(startURL, false, true); + TDEIO::ListJob *job = TDEIO::listRecursive(startURL, false, true); job->setWindow(window); m_listJobCount = 1; - connect(job, TQT_SIGNAL(entries(KIO::Job *, const KIO::UDSEntryList&)), - this, TQT_SLOT(slotNewEntries(KIO::Job *, const KIO::UDSEntryList&))); - connect( job, TQT_SIGNAL( result (KIO::Job *) ), - this, TQT_SLOT( slotListResult (KIO::Job *) ) ); + connect(job, TQT_SIGNAL(entries(TDEIO::Job *, const TDEIO::UDSEntryList&)), + this, TQT_SLOT(slotNewEntries(TDEIO::Job *, const TDEIO::UDSEntryList&))); + connect( job, TQT_SIGNAL( result (TDEIO::Job *) ), + this, TQT_SLOT( slotListResult (TDEIO::Job *) ) ); m_listStartURL = startURL.url(); //kdDebug(24000) << "Now listing: " << startURL.url() << endl; @@ -335,13 +335,13 @@ TQDict QExtFileInfo::allFilesDetailedInternal(const KURL& startURL, c lstFilters.append( new TQRegExp(*it, false, true ) ); bJobOK = true; - KIO::ListJob *job = KIO::listRecursive(startURL, false, true); + TDEIO::ListJob *job = TDEIO::listRecursive(startURL, false, true); job->setWindow(window); m_listJobCount = 1; - connect(job, TQT_SIGNAL(entries(KIO::Job *, const KIO::UDSEntryList&)), - this, TQT_SLOT(slotNewDetailedEntries(KIO::Job *, const KIO::UDSEntryList&))); - connect( job, TQT_SIGNAL( result (KIO::Job *) ), - this, TQT_SLOT( slotListResult (KIO::Job *) ) ); + connect(job, TQT_SIGNAL(entries(TDEIO::Job *, const TDEIO::UDSEntryList&)), + this, TQT_SLOT(slotNewDetailedEntries(TDEIO::Job *, const TDEIO::UDSEntryList&))); + connect( job, TQT_SIGNAL( result (TDEIO::Job *) ), + this, TQT_SLOT( slotListResult (TDEIO::Job *) ) ); m_listStartURL = startURL.url(); //kdDebug(24000) << "Now listing: " << startURL.url() << endl; enter_loop(); @@ -385,7 +385,7 @@ KURL::List QExtFileInfo::allLocalFiles(const TQString& startPath, const TQString } -//Some hackery from KIO::NetAccess as they do not do exactly what we want +//Some hackery from TDEIO::NetAccess as they do not do exactly what we want /* return true if the url exists*/ bool QExtFileInfo::internalExists(const KURL& url, bool readingOnly, TQWidget *window) { @@ -393,12 +393,12 @@ bool QExtFileInfo::internalExists(const KURL& url, bool readingOnly, TQWidget *w KURL url2 = url; url2.adjustPath(-1); // kdDebug(24000)<<"QExtFileInfo::internalExists"<setWindow(window); job->setDetails(0); job->setSide(readingOnly); - connect( job, TQT_SIGNAL( result (KIO::Job *) ), - this, TQT_SLOT( slotResult (KIO::Job *) ) ); + connect( job, TQT_SIGNAL( result (TDEIO::Job *) ), + this, TQT_SLOT( slotResult (TDEIO::Job *) ) ); //To avoid lock-ups, start a timer. TQTimer::singleShot(60*1000, this,TQT_SLOT(slotTimeout())); @@ -413,21 +413,21 @@ bool QExtFileInfo::internalCopy(const KURL& src, const KURL& target, int permiss { bJobOK = true; // success unless further error occurs - KIO::Scheduler::checkSlaveOnHold(true); - KIO::Job * job = KIO::file_copy( src, target, permissions, overwrite, resume, false ); -// KIO::Job * job2 = KIO::del(target, false ); + TDEIO::Scheduler::checkSlaveOnHold(true); + TDEIO::Job * job = TDEIO::file_copy( src, target, permissions, overwrite, resume, false ); +// TDEIO::Job * job2 = TDEIO::del(target, false ); //job2->setWindow (window); - //connect( job2, TQT_SIGNAL( result (KIO::Job *) ), -// this, TQT_SLOT( slotResult (KIO::Job *) ) ); + //connect( job2, TQT_SIGNAL( result (TDEIO::Job *) ), +// this, TQT_SLOT( slotResult (TDEIO::Job *) ) ); //enter_loop(); //if (bJobOK) { // kdDebug(24000) << "Copying " << src << " to " << target << endl; - // KIO::Job *job = KIO::copy( src, target, false ); + // TDEIO::Job *job = TDEIO::copy( src, target, false ); job->setWindow (window); - connect( job, TQT_SIGNAL( result (KIO::Job *) ), - this, TQT_SLOT( slotResult (KIO::Job *) ) ); + connect( job, TQT_SIGNAL( result (TDEIO::Job *) ), + this, TQT_SLOT( slotResult (TDEIO::Job *) ) ); enter_loop(); } return bJobOK; @@ -448,14 +448,14 @@ void QExtFileInfo::enter_loop() tqt_leave_modal(&dummy); } -void QExtFileInfo::slotListResult(KIO::Job *job) +void QExtFileInfo::slotListResult(TDEIO::Job *job) { m_listJobCount--; if (m_listJobCount == 0) slotResult(job); } -void QExtFileInfo::slotResult(KIO::Job *job) +void QExtFileInfo::slotResult(TDEIO::Job *job) { //kdDebug(24000)<<"QExtFileInfo::slotResult"<error(); @@ -464,21 +464,21 @@ void QExtFileInfo::slotResult(KIO::Job *job) if ( !lastErrorMsg ) lastErrorMsg = job->errorString(); } - if ( job->isA("KIO::StatJob") ) - m_entry = static_cast(job)->statResult(); + if ( job->isA("TDEIO::StatJob") ) + m_entry = static_cast(job)->statResult(); tqApp->exit_loop(); } -void QExtFileInfo::slotNewEntries(KIO::Job *job, const KIO::UDSEntryList& udsList) +void QExtFileInfo::slotNewEntries(TDEIO::Job *job, const TDEIO::UDSEntryList& udsList) { - KURL url = static_cast(job)->url(); + KURL url = static_cast(job)->url(); url.adjustPath(-1); // avoid creating these TQStrings again and again static const TQString& dot = TDEGlobal::staticQString("."); static const TQString& dotdot = TDEGlobal::staticQString(".."); - KIO::UDSEntryListConstIterator it = udsList.begin(); - KIO::UDSEntryListConstIterator end = udsList.end(); + TDEIO::UDSEntryListConstIterator it = udsList.begin(); + TDEIO::UDSEntryListConstIterator end = udsList.end(); KURL itemURL; TQPtrList linkItems; linkItems.setAutoDelete(true); @@ -487,9 +487,9 @@ void QExtFileInfo::slotNewEntries(KIO::Job *job, const KIO::UDSEntryList& udsLis TQString name; // find out about the name - KIO::UDSEntry::ConstIterator entit = (*it).begin(); + TDEIO::UDSEntry::ConstIterator entit = (*it).begin(); for( ; entit != (*it).end(); ++entit ) - if ((*entit).m_uds == KIO::UDS_NAME) + if ((*entit).m_uds == TDEIO::UDS_NAME) { name = (*entit).m_str; break; @@ -533,26 +533,26 @@ void QExtFileInfo::slotNewEntries(KIO::Job *job, const KIO::UDSEntryList& udsLis } for (TQPtrList::ConstIterator it = linkItems.constBegin(); it != linkItems.constEnd(); ++it) { - KIO::ListJob *ljob = KIO::listRecursive((*it)->url(), false, true); + TDEIO::ListJob *ljob = TDEIO::listRecursive((*it)->url(), false, true); m_listJobCount++; //kdDebug(24000) << "Now listing: " << (*it)->url() << endl; - connect( ljob, TQT_SIGNAL(entries(KIO::Job *,const KIO::UDSEntryList &)), - this,TQT_SLOT (slotNewEntries(KIO::Job *,const KIO::UDSEntryList &))); - connect( ljob, TQT_SIGNAL(result(KIO::Job *)), - this,TQT_SLOT (slotListResult(KIO::Job *))); + connect( ljob, TQT_SIGNAL(entries(TDEIO::Job *,const TDEIO::UDSEntryList &)), + this,TQT_SLOT (slotNewEntries(TDEIO::Job *,const TDEIO::UDSEntryList &))); + connect( ljob, TQT_SIGNAL(result(TDEIO::Job *)), + this,TQT_SLOT (slotListResult(TDEIO::Job *))); } } -void QExtFileInfo::slotNewDetailedEntries(KIO::Job *job, const KIO::UDSEntryList& udsList) +void QExtFileInfo::slotNewDetailedEntries(TDEIO::Job *job, const TDEIO::UDSEntryList& udsList) { - KURL url = static_cast(job)->url(); + KURL url = static_cast(job)->url(); url.adjustPath(-1); // avoid creating these TQStrings again and again static const TQString& dot = TDEGlobal::staticQString("."); static const TQString& dotdot = TDEGlobal::staticQString(".."); - KIO::UDSEntryListConstIterator it = udsList.begin(); - KIO::UDSEntryListConstIterator end = udsList.end(); + TDEIO::UDSEntryListConstIterator it = udsList.begin(); + TDEIO::UDSEntryListConstIterator end = udsList.end(); KURL itemURL; TQPtrList linkItems; linkItems.setAutoDelete(true); @@ -561,9 +561,9 @@ void QExtFileInfo::slotNewDetailedEntries(KIO::Job *job, const KIO::UDSEntryList TQString name; // find out about the name - KIO::UDSEntry::ConstIterator entit = (*it).begin(); + TDEIO::UDSEntry::ConstIterator entit = (*it).begin(); for( ; entit != (*it).end(); ++entit ) - if ((*entit).m_uds == KIO::UDS_NAME) + if ((*entit).m_uds == TDEIO::UDS_NAME) { name = (*entit).m_str; break; @@ -600,13 +600,13 @@ void QExtFileInfo::slotNewDetailedEntries(KIO::Job *job, const KIO::UDSEntryList } for (TQPtrList::ConstIterator it = linkItems.constBegin(); it != linkItems.constEnd(); ++it) { - KIO::ListJob *ljob = KIO::listRecursive((*it)->url(), false, true); + TDEIO::ListJob *ljob = TDEIO::listRecursive((*it)->url(), false, true); m_listJobCount++; // kdDebug(24000) << "Now listing: " << (*it)->url() << endl; - connect( ljob, TQT_SIGNAL(entries(KIO::Job *,const KIO::UDSEntryList &)), - this,TQT_SLOT (slotNewDetailedEntries(KIO::Job *,const KIO::UDSEntryList &))); - connect( ljob, TQT_SIGNAL(result(KIO::Job *)), - this,TQT_SLOT (slotListResult(KIO::Job *))); + connect( ljob, TQT_SIGNAL(entries(TDEIO::Job *,const TDEIO::UDSEntryList &)), + this,TQT_SLOT (slotNewDetailedEntries(TDEIO::Job *,const TDEIO::UDSEntryList &))); + connect( ljob, TQT_SIGNAL(result(TDEIO::Job *)), + this,TQT_SLOT (slotListResult(TDEIO::Job *))); } } -- cgit v1.2.1