summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2004-07-05 13:18:57 (UTC)
committer zautrix <zautrix>2004-07-05 13:18:57 (UTC)
commitca6ce5868aef5e925ff2e61d363f71e43d2b7d7b (patch) (unidiff)
tree5cb350d3a9bd3451fcf5184a2dd8d36ddd330f0e
parent93f9b1e0a8935210b03a094ce18949b7197041aa (diff)
downloadkdepimpi-ca6ce5868aef5e925ff2e61d363f71e43d2b7d7b.zip
kdepimpi-ca6ce5868aef5e925ff2e61d363f71e43d2b7d7b.tar.gz
kdepimpi-ca6ce5868aef5e925ff2e61d363f71e43d2b7d7b.tar.bz2
Fix of endless loop when removin resources
Diffstat (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 f8e362e..71db891 100644
--- a/microkde/kconfig.cpp
+++ b/microkde/kconfig.cpp
@@ -344,13 +344,14 @@ bool KConfig::deleteGroup( const QString& group)
344 pos = itBool.key().find( group ); 344 pos = itBool.key().find( group );
345 if (pos == 0) { 345 if (pos == 0) {
346 delBool = itBool; 346 delBool = itBool;
347 ++itBool; 347 ++itBool;
348 mBoolMap.remove(delBool); 348 mBoolMap.remove(delBool);
349 dirty = true; 349 dirty = true;
350 } 350 } else
351 ++itBool;
351 352
352 } 353 }
353 /* 354 /*
354 for( itBool = mBoolMap.begin(); itBool != mBoolMap.end(); ++itBool ) 355 for( itBool = mBoolMap.begin(); itBool != mBoolMap.end(); ++itBool )
355 { 356 {
356 pos = itBool.key().find( group ); 357 pos = itBool.key().find( group );
@@ -367,13 +368,14 @@ bool KConfig::deleteGroup( const QString& group)
367 if (pos == 0) { 368 if (pos == 0) {
368 delString = itString; 369 delString = itString;
369 ++itString; 370 ++itString;
370 mStringMap.remove(delString); 371 mStringMap.remove(delString);
371 //qDebug("delte++++++++++++++++++ "); 372 //qDebug("delte++++++++++++++++++ ");
372 dirty = true; 373 dirty = true;
373 } 374 } else
375 ++itString;
374 376
375 } 377 }
376 /* this leads to a memory access violation 378 /* this leads to a memory access violation
377 for( itString = mStringMap.begin(); itString != mStringMap.end(); ++itString ) 379 for( itString = mStringMap.begin(); itString != mStringMap.end(); ++itString )
378 { 380 {
379 pos = itString.key().find( group ); 381 pos = itString.key().find( group );
@@ -389,13 +391,14 @@ bool KConfig::deleteGroup( const QString& group)
389 pos = itDateTime.key().find( group ); 391 pos = itDateTime.key().find( group );
390 if (pos == 0) { 392 if (pos == 0) {
391 delDateTime = itDateTime; 393 delDateTime = itDateTime;
392 ++itDateTime; 394 ++itDateTime;
393 mDateTimeMap.remove(delDateTime); 395 mDateTimeMap.remove(delDateTime);
394 dirty = true; 396 dirty = true;
395 } 397 } else
398 ++itDateTime;
396 399
397 } 400 }
398 /* 401 /*
399 for( itDateTime = mDateTimeMap.begin(); itDateTime != mDateTimeMap.end(); ++itDateTime ) 402 for( itDateTime = mDateTimeMap.begin(); itDateTime != mDateTimeMap.end(); ++itDateTime )
400 { 403 {
401 pos = itDateTime.key().find( group ); 404 pos = itDateTime.key().find( group );