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

List:       kde-commits
Subject:    KDE/kdeutils/kjots
From:       Jaison Lee <lee.jaison () gmail ! com>
Date:       2007-12-17 3:24:46
Message-ID: 1197861886.776803.21588.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 749363 by jlee:

Don't leave an orphaned temporary file if something goes wrong.



 M  +12 -1     KJotsMain.cpp  
 M  +2 -0      KJotsMain.h  


--- trunk/KDE/kdeutils/kjots/KJotsMain.cpp #749362:749363
@@ -1135,12 +1135,23 @@
         }
 
         interimFile.release();
-        KIO::move(tempUrl, saveUrl);
+        
+        KJob *job = KIO::move(tempUrl, saveUrl);
+        connect( job, SIGNAL( result(KJob*) ), this, SLOT( saveFinished(KJob*) ) );
     }
 
     return;
 }
 
+void KJotsMain::saveFinished(KJob *job)
+{
+    //Remove the temporary file if the job was cancelled
+    if ( job->error() ) {
+        KIO::CopyJob *copyJob = static_cast<KIO::CopyJob*>(job);
+        QFile::remove(copyJob->srcUrls()[0].toLocalFile());
+    }
+}
+
 void KJotsMain::importBook()
 {
     KUrl openUrl = KFileDialog::getOpenUrl(KUrl(), "*.book|" + i18n("KJots Books"));
--- trunk/KDE/kdeutils/kjots/KJotsMain.h #749362:749363
@@ -52,6 +52,7 @@
 class KJotsPage;
 class KJotsEdit;
 class KJotsBrowser;
+class KJob;
 
 class confPageMisc : public QDialog, public Ui::confPageMisc
 {
@@ -111,6 +112,7 @@
         void saveHtml();
         void saveNative();
         void saveToFile(ExportType);
+        void saveFinished(KJob *);
         void importBook();
 
         void autoSave(void);
[prev in list] [next in list] [prev in thread] [next in thread]