Mercurial > octave
diff libinterp/corefcn/interpreter.cc @ 27263:99aa1bcb8848
rename octave_link and octave_link_events classes, move inside octave namespace
* event-manager.h, event-manager.cc: Rename from octave-link.h and
octave-link.cc.
(class event_manager): Rename from octave_link. Move inside octave
namespace. Change all uses.
(class interpreter_events): Rename from octave_link_events. Move
inside octave namespace. Change all uses.
* libinterp/corefcn/module.mk: Update.
* qt-interpreter-events.h, qt-interpreter-events.cc: Rename from
octave-qt-link.h and octave-qt-link.cc.
(class qt_interpreter_events): Rename from octave_qt_link_events
Change all uses.
* libgui/src/module.mk: Update.
Change all interpreter functions that uses octave_link in their names
to use event_manager instead.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Thu, 18 Jul 2019 11:23:22 -0400 |
| parents | d67f369b3074 |
| children | 596312d4f25d |
line wrap: on
line diff
--- a/libinterp/corefcn/interpreter.cc Thu Jul 18 09:58:41 2019 -0400 +++ b/libinterp/corefcn/interpreter.cc Thu Jul 18 11:23:22 2019 -0400 @@ -46,6 +46,7 @@ #include "defun.h" #include "display.h" #include "error.h" +#include "event-manager.h" #include "file-io.h" #include "graphics.h" #include "help.h" @@ -54,7 +55,6 @@ #include "interpreter.h" #include "load-path.h" #include "load-save.h" -#include "octave-link.h" #include "octave.h" #include "oct-hist.h" #include "oct-map.h" @@ -151,9 +151,9 @@ // to overriding polymorphism for which the GUI can install its own "quit" // yet call this base "quit" could be nice. No link would be needed here. - octave_link& olnk = interp.get_octave_link (); + octave::event_manager& evmgr = interp.get_event_manager (); - if (! olnk.confirm_shutdown ()) + if (! evmgr.confirm_shutdown ()) return ovl (); if (! quit_allowed) @@ -380,7 +380,7 @@ m_url_handle_manager (), m_cdef_manager (*this), m_gtk_manager (), - m_octave_link (), + m_event_manager (), m_interactive (false), m_read_site_files (true), m_read_init_files (m_app_context != nullptr), @@ -1021,8 +1021,8 @@ // If we are attached to a GUI, process pending events and // disable the link. - m_octave_link.process_events (true); - m_octave_link.disable (); + m_event_manager.process_events (true); + m_event_manager.disable (); OCTAVE_SAFE_CALL (m_input_system.clear_input_event_hooks, ());