1 files changed, 16 insertions, 16 deletions

diff --git a/kioslave/svn/ksvnd/ksvnd.cpp b/kioslave/svn/ksvnd/ksvnd.cpp
index ddc7fb3e..fb96c9af 100644
--- a/kioslave/svn/ksvnd/ksvnd.cpp
+++ b/kioslave/svn/ksvnd/ksvnd.cpp
@@ -196,7 +196,7 @@ bool KSvnd::anyValidWorkingCopy( const KURL::List& wclist ) {
 	return false;
 }
 
-int KSvnd::getStatus( const KURL::List& list ) {
+int KSvnd::gettqStatus( const KURL::List& list ) {
 	int result = 0;
 	uint files = 0, folders = 0, parentsentries = 0, parentshavesvn = 0, subdirhavesvn = 0, external = 0;
 	for ( TQValueListConstIterator<KURL> it = list.begin(); it != list.end() ; ++it ) {
@@ -214,7 +214,7 @@ int KSvnd::getStatus( const KURL::List& list ) {
 				external++;
 			}
 		}
-		if ( ( isFolder( ( *it ) ) && TQFile::exists( ( *it ).directory() + "../.svn/entries" ) ) || TQFile::exists( ( *it ).directory() + "/.svn/entries" ) ) //parent has a .svn ?
+		if ( ( isFolder( ( *it ) ) && TQFile::exists( ( *it ).directory() + "../.svn/entries" ) ) || TQFile::exists( ( *it ).directory() + "/.svn/entries" ) ) //tqparent has a .svn ?
 			parentshavesvn++;
 	}
 	if ( files > 0 ) 
@@ -256,18 +256,18 @@ bool KSvnd::isFolder( const KURL& url ) {
 
 TQStringList KSvnd::getActionMenu ( const KURL::List &list ) {
 	TQStringList result;
-	int listStatus = getStatus( list );
+	int listtqStatus = gettqStatus( list );
 
-	if ( !(listStatus & SomeAreInParentsEntries) &&
-	     !(listStatus & SomeAreExternalToParent) &&
-	     !(listStatus & SomeHaveSvn)) {
-		if( list.size() == 1 && listStatus & SomeAreFolders) {
+	if ( !(listtqStatus & SomeAreInParentsEntries) &&
+	     !(listtqStatus & SomeAreExternalToParent) &&
+	     !(listtqStatus & SomeHaveSvn)) {
+		if( list.size() == 1 && listtqStatus & SomeAreFolders) {
 			result << "Checkout";
 			result << "Export";
 //			result << "CreateRepository";
 			result << "Import";
 		}
-	} else if ( (listStatus & AllAreInParentsEntries) ) {
+	} else if ( (listtqStatus & AllAreInParentsEntries) ) {
 		result << "Diff";
 		//In SVN
 //		result << "ShowLog";
@@ -277,7 +277,7 @@ TQStringList KSvnd::getActionMenu ( const KURL::List &list ) {
 //		result << "Update to revision..."
 		result << "Rename";
 		result << "Delete";
-		if( listStatus & SomeAreFolders && !(listStatus & SomeAreFiles)) {
+		if( listtqStatus & SomeAreFolders && !(listtqStatus & SomeAreFiles)) {
 			result << "Revert";
 //			result << "Cleanup";
 		}
@@ -285,19 +285,19 @@ TQStringList KSvnd::getActionMenu ( const KURL::List &list ) {
 //		result << "BranchTag";
 		result << "Switch";
 		result << "Merge";	
-		if( listStatus & SomeAreFolders && !(listStatus & SomeAreFiles)) {
+		if( listtqStatus & SomeAreFolders && !(listtqStatus & SomeAreFiles)) {
 //			result << "Export";
 //			result << "Relocate";
 			result << "_SEPARATOR_";
 			result << "Add";		
 		}
 		result << "_SEPARATOR_";
-		if( listStatus & SomeAreFiles && !(listStatus & SomeAreFolders)) {
+		if( listtqStatus & SomeAreFiles && !(listtqStatus & SomeAreFolders)) {
 			result << "Blame";
 		}
 		result << "CreatePatch";
 		
-		if( list.size() == 1 && listStatus & SomeAreFolders) {
+		if( list.size() == 1 && listtqStatus & SomeAreFolders) {
 //			result << "ApplyPatchToFolder";
 		}
 	}
@@ -306,12 +306,12 @@ TQStringList KSvnd::getActionMenu ( const KURL::List &list ) {
 
 TQStringList KSvnd::getTopLevelActionMenu ( const KURL::List &list ) {
 	TQStringList result;
-	int listStatus = getStatus( list );
+	int listtqStatus = gettqStatus( list );
 
 	
-	if ( ( listStatus & AllParentsHaveSvn &&
-			( ( listStatus & SomeAreExternalToParent ) || ( listStatus & SomeAreInParentsEntries ) ) 
-				|| ( listStatus & SomeHaveSvn ) )
+	if ( ( listtqStatus & AllParentsHaveSvn &&
+			( ( listtqStatus & SomeAreExternalToParent ) || ( listtqStatus & SomeAreInParentsEntries ) ) 
+				|| ( listtqStatus & SomeHaveSvn ) )
 		) {
 		result << "Update";
 		result << "Commit";