Mercurial > hg > octave-lyh
comparison libgui/src/main-window.h @ 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 | 28136851099a |
children | ad052cdc89ad |
comparison
equal
deleted
inserted
replaced
16420:81ec95768520 | 16421:40d1ddca4db5 |
---|---|
48 #include "history-dockwidget.h" | 48 #include "history-dockwidget.h" |
49 #include "files-dockwidget.h" | 49 #include "files-dockwidget.h" |
50 #include "terminal-dockwidget.h" | 50 #include "terminal-dockwidget.h" |
51 #include "documentation-dockwidget.h" | 51 #include "documentation-dockwidget.h" |
52 #include "octave-qt-event-listener.h" | 52 #include "octave-qt-event-listener.h" |
53 #include "octave-qt-link.h" | |
53 | 54 |
54 /** | 55 /** |
55 * \class MainWindow | 56 * \class MainWindow |
56 * | 57 * |
57 * Represents the main window. | 58 * Represents the main window. |
176 static const int current_directory_max_count = 16; | 177 static const int current_directory_max_count = 16; |
177 QLineEdit * _current_directory_line_edit; | 178 QLineEdit * _current_directory_line_edit; |
178 | 179 |
179 octave_qt_event_listener *_octave_qt_event_listener; | 180 octave_qt_event_listener *_octave_qt_event_listener; |
180 | 181 |
182 octave_qt_link *_octave_qt_link; | |
183 | |
181 // Flag for closing whole application | 184 // Flag for closing whole application |
182 bool _closing; | 185 bool _closing; |
183 }; | 186 }; |
184 | 187 |
185 #endif // MAINWINDOW_H | 188 #endif // MAINWINDOW_H |