Mercurial > octave
diff libgui/src/main-window.cc @ 16421:40d1ddca4db5
improve use of octave_link
* octave-link.h, octave-link.cc (octave_link::connect_link): Rename
from octave_link::connect. Change all uses. Allow link to be
disconnected. Don't add object to singleton_cleanup_list.
* main-window.h, main-window.cc (main_window::_octave_qt_link):
New data member.
(main_window::construct): Initialize it.
(main_window::~main_window): Disconnect octave_link and delete
_octave_qt_link.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Wed, 03 Apr 2013 23:35:33 -0400 |
parents | 70032fc70bee |
children | 04c4dd7fd3ce |
line wrap: on
line diff
--- a/libgui/src/main-window.cc Wed Apr 03 23:16:37 2013 -0400 +++ b/libgui/src/main-window.cc Wed Apr 03 23:35:33 2013 -0400 @@ -42,7 +42,6 @@ #include "file-editor.h" #endif #include "main-window.h" -#include "octave-qt-link.h" #include "settings-dialog.h" #include "builtins.h" @@ -71,6 +70,9 @@ if (_octave_qt_event_listener) delete _octave_qt_event_listener; + octave_link::connect_link (0); + delete _octave_qt_link; + #ifdef HAVE_QSCINTILLA if (_file_editor) delete _file_editor; @@ -1210,7 +1212,9 @@ // FIXME -- is it possible to eliminate the event_listenter? - octave_link::connect (new octave_qt_link ()); + _octave_qt_link = new octave_qt_link (); + + octave_link::connect_link (_octave_qt_link); octave_link::register_event_listener (_octave_qt_event_listener); }