-rw-r--r-- | microkde/kconfig.cpp | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/microkde/kconfig.cpp b/microkde/kconfig.cpp index 940196e..12063ca 100644 --- a/microkde/kconfig.cpp +++ b/microkde/kconfig.cpp | |||
@@ -1,9 +1,11 @@ | |||
1 | #include <qfile.h> | 1 | #include <qfile.h> |
2 | #include <qtextstream.h> | 2 | #include <q3textstream.h> |
3 | #include <qwidget.h> | 3 | #include <qwidget.h> |
4 | //Added by qt3to4: | ||
5 | #include <Q3ValueList> | ||
4 | 6 | ||
5 | #include "kdebug.h" | 7 | #include "kdebug.h" |
6 | 8 | ||
7 | #include "kurl.h" | 9 | #include "kurl.h" |
8 | #include "kstandarddirs.h" | 10 | #include "kstandarddirs.h" |
9 | #include "kconfig.h" | 11 | #include "kconfig.h" |
@@ -50,17 +52,17 @@ void KConfig::setGroup( const QString &group ) | |||
50 | //US | 52 | //US |
51 | QString KConfig::group() const { | 53 | QString KConfig::group() const { |
52 | return mGroup; | 54 | return mGroup; |
53 | } | 55 | } |
54 | 56 | ||
55 | //US added method | 57 | //US added method |
56 | QValueList<int> KConfig::readIntListEntry( const QString & key) | 58 | Q3ValueList<int> KConfig::readIntListEntry( const QString & key) |
57 | { | 59 | { |
58 | // qDebug("KConfig::readIntListEntry key=%s:", key.latin1()); | 60 | // qDebug("KConfig::readIntListEntry key=%s:", key.latin1()); |
59 | 61 | ||
60 | QValueList<int> result; | 62 | Q3ValueList<int> result; |
61 | 63 | ||
62 | QMap<QString,QString>::ConstIterator mit = mStringMap.find( mGroup + key ); | 64 | QMap<QString,QString>::ConstIterator mit = mStringMap.find( mGroup + key ); |
63 | 65 | ||
64 | if ( mit == mStringMap.end() ) { | 66 | if ( mit == mStringMap.end() ) { |
65 | return result; | 67 | return result; |
66 | } | 68 | } |
@@ -108,13 +110,13 @@ QString KConfig::readEntry( const QString &key, const QString &def ) | |||
108 | 110 | ||
109 | return QString::fromUtf8((*it).latin1()); | 111 | return QString::fromUtf8((*it).latin1()); |
110 | } | 112 | } |
111 | 113 | ||
112 | QSize KConfig::readSizeEntry( const QString &key, QSize* def ) | 114 | QSize KConfig::readSizeEntry( const QString &key, QSize* def ) |
113 | { | 115 | { |
114 | QValueList<int> intlist = readIntListEntry(key); | 116 | Q3ValueList<int> intlist = readIntListEntry(key); |
115 | 117 | ||
116 | if (intlist.count() < 2) | 118 | if (intlist.count() < 2) |
117 | { | 119 | { |
118 | if (def) | 120 | if (def) |
119 | return *def; | 121 | return *def; |
120 | else | 122 | else |
@@ -191,17 +193,17 @@ QDateTime KConfig::readDateTimeEntry( const QString &key, const QDateTime *def ) | |||
191 | } | 193 | } |
192 | 194 | ||
193 | return *it; | 195 | return *it; |
194 | } | 196 | } |
195 | 197 | ||
196 | //US added method | 198 | //US added method |
197 | void KConfig::writeEntry( const QString &key, const QValueList<int> &value) | 199 | void KConfig::writeEntry( const QString &key, const Q3ValueList<int> &value) |
198 | { | 200 | { |
199 | QStringList valuesAsStrings; | 201 | QStringList valuesAsStrings; |
200 | 202 | ||
201 | QValueList<int>::ConstIterator it; | 203 | Q3ValueList<int>::ConstIterator it; |
202 | 204 | ||
203 | for( it = value.begin(); it != value.end(); ++it ) | 205 | for( it = value.begin(); it != value.end(); ++it ) |
204 | { | 206 | { |
205 | valuesAsStrings << QString::number(*it); | 207 | valuesAsStrings << QString::number(*it); |
206 | } | 208 | } |
207 | 209 | ||
@@ -243,13 +245,13 @@ void KConfig::writeEntry( const QString & e, const QColor & c ) | |||
243 | l.append( QString::number ( c.blue() ) ); | 245 | l.append( QString::number ( c.blue() ) ); |
244 | writeEntry( e.utf8(), l ); | 246 | writeEntry( e.utf8(), l ); |
245 | } | 247 | } |
246 | 248 | ||
247 | void KConfig::writeEntry( const QString & e, const QSize & s ) | 249 | void KConfig::writeEntry( const QString & e, const QSize & s ) |
248 | { | 250 | { |
249 | QValueList<int> intlist; | 251 | Q3ValueList<int> intlist; |
250 | intlist << s.width() << s.height(); | 252 | intlist << s.width() << s.height(); |
251 | writeEntry( e, intlist ); | 253 | writeEntry( e, intlist ); |
252 | } | 254 | } |
253 | 255 | ||
254 | void KConfig::writeEntry( const QString & e , const QFont & f ) | 256 | void KConfig::writeEntry( const QString & e , const QFont & f ) |
255 | { | 257 | { |
@@ -268,26 +270,26 @@ void KConfig::writeEntry( const QString &key, const QDateTime &dt ) | |||
268 | 270 | ||
269 | void KConfig::load() | 271 | void KConfig::load() |
270 | { | 272 | { |
271 | 273 | ||
272 | 274 | ||
273 | QFile f( mFileName ); | 275 | QFile f( mFileName ); |
274 | if ( !f.open( IO_ReadOnly ) ) { | 276 | if ( !f.open( QIODevice::ReadOnly ) ) { |
275 | //qDebug("KConfig: could not open file %s ",mFileName.latin1() ); | 277 | //qDebug("KConfig: could not open file %s ",mFileName.latin1() ); |
276 | return; | 278 | return; |
277 | } | 279 | } |
278 | 280 | ||
279 | mBoolMap.clear(); | 281 | mBoolMap.clear(); |
280 | mStringMap.clear(); | 282 | mStringMap.clear(); |
281 | 283 | ||
282 | QTextStream t( &f ); | 284 | Q3TextStream t( &f ); |
283 | t.setEncoding( QTextStream::Latin1 ); | 285 | t.setEncoding( Q3TextStream::Latin1 ); |
284 | QString line = t.readLine(); | 286 | QString line = t.readLine(); |
285 | 287 | ||
286 | while ( !line.isNull() ) { | 288 | while ( !line.isNull() ) { |
287 | QStringList tokens = QStringList::split( ",", line ); | 289 | QStringList tokens = line.split(','); |
288 | if ( tokens[0] == "bool" ) { | 290 | if ( tokens[0] == "bool" ) { |
289 | bool value = false; | 291 | bool value = false; |
290 | if ( tokens[2] == "1" ) value = true; | 292 | if ( tokens[2] == "1" ) value = true; |
291 | mBoolMap.insert( tokens[1], value ); | 293 | mBoolMap.insert( tokens[1], value ); |
292 | } else if ( tokens[0] == "QString" ) { | 294 | } else if ( tokens[0] == "QString" ) { |
293 | QString value = tokens[2]; | 295 | QString value = tokens[2]; |
@@ -320,21 +322,21 @@ void KConfig::sync() | |||
320 | KURL path; | 322 | KURL path; |
321 | path.setPath(mFileName); | 323 | path.setPath(mFileName); |
322 | QString dir=path.directory(); | 324 | QString dir=path.directory(); |
323 | KStandardDirs::makeDir(dir); | 325 | KStandardDirs::makeDir(dir); |
324 | 326 | ||
325 | QFile f( mFileName ); | 327 | QFile f( mFileName ); |
326 | if ( !f.open( IO_WriteOnly ) ) { | 328 | if ( !f.open( QIODevice::WriteOnly ) ) { |
327 | 329 | ||
328 | qDebug("KConfig::sync() Can't open file %s ",mFileName.latin1() ); | 330 | qDebug("KConfig::sync() Can't open file %s ",mFileName.latin1() ); |
329 | 331 | ||
330 | return; | 332 | return; |
331 | } | 333 | } |
332 | 334 | ||
333 | QTextStream t( &f ); | 335 | Q3TextStream t( &f ); |
334 | t.setEncoding( QTextStream::Latin1 ); | 336 | t.setEncoding( Q3TextStream::Latin1 ); |
335 | QMap<QString,bool>::ConstIterator itBool; | 337 | QMap<QString,bool>::ConstIterator itBool; |
336 | for( itBool = mBoolMap.begin(); itBool != mBoolMap.end(); ++itBool ) { | 338 | for( itBool = mBoolMap.begin(); itBool != mBoolMap.end(); ++itBool ) { |
337 | t << "bool," << itBool.key() << "," << ( *itBool ? "1" : "0" ) << endl; | 339 | t << "bool," << itBool.key() << "," << ( *itBool ? "1" : "0" ) << endl; |
338 | } | 340 | } |
339 | 341 | ||
340 | QMap<QString,QString>::ConstIterator itString; | 342 | QMap<QString,QString>::ConstIterator itString; |