diff options
Diffstat (limited to 'kioslave/remote')
-rw-r--r-- | kioslave/remote/kio_remote.cpp | 28 | ||||
-rw-r--r-- | kioslave/remote/kio_remote.h | 2 | ||||
-rw-r--r-- | kioslave/remote/remoteimpl.cpp | 54 | ||||
-rw-r--r-- | kioslave/remote/remoteimpl.h | 10 |
4 files changed, 47 insertions, 47 deletions
diff --git a/kioslave/remote/kio_remote.cpp b/kioslave/remote/kio_remote.cpp index f4b71086d..87437700f 100644 --- a/kioslave/remote/kio_remote.cpp +++ b/kioslave/remote/kio_remote.cpp @@ -89,14 +89,14 @@ void RemoteProtocol::listDir(const KURL &url) return; } - error(KIO::ERR_MALFORMED_URL, url.prettyURL()); + error(TDEIO::ERR_MALFORMED_URL, url.prettyURL()); } void RemoteProtocol::listRoot() { - KIO::UDSEntry entry; + TDEIO::UDSEntry entry; - KIO::UDSEntryList remote_entries; + TDEIO::UDSEntryList remote_entries; m_impl.listRoot(remote_entries); totalSize(remote_entries.count()+2); @@ -107,8 +107,8 @@ void RemoteProtocol::listRoot() m_impl.createWizardEntry(entry); listEntry(entry, false); - KIO::UDSEntryListIterator it = remote_entries.begin(); - KIO::UDSEntryListIterator end = remote_entries.end(); + TDEIO::UDSEntryListIterator it = remote_entries.begin(); + TDEIO::UDSEntryListIterator end = remote_entries.end(); for(; it!=end; ++it) { @@ -129,7 +129,7 @@ void RemoteProtocol::stat(const KURL &url) if ( path.isEmpty() || path == "/" ) { // The root is "virtual" - it's not a single physical directory - KIO::UDSEntry entry; + TDEIO::UDSEntry entry; m_impl.createTopLevelEntry( entry ); statEntry( entry ); finished(); @@ -138,7 +138,7 @@ void RemoteProtocol::stat(const KURL &url) if (m_impl.isWizardURL(url)) { - KIO::UDSEntry entry; + TDEIO::UDSEntry entry; if (m_impl.createWizardEntry(entry)) { statEntry(entry); @@ -146,7 +146,7 @@ void RemoteProtocol::stat(const KURL &url) } else { - error(KIO::ERR_DOES_NOT_EXIST, url.prettyURL()); + error(TDEIO::ERR_DOES_NOT_EXIST, url.prettyURL()); } return; } @@ -156,7 +156,7 @@ void RemoteProtocol::stat(const KURL &url) if ( second_slash_idx==-1 || ( (int)url.path().length() )==second_slash_idx+1 ) { - KIO::UDSEntry entry; + TDEIO::UDSEntry entry; if (m_impl.statNetworkFolder(entry, root_dirname)) { statEntry(entry); @@ -177,7 +177,7 @@ void RemoteProtocol::stat(const KURL &url) } } - error(KIO::ERR_MALFORMED_URL, url.prettyURL()); + error(TDEIO::ERR_MALFORMED_URL, url.prettyURL()); } void RemoteProtocol::del(const KURL &url, bool /*isFile*/) @@ -191,7 +191,7 @@ void RemoteProtocol::del(const KURL &url, bool /*isFile*/) return; } - error(KIO::ERR_CANNOT_DELETE, url.prettyURL()); + error(TDEIO::ERR_CANNOT_DELETE, url.prettyURL()); } void RemoteProtocol::get(const KURL &url) @@ -211,7 +211,7 @@ void RemoteProtocol::get(const KURL &url) return; } - error(KIO::ERR_MALFORMED_URL, url.prettyURL()); + error(TDEIO::ERR_MALFORMED_URL, url.prettyURL()); } void RemoteProtocol::rename(const KURL &src, const KURL &dest, @@ -220,7 +220,7 @@ void RemoteProtocol::rename(const KURL &src, const KURL &dest, if (src.protocol()!="remote" || dest.protocol()!="remote" || m_impl.isWizardURL(src) || m_impl.isWizardURL(dest)) { - error(KIO::ERR_UNSUPPORTED_ACTION, src.prettyURL()); + error(TDEIO::ERR_UNSUPPORTED_ACTION, src.prettyURL()); return; } @@ -230,5 +230,5 @@ void RemoteProtocol::rename(const KURL &src, const KURL &dest, return; } - error(KIO::ERR_CANNOT_RENAME, src.prettyURL()); + error(TDEIO::ERR_CANNOT_RENAME, src.prettyURL()); } diff --git a/kioslave/remote/kio_remote.h b/kioslave/remote/kio_remote.h index f2c06296a..77ac1d7cb 100644 --- a/kioslave/remote/kio_remote.h +++ b/kioslave/remote/kio_remote.h @@ -23,7 +23,7 @@ #include <kio/slavebase.h> #include "remoteimpl.h" -class RemoteProtocol : public KIO::SlaveBase +class RemoteProtocol : public TDEIO::SlaveBase { public: RemoteProtocol(const TQCString &protocol, const TQCString &pool, diff --git a/kioslave/remote/remoteimpl.cpp b/kioslave/remote/remoteimpl.cpp index fbc21bfec..2ca263768 100644 --- a/kioslave/remote/remoteimpl.cpp +++ b/kioslave/remote/remoteimpl.cpp @@ -49,7 +49,7 @@ RemoteImpl::RemoteImpl() } } -void RemoteImpl::listRoot(TQValueList<KIO::UDSEntry> &list) const +void RemoteImpl::listRoot(TQValueList<TDEIO::UDSEntry> &list) const { kdDebug(1220) << "RemoteImpl::listRoot" << endl; @@ -67,7 +67,7 @@ void RemoteImpl::listRoot(TQValueList<KIO::UDSEntry> &list) const = dir.entryList( TQDir::Files | TQDir::Readable ); - KIO::UDSEntry entry; + TDEIO::UDSEntry entry; TQStringList::ConstIterator name = filenames.begin(); TQStringList::ConstIterator endf = filenames.end(); @@ -102,7 +102,7 @@ bool RemoteImpl::findDirectory(const TQString &filename, TQString &directory) co = dir.entryList( TQDir::Files | TQDir::Readable ); - KIO::UDSEntry entry; + TDEIO::UDSEntry entry; TQStringList::ConstIterator name = filenames.begin(); TQStringList::ConstIterator endf = filenames.end(); @@ -148,10 +148,10 @@ KURL RemoteImpl::findBaseURL(const TQString &filename) const } -static void addAtom(KIO::UDSEntry &entry, unsigned int ID, long l, +static void addAtom(TDEIO::UDSEntry &entry, unsigned int ID, long l, const TQString &s = TQString::null) { - KIO::UDSAtom atom; + TDEIO::UDSAtom atom; atom.m_uds = ID; atom.m_long = l; atom.m_str = s; @@ -159,14 +159,14 @@ static void addAtom(KIO::UDSEntry &entry, unsigned int ID, long l, } -void RemoteImpl::createTopLevelEntry(KIO::UDSEntry &entry) const +void RemoteImpl::createTopLevelEntry(TDEIO::UDSEntry &entry) const { entry.clear(); - addAtom(entry, KIO::UDS_NAME, 0, "."); - addAtom(entry, KIO::UDS_FILE_TYPE, S_IFDIR); - addAtom(entry, KIO::UDS_ACCESS, 0555); - addAtom(entry, KIO::UDS_MIME_TYPE, 0, "inode/directory"); - addAtom(entry, KIO::UDS_ICON_NAME, 0, "network"); + addAtom(entry, TDEIO::UDS_NAME, 0, "."); + addAtom(entry, TDEIO::UDS_FILE_TYPE, S_IFDIR); + addAtom(entry, TDEIO::UDS_ACCESS, 0555); + addAtom(entry, TDEIO::UDS_MIME_TYPE, 0, "inode/directory"); + addAtom(entry, TDEIO::UDS_ICON_NAME, 0, "network"); } static KURL findWizardRealURL() @@ -184,7 +184,7 @@ static KURL findWizardRealURL() return url; } -bool RemoteImpl::createWizardEntry(KIO::UDSEntry &entry) const +bool RemoteImpl::createWizardEntry(TDEIO::UDSEntry &entry) const { entry.clear(); @@ -195,13 +195,13 @@ bool RemoteImpl::createWizardEntry(KIO::UDSEntry &entry) const return false; } - addAtom(entry, KIO::UDS_NAME, 0, i18n("Add a Network Folder")); - addAtom(entry, KIO::UDS_FILE_TYPE, S_IFREG); - addAtom(entry, KIO::UDS_URL, 0, WIZARD_URL); - addAtom(entry, KIO::UDS_LOCAL_PATH, 0, url.path()); - addAtom(entry, KIO::UDS_ACCESS, 0500); - addAtom(entry, KIO::UDS_MIME_TYPE, 0, "application/x-desktop"); - addAtom(entry, KIO::UDS_ICON_NAME, 0, "wizard"); + addAtom(entry, TDEIO::UDS_NAME, 0, i18n("Add a Network Folder")); + addAtom(entry, TDEIO::UDS_FILE_TYPE, S_IFREG); + addAtom(entry, TDEIO::UDS_URL, 0, WIZARD_URL); + addAtom(entry, TDEIO::UDS_LOCAL_PATH, 0, url.path()); + addAtom(entry, TDEIO::UDS_ACCESS, 0500); + addAtom(entry, TDEIO::UDS_MIME_TYPE, 0, "application/x-desktop"); + addAtom(entry, TDEIO::UDS_ICON_NAME, 0, "wizard"); return true; } @@ -212,7 +212,7 @@ bool RemoteImpl::isWizardURL(const KURL &url) const } -void RemoteImpl::createEntry(KIO::UDSEntry &entry, +void RemoteImpl::createEntry(TDEIO::UDSEntry &entry, const TQString &directory, const TQString &file) const { @@ -227,19 +227,19 @@ void RemoteImpl::createEntry(KIO::UDSEntry &entry, TQString new_filename = file; new_filename.truncate( file.length()-8); - addAtom(entry, KIO::UDS_NAME, 0, desktop.readName()); - addAtom(entry, KIO::UDS_URL, 0, "remote:/"+new_filename); + addAtom(entry, TDEIO::UDS_NAME, 0, desktop.readName()); + addAtom(entry, TDEIO::UDS_URL, 0, "remote:/"+new_filename); - addAtom(entry, KIO::UDS_FILE_TYPE, S_IFDIR); - addAtom(entry, KIO::UDS_MIME_TYPE, 0, "inode/directory"); + addAtom(entry, TDEIO::UDS_FILE_TYPE, S_IFDIR); + addAtom(entry, TDEIO::UDS_MIME_TYPE, 0, "inode/directory"); TQString icon = desktop.readIcon(); - addAtom(entry, KIO::UDS_ICON_NAME, 0, icon); - addAtom(entry, KIO::UDS_LINK_DEST, 0, desktop.readURL()); + addAtom(entry, TDEIO::UDS_ICON_NAME, 0, icon); + addAtom(entry, TDEIO::UDS_LINK_DEST, 0, desktop.readURL()); } -bool RemoteImpl::statNetworkFolder(KIO::UDSEntry &entry, const TQString &filename) const +bool RemoteImpl::statNetworkFolder(TDEIO::UDSEntry &entry, const TQString &filename) const { kdDebug(1220) << "RemoteImpl::statNetworkFolder: " << filename << endl; diff --git a/kioslave/remote/remoteimpl.h b/kioslave/remote/remoteimpl.h index b9bb6ac2d..ff16099dc 100644 --- a/kioslave/remote/remoteimpl.h +++ b/kioslave/remote/remoteimpl.h @@ -31,12 +31,12 @@ class RemoteImpl public: RemoteImpl(); - void createTopLevelEntry(KIO::UDSEntry &entry) const; - bool createWizardEntry(KIO::UDSEntry &entry) const; + void createTopLevelEntry(TDEIO::UDSEntry &entry) const; + bool createWizardEntry(TDEIO::UDSEntry &entry) const; bool isWizardURL(const KURL &url) const; - bool statNetworkFolder(KIO::UDSEntry &entry, const TQString &filename) const; + bool statNetworkFolder(TDEIO::UDSEntry &entry, const TQString &filename) const; - void listRoot(TQValueList<KIO::UDSEntry> &list) const; + void listRoot(TQValueList<TDEIO::UDSEntry> &list) const; KURL findBaseURL(const TQString &filename) const; TQString findDesktopFile(const TQString &filename) const; @@ -47,7 +47,7 @@ public: private: bool findDirectory(const TQString &filename, TQString &directory) const; - void createEntry(KIO::UDSEntry& entry, const TQString &directory, + void createEntry(TDEIO::UDSEntry& entry, const TQString &directory, const TQString &file) const; }; |