1 files changed, 40 insertions, 2 deletions

diff --git a/microkde/kconfig.cpp b/microkde/kconfig.cpp
index 3f23ed2..b882adb 100644
--- a/microkde/kconfig.cpp
+++ b/microkde/kconfig.cpp
@@ -293,124 +293,162 @@ void KConfig::sync()
   
   QMap<QString,bool>::ConstIterator itBool;
   for( itBool = mBoolMap.begin(); itBool != mBoolMap.end(); ++itBool ) {
     t << "bool," << itBool.key() << "," << ( *itBool ? "1" : "0"  ) << endl;
   }
 
   QMap<QString,QString>::ConstIterator itString;
   for( itString = mStringMap.begin(); itString != mStringMap.end(); ++itString ) {
     t << "QString," << itString.key() << "," << (*itString ) << endl;
   }
 
   QMap<QString,QDateTime>::ConstIterator itDateTime;
   for( itDateTime = mDateTimeMap.begin(); itDateTime != mDateTimeMap.end(); ++itDateTime ) {
     QDateTime dt = *itDateTime;
     t << "QDateTime," << itDateTime.key() << ","
       << dt.date().year() << ","
       << dt.date().month() << ","
       << dt.date().day() << ","
       << dt.time().hour() << ","
       << dt.time().minute() << ","
       << dt.time().second() << endl;
   }
 
   f.close();
 
   mDirty = false;
 }
 
 
 //US I took the following deleteGroup method from a newer version from KDE.
 /**
    * Deletes a configuration entry group
    *
    * If the group is not empty and bDeep is false, nothing gets
    * deleted and false is returned.
    * If this group is the current group and it is deleted, the
    * current group is undefined and should be set with setGroup()
    * before the next operation on the configuration object.
    *
    * @param group The name of the group
    *         returns true if we deleted at least one entry.
    */
 bool  KConfig::deleteGroup( const QString& group)
 {
   bool dirty = false;
   int pos;
   
   QMap<QString,bool>::Iterator itBool;
+  QMap<QString,bool>::Iterator delBool;
+  while ( itBool != mBoolMap.end()  ) {
+      pos = itBool.key().find( group );
+      if (pos == 0) {
+          delBool  = itBool;
+          ++itBool;
+          mBoolMap.remove(delBool);
+          dirty = true;
+      }
+      
+  }
+  /*
   for( itBool = mBoolMap.begin(); itBool != mBoolMap.end(); ++itBool )
   {
     pos = itBool.key().find( group );
     if (pos == 0) {
       mBoolMap.remove(itBool);
       dirty = true;
     }
   }
+  */
+  QMap<QString,QString>::Iterator itString = mStringMap.begin();
+  QMap<QString,QString>::Iterator delString ;
+  while( itString != mStringMap.end()  ) {
+      pos = itString.key().find( group );
+      if (pos == 0) {
+          delString = itString;
+          ++itString;
+          mStringMap.remove(delString);
+          //qDebug("delte++++++++++++++++++ ");
+          dirty = true;
+      }
 
-  QMap<QString,QString>::Iterator itString;
+  }
+  /* this leads to a memory access violation
   for( itString = mStringMap.begin(); itString != mStringMap.end(); ++itString )
   {
     pos = itString.key().find( group );
     if (pos == 0) {
       mStringMap.remove(itString);
       dirty = true;
     }
   }
+  */
+  QMap<QString,QDateTime>::Iterator itDateTime= mDateTimeMap.begin();
+  QMap<QString,QDateTime>::Iterator delDateTime;
+  while ( itDateTime != mDateTimeMap.end()  ) {
+      pos = itDateTime.key().find( group );
+      if (pos == 0) {
+          delDateTime = itDateTime;
+          ++itDateTime;
+          mDateTimeMap.remove(delDateTime);
+          dirty = true;
+      }
 
-  QMap<QString,QDateTime>::Iterator itDateTime;
+  }
+  /*
   for( itDateTime = mDateTimeMap.begin(); itDateTime != mDateTimeMap.end(); ++itDateTime )
   {
     pos = itDateTime.key().find( group );
     if (pos == 0) {
       mDateTimeMap.remove(itDateTime);
       dirty = true;
     }
   }
+  */
   
   if (dirty)
      mDirty = true;
   
   return dirty;
 
 }
 
 //US I took the following hasGroup method from a newer version from KDE.
   /**
    * Returns true if the specified group is known about.
    *
    * @param group The group to search for.
    * @return Whether the group exists.
    */
 bool KConfig::hasGroup(const QString &group) const
 {
   QMap<QString,bool>::ConstIterator itBool;
   for( itBool = mBoolMap.begin(); itBool != mBoolMap.end(); ++itBool )
   {
     if (itBool.key().find( group ) == 0) {
       return true;
     }
   }
 
   QMap<QString,QString>::ConstIterator itString;
   for( itString = mStringMap.begin(); itString != mStringMap.end(); ++itString )
   {
     if (itString.key().find( group ) == 0) {
       return true;
     }
   }
 
   QMap<QString,QDateTime>::ConstIterator itDateTime;
   for( itDateTime = mDateTimeMap.begin(); itDateTime != mDateTimeMap.end(); ++itDateTime )
   {
     if (itDateTime.key().find( group ) == 0) {
       return true;
     }
   }
   
   return false;
 }
 
 void KConfig::deleteEntry( const QString &key)
 {
   bool dirty = false;