Mercurial > octave-nkf
diff libgui/src/main-window.cc @ 16426:203976ae18d1
use signals for octave_link::enter_debugger_event and octave_link::exit_debugger_event
* main-window.h, main-window.cc
(main_window::handle_insert_debugger_pointer_request,
main_window::handle_delete_debugger_pointer_request): Delete.
(main_window::construct): Delete signal connections from
_octave_qt_event_listener::insert_debugger_pointer_signal to
main_window::handle_insert_debugger_pointer_request and from
_octave_qt_event_listener::delete_debugger_pointer_signal to
main_window::handle_delete_debugger_pointer_request.
Connect _octave_qt_link::insert_debugger_pointer_signal signal to
_file_editor::handle_insert_debugger_pointer_request.
Connect _octave_qt_link::delete_debugger_pointer_signal signal to
_file_editor::handle_delete_debugger_pointer_request.
* octave-qt-event-listener.h, octave-qt-event-listener.cc
octave_qt_event_listener::insert_debugger_pointer,
octave_qt_event_listener::delete_debugger_pointer): Delete.
(octave_qt_event_listener::insert_debugger_pointer_signal
octave_qt_event_listener::delete_debugger_pointer_signal):
Delete signals.
* octave-qt-link.h, octave-qt-link.cc
(octave_qt_link::do_insert_debugger_pointer,
octave_qt_link::do_delete_debugger_pointer): Now private.
Emit signals instead of using event_listener.
* octave-event-listener.h
(octave_event_listener::insert_debugger_pointer,
octave_event_listener::delete_debugger_pointer): Delete.
* octave-link.h (octave_link::do_insert_debugger_pointer,
octave_link::do_delete_debugger_pointer): Delete.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Thu, 04 Apr 2013 02:09:56 -0400 |
| parents | 8ff9006cedc3 |
| children | 5982d469f79b |
line wrap: on
line diff
--- a/libgui/src/main-window.cc Thu Apr 04 01:50:57 2013 -0400 +++ b/libgui/src/main-window.cc Thu Apr 04 02:09:56 2013 -0400 @@ -495,22 +495,6 @@ } void -main_window::handle_insert_debugger_pointer_request (const QString& file, int line) -{ -#ifdef HAVE_QSCINTILLA - _file_editor->handle_insert_debugger_pointer_request (file, line); -#endif -} - -void -main_window::handle_delete_debugger_pointer_request (const QString& file, int line) -{ -#ifdef HAVE_QSCINTILLA - _file_editor->handle_delete_debugger_pointer_request (file, line); -#endif -} - -void main_window::debug_continue () { octave_link::post_event (this, &main_window::debug_continue_callback); @@ -1175,14 +1159,6 @@ this, SLOT (handle_quit_debug_mode ())); - connect (_octave_qt_event_listener, - SIGNAL (insert_debugger_pointer_signal (const QString&, int)), this, - SLOT (handle_insert_debugger_pointer_request (const QString&, int))); - - connect (_octave_qt_event_listener, - SIGNAL (delete_debugger_pointer_signal (const QString&, int)), this, - SLOT (handle_delete_debugger_pointer_request (const QString&, int))); - // FIXME -- is it possible to eliminate the event_listenter? _octave_qt_link = new octave_qt_link (); @@ -1197,6 +1173,16 @@ _file_editor, SLOT (handle_edit_file_request (const QString&))); + connect (_octave_qt_link, + SIGNAL (insert_debugger_pointer_signal (const QString&, int)), + _file_editor, + SLOT (handle_insert_debugger_pointer_request (const QString&, int))); + + connect (_octave_qt_link, + SIGNAL (delete_debugger_pointer_signal (const QString&, int)), + _file_editor, + SLOT (handle_delete_debugger_pointer_request (const QString&, int))); + octave_link::connect_link (_octave_qt_link); octave_link::register_event_listener (_octave_qt_event_listener);