summaryrefslogtreecommitdiffabout
path: root/microkde/kconfig.cpp
Unidiff
Diffstat (limited to 'microkde/kconfig.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--microkde/kconfig.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/microkde/kconfig.cpp b/microkde/kconfig.cpp
index e0b6e99..821e386 100644
--- a/microkde/kconfig.cpp
+++ b/microkde/kconfig.cpp
@@ -56,25 +56,25 @@ QString KConfig::group() const {
56QValueList<int> KConfig::readIntListEntry( const QString & key) 56QValueList<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 }
@@ -126,25 +126,28 @@ QSize KConfig::readSizeEntry( const QString &key, QSize* def )
126 ret.setHeight(intlist[1]); 126 ret.setHeight(intlist[1]);
127 127
128 return ret; 128 return ret;
129} 129}
130 130
131QStringList KConfig::readListEntry( const QString &key ) 131QStringList 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 QStringList temp = QStringList::split(":@:", QString::fromUtf8((*it).latin1()));
139 if ( temp.count() == 1 )
140 return QStringList::split(":", QString::fromUtf8((*it).latin1()));
141 return temp;
139 142
140} 143}
141 144
142bool KConfig::readBoolEntry( const QString &key, bool def ) 145bool KConfig::readBoolEntry( const QString &key, bool def )
143{ 146{
144 QMap<QString,bool>::ConstIterator it = mBoolMap.find( mGroup + key ); 147 QMap<QString,bool>::ConstIterator it = mBoolMap.find( mGroup + key );
145 148
146 if ( it == mBoolMap.end() ) { 149 if ( it == mBoolMap.end() ) {
147 return def; 150 return def;
148 } 151 }
149 152
150 return *it; 153 return *it;
@@ -211,25 +214,25 @@ void KConfig::writeEntry( const QString & key , int num )
211 writeEntry( key, QString::number ( num ) ); 214 writeEntry( key, QString::number ( num ) );
212} 215}
213 216
214void KConfig::writeEntry( const QString &key, const QString &value ) 217void KConfig::writeEntry( const QString &key, const QString &value )
215{ 218{
216 mStringMap.insert( mGroup + key, value.utf8() ); 219 mStringMap.insert( mGroup + key, value.utf8() );
217 220
218 mDirty = true; 221 mDirty = true;
219} 222}
220 223
221void KConfig::writeEntry( const QString &key, const QStringList &value ) 224void KConfig::writeEntry( const QString &key, const QStringList &value )
222{ 225{
223 mStringMap.insert( mGroup + key, value.join(":").utf8() ); 226 mStringMap.insert( mGroup + key, value.join(":@:").utf8() );
224 227
225 mDirty = true; 228 mDirty = true;
226} 229}
227 230
228void KConfig::writeEntry( const QString &key, bool value) 231void KConfig::writeEntry( const QString &key, bool value)
229{ 232{
230 mBoolMap.insert( mGroup + key, value ); 233 mBoolMap.insert( mGroup + key, value );
231 234
232 mDirty = true; 235 mDirty = true;
233} 236}
234 237
235void KConfig::writeEntry( const QString & e, const QColor & c ) 238void KConfig::writeEntry( const QString & e, const QColor & c )