author | zautrix <zautrix> | 2004-10-05 08:07:41 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-10-05 08:07:41 (UTC) |
commit | ad859d26b813101adab963f50e694961702561d9 (patch) (side-by-side diff) | |
tree | 36eb7f12ee6ee80f50cdd13bbfaba74e9a1b37d1 /libkcal | |
parent | fc2c103f45a6d4e4105259436266538c645f2c87 (diff) | |
download | kdepimpi-ad859d26b813101adab963f50e694961702561d9.zip kdepimpi-ad859d26b813101adab963f50e694961702561d9.tar.gz kdepimpi-ad859d26b813101adab963f50e694961702561d9.tar.bz2 |
cleanup
-rw-r--r-- | libkcal/calstorage.h | 2 | ||||
-rw-r--r-- | libkcal/filestorage.cpp | 4 | ||||
-rw-r--r-- | libkcal/filestorage.h | 2 | ||||
-rw-r--r-- | libkcal/icalformat.cpp | 24 | ||||
-rw-r--r-- | libkcal/icalformat.h | 3 |
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 @@ -40,5 +40,5 @@ class CalStorage virtual bool open() = 0; - virtual bool load(bool = false ) = 0; + virtual bool load( ) = 0; virtual bool save() = 0; virtual bool close() = 0; diff --git a/libkcal/filestorage.cpp b/libkcal/filestorage.cpp index 00c15d9..a139124 100644 --- a/libkcal/filestorage.cpp +++ b/libkcal/filestorage.cpp @@ -77,5 +77,5 @@ bool FileStorage::open() } -bool FileStorage::load( bool quick ) +bool FileStorage::load( ) { kdDebug(5800) << "FileStorage::load(): '" << mFileName << "'" << endl; @@ -87,5 +87,5 @@ bool FileStorage::load( bool quick ) // 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); diff --git a/libkcal/filestorage.h b/libkcal/filestorage.h index e9dc15e..17010ac 100644 --- a/libkcal/filestorage.h +++ b/libkcal/filestorage.h @@ -45,5 +45,5 @@ class FileStorage : public CalStorage bool open(); - bool load(bool quick = false ); + bool load( ); bool save(); bool close(); diff --git a/libkcal/icalformat.cpp b/libkcal/icalformat.cpp index f2e7dfc..3a2aac6 100644 --- a/libkcal/icalformat.cpp +++ b/libkcal/icalformat.cpp @@ -51,7 +51,6 @@ extern "C" { using namespace KCal; -ICalFormat::ICalFormat(bool quick ) +ICalFormat::ICalFormat( ) { - mQuicksave = false; //quick; mImpl = new ICalFormatImpl( this ); tzOffsetMin = 0; @@ -77,14 +76,5 @@ bool ICalFormat::load( Calendar *calendar, const QString &fileName) 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(); @@ -115,14 +105,4 @@ bool ICalFormat::save( Calendar *calendar, const QString &fileName ) 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; diff --git a/libkcal/icalformat.h b/libkcal/icalformat.h index 236efbf..485ab6e 100644 --- a/libkcal/icalformat.h +++ b/libkcal/icalformat.h @@ -41,5 +41,5 @@ class ICalFormat : public CalFormat { public: /** Create new iCalendar format. */ - ICalFormat( bool quick = false ); + ICalFormat( ); virtual ~ICalFormat(); @@ -105,5 +105,4 @@ class ICalFormat : public CalFormat { private: ICalFormatImpl *mImpl; - bool mQuicksave; QString mTimeZoneId; QCString mTzString; |