cleanup

5 files changed, 13 insertions, 126 deletions

diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index eaea040..fecc7e2 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -1220,16 +1220,16 @@ bool CalendarView::syncCalendar(QString filename, int mode)
     FileStorage* storage = new FileStorage( calendar );
     bool syncOK = false;
     storage->setFileName( filename );
     // qDebug("loading ... ");
-    if ( storage->load(KOPrefs::instance()->mUseQuicksave) ) {
+    if ( storage->load() ) {
         getEventViewerDialog()->setSyncMode( true );
         syncOK = synchronizeCalendar( mCalendar, calendar, mode );
         getEventViewerDialog()->setSyncMode( false );
         if (  syncOK ) {
            if ( KOPrefs::instance()->mWriteBackFile )
             {
-                storage->setSaveFormat( new ICalFormat( KOPrefs::instance()->mUseQuicksave) );
+                storage->setSaveFormat( new ICalFormat() );
                 storage->save();
             }
         }
         setModified( true );
@@ -1498,9 +1498,9 @@ bool CalendarView::openCalendar(QString filename, bool merge)
     if (!merge) mCalendar->close();
 
     mStorage->setFileName( filename );
 
-    if ( mStorage->load(KOPrefs::instance()->mUseQuicksave) ) {
+    if ( mStorage->load() ) {
         if ( merge ) ;//setModified( true );
         else {
             //setModified( true );
             mViewManager->setDocumentId( filename );
@@ -1513,11 +1513,13 @@ bool CalendarView::openCalendar(QString filename, bool merge)
         mCalendar->reInitAlarmSettings();
         setSyncEventsReadOnly();
         updateUnmanagedViews();
         updateView();
-        if (  filename != MainWindow::defaultFileName() ) 
-            saveCalendar( MainWindow::defaultFileName() );
         loadedFileVersion = QDateTime::currentDateTime();
+        if (  filename != MainWindow::defaultFileName() ) {
+            saveCalendar( MainWindow::defaultFileName() );
+            watchSavedFile();
+        }
         return true;
     } else {
         // while failing to load, the calendar object could
         // have become partially populated.  Clear it out.
@@ -1599,9 +1601,9 @@ bool CalendarView::saveCalendar( QString filename )
         mViewManager->currentView()->flushView();
 
     //mStorage->setFileName( filename );
 
-    mStorage->setSaveFormat( new ICalFormat( KOPrefs::instance()->mUseQuicksave) );
+    mStorage->setSaveFormat( new ICalFormat() );
     mStorage->setFileName( filename );
     bool success;
     success = mStorage->save();
     if ( !success ) {
@@ -2300,9 +2302,9 @@ void  CalendarView::beamIncidenceList(QPtrList<Incidence> delSel )
             FileStorage storage( cal, fn, new VCalFormat );
             storage.save();
         } else {
             fn += ".ics";
-            FileStorage storage( cal, fn, new ICalFormat( KOPrefs::instance()->mUseQuicksave) );
+            FileStorage storage( cal, fn, new ICalFormat( ) );
             storage.save();
         }
         delete cal;
         mes = i18n("KO/Pi: Ready for beaming");
@@ -2855,9 +2857,9 @@ void CalendarView::action_mail()
         event = static_cast<Event *>(incidence);
         ev = new Event(*event);
         cal_tmp.addEvent(ev);
     }
-    ICalFormat mForm( KOPrefs::instance()->mUseQuicksave);
+    ICalFormat mForm();
     QString attachment = mForm.toString( &cal_tmp );
     if (ev) delete(ev);
 
     mailClient.mailAttendees(currentSelection(), attachment);
@@ -3140,9 +3142,9 @@ void CalendarView::exportICalendar()
 
     // Force correct extension
     if (filename.right(4) != ".ics") filename += ".ics";
 
-    FileStorage storage( mCalendar, filename, new ICalFormat( KOPrefs::instance()->mUseQuicksave) );
+    FileStorage storage( mCalendar, filename, new ICalFormat() );
     storage.save();
 }
 
 bool CalendarView::exportVCalendar( QString filename )
diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp
index 0034715..e0623d5 100644
--- a/korganizer/koprefs.cpp
+++ b/korganizer/koprefs.cpp
@@ -223,9 +223,8 @@ KOPrefs::KOPrefs() :
   addItemInt("PreferredLanguage",&mPreferredLanguage,0);
   addItemInt("PreferredTime",&mPreferredTime,0);
   addItemInt("PreferredDate",&mPreferredDate,0);
   addItemBool("WeekStartsOnSunday",&mWeekStartsOnSunday,false); 
-  addItemBool("QuickSavingWOUnicode",&mUseQuicksave,false); 
   addItemBool("ShortDateInViewer",&mShortDateInViewer,false); 
   addItemString("UserDateFormatLong", &mUserDateFormatLong, "%A %d %b %y");
   addItemString("UserDateFormatShort", &mUserDateFormatShort, "%aK %d.%m.%y");
 
diff --git a/korganizer/koprefs.h b/korganizer/koprefs.h
index 696433e..7abd741 100644
--- a/korganizer/koprefs.h
+++ b/korganizer/koprefs.h
@@ -265,9 +265,8 @@ class KOPrefs : public KPimPrefs
     bool mTodoViewUsesForegroundColor;
     bool mMonthViewUsesForegroundColor;
 
     bool mHightlightDateTimeEdit;
-    bool mUseQuicksave;
     bool mShortDateInViewer;
 
     QStringList mLocationDefaults;
     QStringList mEventSummaryUser;
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 5aa75f5..43ee2d7 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -1951,10 +1951,9 @@ void MainWindow::getFile( bool success )
     if ( ! success ) {
         setCaption( i18n("Error receiving file. Nothing changed!") );
         return;
     }
-    // pending adjust time for watchSavedFile()
-    //mView->watchSavedFile();
+    mView->watchSavedFile();
     mView->openCalendar( defaultFileName() );
     setCaption( i18n("Pi-Sync successful!") );
 
 } 
@@ -1962,13 +1961,8 @@ void MainWindow::getFile( bool success )
 
 void MainWindow::syncPi()
 {
     qApp->processEvents();
-    performQuickQuick();
-}
-
-void MainWindow::performQuickQuick()
-{
     bool ok;
     Q_UINT16 port = KOPrefs::instance()->mActiveSyncPort.toUInt(&ok);
     if ( ! ok ) {
         setCaption( i18n("Sorry, no valid port.Syncing cancelled.") );
@@ -1978,8 +1972,9 @@ void MainWindow::performQuickQuick()
     connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int )), this, SLOT(deleteCommandSocket(KCommandSocket*, int)) );
     setCaption( i18n("Sending request for remote file ...") );
     commandSocket->readFile(  syncFileName() );
 }
+
 void MainWindow::deleteCommandSocket(KCommandSocket*s, int state)
 {
     qDebug("MainWindow::deleteCommandSocket %d", state);
     
@@ -2165,114 +2160,8 @@ void MainWindow::syncRemote( KSyncProfile* prof,  bool ask)
         }
     }
     return;
 }
-void MainWindow::syncSSH()
-{
-    // not used anymore
-    QTime timer;
-    timer.start();
-    //qDebug("MainWindow::syncssh() ");
-    KOPrefs *p = KOPrefs::instance();
-    QString localFile =  p->mLocalTempFile;
-    QString remoteIP = p->mRemoteIP;
-    QString remoteUser = p->mRemoteUser;
-    QString remoteFile = p->mRemoteFile;
-    if ( p->mUsePassWd &&  p->mRemotePassWd.length() > 0  )
-        remoteUser += ":" + p->mRemotePassWd;
-
-    QString question = i18n("Do you really want\nto remote sync?\n \n") +
-        i18n("IP: " ) +remoteIP  +"\n" +
-        i18n("User: " ) + remoteUser +"\n" ;
-    int maxlen = 30;
-    if ( QApplication::desktop()->width() > 320 )
-        maxlen += 25;
-    if ( remoteFile.length() > maxlen )
-        question  +=   i18n("Remote file:\n..." ) + remoteFile.right(maxlen) +"\n";
-    else
-        question  +=   i18n("Remote file:\n " ) + remoteFile +"\n";
-    if ( localFile.length() > maxlen )
-        question  +=   i18n("Local temp file:\n..." ) + localFile.right(maxlen) +"\n";
-    else
-        question  +=   i18n("Local temp file:\n " ) + localFile +"\n";
-
-    if ( QMessageBox::information( this, i18n("KO/Pi Sync"),
-                                   question,
-                                   i18n("Yes"), i18n("No"),
-                                   0, 0 ) != 0 )
-        return;
-    // if ( !p->mUsePassWd ) {
-    //         QString pass = getPassword();
-    //         if ( pass.length() > 0 )
-    //             remoteUser += ":" + pass;
-    // }
-    QString command = "scp " + remoteUser + "@" + remoteIP +":" + remoteFile +"  " +localFile;
-    setCaption ( i18n( "Copy remote file to local machine..." ) );
-    int fileSize = 0;
-    int result = system ( command );
-    // 0 : okay
-    // 256: no such file or dir
-    //
-    qDebug("KO: Remote copy result(0 = okay): %d ",result );
-    if ( result != 0 ) {
-        int len = maxlen;
-        while ( len <  command.length() ) {
-            command.insert( len , "\n" );
-            len += maxlen +2;
-        }
-        question = i18n("Sorry, the copy command failed!\nCommand was:\n%1\n \nTry command on console to get more\ndetailed info about the reason.\n").arg (command) ;
-        QMessageBox::information( this, i18n("KO/Pi Sync - ERROR"),
-                                  question,
-                                  i18n("Okay!")) ;
-        setCaption ("KO/Pi");
-        return;
-    }
-
-
-    setCaption ( i18n( "Copying succeed." ) );
-    //mView->setSyncDevice("ssh-scp" );
-    if ( syncWithFile(localFile , true ) ) {
-//         Event* e = mView->getLastSyncEvent();
-//         e->setReadOnly( false );
-//         e->setLocation( KOPrefs::instance()->mSyncProfileNames[mCurrentSyncProfile]);
-//         e->setReadOnly( true );
-        if ( KOPrefs::instance()->mWriteBackFile ) {
-            command = "scp " + localFile +" " +remoteUser + "@" + remoteIP +":" + remoteFile ;
-            setCaption ( i18n( "Writing back file ..." ) );
-            result = system ( command );
-            if ( result != 0 ) {
-                int len = maxlen;
-                while ( len <  command.length() ) {
-                    command.insert( len , "\n" );
-                    len += maxlen +2;
-                }
-                question = i18n("Sorry, the copy back command failed!\nCommand was:\n%1\n \nTry command on console to get more\ndetailed info about the reason.\n").arg (command) ;
-                QMessageBox::information( this, i18n("KO/Pi Sync - ERROR"),
-                                          question,
-                                          i18n("Okay!")) ;
-                setCaption ("KO/Pi");
-                return;
-            } else {
-                setCaption ( i18n( "Syncronization sucessfully completed" ) );
-            }
-        }
-    }
-    return;
-#if 0
-    system ("scp zaurus@192.168.0.65:/home/zaurus/Applications/korganizer/mycalendar.ics /home/polo/Applications/korganizer/z_sync.ics");
-    while ( timer.elapsed() < 5000 )
-        qApp->processEvents();
-
-    qDebug("MainWindow::merging) ");
-    mView->syncCalendar( "/home/polo/Applications/korganizer/z_sync.ics", 0 );
-    while ( mBlockSaveFlag )
-        qApp->processEvents();
-    save();
-    system ("scp /home/polo/Applications/korganizer/mycalendar.ics zaurus@192.168.0.65:/home/zaurus/Applications/korganizer/mycalendar.ics");
-#endif
-
-}
-
 
 void MainWindow::syncSharp()
 {
     if ( mCalendarModifiedFlag )
diff --git a/korganizer/mainwindow.h b/korganizer/mainwindow.h
index 4da371e..ba627b9 100644
--- a/korganizer/mainwindow.h
+++ b/korganizer/mainwindow.h
@@ -144,9 +144,8 @@ class MainWindow : public QMainWindow
     void fillFilterMenu();
     void selectFilter( int );
 
     void slotSyncMenu( int );
-    void syncSSH();
     void confSync();
     void syncSharp();
     void syncPhone();
     void syncPi();
@@ -176,9 +175,8 @@ class MainWindow : public QMainWindow
     bool mClosed;
     void saveOnClose();
     int mCurrentSyncProfile;
     void enableQuick();
-    void performQuickQuick();
     void syncRemote( KSyncProfile* , bool ask = true);
     bool  mFlagKeyPressed;
     bool  mBlockAtStartup;
     QPEToolBar *iconToolBar;