2 files changed, 8 insertions, 8 deletions
diff --git a/kioslave/svn/ksvnd/commitdlg.ui b/kioslave/svn/ksvnd/commitdlg.ui
index 54e46f3f..35b9a97e 100644
--- a/kioslave/svn/ksvnd/commitdlg.ui
+++ b/kioslave/svn/ksvnd/commitdlg.ui
@@ -108,7 +108,7 @@
     <function>setLog( const TQString &amp; comment )</function>
     <function returnType="TQString">logMessage() const</function>
 </functions>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>ktextedit.h</includehint>
     <includehint>ktextedit.h</includehint>
diff --git a/kioslave/svn/ksvnd/ksvnd.cpp b/kioslave/svn/ksvnd/ksvnd.cpp
index 82777818..174d9fc9 100644
--- a/kioslave/svn/ksvnd/ksvnd.cpp
+++ b/kioslave/svn/ksvnd/ksvnd.cpp
@@ -198,7 +198,7 @@ bool KSvnd::anyValidWorkingCopy( const KURL::List& wclist ) {
 
 int KSvnd::gettqStatus( const KURL::List& list ) {
 	int result = 0;
-	uint files = 0, folders = 0, tqparentsentries = 0, tqparentshavesvn = 0, subdirhavesvn = 0, external = 0;
+	uint files = 0, folders = 0, parentsentries = 0, parentshavesvn = 0, subdirhavesvn = 0, external = 0;
 	for ( TQValueListConstIterator<KURL> it = list.begin(); it != list.end() ; ++it ) {
 		if ( isFolder ( ( *it ) ) ) {
 			folders++;
@@ -206,7 +206,7 @@ int KSvnd::gettqStatus( const KURL::List& list ) {
 			files++;
 		}
 		if ( isFileInSvnEntries ( (*it).filename(),( *it ).directory() + "/.svn/entries" ) ) { // normal subdir known in the working copy
-			tqparentsentries++;
+			parentsentries++;
 		} else if ( isFolder( *it ) ) { // other subfolders (either another module checkouted or an external, or something not known at all)
 			if ( TQFile::exists( ( *it ).path() + "/.svn/entries" ) ) 
 				subdirhavesvn++;
@@ -215,7 +215,7 @@ int KSvnd::gettqStatus( const KURL::List& list ) {
 			}
 		}
 		if ( ( isFolder( ( *it ) ) && TQFile::exists( ( *it ).directory() + "../.svn/entries" ) ) || TQFile::exists( ( *it ).directory() + "/.svn/entries" ) ) //tqparent has a .svn ?
-			tqparentshavesvn++;
+			parentshavesvn++;
 	}
 	if ( files > 0 ) 
 		result |= SomeAreFiles;
@@ -225,15 +225,15 @@ int KSvnd::gettqStatus( const KURL::List& list ) {
 	}
 	if ( folders > 0 )
 		result |= SomeAreFolders;
-	if ( tqparentsentries == list.count() ) {
+	if ( parentsentries == list.count() ) {
 		result |= AllAreInParentsEntries;
 		result |= SomeAreInParentsEntries;
-	} else if ( tqparentsentries != 0 )
+	} else if ( parentsentries != 0 )
 		result |= SomeAreInParentsEntries;
-	if ( tqparentshavesvn == list.count() ) {
+	if ( parentshavesvn == list.count() ) {
 		result |= AllParentsHaveSvn;
 		result |= SomeParentsHaveSvn;
-	} else if ( tqparentshavesvn > 0 )
+	} else if ( parentshavesvn > 0 )
 		result |= SomeParentsHaveSvn;
 	if ( subdirhavesvn == list.count() ) {
 		result |= AllHaveSvn;