[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdeutils/ark
From:       Jaison Lee <lee.jaison () gmail ! com>
Date:       2006-10-30 1:20:17
Message-ID: 1162171217.950471.2466.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 600243 by jlee:

Port to KTempDir API changes.



 M  +2 -3      arkwidget.cpp  
 M  +0 -1      compressedfile.cpp  
 M  +0 -2      tar.cpp  


--- trunk/KDE/kdeutils/ark/arkwidget.cpp #600242:600243
@@ -116,6 +116,7 @@
      m_bDropSourceIsSelf( false ), m_extractList( 0 )
 {
     m_tmpDir = new KTempDir( KStandardDirs::locateLocal( "tmp", "ark" ) );
+    m_tmpDir->setAutoRemove(false);
 
     if ( m_tmpDir->status() != 0 )
     {
@@ -291,7 +292,6 @@
 {
     busy( i18n( "Saving..." ) );
     m_convert_tmpDir =  new KTempDir( tmpDir() + "convtmp" );
-    m_convert_tmpDir->setAutoDelete( true );
     connect( arch, SIGNAL( sigExtract( bool ) ), this, SLOT( convertSlotExtractDone( bool ) ) );
     m_convert_saveAsURL = u;
     arch->unarchFile( 0, m_convert_tmpDir->name() );
@@ -470,7 +470,6 @@
     if ( !m_extractTo_targetDirectory.isLocalFile() )
     {
         m_extractRemoteTmpDir = new KTempDir( tmpDir() + "extremote" );
-        m_extractRemoteTmpDir->setAutoDelete( true );
 
         extractDir = m_extractRemoteTmpDir->name();
         m_extractRemote = true;
@@ -995,6 +994,7 @@
     KUrl u1, u2;
     u1.setPath( m_compressedFile );
     m_createRealArchTmpDir = new KTempDir( tmpDir() + "create_real_arch" );
+    m_createRealArchTmpDir->setAutoRemove(false);
     u2.setPath( m_createRealArchTmpDir->name() + u1.fileName() );
     KIO::NetAccess::copy( u1, u2, this );
     m_compressedFile = "file:" + u2.path(); // AGAIN THE 5 SPACES Hack :-(
@@ -1475,7 +1475,6 @@
         if ( !m_extractURL.isLocalFile() )
         {
             m_extractRemoteTmpDir = new KTempDir( tmpDir() + "extremote" );
-            m_extractRemoteTmpDir->setAutoDelete( true );
 
             extractDir = m_extractRemoteTmpDir->name();
             m_extractRemote = true;
--- trunk/KDE/kdeutils/ark/compressedfile.cpp #600242:600243
@@ -60,7 +60,6 @@
   kDebug(1601) << "CompressedFile constructor" << endl;
   m_tempDirectory = new KTempDir( _gui->tmpDir()
                           + QString::fromLatin1( "compressed_file_temp" ) );
-  m_tempDirectory->setAutoDelete( true );
   m_tmpdir = m_tempDirectory->name();
   initData();
   verifyUtilityIsAvailable(m_archiver_program, m_unarchiver_program);
--- trunk/KDE/kdeutils/ark/tar.cpp #600242:600243
@@ -109,8 +109,6 @@
         compressed = true;
         m_tmpDir = new KTempDir( _gui->tmpDir()
                                  + QString::fromLatin1( "temp_tar" ) );
-        m_tmpDir->setAutoDelete( true );
-        m_tmpDir->qDir()->cd( m_tmpDir->name() );
         // build the temp file name
         KTemporaryFile *pTempFile = new KTemporaryFile();
         pTempFile->setPrefix(m_tmpDir->name());
[prev in list] [next in list] [prev in thread] [next in thread]