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

List:       kde-commits
Subject:    kdelibs/kate/part
From:       Christoph Cullmann <crossfire () babylon2k ! de>
Date:       2003-12-30 12:03:11
Message-ID: 20031230120311.AD89D2A6E () office ! kde ! org
[Download RAW message or body]

CVS commit by cullmann: 

little cleanup of view cleanups ;)


  M +11 -15    katedocument.cpp   1.677
  M +2 -3      kateview.cpp   1.330


--- kdelibs/kate/part/katedocument.cpp  #1.676:1.677
@@ -266,21 +266,9 @@ KateDocument::KateDocument ( bool bSingl
 KateDocument::~KateDocument()
 {
-  //BEGIN spellcheck stuff
-  if( m_kspell )
-  {
-    m_kspell->setAutoDelete(true);
-    m_kspell->cleanUp(); // need a way to wait for this to complete
-    delete m_kspell;
-  }
-  //END
-
-  //
-  // other stuff
-  //
-  if ( !m_bSingleViewMode )
+  if (!singleViewMode())
   {
+    // clean up remaining views
     m_views.setAutoDelete( true );
     m_views.clear();
-    m_views.setAutoDelete( false );
   }
 
@@ -300,4 +288,12 @@ KateDocument::~KateDocument()
   m_plugins.clear ();
   
+  // kspell stuff
+  if( m_kspell )
+  {
+    m_kspell->setAutoDelete(true);
+    m_kspell->cleanUp(); // need a way to wait for this to complete
+    delete m_kspell;
+  }
+   
   delete m_config;
   delete m_indenter;

--- kdelibs/kate/part/kateview.cpp  #1.329:1.330
@@ -150,9 +150,8 @@ KateView::KateView( KateDocument *doc, Q
 KateView::~KateView()
 {
-  if (m_doc && !m_doc->singleViewMode())
-    m_doc->removeView( this );
-
   m_doc->disableAllPluginsGUI (this);
     
+  m_doc->removeView( this );
+    
   delete m_viewInternal;
   delete m_codeCompletion;


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