summaryrefslogtreecommitdiffstats
path: root/kioslave/nfs/kio_nfs.cpp
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-03 20:16:47 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-03 20:16:47 +0000
commit495d08bc2db58ee7fc4ea55a7158f2f61b82fc56 (patch)
treedaabcb652c07b9a17cad88ca50b63a2d91ead4a3 /kioslave/nfs/kio_nfs.cpp
parent50001f1757f97510e80cb1990e2f2d5b00144c2a (diff)
downloadtdebase-495d08bc2db58ee7fc4ea55a7158f2f61b82fc56.tar.gz
tdebase-495d08bc2db58ee7fc4ea55a7158f2f61b82fc56.zip
Automated conversion for enhanced compatibility with TQt for Qt4 3.4.0 TP1
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1211357 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kioslave/nfs/kio_nfs.cpp')
-rw-r--r--kioslave/nfs/kio_nfs.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/kioslave/nfs/kio_nfs.cpp b/kioslave/nfs/kio_nfs.cpp
index debe19d3d..8df2c3609 100644
--- a/kioslave/nfs/kio_nfs.cpp
+++ b/kioslave/nfs/kio_nfs.cpp
@@ -454,18 +454,18 @@ void NFSProtocol::openConnection()
(xdrproc_t) xdr_exports, (char*)&exportlist,total_timeout);
if (!checkForError(clnt_stat, 0, m_currentHost.latin1())) return;
- fhstatus fhStatus;
+ fhstatus fhtqStatus;
bool atLeastOnceSucceeded(FALSE);
for(; exportlist!=0;exportlist = exportlist->ex_next) {
kdDebug(7121) << "found export: " << exportlist->ex_dir << endl;
- memset(&fhStatus, 0, sizeof(fhStatus));
+ memset(&fhtqStatus, 0, sizeof(fhtqStatus));
clnt_stat = clnt_call(m_client, MOUNTPROC_MNT,(xdrproc_t) xdr_dirpath, (char*)(&(exportlist->ex_dir)),
- (xdrproc_t) xdr_fhstatus,(char*) &fhStatus,total_timeout);
- if (fhStatus.fhs_status==0) {
+ (xdrproc_t) xdr_fhstatus,(char*) &fhtqStatus,total_timeout);
+ if (fhtqStatus.fhs_status==0) {
atLeastOnceSucceeded=TRUE;
NFSFileHandle fh;
- fh=fhStatus.fhstatus_u.fhs_fhandle;
+ fh=fhtqStatus.fhstatus_u.fhs_fhandle;
TQString fname;
if ( exportlist->ex_dir[0] == '/' )
fname = KIO::encodeFileName(exportlist->ex_dir + 1);
@@ -473,7 +473,7 @@ void NFSProtocol::openConnection()
fname = KIO::encodeFileName(exportlist->ex_dir);
m_handleCache.insert(TQString("/")+fname,fh);
m_exportedDirs.append(fname);
- // kdDebug() <<"appending file -"<<fname<<"- with FH: -"<<fhStatus.fhstatus_u.fhs_fhandle<<"-"<<endl;
+ // kdDebug() <<"appending file -"<<fname<<"- with FH: -"<<fhtqStatus.fhstatus_u.fhs_fhandle<<"-"<<endl;
}
}
if (!atLeastOnceSucceeded)
@@ -807,7 +807,7 @@ void NFSProtocol::completeAbsoluteLinkUDSEntry(UDSEntry& entry, const TQCString&
struct passwd *user = getpwuid( uid );
if ( user )
{
- m_usercache.insert( uid, new TQString(TQString::fromLatin1(user->pw_name)) );
+ m_usercache.insert( uid, new TQString(TQString::tqfromLatin1(user->pw_name)) );
atom.m_str = user->pw_name;
}
else
@@ -825,7 +825,7 @@ void NFSProtocol::completeAbsoluteLinkUDSEntry(UDSEntry& entry, const TQCString&
struct group *grp = getgrgid( gid );
if ( grp )
{
- m_groupcache.insert( gid, new TQString(TQString::fromLatin1(grp->gr_name)) );
+ m_groupcache.insert( gid, new TQString(TQString::tqfromLatin1(grp->gr_name)) );
atom.m_str = grp->gr_name;
}
else