[Krusader-commits] krusader_kde3/krusader/VFS ftp_vfs.cpp,1.41,1.42 ftp_vfs.h,1.14,1.15

[Rafi Y. <ya...@us...>]

Update of /cvsroot/krusader/krusader_kde3/krusader/VFS
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1337/krusader/VFS

Modified Files:
	ftp_vfs.cpp ftp_vfs.h 
Log Message:
back to qApp->processEvents() since messing with the event loop is obselete..

Index: ftp_vfs.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/VFS/ftp_vfs.cpp,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** ftp_vfs.cpp	21 Jan 2005 16:01:22 -0000	1.41
--- ftp_vfs.cpp	22 Jan 2005 20:28:08 -0000	1.42
***************
*** 58,62 ****
  #include "../resources.h"
  
! ftp_vfs::ftp_vfs(QObject* panel):vfs(panel),busy(false), in_loop(0){
    // set the writable attribute
    isWritable = true;
--- 58,62 ----
  #include "../resources.h"
  
! ftp_vfs::ftp_vfs(QObject* panel):vfs(panel),busy(false){
    // set the writable attribute
    isWritable = true;
***************
*** 68,71 ****
--- 68,75 ----
  }
  
+ ftp_vfs::~ftp_vfs(){
+ 	busy = false;
+ }
+ 
  void ftp_vfs::slotAddFiles(KIO::Job *, const KIO::UDSEntryList& entries){
    KIO::UDSEntryListConstIterator it = entries.begin();
***************
*** 131,139 ****
    }
    busy = false;
-   if( in_loop )
-   {
-     in_loop--;
-     qApp->exit_loop();
-   }
  }
  
--- 135,138 ----
***************
*** 178,185 ****
  
    while( busy ){
!     in_loop++;
!     qApp->enter_loop();
    }
! 
    if( listError ) return false;
  
--- 177,183 ----
  
    while( busy ){
!     qApp->processEvents();
    }
!   
    if( listError ) return false;
  

Index: ftp_vfs.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/VFS/ftp_vfs.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** ftp_vfs.h	21 Jan 2005 16:24:51 -0000	1.14
--- ftp_vfs.h	22 Jan 2005 20:28:09 -0000	1.15
***************
*** 43,47 ****
  	// the constructor simply uses the inherited constructor
  	ftp_vfs(QObject* panel);
! 	~ftp_vfs(){}
  
  	/// Copy a file to the vfs (physical).
--- 43,47 ----
  	// the constructor simply uses the inherited constructor
  	ftp_vfs(QObject* panel);
! 	~ftp_vfs();
  
  	/// Copy a file to the vfs (physical).
***************
*** 79,84 ****
  	KURL origin_backup;         //< used to backup the old URL when refreshing to a new one,
  	bool busy;
! 	bool listError;
! 	int in_loop;        
  };
  
--- 79,83 ----
  	KURL origin_backup;         //< used to backup the old URL when refreshing to a new one,
  	bool busy;
! 	bool listError;     
  };