-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 | |||
@@ -39,7 +39,7 @@ class CalStorage | |||
39 | Calendar *calendar() const { return mCalendar; } | 39 | Calendar *calendar() const { return mCalendar; } |
40 | 40 | ||
41 | virtual bool open() = 0; | 41 | virtual bool open() = 0; |
42 | virtual bool load(bool = false ) = 0; | 42 | virtual bool load( ) = 0; |
43 | virtual bool save() = 0; | 43 | virtual bool save() = 0; |
44 | virtual bool close() = 0; | 44 | virtual bool close() = 0; |
45 | 45 | ||
diff --git a/libkcal/filestorage.cpp b/libkcal/filestorage.cpp index 00c15d9..a139124 100644 --- a/libkcal/filestorage.cpp +++ b/libkcal/filestorage.cpp | |||
@@ -76,7 +76,7 @@ bool FileStorage::open() | |||
76 | return true; | 76 | return true; |
77 | } | 77 | } |
78 | 78 | ||
79 | bool FileStorage::load( bool quick ) | 79 | bool FileStorage::load( ) |
80 | { | 80 | { |
81 | kdDebug(5800) << "FileStorage::load(): '" << mFileName << "'" << endl; | 81 | kdDebug(5800) << "FileStorage::load(): '" << mFileName << "'" << endl; |
82 | 82 | ||
@@ -86,7 +86,7 @@ bool FileStorage::load( bool quick ) | |||
86 | 86 | ||
87 | // Always try to load with iCalendar. It will detect, if it is actually a | 87 | // Always try to load with iCalendar. It will detect, if it is actually a |
88 | // vCalendar file. | 88 | // vCalendar file. |
89 | ICalFormat iCal (quick ); | 89 | ICalFormat iCal; |
90 | 90 | ||
91 | bool success = iCal.load( calendar(), mFileName); | 91 | bool success = iCal.load( calendar(), mFileName); |
92 | 92 | ||
diff --git a/libkcal/filestorage.h b/libkcal/filestorage.h index e9dc15e..17010ac 100644 --- a/libkcal/filestorage.h +++ b/libkcal/filestorage.h | |||
@@ -44,7 +44,7 @@ class FileStorage : public CalStorage | |||
44 | CalFormat *saveFormat()const; | 44 | CalFormat *saveFormat()const; |
45 | 45 | ||
46 | bool open(); | 46 | bool open(); |
47 | bool load(bool quick = false ); | 47 | bool load( ); |
48 | bool save(); | 48 | bool save(); |
49 | bool close(); | 49 | bool close(); |
50 | 50 | ||
diff --git a/libkcal/icalformat.cpp b/libkcal/icalformat.cpp index f2e7dfc..3a2aac6 100644 --- a/libkcal/icalformat.cpp +++ b/libkcal/icalformat.cpp | |||
@@ -50,9 +50,8 @@ extern "C" { | |||
50 | 50 | ||
51 | using namespace KCal; | 51 | using namespace KCal; |
52 | 52 | ||
53 | ICalFormat::ICalFormat(bool quick ) | 53 | ICalFormat::ICalFormat( ) |
54 | { | 54 | { |
55 | mQuicksave = false; //quick; | ||
56 | mImpl = new ICalFormatImpl( this ); | 55 | mImpl = new ICalFormatImpl( this ); |
57 | tzOffsetMin = 0; | 56 | tzOffsetMin = 0; |
58 | //qDebug("new ICalFormat() "); | 57 | //qDebug("new ICalFormat() "); |
@@ -76,16 +75,7 @@ bool ICalFormat::load( Calendar *calendar, const QString &fileName) | |||
76 | } | 75 | } |
77 | QTextStream ts( &file ); | 76 | QTextStream ts( &file ); |
78 | QString text; | 77 | QString text; |
79 | #if 0 | 78 | |
80 | if ( !mQuicksave ) { | ||
81 | qDebug("KO: No quickload!"); | ||
82 | ts.setEncoding( QTextStream::Latin1 ); | ||
83 | text = ts.read(); | ||
84 | } else { | ||
85 | ts.setCodec( QTextCodec::codecForName("utf8") ); | ||
86 | text = ts.read(); | ||
87 | } | ||
88 | #endif | ||
89 | ts.setEncoding( QTextStream::Latin1 ); | 79 | ts.setEncoding( QTextStream::Latin1 ); |
90 | text = ts.read(); | 80 | text = ts.read(); |
91 | file.close(); | 81 | file.close(); |
@@ -114,16 +104,6 @@ bool ICalFormat::save( Calendar *calendar, const QString &fileName ) | |||
114 | } | 104 | } |
115 | QTextStream ts( &file ); | 105 | QTextStream ts( &file ); |
116 | 106 | ||
117 | // #ifdef DESKTOP_VERSION | ||
118 | // mQuicksave = false; | ||
119 | // #endif | ||
120 | // if ( mQuicksave ) { | ||
121 | // ts << text.utf8(); | ||
122 | // } else { | ||
123 | // ts.setEncoding( QTextStream::Latin1 ); | ||
124 | // ts << text; | ||
125 | // //ts << text.latin1(); | ||
126 | // } | ||
127 | ts.setEncoding( QTextStream::Latin1 ); | 107 | ts.setEncoding( QTextStream::Latin1 ); |
128 | ts << text; | 108 | ts << text; |
129 | file.close(); | 109 | file.close(); |
diff --git a/libkcal/icalformat.h b/libkcal/icalformat.h index 236efbf..485ab6e 100644 --- a/libkcal/icalformat.h +++ b/libkcal/icalformat.h | |||
@@ -40,7 +40,7 @@ class ICalFormatImpl; | |||
40 | class ICalFormat : public CalFormat { | 40 | class ICalFormat : public CalFormat { |
41 | public: | 41 | public: |
42 | /** Create new iCalendar format. */ | 42 | /** Create new iCalendar format. */ |
43 | ICalFormat( bool quick = false ); | 43 | ICalFormat( ); |
44 | virtual ~ICalFormat(); | 44 | virtual ~ICalFormat(); |
45 | 45 | ||
46 | /** | 46 | /** |
@@ -104,7 +104,6 @@ class ICalFormat : public CalFormat { | |||
104 | 104 | ||
105 | private: | 105 | private: |
106 | ICalFormatImpl *mImpl; | 106 | ICalFormatImpl *mImpl; |
107 | bool mQuicksave; | ||
108 | QString mTimeZoneId; | 107 | QString mTimeZoneId; |
109 | QCString mTzString; | 108 | QCString mTzString; |
110 | int tzOffsetMin; | 109 | int tzOffsetMin; |