[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdevelop/lib/qextmdi
From:       Falk Brettschneider <falk.brettschneider () gmx ! de>
Date:       2003-11-09 0:03:22
[Download RAW message or body]

CVS commit by falkbr: 

fixed crash in KDockManager destructor (IDEAl mode only) ;
NO_KDE compile fix


  M +11 -1     kmdidockcontainer.cpp   1.8


--- kdevelop/lib/qextmdi/kmdidockcontainer.cpp  #1.7:1.8
@@ -26,4 +26,5 @@
 #ifdef NO_KDE
 #include "kmdidummy.h"
+#include "qapplication.h"
 #else
 #include <kdebug.h>
@@ -117,5 +118,7 @@ KMdiDockContainer::KMdiDockContainer(QWi
 KMdiDockContainer::~KMdiDockContainer()
 {       
-  for (QMap<KMdiDockWidget*,int>::iterator it=m_map.begin();it!=m_map.end();++it) {
+  QMap<KMdiDockWidget*,int>::iterator it;
+  while (m_map.count()) {
+        it = m_map.begin();
         KMdiDockWidget *w=it.key();
           if (m_overlapButtons.contains(w)) {
@@ -123,4 +126,6 @@ KMdiDockContainer::~KMdiDockContainer()
             m_overlapButtons.remove(w);
           }
+    m_map.remove(w);
+    w->undock();
   }
         deactivated(this);
@@ -263,4 +268,5 @@ void KMdiDockContainer::removeWidget(KDo
   tabClicked(id);
   m_tb->removeTab(id);
+  m_ws->removeWidget(w);
   m_map.remove(w);
   m_revMap.remove(id);
@@ -438,5 +444,9 @@ void KMdiDockContainer::load(QDomElement
     m_tb->setTab(it1.current()->id(),false);
   }
+#ifdef NO_KDE
+  qApp->syncX();
+#else
   kapp->syncX();
+#endif
   m_delayedRaise=-1;
 


[prev in list] [next in list] [prev in thread] [next in thread]