Fixed uninstalling redirection from python console

wonder · wonder · commit be58c264cf04 · 2008-05-23T15:35:29.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@8498 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/app/qgspythondialog.cpp b/src/app/qgspythondialog.cpp
@@ -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(QgisInterface* pIface, QWidget *parent)
 
 QgsPythonDialog::~QgsPythonDialog()
 {
-  QgsPythonUtils::uninstallConsoleHooks();
 }
 
 QString QgsPythonDialog::escapeHtml(QString text)
@@ -72,3 +73,10 @@ void QgsPythonDialog::on_edtCmdLine_returnPressed()
   txtHistory->moveCursor(QTextCursor::End);
   txtHistory->ensureCursorVisible();
 }
+
+void QgsPythonDialog::closeEvent(QCloseEvent* event)
+{
+  QgsPythonUtils::uninstallConsoleHooks();
+  
+  QDialog::closeEvent(event);
+}
diff --git a/src/app/qgspythondialog.h b/src/app/qgspythondialog.h
@@ -20,6 +20,7 @@
 #include "ui_qgspythondialog.h"
 
 class QgisInterface;
+class QCloseEvent;
 
 class QgsPythonDialog : public QDialog, private Ui::QgsPythonDialog
 {
@@ -36,6 +37,10 @@ class QgsPythonDialog : public QDialog, private Ui::QgsPythonDialog
     
     void on_edtCmdLine_returnPressed();
     
+  protected:
+    
+    void closeEvent(QCloseEvent* event);
+    
   private:
     
     QgisInterface* mIface;
diff --git a/src/app/qgspythonutils.cpp b/src/app/qgspythonutils.cpp
@@ -150,10 +150,6 @@ void QgsPythonUtils::uninstallConsoleHooks()
 {
   runString("sys.displayhook = sys.__displayhook__");
   runString("sys.stdout = _old_stdout");
-  
-  // TODO: uninstalling stdout redirection doesn't work
-
-  //installErrorHook();
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,8 @@`
`17`	`17`	`#include "qgspythondialog.h"`
`18`	`18`	`#include "qgspythonutils.h"`
`19`	`19`
	`20`	`+#include <QCloseEvent>`
	`21`	`+`
`20`	`22`	`QgsPythonDialog::QgsPythonDialog(QgisInterface* pIface, QWidget *parent)`
`21`	`23`	`: QDialog(parent)`
`22`	`24`	`{`
`@@ -28,7 +30,6 @@ QgsPythonDialog::QgsPythonDialog(QgisInterface* pIface, QWidget *parent)`
`28`	`30`
`29`	`31`	`QgsPythonDialog::~QgsPythonDialog()`
`30`	`32`	`{`
`31`		`- QgsPythonUtils::uninstallConsoleHooks();`
`32`	`33`	`}`
`33`	`34`
`34`	`35`	`QString QgsPythonDialog::escapeHtml(QString text)`
`@@ -72,3 +73,10 @@ void QgsPythonDialog::on_edtCmdLine_returnPressed()`
`72`	`73`	`txtHistory->moveCursor(QTextCursor::End);`
`73`	`74`	`txtHistory->ensureCursorVisible();`
`74`	`75`	`}`
	`76`	`+`
	`77`	`+void QgsPythonDialog::closeEvent(QCloseEvent* event)`
	`78`	`+{`
	`79`	`+ QgsPythonUtils::uninstallConsoleHooks();`
	`80`	`+`
	`81`	`+ QDialog::closeEvent(event);`
	`82`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -150,10 +150,6 @@ void QgsPythonUtils::uninstallConsoleHooks()`
`150`	`150`	`{`
`151`	`151`	`runString("sys.displayhook = sys.__displayhook__");`
`152`	`152`	`runString("sys.stdout = _old_stdout");`
`153`		`-`
`154`		`- // TODO: uninstalling stdout redirection doesn't work`
`155`		`-`
`156`		`- //installErrorHook();`
`157`	`153`	`}`
`158`	`154`
`159`	`155`