SVN commit 541824 by dfaure:

Found the reason why the QObject::destroyed() signal wasn't emitted when closing the window:
missing if(part_manager) before disconnect(part_manager). So disconnect(0) was called and
-everything- got disconnected from DOMTreeWindow. Nasty, heh?

This also fixes the crash when "reopening the dialog when it's already up"
BUG: 127405
CCMAIL: Christian Spiel <e9800675@stud4.tuwien.ac.at>, Leo Savernik <l.savernik@aon.at>


 M  +13 -31    domtreewindow.cpp  
 M  +6 -8      domtreewindow.h  
 M  +2 -2      plugin_domtreeviewer.cpp  
 M  +1 -1      plugin_domtreeviewer.h  


--- branches/KDE/3.5/kdeaddons/konq-plugins/domtreeviewer/domtreewindow.cpp #541823:541824
@@ -57,7 +57,7 @@
 
 DOMTreeWindow::DOMTreeWindow(PluginDomtreeviewer *plugin)
     : KMainWindow( 0, "DOMTreeWindow" ),
-      plugin(plugin), m_view(new DOMTreeView(this, "DOMTreeView", false))
+      m_plugin(plugin), m_view(new DOMTreeView(this, "DOMTreeView", false))
 {
     part_manager = 0;
 
@@ -92,8 +92,6 @@
     connect(view(), SIGNAL(htmlPartChanged(KHTMLPart *)),
     		SLOT(slotHtmlPartChanged(KHTMLPart *)));
 
-    connect(this, SIGNAL(windowClosed()), SLOT(slotDestroyed()));
-
     ManipulationCommand::connect(SIGNAL(error(int, const QString &)),
     				this, SLOT(addMessage(int, const QString &)));
 
@@ -104,7 +102,7 @@
 
 DOMTreeWindow::~DOMTreeWindow()
 {
-    kdDebug(90180) << k_funcinfo << endl;
+    kdDebug(90180) << k_funcinfo << this << endl;
     delete m_commandHistory;
     delete msgdlg;
     delete _config;
@@ -121,16 +119,16 @@
 
 void DOMTreeWindow::setupActions()
 {
-    KStdAction::close(this, SLOT(slotClose()), actionCollection());
+    KStdAction::close(this, SLOT(close()), actionCollection());
 
     KStdAction::cut(this, SLOT(slotCut()), actionCollection())->setEnabled(false);
     KStdAction::copy(this, SLOT(slotCopy()), actionCollection())->setEnabled(false);
     KStdAction::paste(this, SLOT(slotPaste()), actionCollection())->setEnabled(false);
 
     m_commandHistory = new KCommandHistory(actionCollection());
-    
+
     KStdAction::find(this, SLOT(slotFind()), actionCollection());
-    
+
     KStdAction::redisplay(m_view, SLOT(refresh()), actionCollection());
 
     // toggle manipulation dialog
@@ -248,37 +246,20 @@
     }
 }
 
-void DOMTreeWindow::closeEvent(QCloseEvent *event)
-{
-  // HACK: call slot directly as destroyed() isn't
-  // emitted in QObject for some reason
-  plugin->slotDestroyed();
-  event->accept();
-}
-
 void DOMTreeWindow::addMessage(int msg_id, const QString &msg)
 {
   QDateTime t(QDateTime::currentDateTime());
   QString fullmsg = t.toString();
   fullmsg += ":";
-    
+
   if (msg_id != 0)
     fullmsg += " (" + QString::number(msg_id) + ") ";
   fullmsg += msg;
-    
+
   if (msgdlg) msgdlg->addMessage(fullmsg);
   view()->setMessage(msg);
   kdWarning() << fullmsg << endl;
 }
-
-void DOMTreeWindow::slotClose()
-{
-  // HACK: call slot directly as destroyed() isn't
-  // emitted in QObject for some reason
-  plugin->slotDestroyed();
-  deleteLater();
-}
-
 void DOMTreeWindow::slotCut()
 {
   // TODO implement
@@ -345,18 +326,19 @@
 {
     // display the text on the caption
     setCaption(text);
-}    
+}
 
 void DOMTreeWindow::slotHtmlPartChanged(KHTMLPart *p)
 {
   kdDebug(90180) << k_funcinfo << p << endl;
-  
+
   if (p) {
     // set up manager connections
-    disconnect(part_manager);
-    
+    if ( part_manager )
+        disconnect(part_manager);
+
     part_manager = p->manager();
-    
+
     connect(part_manager, SIGNAL(activePartChanged(KParts::Part *)),
     	SLOT(slotActivePartChanged(KParts::Part *)));
     connect(part_manager, SIGNAL(partRemoved(KParts::Part *)),
--- branches/KDE/3.5/kdeaddons/konq-plugins/domtreeviewer/domtreewindow.h #541823:541824
@@ -113,7 +113,7 @@
      * Returns the config object for this plugin.
      */
     KConfig *config() const { return _config; }
-    
+
     /** returns the attribute delete action */
     KAction *deleteAttributeAction() const { return del_attr; }
     /** returns the node delete action */
@@ -126,19 +126,18 @@
      * @param msg message text
      */
     void addMessage(int id, const QString &msg);
-    
+
     /**
      * Displays the message log window.
      */
     void showMessageLog();
-        
+
 protected:
     /**
      * Overridden virtuals for Qt drag 'n drop (XDND)
      */
     virtual void dragEnterEvent(QDragEnterEvent *event);
     virtual void dropEvent(QDropEvent *event);
-    virtual void closeEvent(QCloseEvent *event);
 protected:
     /**
      * This function is called when it is time for the app to save its
@@ -155,7 +154,6 @@
 
 
 private slots:
-    void slotClose();
     void slotCut();
     void slotCopy();
     void slotPaste();
@@ -173,13 +171,13 @@
     void slotActivePartChanged(KParts::Part *);
     void slotPartRemoved(KParts::Part *);
     void slotClosePart();
-    
+
 private:
     void setupAccel();
     void setupActions();
 
 private:
-    PluginDomtreeviewer *plugin;
+    PluginDomtreeviewer *m_plugin;
     DOMTreeView *m_view;
     MessageDialog *msgdlg;
 
@@ -187,7 +185,7 @@
     QPopupMenu *infopanel_ctx;
     QPopupMenu *domtree_ctx;
     KConfig *_config;
-    
+
     KAction *del_tree, *del_attr;
 
     QGuardedPtr<KParts::PartManager> part_manager;
--- branches/KDE/3.5/kdeaddons/konq-plugins/domtreeviewer/plugin_domtreeviewer.cpp #541823:541824
@@ -17,7 +17,7 @@
 
 PluginDomtreeviewer::PluginDomtreeviewer( QObject* parent, const char* name,
 	                                  const QStringList & )
-  : Plugin( parent, name )
+  : Plugin( parent, name ), m_dialog( 0 )
 {
   (void) new KAction( i18n("Show &DOM Tree"),
                       "domtreeviewer", 0,
@@ -33,7 +33,6 @@
 
 void PluginDomtreeviewer::slotShowDOMTree()
 {
-  kdDebug(90180) << k_funcinfo << "m_dialog " << (void *)m_dialog << endl;
   if ( m_dialog )
   {
     delete m_dialog;
@@ -42,6 +41,7 @@
   if (KHTMLPart *part = ::qt_cast<KHTMLPart *>(parent()))
   {
     m_dialog = new DOMTreeWindow(this);
+    connect( m_dialog, SIGNAL( destroyed() ), this, SLOT( slotDestroyed() ) );
     m_dialog->view()->setHtmlPart(part);
     m_dialog->show();
   }
--- branches/KDE/3.5/kdeaddons/konq-plugins/domtreeviewer/plugin_domtreeviewer.h #541823:541824
@@ -21,7 +21,7 @@
   void slotShowDOMTree();
   void slotDestroyed();
 private:
-  QGuardedPtr<DOMTreeWindow> m_dialog;
+  DOMTreeWindow* m_dialog;
 };
 
 #endif