diff --git a/ksquirrel/imageedit/sq_imageconvert.ui.h b/ksquirrel/imageedit/sq_imageconvert.ui.h index 7bad63c..f73fd88 100644 --- a/ksquirrel/imageedit/sq_imageconvert.ui.h +++ b/ksquirrel/imageedit/sq_imageconvert.ui.h @@ -181,7 +181,7 @@ void SQ_ImageConvert::slotOptions() { SQ_ImageEditOptions o(this); - // SQ_ImageEditOptions will write needed KConfig entries, if + // SQ_ImageEditOptions will write needed TDEConfig entries, if // exec() will return TQDialog::Accepted o.setConfigPrefix("convert"); diff --git a/ksquirrel/ksquirrel-libs-configurator/klc.ui b/ksquirrel/ksquirrel-libs-configurator/klc.ui index 8027065..12d89a9 100644 --- a/ksquirrel/ksquirrel-libs-configurator/klc.ui +++ b/ksquirrel/ksquirrel-libs-configurator/klc.ui @@ -164,7 +164,7 @@ class KDirLister; - namespace KIO { class Job; } + namespace TDEIO { class Job; } KURL base, backup; @@ -178,7 +178,7 @@ slotCompleted( const KURL & u ) slotNewItems( const KFileItemList & list ) slotDeleteItem( KFileItem * fi ) - slotDelResult( KIO::Job * job ) + slotDelResult( TDEIO::Job * job ) init() diff --git a/ksquirrel/ksquirrel-libs-configurator/klc.ui.h b/ksquirrel/ksquirrel-libs-configurator/klc.ui.h index 3372fef..cc6f9b1 100644 --- a/ksquirrel/ksquirrel-libs-configurator/klc.ui.h +++ b/ksquirrel/ksquirrel-libs-configurator/klc.ui.h @@ -32,7 +32,7 @@ void KLC::init() backupDir = backup.path(); - KIO::NetAccess::mkdir(backup, this); + TDEIO::NetAccess::mkdir(backup, this); TQTimer::singleShot(0, this, TQT_SLOT(slotLoad())); } @@ -76,9 +76,9 @@ void KLC::moveCodecs(bool e2d) ++it; } - KIO::Job *job = KIO::move(list, e2d ? backup : base); + TDEIO::Job *job = TDEIO::move(list, e2d ? backup : base); - connect(job, TQT_SIGNAL(result(KIO::Job *)), this, TQT_SLOT(slotDelResult(KIO::Job *))); + connect(job, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotDelResult(TDEIO::Job *))); } void KLC::slotCompleted(const KURL &u) @@ -139,7 +139,7 @@ void KLC::slotDeleteItem(KFileItem *fi) } } -void KLC::slotDelResult(KIO::Job *job) +void KLC::slotDelResult(TDEIO::Job *job) { if(job && job->error()) job->showErrorDialog(this); diff --git a/ksquirrel/ksquirrel.cpp b/ksquirrel/ksquirrel.cpp index fc19ef5..67ff6bd 100644 --- a/ksquirrel/ksquirrel.cpp +++ b/ksquirrel/ksquirrel.cpp @@ -140,7 +140,7 @@ KSquirrel::KSquirrel(TQWidget *parent, const char *name) writeDefaultEntries(); - // create KConfig instance. + // create TDEConfig instance. // It will help us to read and write config entries kconf = new SQ_Config(TQT_TQOBJECT(this)); @@ -964,7 +964,7 @@ void KSquirrel::initBookmarks() // local directory (~/.trinity/share/config) void KSquirrel::writeDefaultEntries() { - KConfig conf("ksquirrelrc"); + TDEConfig conf("ksquirrelrc"); if(!conf.hasGroup("External tools")) { @@ -1300,20 +1300,20 @@ void KSquirrel::preCreate() url.setPath(SQ_HLOptions::instance()->param); statStage = false; - KIO::StatJob *job = KIO::stat(url, false); + TDEIO::StatJob *job = TDEIO::stat(url, false); job->setSide(true); job->setDetails(0); - connect(job, TQT_SIGNAL(result(KIO::Job *)), TQT_TQOBJECT(this), TQT_SLOT(slotStatResult(KIO::Job *))); + connect(job, TQT_SIGNAL(result(TDEIO::Job *)), TQT_TQOBJECT(this), TQT_SLOT(slotStatResult(TDEIO::Job *))); } else continueLoading(); } -void KSquirrel::slotStatResult(KIO::Job *_job) +void KSquirrel::slotStatResult(TDEIO::Job *_job) { if(_job) { - KIO::StatJob *job = static_cast(_job); + TDEIO::StatJob *job = static_cast(_job); if(job->error()) { @@ -1327,13 +1327,13 @@ void KSquirrel::slotStatResult(KIO::Job *_job) } // found local/remote URL - KIO::UDSEntry udsEntry = job->statResult(); - KIO::UDSEntry::ConstIterator itEnd = udsEntry.end(); + TDEIO::UDSEntry udsEntry = job->statResult(); + TDEIO::UDSEntry::ConstIterator itEnd = udsEntry.end(); - for(KIO::UDSEntry::ConstIterator it = udsEntry.begin(); it != itEnd;++it) + for(TDEIO::UDSEntry::ConstIterator it = udsEntry.begin(); it != itEnd;++it) { // we need just file type... - if((*it).m_uds == KIO::UDS_FILE_TYPE) + if((*it).m_uds == TDEIO::UDS_FILE_TYPE) { if(S_ISDIR((mode_t)((*it).m_long))) { @@ -1364,10 +1364,10 @@ void KSquirrel::slotStatResult(KIO::Job *_job) // local url is not found. construct remote url and stat() it again KURL url = KURL::fromPathOrURL(SQ_HLOptions::instance()->param); statStage = true; - KIO::StatJob *job2 = KIO::stat(url, false); + TDEIO::StatJob *job2 = TDEIO::stat(url, false); job2->setSide(true); job2->setDetails(0); - connect(job2, TQT_SIGNAL(result(KIO::Job *)), TQT_TQOBJECT(this), TQT_SLOT(slotStatResult(KIO::Job *))); + connect(job2, TQT_SIGNAL(result(TDEIO::Job *)), TQT_TQOBJECT(this), TQT_SLOT(slotStatResult(TDEIO::Job *))); } else continueLoading(); @@ -1575,10 +1575,10 @@ bool KSquirrel::process(const TQCString &fun, const TQByteArray &data, TQCString KURL url = KURL::fromPathOrURL(arg); - KIO::StatJob *job = KIO::stat(url, false); + TDEIO::StatJob *job = TDEIO::stat(url, false); job->setSide(true); job->setDetails(0); - connect(job, TQT_SIGNAL(result(KIO::Job *)), TQT_TQOBJECT(this), TQT_SLOT(slotDCOPStatResult(KIO::Job *))); + connect(job, TQT_SIGNAL(result(TDEIO::Job *)), TQT_TQOBJECT(this), TQT_SLOT(slotDCOPStatResult(TDEIO::Job *))); replyType = "void"; @@ -1589,11 +1589,11 @@ bool KSquirrel::process(const TQCString &fun, const TQByteArray &data, TQCString return DCOPObject::process(fun, data, replyType, replyData); } -void KSquirrel::slotDCOPStatResult(KIO::Job *_job) +void KSquirrel::slotDCOPStatResult(TDEIO::Job *_job) { if(_job) { - KIO::StatJob *job = static_cast(_job); + TDEIO::StatJob *job = static_cast(_job); if(job->error()) { @@ -1605,13 +1605,13 @@ void KSquirrel::slotDCOPStatResult(KIO::Job *_job) bool isdir = false, setc = true; KURL dir = url; - KIO::UDSEntry udsEntry = job->statResult(); - KIO::UDSEntry::ConstIterator itEnd = udsEntry.end(); + TDEIO::UDSEntry udsEntry = job->statResult(); + TDEIO::UDSEntry::ConstIterator itEnd = udsEntry.end(); - for(KIO::UDSEntry::ConstIterator it = udsEntry.begin(); it != itEnd;++it) + for(TDEIO::UDSEntry::ConstIterator it = udsEntry.begin(); it != itEnd;++it) { // we need just file type... - if((*it).m_uds == KIO::UDS_FILE_TYPE) + if((*it).m_uds == TDEIO::UDS_FILE_TYPE) { isdir = S_ISDIR((mode_t)((*it).m_long)); break; @@ -1813,13 +1813,13 @@ void KSquirrel::slotSlideShowStart() // recursion ? bool recurs = kconf->readBoolEntry("recurs", false); - listing = recurs ? KIO::listRecursive(slideShowDir, false, false) - : KIO::listDir(slideShowDir, false, false); + listing = recurs ? TDEIO::listRecursive(slideShowDir, false, false) + : TDEIO::listDir(slideShowDir, false, false); - connect(listing, TQT_SIGNAL(entries(KIO::Job *, const KIO::UDSEntryList &)), - TQT_TQOBJECT(this), TQT_SLOT(slotSlideShowEntries(KIO::Job *, const KIO::UDSEntryList &))); + connect(listing, TQT_SIGNAL(entries(TDEIO::Job *, const TDEIO::UDSEntryList &)), + TQT_TQOBJECT(this), TQT_SLOT(slotSlideShowEntries(TDEIO::Job *, const TDEIO::UDSEntryList &))); - connect(listing, TQT_SIGNAL(result(KIO::Job *)), TQT_TQOBJECT(this), TQT_SLOT(slotSlideShowJobResult(KIO::Job *))); + connect(listing, TQT_SIGNAL(result(TDEIO::Job *)), TQT_TQOBJECT(this), TQT_SLOT(slotSlideShowJobResult(TDEIO::Job *))); timerShowListing->start(1000, true); } @@ -1833,15 +1833,15 @@ void KSquirrel::slotSlideShowListingKill() listingDialog->hide(); } -void KSquirrel::slotSlideShowEntries(KIO::Job *, const KIO::UDSEntryList &list) +void KSquirrel::slotSlideShowEntries(TDEIO::Job *, const TDEIO::UDSEntryList &list) { - KIO::UDSEntryListConstIterator itEnd = list.end(); + TDEIO::UDSEntryListConstIterator itEnd = list.end(); KURL url = KURL::fromPathOrURL(slideShowDir); TQString sfile; - // go through list of KIO::UDSEntrys - for(KIO::UDSEntryListConstIterator it = list.begin(); it != itEnd; ++it) + // go through list of TDEIO::UDSEntrys + for(TDEIO::UDSEntryListConstIterator it = list.begin(); it != itEnd; ++it) { KFileItem *file = new KFileItem(*it, url, true, true); @@ -1859,7 +1859,7 @@ void KSquirrel::slotSlideShowEntries(KIO::Job *, const KIO::UDSEntryList &list) listingDialog->setFile(slideShowItems.count(), sfile); } -void KSquirrel::slotSlideShowJobResult(KIO::Job *job) +void KSquirrel::slotSlideShowJobResult(TDEIO::Job *job) { listingDialog->setFile(0, TQString()); listingDialog->hide(); @@ -2167,11 +2167,11 @@ void KSquirrel::slotRename() renameDestURL = renameSrcURL; renameDestURL.setFileName(mNewFilename); - KIO::Job *job = KIO::move(renameSrcURL, renameDestURL); - connect(job, TQT_SIGNAL(result(KIO::Job*)), TQT_TQOBJECT(this), TQT_SLOT(slotRenameResult(KIO::Job*))); + TDEIO::Job *job = TDEIO::move(renameSrcURL, renameDestURL); + connect(job, TQT_SIGNAL(result(TDEIO::Job*)), TQT_TQOBJECT(this), TQT_SLOT(slotRenameResult(TDEIO::Job*))); } -void KSquirrel::slotRenameResult(KIO::Job *job) +void KSquirrel::slotRenameResult(TDEIO::Job *job) { if(job->error()) { diff --git a/ksquirrel/ksquirrel.h b/ksquirrel/ksquirrel.h index 0a705c3..59ef3e2 100644 --- a/ksquirrel/ksquirrel.h +++ b/ksquirrel/ksquirrel.h @@ -40,7 +40,7 @@ class TQVBox; class TQTimer; class TQSplitter; -namespace KIO { class Job; } +namespace TDEIO { class Job; } class KMenuBar; class KToolBar; @@ -379,8 +379,8 @@ class KSquirrel : public KMainWindow, public DCOPObject private slots: - void slotStatResult(KIO::Job *job); - void slotDCOPStatResult(KIO::Job *job); + void slotStatResult(TDEIO::Job *job); + void slotDCOPStatResult(TDEIO::Job *job); void slotPreviewWidgetNext(); void slotPreviewWidgetPrevious(); @@ -388,7 +388,7 @@ class KSquirrel : public KMainWindow, public DCOPObject void slotSaveYourself(); void slotRename(); - void slotRenameResult(KIO::Job *); + void slotRenameResult(TDEIO::Job *); void slotExtendedToggled(bool); void slotTrayQuit(); void slotClose(); @@ -413,12 +413,12 @@ class KSquirrel : public KMainWindow, public DCOPObject /* * Got new urls while listing directory for slideshow */ - void slotSlideShowEntries(KIO::Job *, const KIO::UDSEntryList &); + void slotSlideShowEntries(TDEIO::Job *, const TDEIO::UDSEntryList &); /* * Directory listed for slideshow */ - void slotSlideShowJobResult(KIO::Job *); + void slotSlideShowJobResult(TDEIO::Job *); void slotSlideShowListingKill(); @@ -662,7 +662,7 @@ class KSquirrel : public KMainWindow, public DCOPObject */ bool slideShowPaused; - KIO::Job *listing; + TDEIO::Job *listing; SQ_SlideShowListing *listingDialog; diff --git a/ksquirrel/ksquirrelpart/sq_config.cpp b/ksquirrel/ksquirrelpart/sq_config.cpp index 8e6e0fa..8c16ce5 100644 --- a/ksquirrel/ksquirrelpart/sq_config.cpp +++ b/ksquirrel/ksquirrelpart/sq_config.cpp @@ -27,7 +27,7 @@ SQ_Config::SQ_Config(TQObject *parent) : TQObject(parent) { m_instance = this; - kconf = new KConfig("ksquirrelrc"); + kconf = new TDEConfig("ksquirrelrc"); } SQ_Config::~SQ_Config() diff --git a/ksquirrel/ksquirrelpart/sq_config.h b/ksquirrel/ksquirrelpart/sq_config.h index 438a8e7..eec2f0e 100644 --- a/ksquirrel/ksquirrelpart/sq_config.h +++ b/ksquirrel/ksquirrelpart/sq_config.h @@ -21,7 +21,7 @@ #include #include -class KConfig; +class TDEConfig; /* * Class for reading/writing config file @@ -61,7 +61,7 @@ class SQ_Config : public TQObject void writeEntry( const TQString& pKey, const TQValueList& rValue, bool bPersistent = true, bool bGlobal = false, bool bNLS = false ); private: - KConfig *kconf; + TDEConfig *kconf; static SQ_Config *m_instance; }; diff --git a/ksquirrel/ksquirrelpart/sq_downloader.cpp b/ksquirrel/ksquirrelpart/sq_downloader.cpp index 31fecc5..a201ab6 100644 --- a/ksquirrel/ksquirrelpart/sq_downloader.cpp +++ b/ksquirrel/ksquirrelpart/sq_downloader.cpp @@ -60,17 +60,17 @@ void SQ_Downloader::start(KFileItem *fi) nomime = true; #endif - job = KIO::get(mURL, false, false); + job = TDEIO::get(mURL, false, false); clean(); continueDownload = false; - connect(job, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)), this, TQT_SLOT(slotData(KIO::Job *, const TQByteArray &))); - connect(job, TQT_SIGNAL(result(KIO::Job *)), this, TQT_SLOT(slotDataResult(KIO::Job *))); + connect(job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), this, TQT_SLOT(slotData(TDEIO::Job *, const TQByteArray &))); + connect(job, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotDataResult(TDEIO::Job *))); } -void SQ_Downloader::slotData(KIO::Job *job, const TQByteArray &ba) +void SQ_Downloader::slotData(TDEIO::Job *job, const TQByteArray &ba) { size += ba.size(); @@ -106,17 +106,17 @@ void SQ_Downloader::slotData(KIO::Job *job, const TQByteArray &ba) } } -void SQ_Downloader::slotDataResult(KIO::Job *cpjob) +void SQ_Downloader::slotDataResult(TDEIO::Job *cpjob) { job = 0; // job error - if(cpjob->error() && cpjob->error() != KIO::ERR_USER_CANCELED) + if(cpjob->error() && cpjob->error() != TDEIO::ERR_USER_CANCELED) { m_error = true; emit result(mEmptyURL); } - else if(cpjob->error() == KIO::ERR_USER_CANCELED) // not supported image/archive type - + else if(cpjob->error() == TDEIO::ERR_USER_CANCELED) // not supported image/archive type - // emit empty url without errors { emit result(mEmptyURL); diff --git a/ksquirrel/ksquirrelpart/sq_downloader.h b/ksquirrel/ksquirrelpart/sq_downloader.h index 2e3af90..dcb797c 100644 --- a/ksquirrel/ksquirrelpart/sq_downloader.h +++ b/ksquirrel/ksquirrelpart/sq_downloader.h @@ -26,7 +26,7 @@ class KFileItem; class KTempFile; -namespace KIO { class Job; } +namespace TDEIO { class Job; } class SQ_Downloader : public TQObject { @@ -50,14 +50,14 @@ class SQ_Downloader : public TQObject void percents(int); private slots: - void slotData(KIO::Job *job, const TQByteArray &data); - void slotDataResult(KIO::Job *); + void slotData(TDEIO::Job *job, const TQByteArray &data); + void slotDataResult(TDEIO::Job *); private: - KIO::Job *job; + TDEIO::Job *job; KURL mEmptyURL, mURL; KTempFile *tmp; - KIO::filesize_t totalSize, size; + TDEIO::filesize_t totalSize, size; bool continueDownload; bool nomime; bool m_error, m_lightmode; diff --git a/ksquirrel/ksquirrelpart/sq_glwidget.cpp b/ksquirrel/ksquirrelpart/sq_glwidget.cpp index aeaf395..e22a7fc 100644 --- a/ksquirrel/ksquirrelpart/sq_glwidget.cpp +++ b/ksquirrel/ksquirrelpart/sq_glwidget.cpp @@ -1515,7 +1515,7 @@ void SQ_GLWidget::decode() { KMessageBox::error(this, i18n("Memory allocation failed for %1 of memory") - .arg(KIO::convertSize(pp.realw * pp.realh * sizeof(RGBA)))); + .arg(TDEIO::convertSize(pp.realw * pp.realh * sizeof(RGBA)))); decodeFailedOn0(SQE_R_NOMEMORY); return; @@ -1997,7 +1997,7 @@ void SQ_GLWidget::setDownloadPercents(int p) percentsLabel->hide(); else { - percentsLabel->setText(i18n("Downloading...") + ' ' + KIO::convertSize(p)); + percentsLabel->setText(i18n("Downloading...") + ' ' + TDEIO::convertSize(p)); percentsLabel->adjustSize(); percentsLabel->show(); } diff --git a/ksquirrel/ksquirrelpart/sq_glwidget.h b/ksquirrel/ksquirrelpart/sq_glwidget.h index 425de1b..443fef1 100644 --- a/ksquirrel/ksquirrelpart/sq_glwidget.h +++ b/ksquirrel/ksquirrelpart/sq_glwidget.h @@ -55,7 +55,7 @@ class KPopupMenu; class KRadioAction; class KTempFile; -namespace KIO { class Job; } +namespace TDEIO { class Job; } class TQTimer; class TQPopupMenu; @@ -475,7 +475,7 @@ class SQ_GLWidget : public TQGLWidget void slotChangeTab(int); void slotCloseRequest(int); - void slotCopyJobResult(KIO::Job *job); + void slotCopyJobResult(TDEIO::Job *job); /* * Slots for toolbar's actions: @@ -516,7 +516,7 @@ class SQ_GLWidget : public TQGLWidget void slotBCG(SQ_ImageBCGOptions *); void slotFilter(SQ_ImageFilterOptions *fltopt); - void slotCopyResult(KIO::Job *); + void slotCopyResult(TDEIO::Job *); private: KAction *pASelectionClear; diff --git a/ksquirrel/ksquirrelpart/sq_glwidget_stuff.cpp b/ksquirrel/ksquirrelpart/sq_glwidget_stuff.cpp index 9b28f9a..1f0ef29 100644 --- a/ksquirrel/ksquirrelpart/sq_glwidget_stuff.cpp +++ b/ksquirrel/ksquirrelpart/sq_glwidget_stuff.cpp @@ -220,7 +220,7 @@ void SQ_GLWidget::slotProperties() stopAnimation(); const int real_size = tab->finfo.image[tab->current].w * tab->finfo.image[tab->current].h * sizeof(RGBA); - TQString sz = KIO::convertSize(real_size); + TQString sz = TDEIO::convertSize(real_size); TQStringList list; TQValueVector > meta; @@ -603,13 +603,13 @@ void SQ_GLWidget::saveAs() if(!url.isLocalFile()) { // src dst perm overwrite resume progress - KIO::Job *j = KIO::file_copy(path, url, -1, true, false, false); + TDEIO::Job *j = TDEIO::file_copy(path, url, -1, true, false, false); - connect(j, TQT_SIGNAL(result(KIO::Job *)), TQT_TQOBJECT(this), TQT_SLOT(slotCopyResult(KIO::Job *))); + connect(j, TQT_SIGNAL(result(TDEIO::Job *)), TQT_TQOBJECT(this), TQT_SLOT(slotCopyResult(TDEIO::Job *))); } } -void SQ_GLWidget::slotCopyResult(KIO::Job *job) +void SQ_GLWidget::slotCopyResult(TDEIO::Job *job) { if(job->error()) { @@ -627,8 +627,8 @@ void SQ_GLWidget::slotCopyResult(KIO::Job *job) if(result == TQDialog::Rejected || d.selectedURL().isEmpty()) return; - KIO::Job *j = KIO::file_copy(tmp->name(), d.selectedURL(), -1, true, false, false); - connect(j, TQT_SIGNAL(result(KIO::Job *)), TQT_TQOBJECT(this), TQT_SLOT(slotCopyResult(KIO::Job *))); + TDEIO::Job *j = TDEIO::file_copy(tmp->name(), d.selectedURL(), -1, true, false, false); + connect(j, TQT_SIGNAL(result(TDEIO::Job *)), TQT_TQOBJECT(this), TQT_SLOT(slotCopyResult(TDEIO::Job *))); } } } @@ -1061,27 +1061,27 @@ void SQ_GLWidget::slotAccelActivated() return; lastCopy = url; - KIO::Job *job; + TDEIO::Job *job; if(!ks.compare(TQt::Key_F5)) - job = KIO::copy(tab->m_original, url); + job = TDEIO::copy(tab->m_original, url); else - job = KIO::move(tab->m_original, url); + job = TDEIO::move(tab->m_original, url); job->setWindow(this); - connect(job, TQT_SIGNAL(result(KIO::Job *)), TQT_TQOBJECT(this), TQT_SLOT(slotCopyJobResult(KIO::Job *))); + connect(job, TQT_SIGNAL(result(TDEIO::Job *)), TQT_TQOBJECT(this), TQT_SLOT(slotCopyJobResult(TDEIO::Job *))); } else if(!ks.compare(TQt::Key_F7) || !ks.compare(TQt::Key_F8)) { - KIO::Job *job; + TDEIO::Job *job; if(!ks.compare(TQt::Key_F6)) - job = KIO::copy(tab->m_original, lastCopy); + job = TDEIO::copy(tab->m_original, lastCopy); else - job = KIO::move(tab->m_original, lastCopy); + job = TDEIO::move(tab->m_original, lastCopy); job->setWindow(this); - connect(job, TQT_SIGNAL(result(KIO::Job *)), TQT_TQOBJECT(this), TQT_SLOT(slotCopyJobResult(KIO::Job *))); + connect(job, TQT_SIGNAL(result(TDEIO::Job *)), TQT_TQOBJECT(this), TQT_SLOT(slotCopyJobResult(TDEIO::Job *))); } else if(!ks.compare(TQt::Key_F9)) copyURL(); else if(!ks.compare(TQt::Key_Slash)) slotShowHelp(); @@ -1143,7 +1143,7 @@ void SQ_GLWidget::zoom(GLfloat val) matrix_zoom(val); } -void SQ_GLWidget::slotCopyJobResult(KIO::Job *job) +void SQ_GLWidget::slotCopyJobResult(TDEIO::Job *job) { if(job->error()) job->showErrorDialog(this); @@ -1224,7 +1224,7 @@ void SQ_GLWidget::crop() { KMessageBox::error(this, i18n("Memory allocation failed for %1 of memory") - .arg(KIO::convertSize(pp.realw * pp.realh * sizeof(RGBA)))); + .arg(TDEIO::convertSize(pp.realw * pp.realh * sizeof(RGBA)))); return; } diff --git a/ksquirrel/ksquirrelpart/sq_imageproperties.ui b/ksquirrel/ksquirrelpart/sq_imageproperties.ui index 0cb55f9..c9e3e99 100644 --- a/ksquirrel/ksquirrelpart/sq_imageproperties.ui +++ b/ksquirrel/ksquirrelpart/sq_imageproperties.ui @@ -936,7 +936,7 @@ class KPopupMenu; class KAction; - namespace KIO { class Job; } + namespace TDEIO { class Job; } KURL url; @@ -954,7 +954,7 @@ slotCopyAll() slotCopyEntry() slotModeClicked( int id ) - slotStatResult( KIO::Job * job ) + slotStatResult( TDEIO::Job * job ) init() diff --git a/ksquirrel/ksquirrelpart/sq_imageproperties.ui.h b/ksquirrel/ksquirrelpart/sq_imageproperties.ui.h index 1ec36b0..3707d1c 100644 --- a/ksquirrel/ksquirrelpart/sq_imageproperties.ui.h +++ b/ksquirrel/ksquirrelpart/sq_imageproperties.ui.h @@ -84,8 +84,8 @@ void SQ_ImageProperties::setURL(const KURL &_url) void SQ_ImageProperties::setFileParams() { - KIO::Job *stjob = KIO::stat(url, false); - connect(stjob, TQT_SIGNAL(result(KIO::Job *)), TQT_TQOBJECT(this), TQT_SLOT(slotStatResult(KIO::Job *))); + TDEIO::Job *stjob = TDEIO::stat(url, false); + connect(stjob, TQT_SIGNAL(result(TDEIO::Job *)), TQT_TQOBJECT(this), TQT_SLOT(slotStatResult(TDEIO::Job *))); #ifdef SQ_HAVE_KEXIF SQ_Config::instance()->setGroup("GL view"); @@ -230,11 +230,11 @@ void SQ_ImageProperties::slotModeClicked(int id) #endif } -void SQ_ImageProperties::slotStatResult(KIO::Job *job) +void SQ_ImageProperties::slotStatResult(TDEIO::Job *job) { if(!job->error()) { - KIO::UDSEntry entry = static_cast(job)->statResult(); + TDEIO::UDSEntry entry = static_cast(job)->statResult(); KFileItem fi(entry, url); KURL t = url; @@ -242,17 +242,17 @@ void SQ_ImageProperties::slotStatResult(KIO::Job *job) lineDirectory->setText(t.isLocalFile() ? t.path() : t.prettyURL()); lineFile->setText(fi.name()); - textSize->setText(KIO::convertSize(fi.size())); + textSize->setText(TDEIO::convertSize(fi.size())); textOwner->setText(TQString("%1").arg(fi.user())); textGroup->setText(TQString("%1").arg(fi.group())); textPermissions->setText(fi.permissionsString()); TQDateTime abs; - abs.setTime_t(fi.time(KIO::UDS_CREATION_TIME)); + abs.setTime_t(fi.time(TDEIO::UDS_CREATION_TIME)); textCreated->setText(abs.toString("dd/MM/yyyy hh:mm:ss")); - abs.setTime_t(fi.time(KIO::UDS_ACCESS_TIME)); + abs.setTime_t(fi.time(TDEIO::UDS_ACCESS_TIME)); textLastRead->setText(abs.toString("dd/MM/yyyy hh:mm:ss")); - abs.setTime_t(fi.time(KIO::UDS_MODIFICATION_TIME)); + abs.setTime_t(fi.time(TDEIO::UDS_MODIFICATION_TIME)); textLastMod->setText(abs.toString("dd/MM/yyyy hh:mm:ss")); } } diff --git a/ksquirrel/ksquirrelpart/sq_libraryhandler.cpp b/ksquirrel/ksquirrelpart/sq_libraryhandler.cpp index 326f07f..4850c84 100644 --- a/ksquirrel/ksquirrelpart/sq_libraryhandler.cpp +++ b/ksquirrel/ksquirrelpart/sq_libraryhandler.cpp @@ -53,7 +53,7 @@ SQ_LibraryHandler::SQ_LibraryHandler(TQObject *parent) kdDebug() << "+SQ_LibraryHandler" << endl; - kconf = new KConfig("ksquirrel-codec-settings"); + kconf = new TDEConfig("ksquirrel-codec-settings"); load(); } diff --git a/ksquirrel/ksquirrelpart/sq_libraryhandler.h b/ksquirrel/ksquirrelpart/sq_libraryhandler.h index de00e3d..0607a3f 100644 --- a/ksquirrel/ksquirrelpart/sq_libraryhandler.h +++ b/ksquirrel/ksquirrelpart/sq_libraryhandler.h @@ -26,7 +26,7 @@ class TQStringList; -class KConfig; +class TDEConfig; class KURL; /* @@ -120,7 +120,7 @@ class SQ_LibraryHandler : public TQObject, public TQValueVector void readSettings(SQ_LIBRARY *lib); private: - KConfig *kconf; + TDEConfig *kconf; static SQ_LibraryHandler *m_instance; }; diff --git a/ksquirrel/main.cpp b/ksquirrel/main.cpp index 230bb1b..c344c36 100644 --- a/ksquirrel/main.cpp +++ b/ksquirrel/main.cpp @@ -155,7 +155,7 @@ int main(int argc, char *argv[]) SQ_SplashScreen *splash = 0; // should we show a splash screen ? - KConfig *config = new KConfig("ksquirrelrc"); + TDEConfig *config = new TDEConfig("ksquirrelrc"); config->setGroup("Main"); if(config->readBoolEntry("splash", true)) diff --git a/ksquirrel/sidebar/sq_categoriesview.cpp b/ksquirrel/sidebar/sq_categoriesview.cpp index 2953156..86eef3d 100644 --- a/ksquirrel/sidebar/sq_categoriesview.cpp +++ b/ksquirrel/sidebar/sq_categoriesview.cpp @@ -231,7 +231,7 @@ void SQ_CategoriesBox::slotNewCategory() if(ok) { lastdir = tmp; - KIO::mkdir(cur->path() + TQDir::separator() + lastdir); + TDEIO::mkdir(cur->path() + TQDir::separator() + lastdir); } } @@ -248,7 +248,7 @@ void SQ_CategoriesBox::slotDropped(TQDropEvent *e, TQListViewItem *parent, TQLis TQString path = cur->path(); if(list.first().path().startsWith(view->dir()->root())) - KIO::move(list, cur->url()); + TDEIO::move(list, cur->url()); else { KURL::List::iterator itEnd = list.end(); @@ -292,7 +292,7 @@ void SQ_CategoriesBox::slotDeleteItem() cur = 0; // physically remove file from storage - KIO::del(tmp, false, false); + TDEIO::del(tmp, false, false); } void SQ_CategoriesBox::slotItemProperties() diff --git a/ksquirrel/sidebar/sq_categorybrowsermenu.cpp b/ksquirrel/sidebar/sq_categorybrowsermenu.cpp index cbf82a2..a8882c8 100644 --- a/ksquirrel/sidebar/sq_categorybrowsermenu.cpp +++ b/ksquirrel/sidebar/sq_categorybrowsermenu.cpp @@ -117,7 +117,7 @@ void SQ_CategoryBrowserMenu::initialize() initIconMap(); // read configuration - KConfig *c = TDEGlobal::config(); + TDEConfig *c = TDEGlobal::config(); c->setGroup("menus"); _showhidden = c->readBoolEntry("ShowHiddenFiles", false); _maxentries = c->readNumEntry("MaxEntries2", 30); @@ -235,7 +235,7 @@ void SQ_CategoryBrowserMenu::initialize() else if(fi->isFile()) { TQString name = fi->fileName(); - TQString title = KIO::decodeFileName(name); + TQString title = TDEIO::decodeFileName(name); // ignore .directory and .order files if (name == ".directory" || name == ".order") continue; diff --git a/ksquirrel/sidebar/sq_directorybasket.cpp b/ksquirrel/sidebar/sq_directorybasket.cpp index a6e983b..392107f 100644 --- a/ksquirrel/sidebar/sq_directorybasket.cpp +++ b/ksquirrel/sidebar/sq_directorybasket.cpp @@ -100,7 +100,7 @@ void SQ_DBMenu::slotDirectoryRename() } } -void SQ_DBMenu::slotDirectoryResult(KIO::Job *job) +void SQ_DBMenu::slotDirectoryResult(TDEIO::Job *job) { if(job && job->error()) job->showErrorDialog(KSquirrel::app()); @@ -110,9 +110,9 @@ void SQ_DBMenu::slotDirectoryDelete() { if(item) { - KIO::Job *job = KIO::del(item->KFileTreeViewItem::url()); + TDEIO::Job *job = TDEIO::del(item->KFileTreeViewItem::url()); - connect(job, TQT_SIGNAL(result(KIO::Job*)), TQT_TQOBJECT(this), TQT_SLOT(slotDirectoryResult(KIO::Job *))); + connect(job, TQT_SIGNAL(result(TDEIO::Job*)), TQT_TQOBJECT(this), TQT_SLOT(slotDirectoryResult(TDEIO::Job *))); } } @@ -343,14 +343,14 @@ void SQ_DirectoryBasket::slotDropped(TQDropEvent *e, TQListViewItem *_parent, TQ { KURL::List::iterator itEnd = list.end(); KFileItemList flist; - KIO::UDSEntry entry; + TDEIO::UDSEntry entry; progressAdd->setTotalSteps(list.count()); timerAdd->start(1000, true); for(KURL::List::iterator it = list.begin();it != itEnd;++it) { - if(KIO::NetAccess::stat(*it, entry, KSquirrel::app())) + if(TDEIO::NetAccess::stat(*it, entry, KSquirrel::app())) flist.append(new KFileItem(entry, *it)); progressAdd->advance(1); diff --git a/ksquirrel/sidebar/sq_directorybasket.h b/ksquirrel/sidebar/sq_directorybasket.h index bdd5856..4d7b382 100644 --- a/ksquirrel/sidebar/sq_directorybasket.h +++ b/ksquirrel/sidebar/sq_directorybasket.h @@ -27,7 +27,7 @@ class TQTimer; class KProgress; -namespace KIO { class Job; } +namespace TDEIO { class Job; } class SQ_DirectoryItem; class SQ_Dir; @@ -49,7 +49,7 @@ class SQ_DBMenu : public SQ_TreeViewMenu void slotChangeIcon(); void slotDirectoryRename(); void slotDirectoryDelete(); - void slotDirectoryResult(KIO::Job *job); + void slotDirectoryResult(TDEIO::Job *job); private: SQ_DirectoryItem *item; diff --git a/ksquirrel/sidebar/sq_imagebasket.cpp b/ksquirrel/sidebar/sq_imagebasket.cpp index a793e0c..e4f130f 100644 --- a/ksquirrel/sidebar/sq_imagebasket.cpp +++ b/ksquirrel/sidebar/sq_imagebasket.cpp @@ -219,13 +219,13 @@ void SQ_ImageBasket::slotSync() { KFileItem *item = 0; KURL path; - KIO::UDSEntry entry; + TDEIO::UDSEntry entry; for((item = fileView->firstFileItem()); item; item = fileView->nextItem(item)) { path = SQ_StorageFile::readStorageFile(item->url().path()); - if(!KIO::NetAccess::stat(path, entry, KSquirrel::app())) + if(!TDEIO::NetAccess::stat(path, entry, KSquirrel::app())) TQFile::remove(item->url().path()); } } diff --git a/ksquirrel/sidebar/sq_previewwidget.cpp b/ksquirrel/sidebar/sq_previewwidget.cpp index 34c7ad1..3da90dd 100644 --- a/ksquirrel/sidebar/sq_previewwidget.cpp +++ b/ksquirrel/sidebar/sq_previewwidget.cpp @@ -357,7 +357,7 @@ void SQ_PreviewWidget::mouseDoubleClickEvent(TQMouseEvent *e) void SQ_PreviewWidget::slotDownloadPercents(int p) { - percentString = i18n("Downloading...") + ' ' + KIO::convertSize(p); + percentString = i18n("Downloading...") + ' ' + TDEIO::convertSize(p); update(); } diff --git a/ksquirrel/sidebar/sq_threaddirlister.cpp b/ksquirrel/sidebar/sq_threaddirlister.cpp index cc389e4..f8562d3 100644 --- a/ksquirrel/sidebar/sq_threaddirlister.cpp +++ b/ksquirrel/sidebar/sq_threaddirlister.cpp @@ -34,7 +34,7 @@ SQ_ThreadDirLister::SQ_ThreadDirLister(TQObject *o) : TQThread(), obj(o) { - cache = new KConfig("ksquirrel-tree-cache"); + cache = new TDEConfig("ksquirrel-tree-cache"); dir = 0; } diff --git a/ksquirrel/sidebar/sq_threaddirlister.h b/ksquirrel/sidebar/sq_threaddirlister.h index aaa4ec6..7aa58fc 100644 --- a/ksquirrel/sidebar/sq_threaddirlister.h +++ b/ksquirrel/sidebar/sq_threaddirlister.h @@ -30,7 +30,7 @@ class TQObject; -class KConfig; +class TDEConfig; /********************************************************/ @@ -109,7 +109,7 @@ class SQ_ThreadDirLister : public TQThread // this object will recieve our events TQObject *obj; TQMutex mutex; - KConfig *cache; + TDEConfig *cache; DIR *dir; }; diff --git a/ksquirrel/sidebar/sq_treeviewmenu.cpp b/ksquirrel/sidebar/sq_treeviewmenu.cpp index c4075c2..6f30e2f 100644 --- a/ksquirrel/sidebar/sq_treeviewmenu.cpp +++ b/ksquirrel/sidebar/sq_treeviewmenu.cpp @@ -69,9 +69,9 @@ void SQ_TreeViewMenu::slotDirectoryNew() { KURL dstURL = m_url; dstURL.addPath(mNewFilename); - KIO::Job *job = KIO::mkdir(dstURL); + TDEIO::Job *job = TDEIO::mkdir(dstURL); - connect(job, TQT_SIGNAL(result(KIO::Job*)), this, TQT_SLOT(slotDirectoryResult(KIO::Job *))); + connect(job, TQT_SIGNAL(result(TDEIO::Job*)), this, TQT_SLOT(slotDirectoryResult(TDEIO::Job *))); } } } @@ -94,9 +94,9 @@ void SQ_TreeViewMenu::slotDirectoryRename() KURL renameDstURL = renameSrcURL; renameDstURL.setFileName(mNewFilename); - KIO::Job *job = KIO::rename(renameSrcURL, renameDstURL, true); + TDEIO::Job *job = TDEIO::rename(renameSrcURL, renameDstURL, true); - connect(job, TQT_SIGNAL(result(KIO::Job*)), this, TQT_SLOT(slotDirectoryResult(KIO::Job *))); + connect(job, TQT_SIGNAL(result(TDEIO::Job*)), this, TQT_SLOT(slotDirectoryResult(TDEIO::Job *))); } } } @@ -111,9 +111,9 @@ void SQ_TreeViewMenu::slotDirectoryDelete() "" + i18n("Are you sure you want to delete %1?").arg(dir) + "") == KMessageBox::No) return; - KIO::Job *job = KIO::del(m_url); + TDEIO::Job *job = TDEIO::del(m_url); - connect(job, TQT_SIGNAL(result(KIO::Job*)), this, TQT_SLOT(slotDirectoryResult(KIO::Job *))); + connect(job, TQT_SIGNAL(result(TDEIO::Job*)), this, TQT_SLOT(slotDirectoryResult(TDEIO::Job *))); } } @@ -127,31 +127,31 @@ void SQ_TreeViewMenu::slotDirectoryClear() "" + i18n("Are you sure you want to delete contents of %1?").arg(m_url.path()) + "") == KMessageBox::No) return; - KIO::Job *job = KIO::listDir(m_url, false, true); + TDEIO::Job *job = TDEIO::listDir(m_url, false, true); - connect(job, TQT_SIGNAL(entries(KIO::Job *, const KIO::UDSEntryList &)), this, TQT_SLOT(slotEntries(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(slotEntries(TDEIO::Job *, const TDEIO::UDSEntryList &))); + connect(job, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotListResult(TDEIO::Job *))); } } -void SQ_TreeViewMenu::slotEntries(KIO::Job *, const KIO::UDSEntryList &list) +void SQ_TreeViewMenu::slotEntries(TDEIO::Job *, const TDEIO::UDSEntryList &list) { - KIO::UDSEntryListConstIterator itEnd = list.end(); + TDEIO::UDSEntryListConstIterator itEnd = list.end(); TQString suff; KURL u; static const TQString &dot = TDEGlobal::staticQString("."); static const TQString &dotdot = TDEGlobal::staticQString(".."); - // go through list of KIO::UDSEntrys - for(KIO::UDSEntryListConstIterator it = list.begin(); it != itEnd; ++it) + // go through list of TDEIO::UDSEntrys + for(TDEIO::UDSEntryListConstIterator it = list.begin(); it != itEnd; ++it) { - KIO::UDSEntry entry = *it; - KIO::UDSEntry::ConstIterator itEnd = entry.end(); + TDEIO::UDSEntry entry = *it; + TDEIO::UDSEntry::ConstIterator itEnd = entry.end(); - for(KIO::UDSEntry::ConstIterator it = entry.begin(); it != itEnd; ++it) + for(TDEIO::UDSEntry::ConstIterator it = entry.begin(); it != itEnd; ++it) { - if((*it).m_uds == KIO::UDS_NAME) + if((*it).m_uds == TDEIO::UDS_NAME) { suff = (*it).m_str; @@ -168,7 +168,7 @@ void SQ_TreeViewMenu::slotEntries(KIO::Job *, const KIO::UDSEntryList &list) } } -void SQ_TreeViewMenu::slotListResult(KIO::Job *job) +void SQ_TreeViewMenu::slotListResult(TDEIO::Job *job) { if(!job) return; @@ -176,12 +176,12 @@ void SQ_TreeViewMenu::slotListResult(KIO::Job *job) job->showErrorDialog(KSquirrel::app()); else if(!urlstodel.isEmpty()) { - KIO::Job *job = KIO::del(urlstodel); - connect(job, TQT_SIGNAL(result(KIO::Job *)), this, TQT_SLOT(slotDirectoryResult(KIO::Job *))); + TDEIO::Job *job = TDEIO::del(urlstodel); + connect(job, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotDirectoryResult(TDEIO::Job *))); } } -void SQ_TreeViewMenu::slotDirectoryResult(KIO::Job *job) +void SQ_TreeViewMenu::slotDirectoryResult(TDEIO::Job *job) { if(job && job->error()) job->showErrorDialog(KSquirrel::app()); diff --git a/ksquirrel/sidebar/sq_treeviewmenu.h b/ksquirrel/sidebar/sq_treeviewmenu.h index 7ffab8d..690ed89 100644 --- a/ksquirrel/sidebar/sq_treeviewmenu.h +++ b/ksquirrel/sidebar/sq_treeviewmenu.h @@ -6,7 +6,7 @@ class TQPoint; -namespace KIO { class Job; } +namespace TDEIO { class Job; } class SQ_TreeViewMenu : public KPopupMenu { @@ -30,11 +30,11 @@ class SQ_TreeViewMenu : public KPopupMenu virtual void slotDirectoryRename(); virtual void slotDirectoryDelete(); virtual void slotDirectoryProperties(); - virtual void slotDirectoryResult(KIO::Job *job); + virtual void slotDirectoryResult(TDEIO::Job *job); void slotDirectoryClear(); - void slotEntries(KIO::Job *, const KIO::UDSEntryList &); - void slotListResult(KIO::Job *); + void slotEntries(TDEIO::Job *, const TDEIO::UDSEntryList &); + void slotListResult(TDEIO::Job *); protected: int id_new, id_rename, id_delete, id_prop, id_clear; diff --git a/ksquirrel/sq_archivehandler.cpp b/ksquirrel/sq_archivehandler.cpp index 62e369a..e934925 100644 --- a/ksquirrel/sq_archivehandler.cpp +++ b/ksquirrel/sq_archivehandler.cpp @@ -104,7 +104,7 @@ void SQ_ArchiveHandler::tryUnpack(const KURL &url, const TQString &mime) if(!prot.isEmpty()) { - // just change protocol, KIO::get() will do all for us + // just change protocol, TDEIO::get() will do all for us KURL _url = url; _url.setProtocol(prot); diff --git a/ksquirrel/sq_config.cpp b/ksquirrel/sq_config.cpp index 8e6e0fa..8c16ce5 100644 --- a/ksquirrel/sq_config.cpp +++ b/ksquirrel/sq_config.cpp @@ -27,7 +27,7 @@ SQ_Config::SQ_Config(TQObject *parent) : TQObject(parent) { m_instance = this; - kconf = new KConfig("ksquirrelrc"); + kconf = new TDEConfig("ksquirrelrc"); } SQ_Config::~SQ_Config() diff --git a/ksquirrel/sq_config.h b/ksquirrel/sq_config.h index 438a8e7..eec2f0e 100644 --- a/ksquirrel/sq_config.h +++ b/ksquirrel/sq_config.h @@ -21,7 +21,7 @@ #include #include -class KConfig; +class TDEConfig; /* * Class for reading/writing config file @@ -61,7 +61,7 @@ class SQ_Config : public TQObject void writeEntry( const TQString& pKey, const TQValueList& rValue, bool bPersistent = true, bool bGlobal = false, bool bNLS = false ); private: - KConfig *kconf; + TDEConfig *kconf; static SQ_Config *m_instance; }; diff --git a/ksquirrel/sq_diroperator.cpp b/ksquirrel/sq_diroperator.cpp index e18a207..c08cc84 100644 --- a/ksquirrel/sq_diroperator.cpp +++ b/ksquirrel/sq_diroperator.cpp @@ -72,7 +72,7 @@ SQ_DirOperator::SQ_DirOperator(const KURL &url, ViewT type_, TQWidget *parent, c { usenew = false; - totalSize = static_cast(0); + totalSize = static_cast(0); // create and insert new actions in context menu setupActionsMy(); @@ -134,7 +134,7 @@ void SQ_DirOperator::slotUrlEntered(const KURL &url) { usenew = false; - totalSize = static_cast(0); + totalSize = static_cast(0); clearListers(); @@ -181,14 +181,14 @@ void SQ_DirOperator::slotFoundMountPoint(const unsigned long &kbSize, KSquirrel::app()->diskProgress()->setIndicator(kbSize-kbAvail); // kbSize != kbAvail+kbUsed KSquirrel::app()->sbarWidget("diskSpace")->setText(TQString::fromLatin1("%1: %2/%3") .arg(mount) - .arg(KIO::convertSizeFromKB(kbAvail)) - .arg(KIO::convertSizeFromKB(kbSize))); + .arg(TDEIO::convertSizeFromKB(kbAvail)) + .arg(TDEIO::convertSizeFromKB(kbSize))); TQToolTip::add(KSquirrel::app()->sbarWidget("diskSpace"), i18n("
Mount point:%1
Total size:%2
Used:%3
Available:%4
") .arg(mount) - .arg(KIO::convertSizeFromKB(kbSize)) - .arg(KIO::convertSizeFromKB(kbUsed)) - .arg(KIO::convertSizeFromKB(kbAvail)) + .arg(TDEIO::convertSizeFromKB(kbSize)) + .arg(TDEIO::convertSizeFromKB(kbUsed)) + .arg(TDEIO::convertSizeFromKB(kbAvail)) ); } @@ -291,7 +291,7 @@ void SQ_DirOperator::slotSelectionChanged() { TQString str = i18n("no files selected"); TQPixmap px; - KIO::filesize_t sz = static_cast(0); + TDEIO::filesize_t sz = static_cast(0); int add = 0; KFileItem *fi = 0; @@ -321,8 +321,8 @@ void SQ_DirOperator::slotSelectionChanged() // costruct name and size str = TQString("%1 %2 %3") .arg(KStringHandler::csqueeze(fi->name(), SQ_MAX_WORD_LENGTH)) - .arg(KIO::convertSize(fi->size())) - .arg(add > 1 ? TQString("[%1/%2]").arg(KIO::convertSize(sz)).arg(add):""); + .arg(TDEIO::convertSize(fi->size())) + .arg(add > 1 ? TQString("[%1/%2]").arg(TDEIO::convertSize(sz)).arg(add):""); } // update statusbar @@ -558,7 +558,7 @@ void SQ_DirOperator::slotUpdateInformation(int files, int dirs) SQ_Config::instance()->setGroup("Fileview"); TQString str = i18n("Total %1 in %2 (%3, %4)") - .arg(KIO::convertSize(totalSize)) + .arg(TDEIO::convertSize(totalSize)) .arg(i18n("1 item", "%n items", total)) .arg(i18n("1 folder", "%n folders", dirs)) .arg(i18n("1 file", "%n files", files)); @@ -992,7 +992,7 @@ void SQ_DirOperator::slotSetURL(const KURL &url) void SQ_DirOperator::calcTotalSize() { - totalSize = static_cast(0); + totalSize = static_cast(0); KFileItemList *list = const_cast(fileview->items()); diff --git a/ksquirrel/sq_diroperator.h b/ksquirrel/sq_diroperator.h index 089ee5a..720a240 100644 --- a/ksquirrel/sq_diroperator.h +++ b/ksquirrel/sq_diroperator.h @@ -253,7 +253,7 @@ class SQ_DirOperator : public KDirOperator KURL lasturl; bool usenew; TQString m_pending; - KIO::filesize_t totalSize; + TDEIO::filesize_t totalSize; KFileItemList oldSelected; KFileItem *oldCurrentItem; SQ_Downloader *down; diff --git a/ksquirrel/sq_downloader.cpp b/ksquirrel/sq_downloader.cpp index 31fecc5..a201ab6 100644 --- a/ksquirrel/sq_downloader.cpp +++ b/ksquirrel/sq_downloader.cpp @@ -60,17 +60,17 @@ void SQ_Downloader::start(KFileItem *fi) nomime = true; #endif - job = KIO::get(mURL, false, false); + job = TDEIO::get(mURL, false, false); clean(); continueDownload = false; - connect(job, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)), this, TQT_SLOT(slotData(KIO::Job *, const TQByteArray &))); - connect(job, TQT_SIGNAL(result(KIO::Job *)), this, TQT_SLOT(slotDataResult(KIO::Job *))); + connect(job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), this, TQT_SLOT(slotData(TDEIO::Job *, const TQByteArray &))); + connect(job, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotDataResult(TDEIO::Job *))); } -void SQ_Downloader::slotData(KIO::Job *job, const TQByteArray &ba) +void SQ_Downloader::slotData(TDEIO::Job *job, const TQByteArray &ba) { size += ba.size(); @@ -106,17 +106,17 @@ void SQ_Downloader::slotData(KIO::Job *job, const TQByteArray &ba) } } -void SQ_Downloader::slotDataResult(KIO::Job *cpjob) +void SQ_Downloader::slotDataResult(TDEIO::Job *cpjob) { job = 0; // job error - if(cpjob->error() && cpjob->error() != KIO::ERR_USER_CANCELED) + if(cpjob->error() && cpjob->error() != TDEIO::ERR_USER_CANCELED) { m_error = true; emit result(mEmptyURL); } - else if(cpjob->error() == KIO::ERR_USER_CANCELED) // not supported image/archive type - + else if(cpjob->error() == TDEIO::ERR_USER_CANCELED) // not supported image/archive type - // emit empty url without errors { emit result(mEmptyURL); diff --git a/ksquirrel/sq_downloader.h b/ksquirrel/sq_downloader.h index 2e3af90..dcb797c 100644 --- a/ksquirrel/sq_downloader.h +++ b/ksquirrel/sq_downloader.h @@ -26,7 +26,7 @@ class KFileItem; class KTempFile; -namespace KIO { class Job; } +namespace TDEIO { class Job; } class SQ_Downloader : public TQObject { @@ -50,14 +50,14 @@ class SQ_Downloader : public TQObject void percents(int); private slots: - void slotData(KIO::Job *job, const TQByteArray &data); - void slotDataResult(KIO::Job *); + void slotData(TDEIO::Job *job, const TQByteArray &data); + void slotDataResult(TDEIO::Job *); private: - KIO::Job *job; + TDEIO::Job *job; KURL mEmptyURL, mURL; KTempFile *tmp; - KIO::filesize_t totalSize, size; + TDEIO::filesize_t totalSize, size; bool continueDownload; bool nomime; bool m_error, m_lightmode; diff --git a/ksquirrel/sq_filedetailview.cpp b/ksquirrel/sq_filedetailview.cpp index 55bf58d..a7db28c 100644 --- a/ksquirrel/sq_filedetailview.cpp +++ b/ksquirrel/sq_filedetailview.cpp @@ -147,7 +147,7 @@ void SQ_FileDetailView::initItem(SQ_FileListViewItem *item, const KFileItem *i) TQDir::SortSpec spec = KFileView::sorting(); if(spec & TQDir::Time) - item->setKey(sortingKey(i->time(KIO::UDS_MODIFICATION_TIME), i->isDir(), spec)); + item->setKey(sortingKey(i->time(TDEIO::UDS_MODIFICATION_TIME), i->isDir(), spec)); else if(spec & TQDir::Size) item->setKey(sortingKey(i->size(), i->isDir(), spec)); else diff --git a/ksquirrel/sq_fileiconviewbase.cpp b/ksquirrel/sq_fileiconviewbase.cpp index 4f230a6..632709e 100644 --- a/ksquirrel/sq_fileiconviewbase.cpp +++ b/ksquirrel/sq_fileiconviewbase.cpp @@ -146,7 +146,7 @@ void SQ_FileIconViewBase::initItemMy(KFileIconViewItem *item, const KFileItem *i TQDir::SortSpec spec = KFileView::sorting(); if(spec & TQDir::Time) - item->setKey(sortingKey((unsigned long)i->time(KIO::UDS_MODIFICATION_TIME), i->isDir(), spec)); + item->setKey(sortingKey((unsigned long)i->time(TDEIO::UDS_MODIFICATION_TIME), i->isDir(), spec)); else if(spec & TQDir::Size) item->setKey(sortingKey(i->size(), i->isDir(), spec)); else diff --git a/ksquirrel/sq_filethumbview.cpp b/ksquirrel/sq_filethumbview.cpp index f9de4cd..210f1cd 100644 --- a/ksquirrel/sq_filethumbview.cpp +++ b/ksquirrel/sq_filethumbview.cpp @@ -167,7 +167,7 @@ void SQ_FileThumbView::setThumbnailPixmap(const KFileItem* fileItem, const SQ_Th if(t.w && t.h) painter.drawText(4, W+rest/2-12, 100, 12, 0, TQString::fromLatin1("%1x%2").arg(t.w).arg(t.h)); - painter.drawText(4, W+rest/2+1, 100, 12, 0, KIO::convertSize(fileItem->size())); + painter.drawText(4, W+rest/2+1, 100, 12, 0, TDEIO::convertSize(fileItem->size())); painter.end(); } else diff --git a/ksquirrel/sq_glwidget.cpp b/ksquirrel/sq_glwidget.cpp index aeaf395..e22a7fc 100644 --- a/ksquirrel/sq_glwidget.cpp +++ b/ksquirrel/sq_glwidget.cpp @@ -1515,7 +1515,7 @@ void SQ_GLWidget::decode() { KMessageBox::error(this, i18n("Memory allocation failed for %1 of memory") - .arg(KIO::convertSize(pp.realw * pp.realh * sizeof(RGBA)))); + .arg(TDEIO::convertSize(pp.realw * pp.realh * sizeof(RGBA)))); decodeFailedOn0(SQE_R_NOMEMORY); return; @@ -1997,7 +1997,7 @@ void SQ_GLWidget::setDownloadPercents(int p) percentsLabel->hide(); else { - percentsLabel->setText(i18n("Downloading...") + ' ' + KIO::convertSize(p)); + percentsLabel->setText(i18n("Downloading...") + ' ' + TDEIO::convertSize(p)); percentsLabel->adjustSize(); percentsLabel->show(); } diff --git a/ksquirrel/sq_glwidget.h b/ksquirrel/sq_glwidget.h index 425de1b..443fef1 100644 --- a/ksquirrel/sq_glwidget.h +++ b/ksquirrel/sq_glwidget.h @@ -55,7 +55,7 @@ class KPopupMenu; class KRadioAction; class KTempFile; -namespace KIO { class Job; } +namespace TDEIO { class Job; } class TQTimer; class TQPopupMenu; @@ -475,7 +475,7 @@ class SQ_GLWidget : public TQGLWidget void slotChangeTab(int); void slotCloseRequest(int); - void slotCopyJobResult(KIO::Job *job); + void slotCopyJobResult(TDEIO::Job *job); /* * Slots for toolbar's actions: @@ -516,7 +516,7 @@ class SQ_GLWidget : public TQGLWidget void slotBCG(SQ_ImageBCGOptions *); void slotFilter(SQ_ImageFilterOptions *fltopt); - void slotCopyResult(KIO::Job *); + void slotCopyResult(TDEIO::Job *); private: KAction *pASelectionClear; diff --git a/ksquirrel/sq_glwidget_stuff.cpp b/ksquirrel/sq_glwidget_stuff.cpp index 9b28f9a..1f0ef29 100644 --- a/ksquirrel/sq_glwidget_stuff.cpp +++ b/ksquirrel/sq_glwidget_stuff.cpp @@ -220,7 +220,7 @@ void SQ_GLWidget::slotProperties() stopAnimation(); const int real_size = tab->finfo.image[tab->current].w * tab->finfo.image[tab->current].h * sizeof(RGBA); - TQString sz = KIO::convertSize(real_size); + TQString sz = TDEIO::convertSize(real_size); TQStringList list; TQValueVector > meta; @@ -603,13 +603,13 @@ void SQ_GLWidget::saveAs() if(!url.isLocalFile()) { // src dst perm overwrite resume progress - KIO::Job *j = KIO::file_copy(path, url, -1, true, false, false); + TDEIO::Job *j = TDEIO::file_copy(path, url, -1, true, false, false); - connect(j, TQT_SIGNAL(result(KIO::Job *)), TQT_TQOBJECT(this), TQT_SLOT(slotCopyResult(KIO::Job *))); + connect(j, TQT_SIGNAL(result(TDEIO::Job *)), TQT_TQOBJECT(this), TQT_SLOT(slotCopyResult(TDEIO::Job *))); } } -void SQ_GLWidget::slotCopyResult(KIO::Job *job) +void SQ_GLWidget::slotCopyResult(TDEIO::Job *job) { if(job->error()) { @@ -627,8 +627,8 @@ void SQ_GLWidget::slotCopyResult(KIO::Job *job) if(result == TQDialog::Rejected || d.selectedURL().isEmpty()) return; - KIO::Job *j = KIO::file_copy(tmp->name(), d.selectedURL(), -1, true, false, false); - connect(j, TQT_SIGNAL(result(KIO::Job *)), TQT_TQOBJECT(this), TQT_SLOT(slotCopyResult(KIO::Job *))); + TDEIO::Job *j = TDEIO::file_copy(tmp->name(), d.selectedURL(), -1, true, false, false); + connect(j, TQT_SIGNAL(result(TDEIO::Job *)), TQT_TQOBJECT(this), TQT_SLOT(slotCopyResult(TDEIO::Job *))); } } } @@ -1061,27 +1061,27 @@ void SQ_GLWidget::slotAccelActivated() return; lastCopy = url; - KIO::Job *job; + TDEIO::Job *job; if(!ks.compare(TQt::Key_F5)) - job = KIO::copy(tab->m_original, url); + job = TDEIO::copy(tab->m_original, url); else - job = KIO::move(tab->m_original, url); + job = TDEIO::move(tab->m_original, url); job->setWindow(this); - connect(job, TQT_SIGNAL(result(KIO::Job *)), TQT_TQOBJECT(this), TQT_SLOT(slotCopyJobResult(KIO::Job *))); + connect(job, TQT_SIGNAL(result(TDEIO::Job *)), TQT_TQOBJECT(this), TQT_SLOT(slotCopyJobResult(TDEIO::Job *))); } else if(!ks.compare(TQt::Key_F7) || !ks.compare(TQt::Key_F8)) { - KIO::Job *job; + TDEIO::Job *job; if(!ks.compare(TQt::Key_F6)) - job = KIO::copy(tab->m_original, lastCopy); + job = TDEIO::copy(tab->m_original, lastCopy); else - job = KIO::move(tab->m_original, lastCopy); + job = TDEIO::move(tab->m_original, lastCopy); job->setWindow(this); - connect(job, TQT_SIGNAL(result(KIO::Job *)), TQT_TQOBJECT(this), TQT_SLOT(slotCopyJobResult(KIO::Job *))); + connect(job, TQT_SIGNAL(result(TDEIO::Job *)), TQT_TQOBJECT(this), TQT_SLOT(slotCopyJobResult(TDEIO::Job *))); } else if(!ks.compare(TQt::Key_F9)) copyURL(); else if(!ks.compare(TQt::Key_Slash)) slotShowHelp(); @@ -1143,7 +1143,7 @@ void SQ_GLWidget::zoom(GLfloat val) matrix_zoom(val); } -void SQ_GLWidget::slotCopyJobResult(KIO::Job *job) +void SQ_GLWidget::slotCopyJobResult(TDEIO::Job *job) { if(job->error()) job->showErrorDialog(this); @@ -1224,7 +1224,7 @@ void SQ_GLWidget::crop() { KMessageBox::error(this, i18n("Memory allocation failed for %1 of memory") - .arg(KIO::convertSize(pp.realw * pp.realh * sizeof(RGBA)))); + .arg(TDEIO::convertSize(pp.realw * pp.realh * sizeof(RGBA)))); return; } diff --git a/ksquirrel/sq_imageproperties.ui b/ksquirrel/sq_imageproperties.ui index c75f810..699dae4 100644 --- a/ksquirrel/sq_imageproperties.ui +++ b/ksquirrel/sq_imageproperties.ui @@ -936,7 +936,7 @@ class KPopupMenu; class KAction; - namespace KIO { class Job; } + namespace TDEIO { class Job; } KURL url; @@ -954,7 +954,7 @@ slotCopyAll() slotCopyEntry() slotModeClicked( int id ) - slotStatResult( KIO::Job * job ) + slotStatResult( TDEIO::Job * job ) init() diff --git a/ksquirrel/sq_imageproperties.ui.h b/ksquirrel/sq_imageproperties.ui.h index 73b63bb..0934ddd 100644 --- a/ksquirrel/sq_imageproperties.ui.h +++ b/ksquirrel/sq_imageproperties.ui.h @@ -84,8 +84,8 @@ void SQ_ImageProperties::setURL(const KURL &_url) void SQ_ImageProperties::setFileParams() { - KIO::Job *stjob = KIO::stat(url, false); - connect(stjob, TQT_SIGNAL(result(KIO::Job *)), this, TQT_SLOT(slotStatResult(KIO::Job *))); + TDEIO::Job *stjob = TDEIO::stat(url, false); + connect(stjob, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotStatResult(TDEIO::Job *))); #ifdef SQ_HAVE_KEXIF SQ_Config::instance()->setGroup("GL view"); @@ -230,11 +230,11 @@ void SQ_ImageProperties::slotModeClicked(int id) #endif } -void SQ_ImageProperties::slotStatResult(KIO::Job *job) +void SQ_ImageProperties::slotStatResult(TDEIO::Job *job) { if(!job->error()) { - KIO::UDSEntry entry = static_cast(job)->statResult(); + TDEIO::UDSEntry entry = static_cast(job)->statResult(); KFileItem fi(entry, url); KURL t = url; @@ -242,17 +242,17 @@ void SQ_ImageProperties::slotStatResult(KIO::Job *job) lineDirectory->setText(t.isLocalFile() ? t.path() : t.prettyURL()); lineFile->setText(fi.name()); - textSize->setText(KIO::convertSize(fi.size())); + textSize->setText(TDEIO::convertSize(fi.size())); textOwner->setText(TQString("%1").arg(fi.user())); textGroup->setText(TQString("%1").arg(fi.group())); textPermissions->setText(fi.permissionsString()); TQDateTime abs; - abs.setTime_t(fi.time(KIO::UDS_CREATION_TIME)); + abs.setTime_t(fi.time(TDEIO::UDS_CREATION_TIME)); textCreated->setText(abs.toString("dd/MM/yyyy hh:mm:ss")); - abs.setTime_t(fi.time(KIO::UDS_ACCESS_TIME)); + abs.setTime_t(fi.time(TDEIO::UDS_ACCESS_TIME)); textLastRead->setText(abs.toString("dd/MM/yyyy hh:mm:ss")); - abs.setTime_t(fi.time(KIO::UDS_MODIFICATION_TIME)); + abs.setTime_t(fi.time(TDEIO::UDS_MODIFICATION_TIME)); textLastMod->setText(abs.toString("dd/MM/yyyy hh:mm:ss")); } } diff --git a/ksquirrel/sq_libraryhandler.cpp b/ksquirrel/sq_libraryhandler.cpp index 326f07f..4850c84 100644 --- a/ksquirrel/sq_libraryhandler.cpp +++ b/ksquirrel/sq_libraryhandler.cpp @@ -53,7 +53,7 @@ SQ_LibraryHandler::SQ_LibraryHandler(TQObject *parent) kdDebug() << "+SQ_LibraryHandler" << endl; - kconf = new KConfig("ksquirrel-codec-settings"); + kconf = new TDEConfig("ksquirrel-codec-settings"); load(); } diff --git a/ksquirrel/sq_libraryhandler.h b/ksquirrel/sq_libraryhandler.h index de00e3d..0607a3f 100644 --- a/ksquirrel/sq_libraryhandler.h +++ b/ksquirrel/sq_libraryhandler.h @@ -26,7 +26,7 @@ class TQStringList; -class KConfig; +class TDEConfig; class KURL; /* @@ -120,7 +120,7 @@ class SQ_LibraryHandler : public TQObject, public TQValueVector void readSettings(SQ_LIBRARY *lib); private: - KConfig *kconf; + TDEConfig *kconf; static SQ_LibraryHandler *m_instance; }; diff --git a/ksquirrel/sq_navigatordropmenu.cpp b/ksquirrel/sq_navigatordropmenu.cpp index d9cf07e..89d767d 100644 --- a/ksquirrel/sq_navigatordropmenu.cpp +++ b/ksquirrel/sq_navigatordropmenu.cpp @@ -68,27 +68,27 @@ void SQ_NavigatorDropMenu::slotCopy() { if(also) emit done(url, SQ_NavigatorDropMenu::Copy); - KIO::Job *job = KIO::copy(list, url); - connect(job, TQT_SIGNAL(result(KIO::Job *)), this, TQT_SLOT(slotJobResult(KIO::Job *))); + TDEIO::Job *job = TDEIO::copy(list, url); + connect(job, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotJobResult(TDEIO::Job *))); } void SQ_NavigatorDropMenu::slotMove() { if(also) emit done(url, SQ_NavigatorDropMenu::Move); - KIO::Job *job = KIO::move(list, url); - connect(job, TQT_SIGNAL(result(KIO::Job *)), this, TQT_SLOT(slotJobResult(KIO::Job *))); + TDEIO::Job *job = TDEIO::move(list, url); + connect(job, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotJobResult(TDEIO::Job *))); } void SQ_NavigatorDropMenu::slotLink() { if(also) emit done(url, SQ_NavigatorDropMenu::Link); - KIO::Job *job = KIO::link(list, url); - connect(job, TQT_SIGNAL(result(KIO::Job *)), this, TQT_SLOT(slotJobResult(KIO::Job *))); + TDEIO::Job *job = TDEIO::link(list, url); + connect(job, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotJobResult(TDEIO::Job *))); } -void SQ_NavigatorDropMenu::slotJobResult(KIO::Job *job) +void SQ_NavigatorDropMenu::slotJobResult(TDEIO::Job *job) { if(job && job->error()) job->showErrorDialog(KSquirrel::app()); diff --git a/ksquirrel/sq_navigatordropmenu.h b/ksquirrel/sq_navigatordropmenu.h index bb1adf0..973b1be 100644 --- a/ksquirrel/sq_navigatordropmenu.h +++ b/ksquirrel/sq_navigatordropmenu.h @@ -23,7 +23,7 @@ #include -namespace KIO { class Job; } +namespace TDEIO { class Job; } class SQ_PopupMenu; @@ -74,7 +74,7 @@ class SQ_NavigatorDropMenu : public TQObject void slotCopy(); void slotMove(); void slotLink(); - void slotJobResult(KIO::Job *); + void slotJobResult(TDEIO::Job *); signals: void done(const KURL &, int); diff --git a/ksquirrel/sq_slideshowwidget.cpp b/ksquirrel/sq_slideshowwidget.cpp index f39029c..b4a63b4 100644 --- a/ksquirrel/sq_slideshowwidget.cpp +++ b/ksquirrel/sq_slideshowwidget.cpp @@ -351,7 +351,7 @@ void SQ_SlideShowWidget::constructMessage() if(mes_name) s_message += fm.fileName(); if(mes_size) - s_message = (mes_name || mes_pos) ? (s_message + " (" + KIO::convertSize(fm.size()) + ')') : KIO::convertSize(fm.size()); + s_message = (mes_name || mes_pos) ? (s_message + " (" + TDEIO::convertSize(fm.size()) + ')') : TDEIO::convertSize(fm.size()); message->setText(s_message); message->adjustSize(); diff --git a/ksquirrel/sq_thumbnailcachemaster.ui b/ksquirrel/sq_thumbnailcachemaster.ui index 7848c67..aec657a 100644 --- a/ksquirrel/sq_thumbnailcachemaster.ui +++ b/ksquirrel/sq_thumbnailcachemaster.ui @@ -243,7 +243,7 @@ slotCalcCache() slotClearCache() - slotClearFinished( KIO::Job * ) + slotClearFinished( TDEIO::Job * ) slotClearMemoryCache() slotCalcCacheMemory() slotShowDiskCache() diff --git a/ksquirrel/sq_thumbnailcachemaster.ui.h b/ksquirrel/sq_thumbnailcachemaster.ui.h index eec64d9..ec7aaed 100644 --- a/ksquirrel/sq_thumbnailcachemaster.ui.h +++ b/ksquirrel/sq_thumbnailcachemaster.ui.h @@ -30,7 +30,7 @@ void SQ_ThumbnailCacheMaster::slotCalcCache() int size = KDirSize::dirSize(url); - TQString s = KIO::convertSize(size); + TQString s = TDEIO::convertSize(size); textThumbSize->setText(s); } @@ -43,11 +43,11 @@ void SQ_ThumbnailCacheMaster::slotClearCache() KURL url = tmp.root(); - KIO::DeleteJob *job = KIO::del(url); - connect(job, TQT_SIGNAL(result(KIO::Job*)), this, TQT_SLOT(slotClearFinished(KIO::Job*))); + TDEIO::DeleteJob *job = TDEIO::del(url); + connect(job, TQT_SIGNAL(result(TDEIO::Job*)), this, TQT_SLOT(slotClearFinished(TDEIO::Job*))); } -void SQ_ThumbnailCacheMaster::slotClearFinished( KIO::Job * ) +void SQ_ThumbnailCacheMaster::slotClearFinished( TDEIO::Job * ) { TQApplication::restoreOverrideCursor(); slotCalcCache(); @@ -66,8 +66,8 @@ void SQ_ThumbnailCacheMaster::slotClearMemoryCache() void SQ_ThumbnailCacheMaster::slotCalcCacheMemory() { textCacheMemSize->setText(TQString::fromLatin1("%1/%2") - .arg(KIO::convertSize(SQ_PixmapCache::instance()->totalSize())) - .arg(KIO::convertSize(SQ_PixmapCache::instance()->cacheLimit()))); + .arg(TDEIO::convertSize(SQ_PixmapCache::instance()->totalSize())) + .arg(TDEIO::convertSize(SQ_PixmapCache::instance()->cacheLimit()))); } void SQ_ThumbnailCacheMaster::slotShowDiskCache() diff --git a/ksquirrel/sq_thumbnailloadjob.cpp b/ksquirrel/sq_thumbnailloadjob.cpp index ee51727..04f7379 100644 --- a/ksquirrel/sq_thumbnailloadjob.cpp +++ b/ksquirrel/sq_thumbnailloadjob.cpp @@ -58,7 +58,7 @@ #define SQ_PREDOWNLOAD_SIZE 20 SQ_ThumbnailLoadJob::SQ_ThumbnailLoadJob(const KFileItemList &items, SQ_FileThumbView *parnt) - : KIO::Job(false), parent(parnt) + : TDEIO::Job(false), parent(parnt) { mBrokenThumbnail.thumbnail = TDEGlobal::iconLoader()->loadIcon("file_broken", KIcon::Desktop, SQ_ThumbnailSize::smallest()); mItems = items; @@ -144,7 +144,7 @@ void SQ_ThumbnailLoadJob::nextFile(bool b) { if(b) { - KIO::Job *j = subjobs.first(); + TDEIO::Job *j = subjobs.first(); if(j) { @@ -203,14 +203,14 @@ void SQ_ThumbnailLoadJob::determineNextIcon() mCurrentURL = mCurrentItem->url(); mItems.removeFirst(); - KIO::StatJob *job = KIO::stat(mCurrentURL, false); + TDEIO::StatJob *job = TDEIO::stat(mCurrentURL, false); job->setSide(true); job->setDetails(0); addSubjob(job); } } -void SQ_ThumbnailLoadJob::slotResult(KIO::Job *job) +void SQ_ThumbnailLoadJob::slotResult(TDEIO::Job *job) { subjobs.remove(job); // Q_ASSERT(subjobs.isEmpty()); @@ -219,23 +219,23 @@ void SQ_ThumbnailLoadJob::slotResult(KIO::Job *job) { case STATE_STATORIG: { - KIO::UDSEntry entry = mCurrentItem->entry(); - KIO::UDSEntry::ConstIterator it = entry.begin(); + TDEIO::UDSEntry entry = mCurrentItem->entry(); + TDEIO::UDSEntry::ConstIterator it = entry.begin(); mOriginalTime = 0; size = totalSize = 0; TQString suff; for(; it != entry.end(); ++it) { - if((*it).m_uds == KIO::UDS_MODIFICATION_TIME) + if((*it).m_uds == TDEIO::UDS_MODIFICATION_TIME) { mOriginalTime = (time_t)((*it).m_long); } - else if((*it).m_uds == KIO::UDS_SIZE) + else if((*it).m_uds == TDEIO::UDS_SIZE) { - totalSize = (KIO::filesize_t)((*it).m_long); + totalSize = (TDEIO::filesize_t)((*it).m_long); } - else if((*it).m_uds == KIO::UDS_NAME) + else if((*it).m_uds == TDEIO::UDS_NAME) { suff = (*it).m_str; } @@ -263,10 +263,10 @@ void SQ_ThumbnailLoadJob::slotResult(KIO::Job *job) mTempURL.setPath(tmp->name()); - KIO::Job *cpjob = KIO::get(mCurrentURL, false, false); + TDEIO::Job *cpjob = TDEIO::get(mCurrentURL, false, false); - connect(cpjob, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)), - this, TQT_SLOT(slotData(KIO::Job *, const TQByteArray &))); + connect(cpjob, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), + this, TQT_SLOT(slotData(TDEIO::Job *, const TQByteArray &))); addSubjob(cpjob); } @@ -278,7 +278,7 @@ void SQ_ThumbnailLoadJob::slotResult(KIO::Job *job) case STATE_PREDOWNLOAD: { // error - if(job->error() && job->error() != KIO::ERR_USER_CANCELED) + if(job->error() && job->error() != TDEIO::ERR_USER_CANCELED) emitThumbnailLoadingFailed(); // no errors, or canceled @@ -303,7 +303,7 @@ void SQ_ThumbnailLoadJob::slotResult(KIO::Job *job) } } -void SQ_ThumbnailLoadJob::slotData(KIO::Job *job, const TQByteArray &data) +void SQ_ThumbnailLoadJob::slotData(TDEIO::Job *job, const TQByteArray &data) { if(!data.size()) return; @@ -474,7 +474,7 @@ void SQ_ThumbnailLoadJob::kill(bool q) { donothing = true; - KIO::Job::kill(q); + TDEIO::Job::kill(q); } #include "sq_thumbnailloadjob.moc" diff --git a/ksquirrel/sq_thumbnailloadjob.h b/ksquirrel/sq_thumbnailloadjob.h index 0c01cb1..6162c73 100644 --- a/ksquirrel/sq_thumbnailloadjob.h +++ b/ksquirrel/sq_thumbnailloadjob.h @@ -43,7 +43,7 @@ typedef TQPtrList KFileItemList; * in given directory. */ -class SQ_ThumbnailLoadJob : public KIO::Job +class SQ_ThumbnailLoadJob : public TDEIO::Job { Q_OBJECT @@ -77,8 +77,8 @@ class SQ_ThumbnailLoadJob : public KIO::Job void done(); private slots: - void slotResult(KIO::Job *job); - void slotData(KIO::Job *job, const TQByteArray &data); + void slotResult(TDEIO::Job *job); + void slotData(TDEIO::Job *job, const TQByteArray &data); private: enum { STATE_STATORIG, STATE_PREDOWNLOAD, STATE_DOWNLOAD } mState; @@ -88,7 +88,7 @@ class SQ_ThumbnailLoadJob : public KIO::Job KURL mCurrentURL; KURL mThumbURL; KURL mTempURL; - KIO::filesize_t totalSize, size; + TDEIO::filesize_t totalSize, size; KTempFile *tmp; time_t mOriginalTime; TQString mime; diff --git a/ksquirrel/sq_thumbnailsunused.cpp b/ksquirrel/sq_thumbnailsunused.cpp index 6b80356..372c315 100644 --- a/ksquirrel/sq_thumbnailsunused.cpp +++ b/ksquirrel/sq_thumbnailsunused.cpp @@ -25,7 +25,7 @@ SQ_ThumbnailsUnused::SQ_ThumbnailsUnused(TQObject *parent) : TQObject(parent), T { m_instance = this; - cache = new KConfig("ksquirrel-unused-cache"); + cache = new TDEConfig("ksquirrel-unused-cache"); load(); } diff --git a/ksquirrel/sq_thumbnailsunused.h b/ksquirrel/sq_thumbnailsunused.h index 94cca16..e55899b 100644 --- a/ksquirrel/sq_thumbnailsunused.h +++ b/ksquirrel/sq_thumbnailsunused.h @@ -25,7 +25,7 @@ #include -class KConfig; +class TDEConfig; /* * This is small helper class for thumbnail loader. It is used only on @@ -50,7 +50,7 @@ class SQ_ThumbnailsUnused : public TQObject, public TQMap private: static SQ_ThumbnailsUnused *m_instance; - KConfig *cache; + TDEConfig *cache; }; #endif diff --git a/ksquirrel/sq_widgetstack.cpp b/ksquirrel/sq_widgetstack.cpp index 0eb9738..b57cb17 100644 --- a/ksquirrel/sq_widgetstack.cpp +++ b/ksquirrel/sq_widgetstack.cpp @@ -562,14 +562,14 @@ void SQ_WidgetStack::slotFilePaste() // get current url KURL _url = url(); emitNewLastURL(_url); - KIO::Job *job; + TDEIO::Job *job; // now copy or move files to current url - job = (fileaction == SQ_WidgetStack::Copy) ? KIO::copy(files, _url) : KIO::move(files, _url); - connect(job, TQT_SIGNAL(result(KIO::Job *)), this, TQT_SLOT(slotJobResult(KIO::Job *))); + job = (fileaction == SQ_WidgetStack::Copy) ? TDEIO::copy(files, _url) : TDEIO::move(files, _url); + connect(job, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotJobResult(TDEIO::Job *))); } -void SQ_WidgetStack::slotJobResult(KIO::Job *job) +void SQ_WidgetStack::slotJobResult(TDEIO::Job *job) { if(job && job->error()) job->showErrorDialog(KSquirrel::app()); @@ -604,8 +604,8 @@ void SQ_WidgetStack::repeat() if(lastURL.isEmpty() || files.isEmpty()) return; - KIO::Job *job = (fileaction == SQ_WidgetStack::Copy) ? KIO::copy(files, lastURL) : KIO::move(files, lastURL); - connect(job, TQT_SIGNAL(result(KIO::Job *)), this, TQT_SLOT(slotJobResult(KIO::Job *))); + TDEIO::Job *job = (fileaction == SQ_WidgetStack::Copy) ? TDEIO::copy(files, lastURL) : TDEIO::move(files, lastURL); + connect(job, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotJobResult(TDEIO::Job *))); } // Create links @@ -624,7 +624,7 @@ void SQ_WidgetStack::slotFileLinkTo() emitNewLastURL(url); // create symlinks - KIO::link(files, url); + TDEIO::link(files, url); } // Copy to... @@ -643,7 +643,7 @@ void SQ_WidgetStack::slotFileCopyTo() emitNewLastURL(url); // copy files to selected directory - KIO::copy(files, url); + TDEIO::copy(files, url); } // Move to... @@ -662,7 +662,7 @@ void SQ_WidgetStack::slotFileMoveTo() emitNewLastURL(url); // move files to selected directory - KIO::move(files, url); + TDEIO::move(files, url); } /* diff --git a/ksquirrel/sq_widgetstack.h b/ksquirrel/sq_widgetstack.h index 367f1e5..2311167 100644 --- a/ksquirrel/sq_widgetstack.h +++ b/ksquirrel/sq_widgetstack.h @@ -26,7 +26,7 @@ #include "sq_diroperator.h" -namespace KIO { class Job; } +namespace TDEIO { class Job; } class TQTimer; @@ -210,7 +210,7 @@ class SQ_WidgetStack : public TQObject void slotTreeMenuDone(const KURL &, int); - void slotJobResult(KIO::Job *job); + void slotJobResult(TDEIO::Job *job); /* * User wants to select to deselect some files.