TQt4 port kdevelop

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdevelop@1236710 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 26 insertions, 26 deletions

diff --git a/vcs/subversion/kdevsvnd.cpp b/vcs/subversion/kdevsvnd.cpp
index 7b4a42d3..b83959e8 100644
--- a/vcs/subversion/kdevsvnd.cpp
+++ b/vcs/subversion/kdevsvnd.cpp
@@ -55,7 +55,7 @@ TQString KDevSvnd::commitDialog(TQString modifiedFiles) {
 	if ( result == TQDialog::Accepted ) {
 		return commitDlg.textMessage->text();
 	} else
-		return TQString::null;
+		return TQString();
 }
 int KDevSvnd::sslServerTrustPrompt( TQString errmsg, TQString hostname, TQString fingerPrint, TQString validfrom, TQString validuntil, TQString issuerName, TQString ascii_cert )
 {
@@ -71,7 +71,7 @@ int KDevSvnd::sslServerTrustPrompt( TQString errmsg, TQString hostname, TQString
 }
 TQString KDevSvnd::sslCertFile()
 {
-	TQString fileName = KFileDialog::getOpenFileName(TQString::null,TQString::null,0, i18n("Open SSL certificate file"));
+	TQString fileName = KFileDialog::getOpenFileName(TQString(),TQString(),0, i18n("Open SSL certificate file"));
 	return fileName;
 }
 TQCString KDevSvnd::sslPasswdDlg(TQString promptMsg)
@@ -239,9 +239,9 @@ TQCString KDevSvnd::sslPasswdDlg(TQString promptMsg)
 // 	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;
+// 	uint files = 0, folders = 0, tqparentsentries = 0, tqparentshavesvn = 0, subdirhavesvn = 0, external = 0;
 // 	for ( TQValueListConstIterator<KURL> it = list.begin(); it != list.end() ; ++it ) {
 // 		if ( isFolder ( ( *it ) ) ) {
 // 			folders++;
@@ -249,7 +249,7 @@ TQCString KDevSvnd::sslPasswdDlg(TQString promptMsg)
 // 			files++;
 // 		}
 // 		if ( isFileInSvnEntries ( (*it).filename(),( *it ).directory() + "/.svn/entries" ) ) { // normal subdir known in the working copy
-// 			parentsentries++;
+// 			tqparentsentries++;
 // 		} 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++;
@@ -257,8 +257,8 @@ TQCString KDevSvnd::sslPasswdDlg(TQString promptMsg)
 // 				external++;
 // 			}
 // 		}
-// 		if ( ( isFolder( ( *it ) ) && TQFile::exists( ( *it ).directory() + "../.svn/entries" ) ) || TQFile::exists( ( *it ).directory() + "/.svn/entries" ) ) //parent has a .svn ?
-// 			parentshavesvn++;
+// 		if ( ( isFolder( ( *it ) ) && TQFile::exists( ( *it ).directory() + "../.svn/entries" ) ) || TQFile::exists( ( *it ).directory() + "/.svn/entries" ) ) //tqparent has a .svn ?
+// 			tqparentshavesvn++;
 // 	}
 // 	if ( files > 0 )
 // 		result |= SomeAreFiles;
@@ -268,15 +268,15 @@ TQCString KDevSvnd::sslPasswdDlg(TQString promptMsg)
 // 	}
 // 	if ( folders > 0 )
 // 		result |= SomeAreFolders;
-// 	if ( parentsentries == list.count() ) {
+// 	if ( tqparentsentries == list.count() ) {
 // 		result |= AllAreInParentsEntries;
 // 		result |= SomeAreInParentsEntries;
-// 	} else if ( parentsentries != 0 )
+// 	} else if ( tqparentsentries != 0 )
 // 		result |= SomeAreInParentsEntries;
-// 	if ( parentshavesvn == list.count() ) {
+// 	if ( tqparentshavesvn == list.count() ) {
 // 		result |= AllParentsHaveSvn;
 // 		result |= SomeParentsHaveSvn;
-// 	} else if ( parentshavesvn > 0 )
+// 	} else if ( tqparentshavesvn > 0 )
 // 		result |= SomeParentsHaveSvn;
 // 	if ( subdirhavesvn == list.count() ) {
 // 		result |= AllHaveSvn;
@@ -299,18 +299,18 @@ TQCString KDevSvnd::sslPasswdDlg(TQString promptMsg)
 //
 // 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";
@@ -320,7 +320,7 @@ TQCString KDevSvnd::sslPasswdDlg(TQString promptMsg)
 // //		result << "Update to revision..."
 // 		result << "Rename";
 // 		result << "Delete";
-// 		if( listStatus & SomeAreFolders && !(listStatus & SomeAreFiles)) {
+// 		if( listtqStatus & SomeAreFolders && !(listtqStatus & SomeAreFiles)) {
 // 			result << "Revert";
 // //			result << "Cleanup";
 // 		}
@@ -328,19 +328,19 @@ TQCString KDevSvnd::sslPasswdDlg(TQString promptMsg)
 // //		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";
 // 		}
 // 	}
@@ -349,12 +349,12 @@ TQCString KDevSvnd::sslPasswdDlg(TQString promptMsg)
 //
 // 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";
@@ -382,7 +382,7 @@ TQCString KDevSvnd::sslPasswdDlg(TQString promptMsg)
 // 	TQDataStream stream(params, IO_WriteOnly);
 // 	stream << path << text_status << prop_status << repos_text_status << repos_prop_status << rev;
 //
-// 	emitDCOPSignal( "subversionStatus(TQString,int,int,int,int,long int)", params );
+// 	emitDCOPSignal( "subversiontqStatus(TQString,int,int,int,int,long int)", params );
 // }
 //
 // void KSvnd::popupMessage( const TQString& message ) {