[QGIS Commit] r8498 - trunk/qgis/src/app

[svn_qgis at osgeo.org]

Author: wonder
Date: 2008-05-23 11:35:29 -0400 (Fri, 23 May 2008)
New Revision: 8498

Modified:
   trunk/qgis/src/app/qgspythondialog.cpp
   trunk/qgis/src/app/qgspythondialog.h
   trunk/qgis/src/app/qgspythonutils.cpp
Log:
Fixed uninstalling redirection from python console


Modified: trunk/qgis/src/app/qgspythondialog.cpp
===================================================================
--- trunk/qgis/src/app/qgspythondialog.cpp	2008-05-23 15:27:49 UTC (rev 8497)
+++ trunk/qgis/src/app/qgspythondialog.cpp	2008-05-23 15:35:29 UTC (rev 8498)
@@ -17,6 +17,8 @@
 #include "qgspythondialog.h"
 #include "qgspythonutils.h"
 
+#include <QCloseEvent>
+
 QgsPythonDialog::QgsPythonDialog(QgisInterface* pIface, QWidget *parent)
   : QDialog(parent)
 {
@@ -28,7 +30,6 @@
 
 QgsPythonDialog::~QgsPythonDialog()
 {
-  QgsPythonUtils::uninstallConsoleHooks();
 }
 
 QString QgsPythonDialog::escapeHtml(QString text)
@@ -72,3 +73,10 @@
   txtHistory->moveCursor(QTextCursor::End);
   txtHistory->ensureCursorVisible();
 }
+
+void QgsPythonDialog::closeEvent(QCloseEvent* event)
+{
+  QgsPythonUtils::uninstallConsoleHooks();
+  
+  QDialog::closeEvent(event);
+}

Modified: trunk/qgis/src/app/qgspythondialog.h
===================================================================
--- trunk/qgis/src/app/qgspythondialog.h	2008-05-23 15:27:49 UTC (rev 8497)
+++ trunk/qgis/src/app/qgspythondialog.h	2008-05-23 15:35:29 UTC (rev 8498)
@@ -20,6 +20,7 @@
 #include "ui_qgspythondialog.h"
 
 class QgisInterface;
+class QCloseEvent;
 
 class QgsPythonDialog : public QDialog, private Ui::QgsPythonDialog
 {
@@ -36,6 +37,10 @@
     
     void on_edtCmdLine_returnPressed();
     
+  protected:
+    
+    void closeEvent(QCloseEvent* event);
+    
   private:
     
     QgisInterface* mIface;

Modified: trunk/qgis/src/app/qgspythonutils.cpp
===================================================================
--- trunk/qgis/src/app/qgspythonutils.cpp	2008-05-23 15:27:49 UTC (rev 8497)
+++ trunk/qgis/src/app/qgspythonutils.cpp	2008-05-23 15:35:29 UTC (rev 8498)
@@ -150,10 +150,6 @@
 {
   runString("sys.displayhook = sys.__displayhook__");
   runString("sys.stdout = _old_stdout");
-  
-  // TODO: uninstalling stdout redirection doesn't work
-
-  //installErrorHook();
 }