diff options
Diffstat (limited to 'src/common')
-rw-r--r-- | src/common/global/generic_config.cpp | 4 | ||||
-rw-r--r-- | src/common/global/purl.cpp | 8 | ||||
-rw-r--r-- | src/common/gui/pfile_ext.cpp | 10 | ||||
-rw-r--r-- | src/common/gui/purl_ext.cpp | 20 |
4 files changed, 21 insertions, 21 deletions
diff --git a/src/common/global/generic_config.cpp b/src/common/global/generic_config.cpp index 6b50ff0..9d951aa 100644 --- a/src/common/global/generic_config.cpp +++ b/src/common/global/generic_config.cpp @@ -26,8 +26,8 @@ class GenericConfigPrivate public: GenericConfigPrivate(const TQString &group) : _group(group) {} ~GenericConfigPrivate() { kapp->config()->sync(); } - KConfig &config() { - KConfig *conf = kapp->config(); + TDEConfig &config() { + TDEConfig *conf = kapp->config(); conf->setGroup(_group); return *conf; } diff --git a/src/common/global/purl.cpp b/src/common/global/purl.cpp index c9ff16d..29da212 100644 --- a/src/common/global/purl.cpp +++ b/src/common/global/purl.cpp @@ -274,14 +274,14 @@ bool PURL::Base::exists(TQDateTime *lastModified) const if ( _url.protocol()=="http" ) return httpUrlExists(); #if !defined(NO_KDE) if (lastModified) { - KIO::UDSEntry uds; - if ( !KIO::NetAccess::stat(_url, uds, tqApp->mainWidget()) ) return false; + TDEIO::UDSEntry uds; + if ( !TDEIO::NetAccess::stat(_url, uds, tqApp->mainWidget()) ) return false; KFileItem item(uds, _url); - lastModified->setTime_t(item.time(KIO::UDS_MODIFICATION_TIME)); + lastModified->setTime_t(item.time(TDEIO::UDS_MODIFICATION_TIME)); return true; } else { // assume file exists if ioslave cannot tell... - return KIO::NetAccess::exists(_url, true, tqApp->mainWidget()); + return TDEIO::NetAccess::exists(_url, true, tqApp->mainWidget()); } #else if (lastModified) lastModified->setTime_t(0); diff --git a/src/common/gui/pfile_ext.cpp b/src/common/gui/pfile_ext.cpp index 080421f..f15baf8 100644 --- a/src/common/gui/pfile_ext.cpp +++ b/src/common/gui/pfile_ext.cpp @@ -34,13 +34,13 @@ bool PURL::File::close() else _file->close(); bool ok = (_tmp ? _tmp->status() : _file->status())==IO_Ok; if ( !_file->name().isEmpty() ) { - KIO::NetAccess::removeTempFile(_file->name()); + TDEIO::NetAccess::removeTempFile(_file->name()); _file->setName(TQString()); } delete _stream; _stream = 0; - if ( ok && _tmp && !_url.isEmpty() && !KIO::NetAccess::upload(_tmp->name(), _url.kurl(), tqApp->mainWidget()) ) { - _error = KIO::NetAccess::lastErrorString(); + if ( ok && _tmp && !_url.isEmpty() && !TDEIO::NetAccess::upload(_tmp->name(), _url.kurl(), tqApp->mainWidget()) ) { + _error = TDEIO::NetAccess::lastErrorString(); ok = false; _log.sorry(i18n("Could not save file."), errorString()); } @@ -53,8 +53,8 @@ bool PURL::File::openForRead() { close(); TQString tmp; - if ( !KIO::NetAccess::download(_url.kurl(), tmp, tqApp->mainWidget()) ) { - _error = KIO::NetAccess::lastErrorString(); + if ( !TDEIO::NetAccess::download(_url.kurl(), tmp, tqApp->mainWidget()) ) { + _error = TDEIO::NetAccess::lastErrorString(); _log.sorry(i18n("Could not open file for reading."), errorString()); return false; } diff --git a/src/common/gui/purl_ext.cpp b/src/common/gui/purl_ext.cpp index df657a7..8e4a255 100644 --- a/src/common/gui/purl_ext.cpp +++ b/src/common/gui/purl_ext.cpp @@ -27,8 +27,8 @@ bool PURL::Url::copyTo(const Url &destination, Log::Generic &log) const // } //#else // do not overwrite - bool ok = KIO::NetAccess::file_copy(_url, destination._url, -1, false, false, tqApp->mainWidget()); - if ( !ok ) log.sorry(i18n("Could not copy file"), KIO::NetAccess::lastErrorString()); + bool ok = TDEIO::NetAccess::file_copy(_url, destination._url, -1, false, false, tqApp->mainWidget()); + if ( !ok ) log.sorry(i18n("Could not copy file"), TDEIO::NetAccess::lastErrorString()); return ok; //#endif } @@ -44,12 +44,12 @@ bool PURL::Url::create(Log::Generic &log) const // } //#else // assume file do no exist if ioslave cannot tell... - if ( KIO::NetAccess::exists(_url, false, tqApp->mainWidget()) ) return true; + if ( TDEIO::NetAccess::exists(_url, false, tqApp->mainWidget()) ) return true; KTempFile tmp; tmp.setAutoDelete(true); // do not overwrite - bool ok = KIO::NetAccess::file_copy(tmp.name(), _url, -1, false, false, tqApp->mainWidget()); - if ( !ok ) log.sorry(i18n("Could not create file"), KIO::NetAccess::lastErrorString()); + bool ok = TDEIO::NetAccess::file_copy(tmp.name(), _url, -1, false, false, tqApp->mainWidget()); + if ( !ok ) log.sorry(i18n("Could not create file"), TDEIO::NetAccess::lastErrorString()); //#endif return ok; } @@ -71,8 +71,8 @@ bool PURL::Url::del(Log::Generic &log) const // return false; // } //#else - bool ok = KIO::NetAccess::del(_url, tqApp->mainWidget()); - if ( !ok ) log.sorry(i18n("Could not delete file."), KIO::NetAccess::lastErrorString()); + bool ok = TDEIO::NetAccess::del(_url, tqApp->mainWidget()); + if ( !ok ) log.sorry(i18n("Could not delete file."), TDEIO::NetAccess::lastErrorString()); return ok; //#endif } @@ -103,9 +103,9 @@ bool PURL::Directory::create(Log::Generic &log) const // } //#else // assume dir do no exist if ioslave cannot tell... - if ( KIO::NetAccess::exists(_url, false, tqApp->mainWidget()) ) return true; - bool ok = KIO::NetAccess::mkdir(_url, tqApp->mainWidget()); - if ( !ok ) log.sorry(i18n("Could not create directory"), KIO::NetAccess::lastErrorString()); + if ( TDEIO::NetAccess::exists(_url, false, tqApp->mainWidget()) ) return true; + bool ok = TDEIO::NetAccess::mkdir(_url, tqApp->mainWidget()); + if ( !ok ) log.sorry(i18n("Could not create directory"), TDEIO::NetAccess::lastErrorString()); //#endif return ok; } |