cleanup

5 files changed, 7 insertions, 28 deletions

diff --git a/libkcal/calstorage.h b/libkcal/calstorage.h
index 72972ea..82c8682 100644
--- a/libkcal/calstorage.h
+++ b/libkcal/calstorage.h
@@ -36,13 +36,13 @@ class CalStorage
     }
     virtual ~CalStorage() {}
 
     Calendar *calendar() const { return mCalendar; }
   
     virtual bool open() = 0;
-    virtual bool load(bool = false ) = 0;
+    virtual bool load( ) = 0;
     virtual bool save() = 0;
     virtual bool close() = 0;
 
   private:
     Calendar *mCalendar;
 };
diff --git a/libkcal/filestorage.cpp b/libkcal/filestorage.cpp
index 00c15d9..a139124 100644
--- a/libkcal/filestorage.cpp
+++ b/libkcal/filestorage.cpp
@@ -73,23 +73,23 @@ CalFormat *FileStorage::saveFormat()const
 
 bool FileStorage::open()
 {
   return true;
 }
 
-bool FileStorage::load( bool quick )
+bool FileStorage::load( )
 {
   kdDebug(5800) << "FileStorage::load(): '" << mFileName << "'" << endl;
 
   // do we want to silently accept this, or make some noise?  Dunno...
   // it is a semantical thing vs. a practical thing.
   if (mFileName.isEmpty()) return false;
 
   // Always try to load with iCalendar. It will detect, if it is actually a
   // vCalendar file.
-  ICalFormat iCal (quick );
+  ICalFormat iCal;
 
   bool success = iCal.load( calendar(), mFileName);
 
   if ( !success ) {
     if ( iCal.exception() ) {
 //      kdDebug(5800) << "---Error: " << mFormat->exception()->errorCode() << endl;
diff --git a/libkcal/filestorage.h b/libkcal/filestorage.h
index e9dc15e..17010ac 100644
--- a/libkcal/filestorage.h
+++ b/libkcal/filestorage.h
@@ -41,13 +41,13 @@ class FileStorage : public CalStorage
       FileStorage takes ownership of format object.
     */
     void setSaveFormat( CalFormat * );
     CalFormat *saveFormat()const;
 
     bool open();
-    bool load(bool quick = false );
+    bool load( );
     bool save();
     bool close();
 
   private:
     QString mFileName;
     CalFormat *mSaveFormat;
diff --git a/libkcal/icalformat.cpp b/libkcal/icalformat.cpp
index f2e7dfc..3a2aac6 100644
--- a/libkcal/icalformat.cpp
+++ b/libkcal/icalformat.cpp
@@ -47,15 +47,14 @@ extern "C" {
 #include "icalformatimpl.h"
 
 #define _ICAL_VERSION "2.0"
 
 using namespace KCal;
 
-ICalFormat::ICalFormat(bool quick )
+ICalFormat::ICalFormat( )
 {
-    mQuicksave = false; //quick; 
    mImpl = new ICalFormatImpl( this );
    tzOffsetMin = 0;
    //qDebug("new ICalFormat() ");
 }
 
 ICalFormat::~ICalFormat()
@@ -73,22 +72,13 @@ bool ICalFormat::load( Calendar *calendar, const QString &fileName)
   if (!file.open( IO_ReadOnly ) ) {
     setException(new ErrorFormat(ErrorFormat::LoadError));
     return false;
   } 
   QTextStream ts( &file );
   QString text; 
-#if 0
-  if ( !mQuicksave ) {
-      qDebug("KO: No quickload!");
-      ts.setEncoding( QTextStream::Latin1 );
-      text = ts.read(); 
-  } else {
-      ts.setCodec( QTextCodec::codecForName("utf8") );
-      text = ts.read(); 
-  }
-#endif
+
   ts.setEncoding( QTextStream::Latin1 );
   text = ts.read(); 
   file.close();
 
   return fromString( calendar, text );
 }
@@ -111,22 +101,12 @@ bool ICalFormat::save( Calendar *calendar, const QString &fileName )
     setException(new ErrorFormat(ErrorFormat::SaveError,
                  i18n("Could not open file '%1'").arg(fileName)));
     return false;
   }
   QTextStream ts( &file );
 
-// #ifdef DESKTOP_VERSION
-//   mQuicksave = false;
-// #endif
-//   if ( mQuicksave ) {
-//       ts << text.utf8();
-//   } else {
-//       ts.setEncoding( QTextStream::Latin1 );
-//       ts << text;
-//       //ts << text.latin1();
-//   }
   ts.setEncoding( QTextStream::Latin1 );
   ts << text;
   file.close();
   //qDebug("saving file takes ms: %d ", is.elapsed() );
   return true;
 }
diff --git a/libkcal/icalformat.h b/libkcal/icalformat.h
index 236efbf..485ab6e 100644
--- a/libkcal/icalformat.h
+++ b/libkcal/icalformat.h
@@ -37,13 +37,13 @@ class ICalFormatImpl;
 
   @short iCalendar format implementation
 */
 class ICalFormat : public CalFormat {
   public:
     /** Create new iCalendar format. */
-    ICalFormat( bool quick = false );
+    ICalFormat( );
     virtual ~ICalFormat();
 
     /**
       Loads a calendar on disk in iCalendar format into calendar.
       Returns true if successful, else returns false. Provides more error
       information by exception().
@@ -101,13 +101,12 @@ class ICalFormat : public CalFormat {
     int timeOffset();
     const char * tzString();
     bool utc() const;
 
   private:
     ICalFormatImpl *mImpl;
-    bool mQuicksave;
     QString mTimeZoneId;
     QCString mTzString;
     int tzOffsetMin;
     bool mUtc;
 };