diff options
Diffstat (limited to 'vcs/subversion/subversion_core.cpp')
| -rw-r--r-- | vcs/subversion/subversion_core.cpp | 232 | 
1 files changed, 116 insertions, 116 deletions
| diff --git a/vcs/subversion/subversion_core.cpp b/vcs/subversion/subversion_core.cpp index 85dcd883..4b16e68f 100644 --- a/vcs/subversion/subversion_core.cpp +++ b/vcs/subversion/subversion_core.cpp @@ -40,12 +40,12 @@  #include <ktempfile.h>  #include <kprocess.h>  #include <kstandarddirs.h> -#include <qtextcodec.h> -#include <qtextstream.h> -#include <qtextbrowser.h> +#include <tqtextcodec.h> +#include <tqtextstream.h> +#include <tqtextbrowser.h>  #include <kmessagebox.h>  #include <klocale.h> -#include <qregexp.h> +#include <tqregexp.h>  #include <kapplication.h>  #include <kinstance.h> @@ -55,13 +55,13 @@ using namespace KIO;  using namespace SvnGlobal;  subversionCore::subversionCore(subversionPart *part) -// 	: QObject(NULL, "subversion core"), DCOPObject("subversion") { -	: QObject(NULL, "subversion core") { +// 	: TQObject(NULL, "subversion core"), DCOPObject("subversion") { +	: TQObject(NULL, "subversion core") {  		m_part = part;  		m_widget = new subversionWidget(part, 0 , "subversionprocesswidget");  // 		m_logViewWidget = new SvnLogViewWidget( part, 0 );  // 		m_part->mainWindow()->embedOutputView( m_logViewWidget, i18n( "Subversion Log" ), i18n( "Subversion Log" ) ); -//		if ( ! connectDCOPSignal("kded", "ksvnd", "subversionNotify(QString,int,int,QString,int,int,long int,QString)", "notification(QString,int,int,QString,int,int,long int,QString)", false ) ) +//		if ( ! connectDCOPSignal("kded", "ksvnd", "subversionNotify(TQString,int,int,TQString,int,int,long int,TQString)", "notification(TQString,int,int,TQString,int,int,long int,TQString)", false ) )  //			kdWarning() << "Failed to connect to kded dcop signal ! Notifications won't work..." << endl;          m_fileInfoProvider = new SVNFileInfoProvider( part ); @@ -87,7 +87,7 @@ KDevVCSFileInfoProvider *subversionCore::fileInfoProvider() const {  }  //not used anymore -// void subversionCore::notification( const QString& path, int action, int kind, const QString& mime_type, int content_state ,int prop_state ,long int revision, const QString& userstring ) { +// void subversionCore::notification( const TQString& path, int action, int kind, const TQString& mime_type, int content_state ,int prop_state ,long int revision, const TQString& userstring ) {  // 	kdDebug(9036) << "Subversion Notification : "  // 		<< "path : " << path  // 		<< "action: " << action @@ -118,16 +118,16 @@ void subversionCore::resolve( const KURL::List& list ) {  		servURL.setProtocol( "kdevsvn+" + servURL.protocol() ); //make sure it starts with "svn"  	}  	kdDebug(9036) << "servURL : " << servURL.prettyURL() << endl; -	for ( QValueListConstIterator<KURL> it = list.begin(); it != list.end() ; ++it ) { +	for ( TQValueListConstIterator<KURL> it = list.begin(); it != list.end() ; ++it ) {  		kdDebug(9036) << "resolving: " << (*it).prettyURL() << endl; -		QByteArray parms; -		QDataStream s( parms, IO_WriteOnly ); +		TQByteArray parms; +		TQDataStream s( parms, IO_WriteOnly );  		int cmd = 11;  		bool recurse = true;  		s << cmd << *it << recurse;  		SimpleJob * job = KIO::special(servURL, parms, true);  		job->setWindow( m_part->mainWindow()->main() ); -		connect( job, SIGNAL( result( KIO::Job * ) ), this, SLOT( slotResult( KIO::Job * ) ) ); +		connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) );  	}  } @@ -135,32 +135,32 @@ void subversionCore::update( const KURL::List& list ) {  	KURL servURL = "kdevsvn+svn://blah/";  	kdDebug(9036) << "Updating. servURL : " << servURL.prettyURL() << endl; -	QByteArray parms; -	QDataStream s( parms, IO_WriteOnly ); +	TQByteArray parms; +	TQDataStream s( parms, IO_WriteOnly );  	int cmd = 2;  	int rev = -1; -	s << cmd << list << rev << QString( "HEAD" ); +	s << cmd << list << rev << TQString( "HEAD" );  	SimpleJob * job = KIO::special(servURL, parms, false); -	connect( job, SIGNAL( result( KIO::Job * ) ), this, SLOT( slotResult( KIO::Job * ) ) ); +	connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) );  	initProcessDlg( (KIO::Job*)job, i18n("Subversion Update") , i18n("Subversion Update") );  } -void subversionCore::diff( const KURL::List& list, const QString& where){ +void subversionCore::diff( const KURL::List& list, const TQString& where){  	kdDebug(9036) << "diff " << list << endl;  	KURL servURL = "kdevsvn+svn://this_is_a_fake_URL_and_this_is_normal/"; -	for ( QValueListConstIterator<KURL> it = list.begin(); it != list.end() ; ++it ) { -		QByteArray parms; -		QDataStream s( parms, IO_WriteOnly ); +	for ( TQValueListConstIterator<KURL> it = list.begin(); it != list.end() ; ++it ) { +		TQByteArray parms; +		TQDataStream s( parms, IO_WriteOnly );  		int cmd = 13;  		kdDebug(9036) << "diffing : " << (*it).prettyURL() << endl;  		int rev1=-1;  		int rev2=-1; -		QString revkind1 = where; -		QString revkind2 = "WORKING"; +		TQString revkind1 = where; +		TQString revkind2 = "WORKING";  		s << cmd << *it << *it << rev1 << revkind1 << rev2 << revkind2 << true ;  		KIO::SimpleJob * job = KIO::special(servURL, parms, true); -		connect( job, SIGNAL( result( KIO::Job * ) ), this, SLOT( slotResult( KIO::Job * ) ) ); +		connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) );  		KIO::NetAccess::synchronousRun( job, 0 );  		if ( diffresult.count() > 0 ) {  			//check kompare is available @@ -171,14 +171,14 @@ void subversionCore::diff( const KURL::List& list, const QString& where){  					KTempFile tmpPatch = KTempFile(tmpDir.name());  					// write the patch -					QTextStream *stream = tmpPatch.textStream(); -					stream->setCodec( QTextCodec::codecForName( "utf8" ) ); -					for ( QStringList::Iterator it2 = diffresult.begin();it2 != diffresult.end() ; ++it2 ) { +					TQTextStream *stream = tmpPatch.textStream(); +					stream->setCodec( TQTextCodec::codecForName( "utf8" ) ); +					for ( TQStringList::Iterator it2 = diffresult.begin();it2 != diffresult.end() ; ++it2 ) {  						( *stream ) << ( *it2 ) << "\n";  					}  					tmpPatch.close(); -					QString ourCopy = tmpDir.name()+(*it).fileName(); +					TQString ourCopy = tmpDir.name()+(*it).fileName();  					KProcess copy;  					copy << "cp" << (*it).prettyURL(0,KURL::StripFileProtocol) <<  tmpDir.name(); @@ -197,9 +197,9 @@ void subversionCore::diff( const KURL::List& list, const QString& where){  					// only diff  					KTempFile *tmp = new KTempFile;  					tmp->setAutoDelete(true); -					QTextStream *stream = tmp->textStream(); -					stream->setCodec( QTextCodec::codecForName( "utf8" ) ); -					for ( QStringList::Iterator it2 = diffresult.begin();it2 != diffresult.end() ; ++it2 ) { +					TQTextStream *stream = tmp->textStream(); +					stream->setCodec( TQTextCodec::codecForName( "utf8" ) ); +					for ( TQStringList::Iterator it2 = diffresult.begin();it2 != diffresult.end() ; ++it2 ) {  						( *stream ) << ( *it2 ) << "\n";  					}  					tmp->close(); @@ -209,17 +209,17 @@ void subversionCore::diff( const KURL::List& list, const QString& where){  				}  			} else { //else do it with message box  				Subversion_Diff df; -				for ( QStringList::Iterator it2 = diffresult.begin();it2 != diffresult.end() ; ++it2 ) { +				for ( TQStringList::Iterator it2 = diffresult.begin();it2 != diffresult.end() ; ++it2 ) {  					df.text->append( *it2 );  				} -				QFont f = df.font(); +				TQFont f = df.font();  				f.setFixedPitch( true );  				df.text->setFont( f );  				df.exec();  			}  		}  		else{ -			QString diffTo = i18n("the local disk checked out copy."); +			TQString diffTo = i18n("the local disk checked out copy.");  			if ( where=="HEAD"){  				diffTo=i18n("the current svn HEAD version.");  			} @@ -230,18 +230,18 @@ void subversionCore::diff( const KURL::List& list, const QString& where){  }  void subversionCore::diffAsync( const KURL &pathOrUrl1, const KURL &pathOrUrl2, -							int rev1, QString revKind1, int rev2, QString revKind2, +							int rev1, TQString revKind1, int rev2, TQString revKind2,  							bool recurse, bool pegdiff )  {  	KURL servURL = "kdevsvn+svn://blah/"; -	QByteArray parms; -	QDataStream s( parms, IO_WriteOnly ); +	TQByteArray parms; +	TQDataStream s( parms, IO_WriteOnly );  	int cmd = 13;  	kdDebug(9036) << "diffing async : " << pathOrUrl1 << " and " << pathOrUrl2 << endl;  	s << cmd << pathOrUrl1 << pathOrUrl2 << rev1 << revKind1 << rev2 << revKind2 << recurse;  	s << pegdiff;  	KIO::SimpleJob * job = KIO::special(servURL, parms, false); -	connect( job, SIGNAL( result( KIO::Job * ) ), this, SLOT( slotDiffResult( KIO::Job * ) ) ); +	connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotDiffResult( KIO::Job * ) ) );  	initProcessDlg( (KIO::Job*)job, pathOrUrl1.prettyURL(), pathOrUrl2.prettyURL() );  } @@ -252,16 +252,16 @@ void subversionCore::commit( const KURL::List& list, bool recurse, bool keeplock  		servURL.setProtocol( "kdevsvn+" + servURL.protocol() ); //make sure it starts with "svn"  	}  	kdDebug(9036) << "servURL : " << servURL.prettyURL() << endl; -	QByteArray parms; -	QDataStream s( parms, IO_WriteOnly ); +	TQByteArray parms; +	TQDataStream s( parms, IO_WriteOnly );  	int cmd = 103;   	s << cmd << recurse << keeplocks; -	for ( QValueListConstIterator<KURL> it = list.begin(); it != list.end() ; ++it ) { +	for ( TQValueListConstIterator<KURL> it = list.begin(); it != list.end() ; ++it ) {  		kdDebug(9036) << "adding to list: " << (*it).prettyURL() << endl;  		s << *it;  	}  	SimpleJob * job = KIO::special(servURL, parms, false); -	connect( job, SIGNAL( result( KIO::Job * ) ), this, SLOT( slotResult( KIO::Job * ) ) ); +	connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) );  	if( list.count() == 1 )  		initProcessDlg( (KIO::Job*)job, (*(list.begin())).prettyURL() , i18n("Commit to remote repository") );  	else if( list.count() > 1 ) @@ -269,7 +269,7 @@ void subversionCore::commit( const KURL::List& list, bool recurse, bool keeplock  }  // Right now, only one item for each action.  void subversionCore::svnLog( const KURL::List& list, -		int revstart, QString revKindStart, int revend, QString revKindEnd, +		int revstart, TQString revKindStart, int revend, TQString revKindEnd,  		bool discorverChangedPath, bool strictNodeHistory )  {  	// ensure that part has repository information. This info is used to retrieve root repository URL @@ -281,26 +281,26 @@ void subversionCore::svnLog( const KURL::List& list,  		servURL.setProtocol( "kdevsvn+" + servURL.protocol() ); //make sure it starts with "svn"  	}  	kdDebug(9036) << "servURL : " << servURL.prettyURL() << endl; -	QByteArray parms; -	QDataStream s( parms, IO_WriteOnly ); +	TQByteArray parms; +	TQDataStream s( parms, IO_WriteOnly );  	// prepare arguments  	int cmd = 4;  // 	int revstart = -1, revend = 0; -// 	QString revKindStart = "HEAD", revKindEnd = ""; +// 	TQString revKindStart = "HEAD", revKindEnd = "";  // 	bool repositLog = true, discorverChangedPath = true, strictNodeHistory = true;  	s << cmd << revstart << revKindStart << revend << revKindEnd;  	s << discorverChangedPath << strictNodeHistory; -	for ( QValueListConstIterator<KURL> it = list.begin(); it != list.end() ; ++it ) { +	for ( TQValueListConstIterator<KURL> it = list.begin(); it != list.end() ; ++it ) {  		kdDebug(9036) << "svnCore: adding to list: " << (*it).prettyURL() << endl;  		s << *it;  	}  	SimpleJob * job = KIO::special(servURL, parms, false); -	connect( job, SIGNAL( result( KIO::Job * ) ), this, SLOT( slotLogResult( KIO::Job * ) ) ); +	connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotLogResult( KIO::Job * ) ) );  	//  progress info. LogView is allowed and meaninful only for one url in KDev3.4  	initProcessDlg( (KIO::Job*)job, (*(list.begin())).prettyURL() , i18n("Subversion Log View") );  } -void subversionCore::blame( const KURL &url, UrlMode mode, int revstart, QString revKindStart, int revend, QString revKindEnd ) +void subversionCore::blame( const KURL &url, UrlMode mode, int revstart, TQString revKindStart, int revend, TQString revKindEnd )  {  	KURL servURL = m_part->baseURL();  	if ( servURL.isEmpty() ) servURL="kdevsvn+svn://blah/"; @@ -308,15 +308,15 @@ void subversionCore::blame( const KURL &url, UrlMode mode, int revstart, QString  		servURL.setProtocol( "kdevsvn+" + servURL.protocol() ); //make sure it starts with "svn"  	}  	kdDebug(9036) << "servURL : " << servURL.prettyURL() << endl; -	QByteArray parms; -	QDataStream s( parms, IO_WriteOnly ); +	TQByteArray parms; +	TQDataStream s( parms, IO_WriteOnly );  	// prepare arguments  	int cmd = 14;  	s << cmd << url << (int)mode ;  	s << revstart << revKindStart << revend << revKindEnd ;  	SimpleJob * job = KIO::special(servURL, parms, false); -	connect( job, SIGNAL( result( KIO::Job * ) ), this, SLOT( slotBlameResult( KIO::Job * ) ) ); +	connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotBlameResult( KIO::Job * ) ) );  	initProcessDlg( (KIO::Job*)job, url.prettyURL() , i18n("Subversion Blame") );  } @@ -325,75 +325,75 @@ void subversionCore::add( const KURL::List& list ) {  	KURL servURL = "kdevsvn+svn://blah/";  	kdDebug(9036) << "Deleting servURL : " << servURL.prettyURL() << endl; -	QByteArray parms; -	QDataStream s( parms, IO_WriteOnly ); +	TQByteArray parms; +	TQDataStream s( parms, IO_WriteOnly );  	int cmd = 6;  	s << cmd << list;  	// add/delete/revert works on local copy. Don't need to show progress dialog  	SimpleJob * job = KIO::special(servURL, parms, false);   	job->setWindow( m_part->mainWindow()->main() ); -	connect( job, SIGNAL( result( KIO::Job * ) ), this, SLOT( slotResult( KIO::Job * ) ) ); +	connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) );  }  void subversionCore::del( const KURL::List& list ) {  	KURL servURL = "kdevsvn+svn://blah/";  	kdDebug(9036) << "Deleting servURL : " << servURL.prettyURL() << endl; -	QByteArray parms; -	QDataStream s( parms, IO_WriteOnly ); +	TQByteArray parms; +	TQDataStream s( parms, IO_WriteOnly );  	int cmd = 7;  	s << cmd << list;  	// add/delete/revert works on local copy. Don't need to show progress dialog  	SimpleJob * job = KIO::special(servURL, parms, false);  	job->setWindow( m_part->mainWindow()->main() ); -	connect( job, SIGNAL( result( KIO::Job * ) ), this, SLOT( slotResult( KIO::Job * ) ) ); +	connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) );  }  void subversionCore::revert( const KURL::List& list ) {  	KURL servURL = "kdevsvn+svn://blah/";  	kdDebug(9036) << "Reverting servURL : " << servURL.prettyURL() << endl; -	QByteArray parms; -	QDataStream s( parms, IO_WriteOnly ); +	TQByteArray parms; +	TQDataStream s( parms, IO_WriteOnly );  	int cmd = 8;  	s << cmd << list;  	SimpleJob * job = KIO::special(servURL, parms, false);  	job->setWindow( m_part->mainWindow()->main() ); -	connect( job, SIGNAL( result( KIO::Job * ) ), this, SLOT( slotResult( KIO::Job * ) ) ); +	connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) );  }  void subversionCore::checkout() {  	svn_co checkoutDlg; -	if ( checkoutDlg.exec() == QDialog::Accepted ) { +	if ( checkoutDlg.exec() == TQDialog::Accepted ) {  		//checkout :) -		QByteArray parms; -		QDataStream s( parms, IO_WriteOnly ); +		TQByteArray parms; +		TQDataStream s( parms, IO_WriteOnly );  		KURL servURL ( checkoutDlg.serverURL->url() );  		wcPath = checkoutDlg.localDir->url() + "/" + checkoutDlg.newDir->text();  		int cmd = 1;  		int rev = -1; -		s << cmd << servURL << KURL( wcPath ) << rev << QString( "HEAD" ); +		s << cmd << servURL << KURL( wcPath ) << rev << TQString( "HEAD" );  		servURL.setProtocol( "kdevsvn+" + servURL.protocol() ); //make sure it starts with "svn"  		SimpleJob * job = KIO::special(servURL,parms, true);  		job->setWindow( m_part->mainWindow()->main() ); -		connect( job, SIGNAL( result( KIO::Job * ) ), this, SLOT( slotEndCheckout( KIO::Job * ) ) ); +		connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotEndCheckout( KIO::Job * ) ) );  	}  }  void subversionCore::switchTree( const KURL &path, const KURL &repositUrl, -								int revNum, const QString &revKind, bool recurse ) +								int revNum, const TQString &revKind, bool recurse )  {  	KURL servURL = "kdevsvn+svn://blah/"; -	QByteArray parms; -	QDataStream s( parms, IO_WriteOnly ); +	TQByteArray parms; +	TQDataStream s( parms, IO_WriteOnly );  	// prepare arguments  	int cmd = 12;  	s << cmd << path << repositUrl ;  	s << recurse << revNum << revKind;  	SimpleJob * job = KIO::special(servURL, parms, false); -	connect( job, SIGNAL( result( KIO::Job * ) ), this, SLOT( slotResult( KIO::Job * ) ) ); +	connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) );  	initProcessDlg( (KIO::Job*)job, repositUrl.prettyURL() , path.prettyURL() );  } @@ -401,66 +401,66 @@ void subversionCore::switchRelocate( const KURL &path,  									 const KURL ¤tUrl, const KURL &newUrl, bool recurse )  {  	KURL servURL = "kdevsvn+svn://blah/"; -	QByteArray parms; -	QDataStream s( parms, IO_WriteOnly ); +	TQByteArray parms; +	TQDataStream s( parms, IO_WriteOnly );  	// prepare arguments  	int cmd = 16;  	s << cmd << path << currentUrl << newUrl << recurse;  	SimpleJob * job = KIO::special(servURL, parms, false); -	connect( job, SIGNAL( result( KIO::Job * ) ), this, SLOT( slotResult( KIO::Job * ) ) ); +	connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) );  	// this doesn't contact repository  } -void subversionCore::svnCopy( const KURL &src, int srcRev, const QString &srcRevKind, +void subversionCore::svnCopy( const KURL &src, int srcRev, const TQString &srcRevKind,  							  const KURL &dest )  {  	KURL servURL = "kdevsvn+svn://blah/"; -	QByteArray parms; -	QDataStream s( parms, IO_WriteOnly ); +	TQByteArray parms; +	TQDataStream s( parms, IO_WriteOnly );  	// prepare arguments  	int cmd = 17;  	s << cmd << src << srcRev << srcRevKind << dest;  	SimpleJob * job = KIO::special(servURL, parms, false); -	connect( job, SIGNAL( result( KIO::Job * ) ), this, SLOT( slotResult( KIO::Job * ) ) ); +	connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) );  	initProcessDlg( (KIO::Job*)job, src.prettyURL(), dest.prettyURL() );  } -void subversionCore::merge( const KURL &src1, int rev1, QString revKind1, -							const KURL &src2, int rev2, QString revKind2, const KURL &wc_path, +void subversionCore::merge( const KURL &src1, int rev1, TQString revKind1, +							const KURL &src2, int rev2, TQString revKind2, const KURL &wc_path,  							bool recurse, bool ignore_ancestry, bool force, bool dry_run )  {  	KURL servURL = "kdevsvn+svn://blah/"; -	QByteArray parms; -	QDataStream s( parms, IO_WriteOnly ); +	TQByteArray parms; +	TQDataStream s( parms, IO_WriteOnly );  	// prepare arguments  	int cmd = 18;  	s << cmd << src1 << rev1 << revKind1 << src2 << rev2 << revKind2 << wc_path;  	s << recurse << ignore_ancestry << force << dry_run;  	SimpleJob * job = KIO::special(servURL, parms, false); -	connect( job, SIGNAL( result( KIO::Job * ) ), this, SLOT( slotResult( KIO::Job * ) ) ); +	connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) );  	initProcessDlg( (KIO::Job*)job, src1.prettyURL() + "\n" + src2.prettyURL() ,  					wc_path.prettyURL() );  } -bool subversionCore::clientInfo( KURL path_or_url, bool recurse, QMap< KURL, SvnInfoHolder> &holderMap ) +bool subversionCore::clientInfo( KURL path_or_url, bool recurse, TQMap< KURL, SvnInfoHolder> &holderMap )  {      KURL servURL = "kdevsvn+svn://blah/"; -    QByteArray parms; -    QDataStream s( parms, IO_WriteOnly ); +    TQByteArray parms; +    TQDataStream s( parms, IO_WriteOnly );      int cmd = 15; -    s << cmd << path_or_url << -1 << QString("UNSPECIFIED") << -1 << QString("UNSPECIFIED") << recurse; +    s << cmd << path_or_url << -1 << TQString("UNSPECIFIED") << -1 << TQString("UNSPECIFIED") << recurse;      SimpleJob *job = KIO::special( servURL, parms, false ); -    QMap<QString,QString> ma; +    TQMap<TQString,TQString> ma;      KIO::NetAccess::synchronousRun(job, 0, 0, 0, &ma ); // synchronize -    QValueList<QString> keys = ma.keys(); -    QValueList<QString>::Iterator begin = keys.begin(), end = keys.end(), it; +    TQValueList<TQString> keys = ma.keys(); +    TQValueList<TQString>::Iterator begin = keys.begin(), end = keys.end(), it;      int curIdx, lastIdx; -    QRegExp rx( "([0-9]*)(.*)" ); +    TQRegExp rx( "([0-9]*)(.*)" );      for ( it = begin; it != end; /*++it*/) {          kdDebug(9036) << "METADATA key: " << *it << " value: " << ma[ *it ] << endl; @@ -496,7 +496,7 @@ bool subversionCore::clientInfo( KURL path_or_url, bool recurse, QMap< KURL, Svn  void subversionCore::slotEndCheckout( KIO::Job * job ) {  	if ( job->error() ) {  		job->showErrorDialog( m_part->mainWindow()->main() ); -		emit checkoutFinished( QString::null ); +		emit checkoutFinished( TQString::null );  	} else  		emit checkoutFinished(wcPath);  } @@ -513,9 +513,9 @@ void subversionCore::slotResult( KIO::Job * job ) {          return;      }      KIO::MetaData ma = job->metaData(); -	QValueList<QString> keys = ma.keys(); +	TQValueList<TQString> keys = ma.keys();  	qHeapSort( keys ); -	QValueList<QString>::Iterator begin = keys.begin(), end = keys.end(), it; +	TQValueList<TQString>::Iterator begin = keys.begin(), end = keys.end(), it;  	for ( it = begin; it != end; ++it ) {  // 		kdDebug(9036) << "METADATA : " << *it << ":" << ma[ *it ] << endl; @@ -542,15 +542,15 @@ void subversionCore::slotLogResult( KIO::Job * job )  		return;  	} -	QValueList<SvnLogHolder> holderList; +	TQValueList<SvnLogHolder> holderList;  	KIO::MetaData ma = job->metaData(); -	QValueList<QString> keys = ma.keys(); -	QRegExp rx( "([0-9]*)(.*)" ); +	TQValueList<TQString> keys = ma.keys(); +	TQRegExp rx( "([0-9]*)(.*)" );  	int curIdx, lastIdx; -	QString requestedUrl; +	TQString requestedUrl; -	for (QValueList<QString>::Iterator it = keys.begin(); it != keys.end(); /*++it*/ ){ +	for (TQValueList<TQString>::Iterator it = keys.begin(); it != keys.end(); /*++it*/ ){  		if ( rx.search( *it ) == -1 ){  			kdDebug(9036) << " Exiting loop at line " << __LINE__ <<endl;  			return; // something is wrong ! :) @@ -601,14 +601,14 @@ void subversionCore::slotBlameResult( KIO::Job * job )                                      ) );          return;      } -	QValueList<SvnBlameHolder> blameList; +	TQValueList<SvnBlameHolder> blameList;  	KIO::MetaData ma = job->metaData(); -	QValueList<QString> keys = ma.keys(); -	QRegExp rx( "([0-9]*)(.*)" ); +	TQValueList<TQString> keys = ma.keys(); +	TQRegExp rx( "([0-9]*)(.*)" );  	int curIdx, lastIdx; -	for (QValueList<QString>::Iterator it = keys.begin(); it != keys.end(); /*++it*/ ){ +	for (TQValueList<TQString>::Iterator it = keys.begin(); it != keys.end(); /*++it*/ ){  		if ( rx.search( *it ) == -1 ){  			kdDebug(9036) << " Exiting loop at line " << __LINE__ <<endl;  			return; // something is wrong ! :) @@ -672,10 +672,10 @@ void subversionCore::slotDiffResult( KIO::Job * job )  		return;  	}  	KIO::MetaData ma = job->metaData(); -	QValueList<QString> keys = ma.keys(); +	TQValueList<TQString> keys = ma.keys();  	qHeapSort( keys ); -	QValueList<QString>::Iterator begin = keys.begin(), end = keys.end(), it; -	QStringList diffList; +	TQValueList<TQString>::Iterator begin = keys.begin(), end = keys.end(), it; +	TQStringList diffList;  	for ( it = begin; it != end; ++it ) {  // 		kdDebug(9036) << "METADATA : " << *it << ":" << ma[ *it ] << endl; @@ -689,9 +689,9 @@ void subversionCore::slotDiffResult( KIO::Job * job )  		if ( !KStandardDirs::findExe( "kompare" ).isNull() ) {  			KTempFile *tmp = new KTempFile;  			tmp->setAutoDelete(true); -			QTextStream *stream = tmp->textStream(); -			stream->setCodec( QTextCodec::codecForName( "utf8" ) ); -			for ( QStringList::Iterator it2 = diffList.begin();it2 != diffList.end() ; ++it2 ) { +			TQTextStream *stream = tmp->textStream(); +			stream->setCodec( TQTextCodec::codecForName( "utf8" ) ); +			for ( TQStringList::Iterator it2 = diffList.begin();it2 != diffList.end() ; ++it2 ) {  				( *stream ) << ( *it2 ) << "\n";  			}  			tmp->close(); @@ -700,12 +700,12 @@ void subversionCore::slotDiffResult( KIO::Job * job )  			p->start();  		} else { //else do it with message box -			KMessageBox::information( NULL, i18n("You do not have kompare installed. We recommend you install kompare to view differences graphically.") + "\nhttp://www.caffeinated.me.uk/kompare/" , QString::null , "userDoesNotWantKompare" ); +			KMessageBox::information( NULL, i18n("You do not have kompare installed. We recommend you install kompare to view differences graphically.") + "\nhttp://www.caffeinated.me.uk/kompare/" , TQString::null , "userDoesNotWantKompare" );  			Subversion_Diff df; -			for ( QStringList::Iterator it2 = diffList.begin();it2 != diffList.end() ; ++it2 ) { +			for ( TQStringList::Iterator it2 = diffList.begin();it2 != diffList.end() ; ++it2 ) {  				df.text->append( *it2 );  			} -			QFont f = df.font(); +			TQFont f = df.font();  			f.setFixedPitch( true );  			df.text->setFont( f );  			df.exec(); @@ -716,19 +716,19 @@ void subversionCore::slotDiffResult( KIO::Job * job )  	}  } -void subversionCore::initProcessDlg( KIO::Job *job, const QString &src, const QString &dest ) +void subversionCore::initProcessDlg( KIO::Job *job, const TQString &src, const TQString &dest )  {  	SvnProgressDlg *progress = new SvnProgressDlg( true );  	progress->setSourceUrl( src );  	progress->setDestUrl( dest );  	progress->setJob( job ); -	connect( job, SIGNAL( totalSize(KIO::Job*, KIO::filesize_t) ), -			 progress, SLOT( slotTotalSize (KIO::Job*, KIO::filesize_t) ) ); -	connect( job, SIGNAL( processedSize(KIO::Job*, KIO::filesize_t) ), -			 progress, SLOT( slotProcessedSize(KIO::Job*, KIO::filesize_t) ) ); +	connect( job, TQT_SIGNAL( totalSize(KIO::Job*, KIO::filesize_t) ), +			 progress, TQT_SLOT( slotTotalSize (KIO::Job*, KIO::filesize_t) ) ); +	connect( job, TQT_SIGNAL( processedSize(KIO::Job*, KIO::filesize_t) ), +			 progress, TQT_SLOT( slotProcessedSize(KIO::Job*, KIO::filesize_t) ) );  } -void subversionCore::createNewProject( const QString& // dirName +void subversionCore::createNewProject( const TQString& // dirName                                         , const KURL& // importURL                                         , bool // init                                         ) { | 
