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

5 files changed, 21 insertions, 21 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
diff --git a/kioslave/nfs/mount.h b/kioslave/nfs/mount.h
index c3b8c217f..68924ed30 100644
--- a/kioslave/nfs/mount.h
+++ b/kioslave/nfs/mount.h
@@ -177,7 +177,7 @@ struct ppathcnf {
 	short pc_pipe_buf;
 	u_char pc_vdisable;
 	char pc_xxx;
-	short pc_mask[2];
+	short pc_tqmask[2];
 };
 typedef struct ppathcnf ppathcnf;
 #ifdef __cplusplus 
diff --git a/kioslave/nfs/mount.x b/kioslave/nfs/mount.x
index 4aaf97de9..fa51ab502 100644
--- a/kioslave/nfs/mount.x
+++ b/kioslave/nfs/mount.x
@@ -117,8 +117,8 @@ struct ppathcnf {
 	short	pc_path_max;	/* max path name length (/x/y/x/.. ) */
 	short	pc_pipe_buf;	/* size of a pipe (bytes) */
 	u_char	pc_vdisable;	/* safe char to turn off c_cc[i] */
-	char	pc_xxx;		/* alignment padding; cc_t == char */
-	short	pc_mask[2];	/* validity and boolean bits */
+	char	pc_xxx;		/* tqalignment padding; cc_t == char */
+	short	pc_tqmask[2];	/* validity and boolean bits */
 };
 
 program MOUNTPROG {
@@ -136,7 +136,7 @@ program MOUNTPROG {
 		MOUNTPROC_NULL(void) = 0;
 
 		/*	
-		 * If fhs_status is 0, then fhs_fhandle contains the
+		 * If fhs_status is 0, then fhs_fhandle tqcontains the
 	 	 * file handle for the directory. This file handle may
 		 * be used in the NFS protocol. This procedure also adds
 		 * a new entry to the mount list for this client mounting
@@ -148,7 +148,7 @@ program MOUNTPROG {
 
 		/*
 		 * Returns the list of remotely mounted filesystems. The 
-		 * mountlist contains one entry for each hostname and 
+		 * mountlist tqcontains one entry for each hostname and 
 		 * directory pair.
 		 */
 		mountlist
@@ -197,7 +197,7 @@ program MOUNTPROG {
 		MOUNTPROC_NULL(void) = 0;
 
 		/*	
-		 * If fhs_status is 0, then fhs_fhandle contains the
+		 * If fhs_status is 0, then fhs_fhandle tqcontains the
 	 	 * file handle for the directory. This file handle may
 		 * be used in the NFS protocol. This procedure also adds
 		 * a new entry to the mount list for this client mounting
@@ -209,7 +209,7 @@ program MOUNTPROG {
 
 		/*
 		 * Returns the list of remotely mounted filesystems. The 
-		 * mountlist contains one entry for each hostname and 
+		 * mountlist tqcontains one entry for each hostname and 
 		 * directory pair.
 		 */
 		mountlist
diff --git a/kioslave/nfs/mount_xdr.c b/kioslave/nfs/mount_xdr.c
index 38a43ca28..fc393ec45 100644
--- a/kioslave/nfs/mount_xdr.c
+++ b/kioslave/nfs/mount_xdr.c
@@ -234,14 +234,14 @@ xdr_ppathcnf(XDR *xdrs, ppathcnf *objp)
 	 }
 		buf = XDR_INLINE(xdrs,   2  * BYTES_PER_XDR_UNIT);
 		if (buf == NULL) {
-		 if (!xdr_vector(xdrs, (char *)objp->pc_mask, 2, sizeof(short), (xdrproc_t)xdr_short)) {
+		 if (!xdr_vector(xdrs, (char *)objp->pc_tqmask, 2, sizeof(short), (xdrproc_t)xdr_short)) {
 			 return (FALSE);
 		 }
 
 	  }
 	  else {
 		{ register short *genp; 
-		  for ( i = 0,genp=objp->pc_mask;
+		  for ( i = 0,genp=objp->pc_tqmask;
  			i < 2; i++){
 				 IXDR_PUT_SHORT(buf,*genp++);
 		   }
@@ -288,14 +288,14 @@ xdr_ppathcnf(XDR *xdrs, ppathcnf *objp)
 	 }
 		buf = XDR_INLINE(xdrs, 2  * BYTES_PER_XDR_UNIT);
 		if (buf == NULL) {
-		 if (!xdr_vector(xdrs, (char *)objp->pc_mask, 2, sizeof(short), (xdrproc_t)xdr_short)) {
+		 if (!xdr_vector(xdrs, (char *)objp->pc_tqmask, 2, sizeof(short), (xdrproc_t)xdr_short)) {
 			 return (FALSE);
 		 }
 
 	  }
 	  else {
 		{ register short *genp; 
-		  for ( i = 0,genp=objp->pc_mask;
+		  for ( i = 0,genp=objp->pc_tqmask;
  			i < 2; i++){
 				 *genp++ = IXDR_GET_SHORT(buf);
 		   }
@@ -328,7 +328,7 @@ xdr_ppathcnf(XDR *xdrs, ppathcnf *objp)
 	 if (!xdr_char(xdrs, &objp->pc_xxx)) {
 		 return (FALSE);
 	 }
-	 if (!xdr_vector(xdrs, (char *)objp->pc_mask, 2, sizeof(short), (xdrproc_t)xdr_short)) {
+	 if (!xdr_vector(xdrs, (char *)objp->pc_tqmask, 2, sizeof(short), (xdrproc_t)xdr_short)) {
 		 return (FALSE);
 	 }
 	return (TRUE);
diff --git a/kioslave/nfs/nfs_prot.x b/kioslave/nfs/nfs_prot.x
index cd21123c7..90dfd5dce 100644
--- a/kioslave/nfs/nfs_prot.x
+++ b/kioslave/nfs/nfs_prot.x
@@ -207,7 +207,7 @@ struct readargs {
 };
 
 /*
- * Status OK portion of remote read reply
+ * tqStatus OK portion of remote read reply
  */
 struct readokres {
 	fattr	attributes;	/* attributes, need for pagin*/