1 files changed, 11 insertions, 9 deletions

diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index eaea040..fecc7e2 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -1223,3 +1223,3 @@ bool CalendarView::syncCalendar(QString filename, int mode)
     // qDebug("loading ... ");
-    if ( storage->load(KOPrefs::instance()->mUseQuicksave) ) {
+    if ( storage->load() ) {
         getEventViewerDialog()->setSyncMode( true );
@@ -1230,3 +1230,3 @@ bool CalendarView::syncCalendar(QString filename, int mode)
             {
-                storage->setSaveFormat( new ICalFormat( KOPrefs::instance()->mUseQuicksave) );
+                storage->setSaveFormat( new ICalFormat() );
                 storage->save();
@@ -1501,3 +1501,3 @@ bool CalendarView::openCalendar(QString filename, bool merge)
 
-    if ( mStorage->load(KOPrefs::instance()->mUseQuicksave) ) {
+    if ( mStorage->load() ) {
         if ( merge ) ;//setModified( true );
@@ -1516,5 +1516,7 @@ bool CalendarView::openCalendar(QString filename, bool merge)
         updateView();
-        if (  filename != MainWindow::defaultFileName() ) 
-            saveCalendar( MainWindow::defaultFileName() );
         loadedFileVersion = QDateTime::currentDateTime();
+        if (  filename != MainWindow::defaultFileName() ) {
+            saveCalendar( MainWindow::defaultFileName() );
+            watchSavedFile();
+        }
         return true;
@@ -1602,3 +1604,3 @@ bool CalendarView::saveCalendar( QString filename )
 
-    mStorage->setSaveFormat( new ICalFormat( KOPrefs::instance()->mUseQuicksave) );
+    mStorage->setSaveFormat( new ICalFormat() );
     mStorage->setFileName( filename );
@@ -2303,3 +2305,3 @@ void  CalendarView::beamIncidenceList(QPtrList<Incidence> delSel )
             fn += ".ics";
-            FileStorage storage( cal, fn, new ICalFormat( KOPrefs::instance()->mUseQuicksave) );
+            FileStorage storage( cal, fn, new ICalFormat( ) );
             storage.save();
@@ -2858,3 +2860,3 @@ void CalendarView::action_mail()
     }
-    ICalFormat mForm( KOPrefs::instance()->mUseQuicksave);
+    ICalFormat mForm();
     QString attachment = mForm.toString( &cal_tmp );
@@ -3143,3 +3145,3 @@ void CalendarView::exportICalendar()
 
-    FileStorage storage( mCalendar, filename, new ICalFormat( KOPrefs::instance()->mUseQuicksave) );
+    FileStorage storage( mCalendar, filename, new ICalFormat() );
     storage.save();