[KBear-cvs] kbear/kbear/plugins/filediff kbearfilediffplugin.cpp,1.8,1.9

[<kb...@us...>]

Update of /cvsroot/kbear/kbear/kbear/plugins/filediff
In directory sc8-pr-cvs1:/tmp/cvs-serv5824/kbear/plugins/filediff

Modified Files:
	kbearfilediffplugin.cpp 
Log Message:
See Changelog

Index: kbearfilediffplugin.cpp
===================================================================
RCS file: /cvsroot/kbear/kbear/kbear/plugins/filediff/kbearfilediffplugin.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** kbearfilediffplugin.cpp	23 Jul 2003 18:27:26 -0000	1.8
--- kbearfilediffplugin.cpp	24 Aug 2003 09:59:28 -0000	1.9
***************
*** 220,227 ****
  
  	// we need to clean up these files after us
! 	if( QFile::exists( m_sourceTmpURL.path() ) )
  		QFile::remove( m_sourceTmpURL.path() );
  
! 	if( QFile::exists( m_destTmpURL.path() ) )
  		QFile::remove( m_destTmpURL.path() );
  
--- 220,227 ----
  
  	// we need to clean up these files after us
! 	if( m_sourceURL != m_sourceTmpURL && QFile::exists( m_sourceTmpURL.path() ) )
  		QFile::remove( m_sourceTmpURL.path() );
  
! 	if( m_destURL != m_destTmpURL && QFile::exists( m_destTmpURL.path() ) )
  		QFile::remove( m_destTmpURL.path() );
  
***************
*** 308,312 ****
  void KBearFileDiffPlugin::slotSourceStatusChanged( long, unsigned int status ) {
  	if( status == Transfer::Canceled ) {
! 		if( QFile::exists( m_sourceTmpURL.url() ) )
  			QFile::remove( m_sourceTmpURL.url() );
  
--- 308,312 ----
  void KBearFileDiffPlugin::slotSourceStatusChanged( long, unsigned int status ) {
  	if( status == Transfer::Canceled ) {
! 		if( m_sourceURL != m_sourceTmpURL && QFile::exists( m_sourceTmpURL.url() ) )
  			QFile::remove( m_sourceTmpURL.url() );
  
***************
*** 318,322 ****
  void KBearFileDiffPlugin::slotDestStatusChanged( long, unsigned int status ) {
  	if( status == Transfer::Canceled ) {
! 		if( QFile::exists( m_destTmpURL.url() ) )
  			QFile::remove( m_destTmpURL.url() );
  
--- 318,322 ----
  void KBearFileDiffPlugin::slotDestStatusChanged( long, unsigned int status ) {
  	if( status == Transfer::Canceled ) {
! 		if( m_destURL != m_destTmpURL && QFile::exists( m_destTmpURL.url() ) )
  			QFile::remove( m_destTmpURL.url() );
  
***************
*** 431,438 ****
  
  			// we need to clean up these files after us
! 			if( QFile::exists( m_sourceTmpURL.path() ) )
  				QFile::remove( m_sourceTmpURL.path() );
  
! 			if( QFile::exists( m_destTmpURL.path() ) )
  				QFile::remove( m_destTmpURL.path() );
  
--- 431,438 ----
  
  			// we need to clean up these files after us
! 			if( m_sourceURL != m_sourceTmpURL && QFile::exists( m_sourceTmpURL.path() ) )
  				QFile::remove( m_sourceTmpURL.path() );
  
! 			if( m_destURL != m_destTmpURL && QFile::exists( m_destTmpURL.path() ) )
  				QFile::remove( m_destTmpURL.path() );
  
***************
*** 445,452 ****
  		KMessageBox::error( m_outputWidget, i18n("Diff command failed (%1):\n").arg( m_diffProcess->exitStatus() ) + m_stdErr );
  	}
! 	if( QFile::exists( m_sourceTmpURL.path() ) && m_sourceTmpURL != m_sourceURL )
  		QFile::remove( m_sourceTmpURL.path() );
  
! 	if( QFile::exists( m_destTmpURL.path() ) && m_destTmpURL != m_destURL )
  		QFile::remove( m_destTmpURL.path() );
  
--- 445,452 ----
  		KMessageBox::error( m_outputWidget, i18n("Diff command failed (%1):\n").arg( m_diffProcess->exitStatus() ) + m_stdErr );
  	}
! 	if( m_sourceTmpURL != m_sourceURL && QFile::exists( m_sourceTmpURL.path() ) )
  		QFile::remove( m_sourceTmpURL.path() );
  
! 	if( m_destURL != m_destTmpURL && QFile::exists( m_destTmpURL.path() ) )
  		QFile::remove( m_destTmpURL.path() );