author | zautrix <zautrix> | 2005-02-07 14:16:32 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-02-07 14:16:32 (UTC) |
commit | 5fb1e954dd606d0c8b2bd88ff50dcc3284fa09b6 (patch) (unidiff) | |
tree | 481cf4af9f7f1f46c1c7cf92be7545f555da000a /microkde/kconfig.cpp | |
parent | d3b63db1205720e0a78cdc1a3cd11b2d02c98c6a (diff) | |
download | kdepimpi-5fb1e954dd606d0c8b2bd88ff50dcc3284fa09b6.zip kdepimpi-5fb1e954dd606d0c8b2bd88ff50dcc3284fa09b6.tar.gz kdepimpi-5fb1e954dd606d0c8b2bd88ff50dcc3284fa09b6.tar.bz2 |
utf8 fix
-rw-r--r-- | microkde/kconfig.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/microkde/kconfig.cpp b/microkde/kconfig.cpp index 862166d..b9cf2f1 100644 --- a/microkde/kconfig.cpp +++ b/microkde/kconfig.cpp | |||
@@ -1,547 +1,547 @@ | |||
1 | #include <qfile.h> | 1 | #include <qfile.h> |
2 | #include <qtextstream.h> | 2 | #include <qtextstream.h> |
3 | #include <qwidget.h> | 3 | #include <qwidget.h> |
4 | 4 | ||
5 | #include "kdebug.h" | 5 | #include "kdebug.h" |
6 | 6 | ||
7 | #include "kurl.h" | 7 | #include "kurl.h" |
8 | #include "kstandarddirs.h" | 8 | #include "kstandarddirs.h" |
9 | #include "kconfig.h" | 9 | #include "kconfig.h" |
10 | 10 | ||
11 | QString KConfig::mGroup = ""; | 11 | QString KConfig::mGroup = ""; |
12 | //QString KConfig::mGroup = "General"; | 12 | //QString KConfig::mGroup = "General"; |
13 | 13 | ||
14 | KConfig::KConfig( const QString &fileName ) | 14 | KConfig::KConfig( const QString &fileName ) |
15 | : mFileName( fileName ), mDirty( false ) | 15 | : mFileName( fileName ), mDirty( false ) |
16 | { | 16 | { |
17 | 17 | ||
18 | mTempGroup = ""; | 18 | mTempGroup = ""; |
19 | load(); | 19 | load(); |
20 | 20 | ||
21 | } | 21 | } |
22 | 22 | ||
23 | 23 | ||
24 | KConfig::~KConfig() | 24 | KConfig::~KConfig() |
25 | { | 25 | { |
26 | sync(); | 26 | sync(); |
27 | } | 27 | } |
28 | // we need the temp group for plugins on windows | 28 | // we need the temp group for plugins on windows |
29 | void KConfig::setTempGroup( const QString &group ) | 29 | void KConfig::setTempGroup( const QString &group ) |
30 | { | 30 | { |
31 | mTempGroup = group; | 31 | mTempGroup = group; |
32 | 32 | ||
33 | if ( mTempGroup.right( 1 ) != "/" ) mTempGroup += "/"; | 33 | if ( mTempGroup.right( 1 ) != "/" ) mTempGroup += "/"; |
34 | } | 34 | } |
35 | 35 | ||
36 | 36 | ||
37 | QString KConfig::tempGroup() const { | 37 | QString KConfig::tempGroup() const { |
38 | return mTempGroup; | 38 | return mTempGroup; |
39 | } | 39 | } |
40 | 40 | ||
41 | void KConfig::setGroup( const QString &group ) | 41 | void KConfig::setGroup( const QString &group ) |
42 | { | 42 | { |
43 | 43 | ||
44 | 44 | ||
45 | mGroup = group; | 45 | mGroup = group; |
46 | 46 | ||
47 | if ( mGroup.right( 1 ) != "/" ) mGroup += "/"; | 47 | if ( mGroup.right( 1 ) != "/" ) mGroup += "/"; |
48 | } | 48 | } |
49 | 49 | ||
50 | //US | 50 | //US |
51 | QString KConfig::group() const { | 51 | QString KConfig::group() const { |
52 | return mGroup; | 52 | return mGroup; |
53 | } | 53 | } |
54 | 54 | ||
55 | //US added method | 55 | //US added method |
56 | QValueList<int> KConfig::readIntListEntry( const QString & key) | 56 | QValueList<int> KConfig::readIntListEntry( const QString & key) |
57 | { | 57 | { |
58 | // qDebug("KConfig::readIntListEntry key=%s:", key.latin1()); | 58 | // qDebug("KConfig::readIntListEntry key=%s:", key.latin1()); |
59 | 59 | ||
60 | QValueList<int> result; | 60 | QValueList<int> result; |
61 | 61 | ||
62 | QMap<QString,QString>::ConstIterator mit = mStringMap.find( mGroup + key ); | 62 | QMap<QString,QString>::ConstIterator mit = mStringMap.find( mGroup + key ); |
63 | 63 | ||
64 | if ( mit == mStringMap.end() ) { | 64 | if ( mit == mStringMap.end() ) { |
65 | return result; | 65 | return result; |
66 | } | 66 | } |
67 | 67 | ||
68 | QStringList valuesAsStrings = QStringList::split(":", *mit ); | 68 | QStringList valuesAsStrings = QStringList::split(":", *mit ); |
69 | bool ok = false; | 69 | bool ok = false; |
70 | bool ok2 = true; | 70 | bool ok2 = true; |
71 | int val; | 71 | int val; |
72 | 72 | ||
73 | for ( QStringList::Iterator sit = valuesAsStrings.begin(); sit != valuesAsStrings.end(); ++sit ) { | 73 | for ( QStringList::Iterator sit = valuesAsStrings.begin(); sit != valuesAsStrings.end(); ++sit ) { |
74 | val = (*sit).toInt(&ok); | 74 | val = (*sit).toInt(&ok); |
75 | result << val; | 75 | result << val; |
76 | if (ok == false) { | 76 | if (ok == false) { |
77 | qDebug("KConfig::readIntListEntry str=%s , int=%n:", (*sit).latin1(), &val); | 77 | qDebug("KConfig::readIntListEntry str=%s , int=%n:", (*sit).latin1(), &val); |
78 | ok2 = false; | 78 | ok2 = false; |
79 | } | 79 | } |
80 | } | 80 | } |
81 | 81 | ||
82 | if (ok2 == false) | 82 | if (ok2 == false) |
83 | { | 83 | { |
84 | 84 | ||
85 | qDebug("KConfig::readIntListEntry: error while reading one of the intvalues."); | 85 | qDebug("KConfig::readIntListEntry: error while reading one of the intvalues."); |
86 | } | 86 | } |
87 | 87 | ||
88 | return result; | 88 | return result; |
89 | } | 89 | } |
90 | 90 | ||
91 | int KConfig::readNumEntry( const QString & key, int def ) | 91 | int KConfig::readNumEntry( const QString & key, int def ) |
92 | { | 92 | { |
93 | QString res = readEntry(key, QString::number(def ) ); | 93 | QString res = readEntry(key, QString::number(def ) ); |
94 | bool ok = false; | 94 | bool ok = false; |
95 | int result = res.toInt(&ok); | 95 | int result = res.toInt(&ok); |
96 | if ( ok ) | 96 | if ( ok ) |
97 | return result; | 97 | return result; |
98 | return def; | 98 | return def; |
99 | } | 99 | } |
100 | 100 | ||
101 | QString KConfig::readEntry( const QString &key, const QString &def ) | 101 | QString KConfig::readEntry( const QString &key, const QString &def ) |
102 | { | 102 | { |
103 | QMap<QString,QString>::ConstIterator it = mStringMap.find( mGroup + key ); | 103 | QMap<QString,QString>::ConstIterator it = mStringMap.find( mGroup + key ); |
104 | 104 | ||
105 | if ( it == mStringMap.end() ) { | 105 | if ( it == mStringMap.end() ) { |
106 | return def; | 106 | return def; |
107 | } | 107 | } |
108 | 108 | ||
109 | return QString::fromUtf8((*it).latin1()); | 109 | return QString::fromUtf8((*it).latin1()); |
110 | } | 110 | } |
111 | 111 | ||
112 | QSize KConfig::readSizeEntry( const QString &key, QSize* def ) | 112 | QSize KConfig::readSizeEntry( const QString &key, QSize* def ) |
113 | { | 113 | { |
114 | QValueList<int> intlist = readIntListEntry(key); | 114 | QValueList<int> intlist = readIntListEntry(key); |
115 | 115 | ||
116 | if (intlist.count() < 2) | 116 | if (intlist.count() < 2) |
117 | { | 117 | { |
118 | if (def) | 118 | if (def) |
119 | return *def; | 119 | return *def; |
120 | else | 120 | else |
121 | return QSize(); | 121 | return QSize(); |
122 | } | 122 | } |
123 | 123 | ||
124 | QSize ret; | 124 | QSize ret; |
125 | ret.setWidth(intlist[0]); | 125 | ret.setWidth(intlist[0]); |
126 | ret.setHeight(intlist[1]); | 126 | ret.setHeight(intlist[1]); |
127 | 127 | ||
128 | return ret; | 128 | return ret; |
129 | } | 129 | } |
130 | 130 | ||
131 | QStringList KConfig::readListEntry( const QString &key ) | 131 | QStringList KConfig::readListEntry( const QString &key ) |
132 | { | 132 | { |
133 | QMap<QString,QString>::ConstIterator it = mStringMap.find( mGroup + key ); | 133 | QMap<QString,QString>::ConstIterator it = mStringMap.find( mGroup + key ); |
134 | 134 | ||
135 | if ( it == mStringMap.end() ) { | 135 | if ( it == mStringMap.end() ) { |
136 | return QStringList(); | 136 | return QStringList(); |
137 | } | 137 | } |
138 | return QStringList::split(":", QString::fromUtf8((*it).latin1())); | 138 | return QStringList::split(":", QString::fromUtf8((*it).latin1())); |
139 | 139 | ||
140 | } | 140 | } |
141 | 141 | ||
142 | bool KConfig::readBoolEntry( const QString &key, bool def ) | 142 | bool KConfig::readBoolEntry( const QString &key, bool def ) |
143 | { | 143 | { |
144 | QMap<QString,bool>::ConstIterator it = mBoolMap.find( mGroup + key ); | 144 | QMap<QString,bool>::ConstIterator it = mBoolMap.find( mGroup + key ); |
145 | 145 | ||
146 | if ( it == mBoolMap.end() ) { | 146 | if ( it == mBoolMap.end() ) { |
147 | return def; | 147 | return def; |
148 | } | 148 | } |
149 | 149 | ||
150 | return *it; | 150 | return *it; |
151 | } | 151 | } |
152 | 152 | ||
153 | QColor KConfig::readColorEntry( const QString & e, QColor *def ) | 153 | QColor KConfig::readColorEntry( const QString & e, QColor *def ) |
154 | { | 154 | { |
155 | 155 | ||
156 | QStringList l; | 156 | QStringList l; |
157 | l = readListEntry( e ); | 157 | l = readListEntry( e.utf8() ); |
158 | if (l.count() != 3 ) { | 158 | if (l.count() != 3 ) { |
159 | if ( def ) | 159 | if ( def ) |
160 | return *def; | 160 | return *def; |
161 | else | 161 | else |
162 | return QColor(); | 162 | return QColor(); |
163 | } | 163 | } |
164 | QColor c ( l[0].toInt(), l[1].toInt(), l[2].toInt() ); | 164 | QColor c ( l[0].toInt(), l[1].toInt(), l[2].toInt() ); |
165 | return c; | 165 | return c; |
166 | } | 166 | } |
167 | 167 | ||
168 | QFont KConfig::readFontEntry( const QString & e, QFont *def ) | 168 | QFont KConfig::readFontEntry( const QString & e, QFont *def ) |
169 | { | 169 | { |
170 | QStringList font = readListEntry( e ); | 170 | QStringList font = readListEntry( e ); |
171 | if ( font.isEmpty() ) | 171 | if ( font.isEmpty() ) |
172 | return *def; | 172 | return *def; |
173 | QFont f; | 173 | QFont f; |
174 | f.setFamily( font[0]); | 174 | f.setFamily( font[0]); |
175 | f.setBold ( font[1] == "bold"); | 175 | f.setBold ( font[1] == "bold"); |
176 | f.setPointSize ( font[2].toInt()); | 176 | f.setPointSize ( font[2].toInt()); |
177 | f.setItalic( font[3] == "italic" ); | 177 | f.setItalic( font[3] == "italic" ); |
178 | return f; | 178 | return f; |
179 | } | 179 | } |
180 | 180 | ||
181 | QDateTime KConfig::readDateTimeEntry( const QString &key, const QDateTime *def ) | 181 | QDateTime KConfig::readDateTimeEntry( const QString &key, const QDateTime *def ) |
182 | { | 182 | { |
183 | QMap<QString,QDateTime>::ConstIterator it = mDateTimeMap.find( mGroup + key ); | 183 | QMap<QString,QDateTime>::ConstIterator it = mDateTimeMap.find( mGroup + key ); |
184 | 184 | ||
185 | if ( it == mDateTimeMap.end() ) { | 185 | if ( it == mDateTimeMap.end() ) { |
186 | if ( def ) return *def; | 186 | if ( def ) return *def; |
187 | else return QDateTime(); | 187 | else return QDateTime(); |
188 | } | 188 | } |
189 | 189 | ||
190 | return *it; | 190 | return *it; |
191 | } | 191 | } |
192 | 192 | ||
193 | //US added method | 193 | //US added method |
194 | void KConfig::writeEntry( const QString &key, const QValueList<int> &value) | 194 | void KConfig::writeEntry( const QString &key, const QValueList<int> &value) |
195 | { | 195 | { |
196 | QStringList valuesAsStrings; | 196 | QStringList valuesAsStrings; |
197 | 197 | ||
198 | QValueList<int>::ConstIterator it; | 198 | QValueList<int>::ConstIterator it; |
199 | 199 | ||
200 | for( it = value.begin(); it != value.end(); ++it ) | 200 | for( it = value.begin(); it != value.end(); ++it ) |
201 | { | 201 | { |
202 | valuesAsStrings << QString::number(*it); | 202 | valuesAsStrings << QString::number(*it); |
203 | } | 203 | } |
204 | 204 | ||
205 | mStringMap.insert( mGroup + key, valuesAsStrings.join(":") ); | 205 | mStringMap.insert( mGroup + key, valuesAsStrings.join(":") ); |
206 | mDirty = true; | 206 | mDirty = true; |
207 | } | 207 | } |
208 | 208 | ||
209 | void KConfig::writeEntry( const QString & key , int num ) | 209 | void KConfig::writeEntry( const QString & key , int num ) |
210 | { | 210 | { |
211 | writeEntry( key, QString::number ( num ) ); | 211 | writeEntry( key, QString::number ( num ) ); |
212 | } | 212 | } |
213 | 213 | ||
214 | void KConfig::writeEntry( const QString &key, const QString &value ) | 214 | void KConfig::writeEntry( const QString &key, const QString &value ) |
215 | { | 215 | { |
216 | mStringMap.insert( mGroup + key, value.utf8() ); | 216 | mStringMap.insert( mGroup + key, value.utf8() ); |
217 | 217 | ||
218 | mDirty = true; | 218 | mDirty = true; |
219 | } | 219 | } |
220 | 220 | ||
221 | void KConfig::writeEntry( const QString &key, const QStringList &value ) | 221 | void KConfig::writeEntry( const QString &key, const QStringList &value ) |
222 | { | 222 | { |
223 | mStringMap.insert( mGroup + key, value.join(":").utf8() ); | 223 | mStringMap.insert( mGroup + key, value.join(":").utf8() ); |
224 | 224 | ||
225 | mDirty = true; | 225 | mDirty = true; |
226 | } | 226 | } |
227 | 227 | ||
228 | void KConfig::writeEntry( const QString &key, bool value) | 228 | void KConfig::writeEntry( const QString &key, bool value) |
229 | { | 229 | { |
230 | mBoolMap.insert( mGroup + key, value ); | 230 | mBoolMap.insert( mGroup + key, value ); |
231 | 231 | ||
232 | mDirty = true; | 232 | mDirty = true; |
233 | } | 233 | } |
234 | 234 | ||
235 | void KConfig::writeEntry( const QString & e, const QColor & c ) | 235 | void KConfig::writeEntry( const QString & e, const QColor & c ) |
236 | { | 236 | { |
237 | QStringList l; | 237 | QStringList l; |
238 | l.append( QString::number ( c.red() ) ); | 238 | l.append( QString::number ( c.red() ) ); |
239 | l.append( QString::number ( c.green() ) ); | 239 | l.append( QString::number ( c.green() ) ); |
240 | l.append( QString::number ( c.blue() ) ); | 240 | l.append( QString::number ( c.blue() ) ); |
241 | writeEntry( e, l ); | 241 | writeEntry( e.utf8(), l ); |
242 | } | 242 | } |
243 | 243 | ||
244 | void KConfig::writeEntry( const QString & e, const QSize & s ) | 244 | void KConfig::writeEntry( const QString & e, const QSize & s ) |
245 | { | 245 | { |
246 | QValueList<int> intlist; | 246 | QValueList<int> intlist; |
247 | intlist << s.width() << s.height(); | 247 | intlist << s.width() << s.height(); |
248 | writeEntry( e, intlist ); | 248 | writeEntry( e, intlist ); |
249 | } | 249 | } |
250 | 250 | ||
251 | void KConfig::writeEntry( const QString & e , const QFont & f ) | 251 | void KConfig::writeEntry( const QString & e , const QFont & f ) |
252 | { | 252 | { |
253 | QStringList font; | 253 | QStringList font; |
254 | font.append( f.family()); | 254 | font.append( f.family()); |
255 | font.append( (!f.bold ()?"nonbold":"bold") ); | 255 | font.append( (!f.bold ()?"nonbold":"bold") ); |
256 | font.append( QString::number ( f.pointSize () ) ); | 256 | font.append( QString::number ( f.pointSize () ) ); |
257 | font.append( !f.italic ()?"nonitalic":"italic" ); | 257 | font.append( !f.italic ()?"nonitalic":"italic" ); |
258 | writeEntry( e, font ); | 258 | writeEntry( e, font ); |
259 | } | 259 | } |
260 | 260 | ||
261 | void KConfig::writeEntry( const QString &key, const QDateTime &dt ) | 261 | void KConfig::writeEntry( const QString &key, const QDateTime &dt ) |
262 | { | 262 | { |
263 | mDateTimeMap.insert( mGroup + key, dt ); | 263 | mDateTimeMap.insert( mGroup + key, dt ); |
264 | } | 264 | } |
265 | 265 | ||
266 | void KConfig::load() | 266 | void KConfig::load() |
267 | { | 267 | { |
268 | 268 | ||
269 | 269 | ||
270 | QFile f( mFileName ); | 270 | QFile f( mFileName ); |
271 | if ( !f.open( IO_ReadOnly ) ) { | 271 | if ( !f.open( IO_ReadOnly ) ) { |
272 | //qDebug("KConfig: could not open file %s ",mFileName.latin1() ); | 272 | //qDebug("KConfig: could not open file %s ",mFileName.latin1() ); |
273 | return; | 273 | return; |
274 | } | 274 | } |
275 | 275 | ||
276 | mBoolMap.clear(); | 276 | mBoolMap.clear(); |
277 | mStringMap.clear(); | 277 | mStringMap.clear(); |
278 | 278 | ||
279 | QTextStream t( &f ); | 279 | QTextStream t( &f ); |
280 | 280 | ||
281 | QString line = t.readLine(); | 281 | QString line = t.readLine(); |
282 | 282 | ||
283 | while ( !line.isNull() ) { | 283 | while ( !line.isNull() ) { |
284 | QStringList tokens = QStringList::split( ",", line ); | 284 | QStringList tokens = QStringList::split( ",", line ); |
285 | if ( tokens[0] == "bool" ) { | 285 | if ( tokens[0] == "bool" ) { |
286 | bool value = false; | 286 | bool value = false; |
287 | if ( tokens[2] == "1" ) value = true; | 287 | if ( tokens[2] == "1" ) value = true; |
288 | mBoolMap.insert( tokens[1], value ); | 288 | mBoolMap.insert( tokens[1], value ); |
289 | } else if ( tokens[0] == "QString" ) { | 289 | } else if ( tokens[0] == "QString" ) { |
290 | QString value = tokens[2]; | 290 | QString value = tokens[2]; |
291 | mStringMap.insert( tokens[1], value ); | 291 | mStringMap.insert( tokens[1], value ); |
292 | } else if ( tokens[0] == "QDateTime" ) { | 292 | } else if ( tokens[0] == "QDateTime" ) { |
293 | #if 0 | 293 | #if 0 |
294 | int year = tokens[2].toInt(); | 294 | int year = tokens[2].toInt(); |
295 | QDateTime dt( QDate( year, | 295 | QDateTime dt( QDate( year, |
296 | tokens[3].toInt(), | 296 | tokens[3].toInt(), |
297 | tokens[4].toInt() ), | 297 | tokens[4].toInt() ), |
298 | QTime( tokens[5].toInt(), tokens[6].toInt(), | 298 | QTime( tokens[5].toInt(), tokens[6].toInt(), |
299 | tokens[7].toInt() ) ); | 299 | tokens[7].toInt() ) ); |
300 | mDateTimeMap.insert( tokens[1], dt ); | 300 | mDateTimeMap.insert( tokens[1], dt ); |
301 | #endif | 301 | #endif |
302 | } | 302 | } |
303 | 303 | ||
304 | line = t.readLine(); | 304 | line = t.readLine(); |
305 | } | 305 | } |
306 | } | 306 | } |
307 | 307 | ||
308 | void KConfig::sync() | 308 | void KConfig::sync() |
309 | { | 309 | { |
310 | 310 | ||
311 | if ( !mDirty ) return; | 311 | if ( !mDirty ) return; |
312 | //qDebug("KConfig::sync() %s ",mFileName.latin1() ); | 312 | //qDebug("KConfig::sync() %s ",mFileName.latin1() ); |
313 | //kdDebug() << "KConfig::sync(): " << mFileName << endl; | 313 | //kdDebug() << "KConfig::sync(): " << mFileName << endl; |
314 | 314 | ||
315 | //US I took the following code from a newer version of KDE | 315 | //US I took the following code from a newer version of KDE |
316 | // Create the containing dir if needed | 316 | // Create the containing dir if needed |
317 | KURL path; | 317 | KURL path; |
318 | path.setPath(mFileName); | 318 | path.setPath(mFileName); |
319 | QString dir=path.directory(); | 319 | QString dir=path.directory(); |
320 | KStandardDirs::makeDir(dir); | 320 | KStandardDirs::makeDir(dir); |
321 | 321 | ||
322 | QFile f( mFileName ); | 322 | QFile f( mFileName ); |
323 | if ( !f.open( IO_WriteOnly ) ) { | 323 | if ( !f.open( IO_WriteOnly ) ) { |
324 | 324 | ||
325 | qDebug("KConfig::sync() Can't open file %s ",mFileName.latin1() ); | 325 | qDebug("KConfig::sync() Can't open file %s ",mFileName.latin1() ); |
326 | 326 | ||
327 | return; | 327 | return; |
328 | } | 328 | } |
329 | 329 | ||
330 | QTextStream t( &f ); | 330 | QTextStream t( &f ); |
331 | 331 | ||
332 | QMap<QString,bool>::ConstIterator itBool; | 332 | QMap<QString,bool>::ConstIterator itBool; |
333 | for( itBool = mBoolMap.begin(); itBool != mBoolMap.end(); ++itBool ) { | 333 | for( itBool = mBoolMap.begin(); itBool != mBoolMap.end(); ++itBool ) { |
334 | t << "bool," << itBool.key() << "," << ( *itBool ? "1" : "0" ) << endl; | 334 | t << "bool," << itBool.key() << "," << ( *itBool ? "1" : "0" ) << endl; |
335 | } | 335 | } |
336 | 336 | ||
337 | QMap<QString,QString>::ConstIterator itString; | 337 | QMap<QString,QString>::ConstIterator itString; |
338 | for( itString = mStringMap.begin(); itString != mStringMap.end(); ++itString ) { | 338 | for( itString = mStringMap.begin(); itString != mStringMap.end(); ++itString ) { |
339 | t << "QString," << itString.key() << "," << (*itString ) << endl; | 339 | t << "QString," << itString.key() << "," << (*itString ) << endl; |
340 | } | 340 | } |
341 | 341 | ||
342 | QMap<QString,QDateTime>::ConstIterator itDateTime; | 342 | QMap<QString,QDateTime>::ConstIterator itDateTime; |
343 | for( itDateTime = mDateTimeMap.begin(); itDateTime != mDateTimeMap.end(); ++itDateTime ) { | 343 | for( itDateTime = mDateTimeMap.begin(); itDateTime != mDateTimeMap.end(); ++itDateTime ) { |
344 | QDateTime dt = *itDateTime; | 344 | QDateTime dt = *itDateTime; |
345 | t << "QDateTime," << itDateTime.key() << "," | 345 | t << "QDateTime," << itDateTime.key() << "," |
346 | << dt.date().year() << "," | 346 | << dt.date().year() << "," |
347 | << dt.date().month() << "," | 347 | << dt.date().month() << "," |
348 | << dt.date().day() << "," | 348 | << dt.date().day() << "," |
349 | << dt.time().hour() << "," | 349 | << dt.time().hour() << "," |
350 | << dt.time().minute() << "," | 350 | << dt.time().minute() << "," |
351 | << dt.time().second() << endl; | 351 | << dt.time().second() << endl; |
352 | } | 352 | } |
353 | 353 | ||
354 | f.close(); | 354 | f.close(); |
355 | 355 | ||
356 | mDirty = false; | 356 | mDirty = false; |
357 | } | 357 | } |
358 | 358 | ||
359 | 359 | ||
360 | //US I took the following deleteGroup method from a newer version from KDE. | 360 | //US I took the following deleteGroup method from a newer version from KDE. |
361 | /** | 361 | /** |
362 | * Deletes a configuration entry group | 362 | * Deletes a configuration entry group |
363 | * | 363 | * |
364 | * If the group is not empty and bDeep is false, nothing gets | 364 | * If the group is not empty and bDeep is false, nothing gets |
365 | * deleted and false is returned. | 365 | * deleted and false is returned. |
366 | * If this group is the current group and it is deleted, the | 366 | * If this group is the current group and it is deleted, the |
367 | * current group is undefined and should be set with setGroup() | 367 | * current group is undefined and should be set with setGroup() |
368 | * before the next operation on the configuration object. | 368 | * before the next operation on the configuration object. |
369 | * | 369 | * |
370 | * @param group The name of the group | 370 | * @param group The name of the group |
371 | * returns true if we deleted at least one entry. | 371 | * returns true if we deleted at least one entry. |
372 | */ | 372 | */ |
373 | bool KConfig::deleteGroup( const QString& group) | 373 | bool KConfig::deleteGroup( const QString& group) |
374 | { | 374 | { |
375 | bool dirty = false; | 375 | bool dirty = false; |
376 | int pos; | 376 | int pos; |
377 | 377 | ||
378 | QMap<QString,bool>::Iterator itBool = mBoolMap.begin(); | 378 | QMap<QString,bool>::Iterator itBool = mBoolMap.begin(); |
379 | QMap<QString,bool>::Iterator delBool; | 379 | QMap<QString,bool>::Iterator delBool; |
380 | 380 | ||
381 | while ( itBool != mBoolMap.end() ) { | 381 | while ( itBool != mBoolMap.end() ) { |
382 | pos = itBool.key().find( group ); | 382 | pos = itBool.key().find( group ); |
383 | if (pos == 0) { | 383 | if (pos == 0) { |
384 | delBool = itBool; | 384 | delBool = itBool; |
385 | ++itBool; | 385 | ++itBool; |
386 | mBoolMap.remove(delBool); | 386 | mBoolMap.remove(delBool); |
387 | dirty = true; | 387 | dirty = true; |
388 | } else | 388 | } else |
389 | ++itBool; | 389 | ++itBool; |
390 | 390 | ||
391 | } | 391 | } |
392 | /* | 392 | /* |
393 | for( itBool = mBoolMap.begin(); itBool != mBoolMap.end(); ++itBool ) | 393 | for( itBool = mBoolMap.begin(); itBool != mBoolMap.end(); ++itBool ) |
394 | { | 394 | { |
395 | pos = itBool.key().find( group ); | 395 | pos = itBool.key().find( group ); |
396 | if (pos == 0) { | 396 | if (pos == 0) { |
397 | mBoolMap.remove(itBool); | 397 | mBoolMap.remove(itBool); |
398 | dirty = true; | 398 | dirty = true; |
399 | } | 399 | } |
400 | } | 400 | } |
401 | */ | 401 | */ |
402 | QMap<QString,QString>::Iterator itString = mStringMap.begin(); | 402 | QMap<QString,QString>::Iterator itString = mStringMap.begin(); |
403 | QMap<QString,QString>::Iterator delString ; | 403 | QMap<QString,QString>::Iterator delString ; |
404 | while( itString != mStringMap.end() ) { | 404 | while( itString != mStringMap.end() ) { |
405 | pos = itString.key().find( group ); | 405 | pos = itString.key().find( group ); |
406 | if (pos == 0) { | 406 | if (pos == 0) { |
407 | delString = itString; | 407 | delString = itString; |
408 | ++itString; | 408 | ++itString; |
409 | mStringMap.remove(delString); | 409 | mStringMap.remove(delString); |
410 | //qDebug("delte++++++++++++++++++ "); | 410 | //qDebug("delte++++++++++++++++++ "); |
411 | dirty = true; | 411 | dirty = true; |
412 | } else | 412 | } else |
413 | ++itString; | 413 | ++itString; |
414 | 414 | ||
415 | } | 415 | } |
416 | /* this leads to a memory access violation | 416 | /* this leads to a memory access violation |
417 | for( itString = mStringMap.begin(); itString != mStringMap.end(); ++itString ) | 417 | for( itString = mStringMap.begin(); itString != mStringMap.end(); ++itString ) |
418 | { | 418 | { |
419 | pos = itString.key().find( group ); | 419 | pos = itString.key().find( group ); |
420 | if (pos == 0) { | 420 | if (pos == 0) { |
421 | mStringMap.remove(itString); | 421 | mStringMap.remove(itString); |
422 | dirty = true; | 422 | dirty = true; |
423 | } | 423 | } |
424 | } | 424 | } |
425 | */ | 425 | */ |
426 | QMap<QString,QDateTime>::Iterator itDateTime= mDateTimeMap.begin(); | 426 | QMap<QString,QDateTime>::Iterator itDateTime= mDateTimeMap.begin(); |
427 | QMap<QString,QDateTime>::Iterator delDateTime; | 427 | QMap<QString,QDateTime>::Iterator delDateTime; |
428 | while ( itDateTime != mDateTimeMap.end() ) { | 428 | while ( itDateTime != mDateTimeMap.end() ) { |
429 | pos = itDateTime.key().find( group ); | 429 | pos = itDateTime.key().find( group ); |
430 | if (pos == 0) { | 430 | if (pos == 0) { |
431 | delDateTime = itDateTime; | 431 | delDateTime = itDateTime; |
432 | ++itDateTime; | 432 | ++itDateTime; |
433 | mDateTimeMap.remove(delDateTime); | 433 | mDateTimeMap.remove(delDateTime); |
434 | dirty = true; | 434 | dirty = true; |
435 | } else | 435 | } else |
436 | ++itDateTime; | 436 | ++itDateTime; |
437 | 437 | ||
438 | } | 438 | } |
439 | /* | 439 | /* |
440 | for( itDateTime = mDateTimeMap.begin(); itDateTime != mDateTimeMap.end(); ++itDateTime ) | 440 | for( itDateTime = mDateTimeMap.begin(); itDateTime != mDateTimeMap.end(); ++itDateTime ) |
441 | { | 441 | { |
442 | pos = itDateTime.key().find( group ); | 442 | pos = itDateTime.key().find( group ); |
443 | if (pos == 0) { | 443 | if (pos == 0) { |
444 | mDateTimeMap.remove(itDateTime); | 444 | mDateTimeMap.remove(itDateTime); |
445 | dirty = true; | 445 | dirty = true; |
446 | } | 446 | } |
447 | } | 447 | } |
448 | */ | 448 | */ |
449 | 449 | ||
450 | if (dirty) | 450 | if (dirty) |
451 | mDirty = true; | 451 | mDirty = true; |
452 | 452 | ||
453 | return dirty; | 453 | return dirty; |
454 | 454 | ||
455 | } | 455 | } |
456 | 456 | ||
457 | //US I took the following hasGroup method from a newer version from KDE. | 457 | //US I took the following hasGroup method from a newer version from KDE. |
458 | /** | 458 | /** |
459 | * Returns true if the specified group is known about. | 459 | * Returns true if the specified group is known about. |
460 | * | 460 | * |
461 | * @param group The group to search for. | 461 | * @param group The group to search for. |
462 | * @return Whether the group exists. | 462 | * @return Whether the group exists. |
463 | */ | 463 | */ |
464 | bool KConfig::hasGroup(const QString &group) const | 464 | bool KConfig::hasGroup(const QString &group) const |
465 | { | 465 | { |
466 | QMap<QString,bool>::ConstIterator itBool; | 466 | QMap<QString,bool>::ConstIterator itBool; |
467 | for( itBool = mBoolMap.begin(); itBool != mBoolMap.end(); ++itBool ) | 467 | for( itBool = mBoolMap.begin(); itBool != mBoolMap.end(); ++itBool ) |
468 | { | 468 | { |
469 | if (itBool.key().find( group ) == 0) { | 469 | if (itBool.key().find( group ) == 0) { |
470 | return true; | 470 | return true; |
471 | } | 471 | } |
472 | } | 472 | } |
473 | 473 | ||
474 | QMap<QString,QString>::ConstIterator itString; | 474 | QMap<QString,QString>::ConstIterator itString; |
475 | for( itString = mStringMap.begin(); itString != mStringMap.end(); ++itString ) | 475 | for( itString = mStringMap.begin(); itString != mStringMap.end(); ++itString ) |
476 | { | 476 | { |
477 | if (itString.key().find( group ) == 0) { | 477 | if (itString.key().find( group ) == 0) { |
478 | return true; | 478 | return true; |
479 | } | 479 | } |
480 | } | 480 | } |
481 | 481 | ||
482 | QMap<QString,QDateTime>::ConstIterator itDateTime; | 482 | QMap<QString,QDateTime>::ConstIterator itDateTime; |
483 | for( itDateTime = mDateTimeMap.begin(); itDateTime != mDateTimeMap.end(); ++itDateTime ) | 483 | for( itDateTime = mDateTimeMap.begin(); itDateTime != mDateTimeMap.end(); ++itDateTime ) |
484 | { | 484 | { |
485 | if (itDateTime.key().find( group ) == 0) { | 485 | if (itDateTime.key().find( group ) == 0) { |
486 | return true; | 486 | return true; |
487 | } | 487 | } |
488 | } | 488 | } |
489 | 489 | ||
490 | return false; | 490 | return false; |
491 | } | 491 | } |
492 | 492 | ||
493 | void KConfig::deleteEntry( const QString &key) | 493 | void KConfig::deleteEntry( const QString &key) |
494 | { | 494 | { |
495 | bool dirty = false; | 495 | bool dirty = false; |
496 | 496 | ||
497 | QMap<QString,bool>::Iterator itBool = mBoolMap.find( mGroup + key ); | 497 | QMap<QString,bool>::Iterator itBool = mBoolMap.find( mGroup + key ); |
498 | if ( itBool != mBoolMap.end() ) { | 498 | if ( itBool != mBoolMap.end() ) { |
499 | mBoolMap.remove(itBool); | 499 | mBoolMap.remove(itBool); |
500 | dirty = true; | 500 | dirty = true; |
501 | } | 501 | } |
502 | 502 | ||
503 | 503 | ||
504 | QMap<QString,QString>::Iterator itString = mStringMap.find( mGroup + key ); | 504 | QMap<QString,QString>::Iterator itString = mStringMap.find( mGroup + key ); |
505 | if ( itString != mStringMap.end() ) { | 505 | if ( itString != mStringMap.end() ) { |
506 | mStringMap.remove(itString); | 506 | mStringMap.remove(itString); |
507 | dirty = true; | 507 | dirty = true; |
508 | } | 508 | } |
509 | 509 | ||
510 | 510 | ||
511 | QMap<QString,QDateTime>::Iterator itDateTime = mDateTimeMap.find( mGroup + key ); | 511 | QMap<QString,QDateTime>::Iterator itDateTime = mDateTimeMap.find( mGroup + key ); |
512 | if ( itDateTime != mDateTimeMap.end() ) { | 512 | if ( itDateTime != mDateTimeMap.end() ) { |
513 | mDateTimeMap.remove(itDateTime); | 513 | mDateTimeMap.remove(itDateTime); |
514 | dirty = true; | 514 | dirty = true; |
515 | } | 515 | } |
516 | 516 | ||
517 | if (dirty) | 517 | if (dirty) |
518 | mDirty = true; | 518 | mDirty = true; |
519 | 519 | ||
520 | } | 520 | } |
521 | 521 | ||
522 | //US | 522 | //US |
523 | QString KConfig::getFileName() | 523 | QString KConfig::getFileName() |
524 | { | 524 | { |
525 | return mFileName; | 525 | return mFileName; |
526 | } | 526 | } |
527 | 527 | ||
528 | bool KConfig::hasKey( const QString &key) | 528 | bool KConfig::hasKey( const QString &key) |
529 | { | 529 | { |
530 | QMap<QString,bool>::Iterator itBool = mBoolMap.find( mGroup + key ); | 530 | QMap<QString,bool>::Iterator itBool = mBoolMap.find( mGroup + key ); |
531 | if ( itBool != mBoolMap.end() ) { | 531 | if ( itBool != mBoolMap.end() ) { |
532 | return true; | 532 | return true; |
533 | } | 533 | } |
534 | 534 | ||
535 | QMap<QString,QString>::Iterator itString = mStringMap.find( mGroup + key ); | 535 | QMap<QString,QString>::Iterator itString = mStringMap.find( mGroup + key ); |
536 | if ( itString != mStringMap.end() ) { | 536 | if ( itString != mStringMap.end() ) { |
537 | return true; | 537 | return true; |
538 | } | 538 | } |
539 | 539 | ||
540 | QMap<QString,QDateTime>::Iterator itDateTime = mDateTimeMap.find( mGroup + key ); | 540 | QMap<QString,QDateTime>::Iterator itDateTime = mDateTimeMap.find( mGroup + key ); |
541 | if ( itDateTime != mDateTimeMap.end() ) { | 541 | if ( itDateTime != mDateTimeMap.end() ) { |
542 | return true; | 542 | return true; |
543 | } | 543 | } |
544 | 544 | ||
545 | return false; | 545 | return false; |
546 | } | 546 | } |
547 | 547 | ||