summaryrefslogtreecommitdiffstats
path: root/kioslave/home
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:30:47 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:30:47 -0600
commitcc74f360bb40da3d79f58048f8e8611804980aa6 (patch)
treec4385d2c16b904757b1c8bb998a4aec6993373f7 /kioslave/home
parent79b21d47bce1ee428affc97534cd8b257232a871 (diff)
downloadtdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.tar.gz
tdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'kioslave/home')
-rw-r--r--kioslave/home/homeimpl.cpp72
-rw-r--r--kioslave/home/homeimpl.h14
-rw-r--r--kioslave/home/kio_home.cpp24
-rw-r--r--kioslave/home/kio_home.h2
4 files changed, 56 insertions, 56 deletions
diff --git a/kioslave/home/homeimpl.cpp b/kioslave/home/homeimpl.cpp
index 9d6d0d5bd..ea3dad520 100644
--- a/kioslave/home/homeimpl.cpp
+++ b/kioslave/home/homeimpl.cpp
@@ -69,7 +69,7 @@ bool HomeImpl::realURL(const TQString &name, const TQString &path, KURL &url)
}
-bool HomeImpl::listHomes(TQValueList<KIO::UDSEntry> &list)
+bool HomeImpl::listHomes(TQValueList<TDEIO::UDSEntry> &list)
{
kdDebug() << "HomeImpl::listHomes" << endl;
@@ -93,7 +93,7 @@ bool HomeImpl::listHomes(TQValueList<KIO::UDSEntry> &list)
&& !uid_list.contains( (*it).uid() ) )
{
uid_list.append( (*it).uid() );
- KIO::UDSEntry entry;
+ TDEIO::UDSEntry entry;
createHomeEntry(entry, *it);
list.append(entry);
}
@@ -103,10 +103,10 @@ bool HomeImpl::listHomes(TQValueList<KIO::UDSEntry> &list)
return true;
}
-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;
@@ -114,19 +114,19 @@ static void addAtom(KIO::UDSEntry &entry, unsigned int ID, long l,
}
-void HomeImpl::createTopLevelEntry(KIO::UDSEntry &entry) const
+void HomeImpl::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, "kfm_home");
- addAtom(entry, KIO::UDS_USER, 0, "root");
- addAtom(entry, KIO::UDS_GROUP, 0, "root");
+ 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, "kfm_home");
+ addAtom(entry, TDEIO::UDS_USER, 0, "root");
+ addAtom(entry, TDEIO::UDS_GROUP, 0, "root");
}
-void HomeImpl::createHomeEntry(KIO::UDSEntry &entry,
+void HomeImpl::createHomeEntry(TDEIO::UDSEntry &entry,
const KUser &user)
{
kdDebug() << "HomeImpl::createHomeEntry" << endl;
@@ -140,13 +140,13 @@ void HomeImpl::createHomeEntry(KIO::UDSEntry &entry,
full_name = user.fullName()+" ("+user.loginName()+")";
}
- full_name = KIO::encodeFileName( full_name );
+ full_name = TDEIO::encodeFileName( full_name );
- addAtom(entry, KIO::UDS_NAME, 0, full_name);
- addAtom(entry, KIO::UDS_URL, 0, "home:/"+user.loginName());
+ addAtom(entry, TDEIO::UDS_NAME, 0, full_name);
+ addAtom(entry, TDEIO::UDS_URL, 0, "home:/"+user.loginName());
- 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_name = "folder_home2";
@@ -155,14 +155,14 @@ void HomeImpl::createHomeEntry(KIO::UDSEntry &entry,
icon_name = "folder_home";
}
- addAtom(entry, KIO::UDS_ICON_NAME, 0, icon_name);
+ addAtom(entry, TDEIO::UDS_ICON_NAME, 0, icon_name);
KURL url;
url.setPath(user.homeDir());
entry += extractUrlInfos(url);
}
-bool HomeImpl::statHome(const TQString &name, KIO::UDSEntry &entry)
+bool HomeImpl::statHome(const TQString &name, TDEIO::UDSEntry &entry)
{
kdDebug() << "HomeImpl::statHome: " << name << endl;
@@ -177,41 +177,41 @@ bool HomeImpl::statHome(const TQString &name, KIO::UDSEntry &entry)
return false;
}
-void HomeImpl::slotStatResult(KIO::Job *job)
+void HomeImpl::slotStatResult(TDEIO::Job *job)
{
if ( job->error() == 0)
{
- KIO::StatJob *stat_job = static_cast<KIO::StatJob *>(job);
+ TDEIO::StatJob *stat_job = static_cast<TDEIO::StatJob *>(job);
m_entryBuffer = stat_job->statResult();
}
tqApp->eventLoop()->exitLoop();
}
-KIO::UDSEntry HomeImpl::extractUrlInfos(const KURL &url)
+TDEIO::UDSEntry HomeImpl::extractUrlInfos(const KURL &url)
{
m_entryBuffer.clear();
- KIO::StatJob *job = KIO::stat(url, false);
- connect( job, TQT_SIGNAL( result(KIO::Job *) ),
- this, TQT_SLOT( slotStatResult(KIO::Job *) ) );
+ TDEIO::StatJob *job = TDEIO::stat(url, false);
+ connect( job, TQT_SIGNAL( result(TDEIO::Job *) ),
+ this, TQT_SLOT( slotStatResult(TDEIO::Job *) ) );
tqApp->eventLoop()->enterLoop();
- KIO::UDSEntry::iterator it = m_entryBuffer.begin();
- KIO::UDSEntry::iterator end = m_entryBuffer.end();
+ TDEIO::UDSEntry::iterator it = m_entryBuffer.begin();
+ TDEIO::UDSEntry::iterator end = m_entryBuffer.end();
- KIO::UDSEntry infos;
+ TDEIO::UDSEntry infos;
for(; it!=end; ++it)
{
switch( (*it).m_uds )
{
- case KIO::UDS_ACCESS:
- case KIO::UDS_USER:
- case KIO::UDS_GROUP:
- case KIO::UDS_CREATION_TIME:
- case KIO::UDS_MODIFICATION_TIME:
- case KIO::UDS_ACCESS_TIME:
+ case TDEIO::UDS_ACCESS:
+ case TDEIO::UDS_USER:
+ case TDEIO::UDS_GROUP:
+ case TDEIO::UDS_CREATION_TIME:
+ case TDEIO::UDS_MODIFICATION_TIME:
+ case TDEIO::UDS_ACCESS_TIME:
infos.append(*it);
break;
default:
@@ -219,7 +219,7 @@ KIO::UDSEntry HomeImpl::extractUrlInfos(const KURL &url)
}
}
- addAtom(infos, KIO::UDS_LOCAL_PATH, 0, url.path());
+ addAtom(infos, TDEIO::UDS_LOCAL_PATH, 0, url.path());
return infos;
}
diff --git a/kioslave/home/homeimpl.h b/kioslave/home/homeimpl.h
index 62c7b3868..786fa598a 100644
--- a/kioslave/home/homeimpl.h
+++ b/kioslave/home/homeimpl.h
@@ -36,19 +36,19 @@ public:
bool parseURL(const KURL &url, TQString &name, TQString &path) const;
bool realURL(const TQString &name, const TQString &path, KURL &url);
- bool statHome(const TQString &name, KIO::UDSEntry &entry);
- bool listHomes(TQValueList<KIO::UDSEntry> &list);
+ bool statHome(const TQString &name, TDEIO::UDSEntry &entry);
+ bool listHomes(TQValueList<TDEIO::UDSEntry> &list);
- void createTopLevelEntry(KIO::UDSEntry &entry) const;
+ void createTopLevelEntry(TDEIO::UDSEntry &entry) const;
private slots:
- void slotStatResult(KIO::Job *job);
+ void slotStatResult(TDEIO::Job *job);
private:
- void createHomeEntry(KIO::UDSEntry& entry, const KUser &user);
+ void createHomeEntry(TDEIO::UDSEntry& entry, const KUser &user);
- KIO::UDSEntry extractUrlInfos(const KURL &url);
- KIO::UDSEntry m_entryBuffer;
+ TDEIO::UDSEntry extractUrlInfos(const KURL &url);
+ TDEIO::UDSEntry m_entryBuffer;
long m_effectiveUid;
diff --git a/kioslave/home/kio_home.cpp b/kioslave/home/kio_home.cpp
index 3f307f6fd..bd55aee0a 100644
--- a/kioslave/home/kio_home.cpp
+++ b/kioslave/home/kio_home.cpp
@@ -72,14 +72,14 @@ bool HomeProtocol::rewriteURL(const KURL &url, KURL &newUrl)
if ( !m_impl.parseURL(url, name, path) )
{
- error(KIO::ERR_MALFORMED_URL, url.prettyURL());
+ error(TDEIO::ERR_MALFORMED_URL, url.prettyURL());
return false;
}
if ( !m_impl.realURL(name, path, newUrl) )
{
- error(KIO::ERR_MALFORMED_URL, url.prettyURL());
+ error(TDEIO::ERR_MALFORMED_URL, url.prettyURL());
return false;
}
@@ -102,7 +102,7 @@ void HomeProtocol::listDir(const KURL &url)
if ( !ok )
{
- error(KIO::ERR_MALFORMED_URL, url.prettyURL());
+ error(TDEIO::ERR_MALFORMED_URL, url.prettyURL());
return;
}
@@ -111,14 +111,14 @@ void HomeProtocol::listDir(const KURL &url)
void HomeProtocol::listRoot()
{
- KIO::UDSEntry entry;
+ TDEIO::UDSEntry entry;
- KIO::UDSEntryList home_entries;
+ TDEIO::UDSEntryList home_entries;
bool ok = m_impl.listHomes(home_entries);
if (!ok) // can't happen
{
- error(KIO::ERR_UNKNOWN, "");
+ error(TDEIO::ERR_UNKNOWN, "");
return;
}
@@ -127,8 +127,8 @@ void HomeProtocol::listRoot()
m_impl.createTopLevelEntry(entry);
listEntry(entry, false);
- KIO::UDSEntryListIterator it = home_entries.begin();
- KIO::UDSEntryListIterator end = home_entries.end();
+ TDEIO::UDSEntryListIterator it = home_entries.begin();
+ TDEIO::UDSEntryListIterator end = home_entries.end();
for(; it!=end; ++it)
{
@@ -149,7 +149,7 @@ void HomeProtocol::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();
@@ -161,13 +161,13 @@ void HomeProtocol::stat(const KURL &url)
if ( !ok )
{
- error(KIO::ERR_MALFORMED_URL, url.prettyURL());
+ error(TDEIO::ERR_MALFORMED_URL, url.prettyURL());
return;
}
if( path.isEmpty() )
{
- KIO::UDSEntry entry;
+ TDEIO::UDSEntry entry;
if ( m_impl.statHome(name, entry) )
{
@@ -176,7 +176,7 @@ void HomeProtocol::stat(const KURL &url)
}
else
{
- error(KIO::ERR_DOES_NOT_EXIST, url.prettyURL());
+ error(TDEIO::ERR_DOES_NOT_EXIST, url.prettyURL());
}
}
else
diff --git a/kioslave/home/kio_home.h b/kioslave/home/kio_home.h
index cf5f3a3cd..25607a5d4 100644
--- a/kioslave/home/kio_home.h
+++ b/kioslave/home/kio_home.h
@@ -23,7 +23,7 @@
#include <kio/forwardingslavebase.h>
#include "homeimpl.h"
-class HomeProtocol : public KIO::ForwardingSlaveBase
+class HomeProtocol : public TDEIO::ForwardingSlaveBase
{
public:
HomeProtocol(const TQCString &protocol, const TQCString &pool,