diff options
Diffstat (limited to 'kpackage')
-rw-r--r-- | kpackage/kio.cpp | 40 | ||||
-rw-r--r-- | kpackage/kio.h | 6 | ||||
-rw-r--r-- | kpackage/kpackage.cpp | 10 | ||||
-rw-r--r-- | kpackage/kpackage.h | 14 | ||||
-rw-r--r-- | kpackage/kplview.cpp | 6 | ||||
-rw-r--r-- | kpackage/managementWidget.cpp | 4 | ||||
-rw-r--r-- | kpackage/options.cpp | 6 | ||||
-rw-r--r-- | kpackage/pkgOptions.cpp | 4 | ||||
-rw-r--r-- | kpackage/updateLoc.cpp | 12 |
9 files changed, 51 insertions, 51 deletions
diff --git a/kpackage/kio.cpp b/kpackage/kio.cpp index f11ed53..89e2100 100644 --- a/kpackage/kio.cpp +++ b/kpackage/kio.cpp @@ -34,16 +34,16 @@ Kio::Kio() bool Kio::download(const KURL & from, const TQString & to) { - KIO::Job *iojob = KIO::file_copy(from, to); - connect( iojob, TQT_SIGNAL( result(KIO::Job*) ), - TQT_SLOT( slotIOJobFinished( KIO::Job* ))); + TDEIO::Job *iojob = TDEIO::file_copy(from, to); + connect( iojob, TQT_SIGNAL( result(TDEIO::Job*) ), + TQT_SLOT( slotIOJobFinished( TDEIO::Job* ))); // missing modal widget hack here. - // I'd recommend using KIO::NetAccess instead (David). + // I'd recommend using TDEIO::NetAccess instead (David). kapp->enter_loop(); return worked; } -void Kio::slotIOJobFinished( KIO::Job * job) +void Kio::slotIOJobFinished( TDEIO::Job * job) { worked = (job->error() == 0); kapp->exit_loop(); @@ -68,18 +68,18 @@ bool Kiod::listDir(const TQString &url, const TQString &fname, bool subdirs) if (file->open(IO_WriteOnly)) { delete fileT; fileT = new TQTextStream(file); - KIO::ListJob *job; + TDEIO::ListJob *job; if (!subdirs) - job = KIO::listDir( url ); + job = TDEIO::listDir( url ); else - job = KIO::listRecursive( url, false); + job = TDEIO::listRecursive( url, false); kdDebug() << "started " << job << " " << subdirs << endl; - TQObject::connect( job, TQT_SIGNAL( entries( KIO::Job*, const KIO::UDSEntryList& ) ), - TQT_SLOT( slotListEntries( KIO::Job*, const KIO::UDSEntryList& ) ) ); - TQObject::connect( job, TQT_SIGNAL( result( KIO::Job * ) ), - TQT_SLOT( slotFinished( KIO::Job* ) ) ); + TQObject::connect( job, TQT_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ), + TQT_SLOT( slotListEntries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ) ); + TQObject::connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), + TQT_SLOT( slotFinished( TDEIO::Job* ) ) ); kapp->enter_loop(); @@ -92,21 +92,21 @@ bool Kiod::listDir(const TQString &url, const TQString &fname, bool subdirs) return FALSE; } -void Kiod::slotListEntries( KIO::Job *, const KIO::UDSEntryList& entries ) +void Kiod::slotListEntries( TDEIO::Job *, const TDEIO::UDSEntryList& entries ) { long size = 0; TQString text; - KIO::UDSEntryList::ConstIterator entryIt = entries.begin(); + TDEIO::UDSEntryList::ConstIterator entryIt = entries.begin(); for (; entryIt != entries.end(); ++entryIt) { - //kdDebug() << "listDir " << dynamic_cast<KIO::ListJob*>(job)->url() << endl; - for (KIO::UDSEntry::ConstIterator it = (*entryIt).begin(); + //kdDebug() << "listDir " << dynamic_cast<TDEIO::ListJob*>(job)->url() << endl; + for (TDEIO::UDSEntry::ConstIterator it = (*entryIt).begin(); it != (*entryIt).end(); it++ ) { - if ( (*it).m_uds == KIO::UDS_SIZE ) + if ( (*it).m_uds == TDEIO::UDS_SIZE ) size = (*it).m_long; - else if ( (*it).m_uds == KIO::UDS_NAME ) + else if ( (*it).m_uds == TDEIO::UDS_NAME ) text = (*it).m_str; } *fileT << text << "\n" << size << "\n"; @@ -114,9 +114,9 @@ void Kiod::slotListEntries( KIO::Job *, const KIO::UDSEntryList& entries ) } } -void Kiod::slotFinished( KIO::Job *job ) +void Kiod::slotFinished( TDEIO::Job *job ) { - //kdDebug() << "finished" << " " << job << " " << dynamic_cast<KIO::ListJob*>(job)->url() << endl; + //kdDebug() << "finished" << " " << job << " " << dynamic_cast<TDEIO::ListJob*>(job)->url() << endl; worked = (job->error() == 0); kapp->exit_loop(); } diff --git a/kpackage/kio.h b/kpackage/kio.h index 3fae21c..6698d67 100644 --- a/kpackage/kio.h +++ b/kpackage/kio.h @@ -51,7 +51,7 @@ private: bool worked; private slots: - void slotIOJobFinished( KIO::Job *job ); + void slotIOJobFinished( TDEIO::Job *job ); }; class Kiod: public TQObject @@ -71,7 +71,7 @@ private: bool worked; private slots: - void slotListEntries( KIO::Job *, const KIO::UDSEntryList& ); - void slotFinished( KIO::Job *); + void slotListEntries( TDEIO::Job *, const TDEIO::UDSEntryList& ); + void slotFinished( TDEIO::Job *); }; #endif diff --git a/kpackage/kpackage.cpp b/kpackage/kpackage.cpp index 75aeabb..add161e 100644 --- a/kpackage/kpackage.cpp +++ b/kpackage/kpackage.cpp @@ -64,7 +64,7 @@ extern Opts *opts; ////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////// -KPKG::KPKG(KConfig *_config) +KPKG::KPKG(TDEConfig *_config) : KMainWindow(0) { kpackage = new KPACKAGE(_config, this); @@ -251,7 +251,7 @@ void KPKG::writeSettings(){ kpackage->management->writePSeparator(); - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup("Kpackage"); @@ -279,13 +279,13 @@ void KPKG::clearDCache(){ cacheObj::clearDCache(); } -void KPKG::saveProperties(KConfig *config ) +void KPKG::saveProperties(TDEConfig *config ) { config->writePathEntry("Name", kpackage->save_url.url()); } -void KPKG::readProperties(KConfig *config) +void KPKG::readProperties(TDEConfig *config) { TQString entry = config->readPathEntry("Name"); // no default if (entry.isNull()) @@ -302,7 +302,7 @@ bool KPKG::queryClose() { ////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////// -KPACKAGE::KPACKAGE(KConfig *_config, TQWidget *parent) +KPACKAGE::KPACKAGE(TDEConfig *_config, TQWidget *parent) : TQWidget(parent) { diff --git a/kpackage/kpackage.h b/kpackage/kpackage.h index 5eecc38..18e6e85 100644 --- a/kpackage/kpackage.h +++ b/kpackage/kpackage.h @@ -43,7 +43,7 @@ class KFileDialog; class KProgress; class TQFrame; -class KConfig; +class TDEConfig; class TQLabel; class Search; class FindF; @@ -67,7 +67,7 @@ class KPACKAGE : public TQWidget ///////////// METHODS ------------------------------------------------------ public: - KPACKAGE(KConfig *_config, TQWidget *parent); + KPACKAGE(TDEConfig *_config, TQWidget *parent); // Constructor ~KPACKAGE(); @@ -182,7 +182,7 @@ public: enum { Management, Installation } ; // Widget modes - KConfig *config; + TDEConfig *config; // pointer to kconfig object managementWidget *management; @@ -237,7 +237,7 @@ class KPKG : public KMainWindow public: - KPKG(KConfig *_config); + KPKG(TDEConfig *_config); // Constructor void add_recent_file(const TQString &newfile); @@ -246,8 +246,8 @@ public: void writeSettings(); // write config settings - void saveProperties(KConfig *config); - void readProperties(KConfig *config); + void saveProperties(TDEConfig *config); + void readProperties(TDEConfig *config); // save and read restart sstate void disableMenu(); @@ -260,7 +260,7 @@ public: Options *optiondialog; // Options dialog - KConfig *config ; + TDEConfig *config ; // Saved config information void disableNext(); diff --git a/kpackage/kplview.cpp b/kpackage/kplview.cpp index f7d25cc..b5ca8f1 100644 --- a/kpackage/kplview.cpp +++ b/kpackage/kplview.cpp @@ -525,7 +525,7 @@ void KpTreeList::stackRemove(KpTreeListItem *pack) //////////////////////////////////////////////////////////////// void KpTreeList::writeTreeType() { - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup("Kpackage"); @@ -534,7 +534,7 @@ void KpTreeList::writeTreeType() void KpTreeList::readTreeType() { - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup("Kpackage"); @@ -551,7 +551,7 @@ void KpTreeList::writeTreeConfig() void KpTreeList::readTreeConfig() { - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); restoreLayout(config, "Tree"); diff --git a/kpackage/managementWidget.cpp b/kpackage/managementWidget.cpp index cdd7f45..b50dcee 100644 --- a/kpackage/managementWidget.cpp +++ b/kpackage/managementWidget.cpp @@ -218,7 +218,7 @@ void managementWidget::setupWidgets() //////////////////////////////////////////////////////////////// void managementWidget::writePSeparator() { - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup("Kpackage"); @@ -228,7 +228,7 @@ void managementWidget::writePSeparator() void managementWidget::readPSeparator() { - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup("Kpackage"); diff --git a/kpackage/options.cpp b/kpackage/options.cpp index 8d86470..837c51c 100644 --- a/kpackage/options.cpp +++ b/kpackage/options.cpp @@ -389,7 +389,7 @@ Opts::~Opts() void Opts::readSettings(const TQString &initHost) { - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup("Kpackage"); @@ -428,7 +428,7 @@ void Opts::readSettings(const TQString &initHost) void Opts::readLaterSettings() { - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup("Kpackage"); int i; @@ -442,7 +442,7 @@ void Opts::readLaterSettings() void Opts::writeSettings() { - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup("Kpackage"); diff --git a/kpackage/pkgOptions.cpp b/kpackage/pkgOptions.cpp index 67d2a7a..4c68366 100644 --- a/kpackage/pkgOptions.cpp +++ b/kpackage/pkgOptions.cpp @@ -322,7 +322,7 @@ void pkgOptions::keepToggle(bool kp) { // kdDebug() << "KEEP " << kp << "\n"; - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup("Kpackage"); config->writeEntry("keepIWin", kp); @@ -332,7 +332,7 @@ void pkgOptions::keepToggle(bool kp) void pkgOptions::getKeep() { - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup("Kpackage"); keep = config->readBoolEntry("keepIWin", true); kdDebug() << "getKEEP " << keep << "\n"; diff --git a/kpackage/updateLoc.cpp b/kpackage/updateLoc.cpp index c662da8..0cc5d89 100644 --- a/kpackage/updateLoc.cpp +++ b/kpackage/updateLoc.cpp @@ -432,7 +432,7 @@ void pdUpdateLoc::applyS(LcacheObj *slist) { TQString t,pn,cn,pv,prev,opts; cacheObj *CObj; - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup(interName); cn = interface->head; @@ -466,7 +466,7 @@ void pdUpdateLoc::readSettings() { TQString pv, pn; - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup(interName); @@ -489,7 +489,7 @@ void pdUpdateLoc::writeSettings() { TQString pv, pn; - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup(interName); if (haveBase) { @@ -577,7 +577,7 @@ cUpdateLoc::~cUpdateLoc() { TQString t,pn,cn,pv,prev,opts; cacheObj *CObj; - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup(interName); cn = interface->head; @@ -601,7 +601,7 @@ void cUpdateLoc::readSettings() { TQString pv, pn; - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup(interName); @@ -623,7 +623,7 @@ void cUpdateLoc::writeSettings() { TQString pv, pn; - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup(interName); |