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

List:       kde-commits
Subject:    kdebase/kate/app
From:       Christoph Cullmann <crossfire () babylon2k ! de>
Date:       2003-10-19 12:50:54
[Download RAW message or body]

CVS commit by cullmann: 

don't crash on exit


  M +5 -1      kateapp.cpp   1.71
  M +8 -4      katedocmanager.cpp   1.53
  M +4 -0      katedocmanager.h   1.31
  M +2 -2      katemainwindow.cpp   1.197


--- kdebase/kate/app/kateapp.cpp  #1.70:1.71
@@ -152,4 +153,7 @@ KateApp::~KateApp ()
   //m_docManager->closeAllDocuments();
   delete m_obj;
+  
+  // delete this now, or we crash
+  delete m_docManager;
 }
 

--- kdebase/kate/app/katedocmanager.cpp  #1.52:1.53
@@ -29,8 +29,11 @@
 #include <kate/view.h>
 
+#include <kparts/factory.h>
+
 #include <klocale.h>
 #include <kdebug.h>
 #include <kconfig.h>
 #include <kapplication.h>
+#include <klibloader.h>
 
 #include <qtextcodec.h>
@@ -42,4 +45,6 @@
 KateDocManager::KateDocManager (QObject *parent) : QObject (parent)
 {
+  m_factory = (KParts::Factory *) KLibLoader::self()->factory ("libkatepart");
+
   m_documentManager = new Kate::DocumentManager (this);
   m_docList.setAutoDelete(true);
@@ -56,11 +61,10 @@ KateDocManager::~KateDocManager ()
 {
   delete m_dcop;
-
-  m_docList.setAutoDelete(false);
 }
 
 Kate::Document *KateDocManager::createDoc ()
 {
-  KTextEditor::Document *doc = KTextEditor::createDocument ("libkatepart", this, \
"Kate::Document"); +  KTextEditor::Document *doc = (KTextEditor::Document *) \
m_factory->createPart (0, "", this, "", "KTextEditor::Document"); +  
   m_docList.append((Kate::Document *)doc);
   m_docDict.insert (doc->documentNumber(), (Kate::Document *)doc);

--- kdebase/kate/app/katedocmanager.h  #1.30:1.31
@@ -31,4 +31,6 @@
 #include <qintdict.h>
 
+namespace KParts { class Factory; }
+
 class KConfig;
 class DCOPObject;
@@ -114,4 +116,6 @@ class KateDocManager : public QObject
 
     DCOPObject *m_dcop;
+    
+    KParts::Factory *m_factory;
 };
 

--- kdebase/kate/app/katemainwindow.cpp  #1.196:1.197
@@ -167,5 +167,5 @@ KateMainWindow::KateMainWindow(KateDocMa
 
   // call it as last thing, must be sure everything is already set up ;)
-  setAutoSaveSettings ("MainWindow Settings");//mainDock->setDockSite( \
KDockWidget::DockNone ); +  setAutoSaveSettings ("MainWindow Settings");
 }
 


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