Mercurial > octave

diff libgui/src/main-window.cc @ 27263:99aa1bcb8848

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 dccdc3b001a2
children d75c7b4f7645
line wrap: on
line diff
--- a/libgui/src/main-window.cc	Thu Jul 18 09:58:41 2019 -0400
+++ b/libgui/src/main-window.cc	Thu Jul 18 11:23:22 2019 -0400
@@ -336,10 +336,10 @@
 
     if (! file.isEmpty ())
       {
-        octave_link& olnk
-          = __get_octave_link__ ("main_window::handle_save_workspace_request");
-
-        olnk.post_event
+        event_manager& evmgr
+          = __get_event_manager__ ("main_window::handle_save_workspace_request");
+
+        evmgr.post_event
           ([file] (void)
            {
              // INTERPRETER THREAD
@@ -368,10 +368,10 @@
 
     if (! file.isEmpty ())
       {
-        octave_link& olnk
-          = __get_octave_link__ ("main_window::handle_load_workspace_request");
-
-        olnk.post_event
+        event_manager& evmgr
+          = __get_event_manager__ ("main_window::handle_load_workspace_request");
+
+        evmgr.post_event
           ([file] (void)
            {
              // INTERPRETER THREAD
@@ -383,9 +383,9 @@
 
              tree_evaluator& tw = interp.get_evaluator ();
 
-             octave_link& xolnk = interp.get_octave_link ();
-
-             xolnk.set_workspace (true, tw.get_symbol_info ());
+             event_manager& xevmgr = interp.get_event_manager ();
+
+             xevmgr.set_workspace (true, tw.get_symbol_info ());
            });
       }
   }
@@ -396,10 +396,10 @@
       {
         std::string file = file_arg.toStdString ();
 
-        octave_link& olnk
-          = __get_octave_link__ ("main_window::handle_open_any_request");
-
-        olnk.post_event
+        event_manager& evmgr
+          = __get_event_manager__ ("main_window::handle_open_any_request");
+
+        evmgr.post_event
           ([file] (void)
            {
              // INTERPRETER THREAD
@@ -413,19 +413,19 @@
              // variables.
              tree_evaluator& tw = interp.get_evaluator ();
 
-             octave_link& xolnk = interp.get_octave_link ();
-
-             xolnk.set_workspace (true, tw.get_symbol_info ());
+             event_manager& xevmgr = interp.get_event_manager ();
+
+             xevmgr.set_workspace (true, tw.get_symbol_info ());
            });
       }
   }
 
   void main_window::handle_clear_workspace_request (void)
   {
-    octave_link& olnk
-      = __get_octave_link__ ("main_window::handle_clear_workspace_request");
-
-    olnk.post_event
+    event_manager& evmgr
+      = __get_event_manager__ ("main_window::handle_clear_workspace_request");
+
+    evmgr.post_event
       ([] (void)
        {
          // INTERPRETER THREAD
@@ -439,10 +439,10 @@
 
   void main_window::handle_clear_command_window_request (void)
   {
-    octave_link& olnk
-      = __get_octave_link__ ("main_window::handle_clear_command_window_request");
-
-    olnk.post_event
+    event_manager& evmgr
+      = __get_event_manager__ ("main_window::handle_clear_command_window_request");
+
+    evmgr.post_event
       ([] (void)
        {
          // INTERPRETER THREAD
@@ -454,10 +454,10 @@
 
   void main_window::handle_clear_history_request (void)
   {
-    octave_link& olnk
-      = __get_octave_link__ ("main_window::handle_clear_history_request");
-
-    olnk.post_event
+    event_manager& evmgr
+      = __get_event_manager__ ("main_window::handle_clear_history_request");
+
+    evmgr.post_event
       ([] (void)
        {
          // INTERPRETER THREAD
@@ -473,10 +473,10 @@
   {
     if (command_window_has_focus ())
       {
-        octave_link& olnk
-          = __get_octave_link__ ("main_window::handle_undo_request");
-
-        olnk.post_event
+        event_manager& evmgr
+          = __get_event_manager__ ("main_window::handle_undo_request");
+
+        evmgr.post_event
           ([] (void)
            {
              // INTERPRETER THREAD
@@ -496,10 +496,10 @@
     std::string old_name = old_name_arg.toStdString ();
     std::string new_name = new_name_arg.toStdString ();
 
-    octave_link& olnk
-      = __get_octave_link__ ("main_window::handle_rename_variable_request");
-
-    olnk.post_event
+    event_manager& evmgr
+      = __get_event_manager__ ("main_window::handle_rename_variable_request");
+
+    evmgr.post_event
       ([old_name, new_name] (void)
        {
          // INTERPRETER THREAD
@@ -515,9 +515,9 @@
 
              tree_evaluator& tw = interp.get_evaluator ();
 
-             octave_link& xolnk = interp.get_octave_link ();
-
-             xolnk.set_workspace (true, tw.get_symbol_info ());
+             event_manager& xevmgr = interp.get_event_manager ();
+
+             xevmgr.set_workspace (true, tw.get_symbol_info ());
            }
 
          // FIXME: if this action fails, do we need a way to display that info
@@ -547,7 +547,7 @@
   {
     interpreter_qobject *interp_qobj = m_octave_qobj.interpreter_qobj ();
 
-    octave_qt_link_events *qt_link = interp_qobj->qt_link ();
+    qt_interpreter_events *qt_link = interp_qobj->qt_link ();
 
     // Wait for worker to suspend
     qt_link->lock ();
@@ -886,10 +886,10 @@
       {
         m_default_encoding = new_default_encoding;
 
-        octave_link& olnk
-          = __get_octave_link__ ("main_window::notice_settings");
-
-        olnk.post_event
+        event_manager& evmgr
+          = __get_event_manager__ ("main_window::notice_settings");
+
+        evmgr.post_event
           ([this] (void)
            {
              // INTERPRETER THREAD
@@ -1010,10 +1010,10 @@
 
     if (fileInfo.exists () && fileInfo.isDir ())
       {
-        octave_link& olnk
-          = __get_octave_link__ ("main_window::set_current_working_directory");
-
-        olnk.post_event
+        event_manager& evmgr
+          = __get_event_manager__ ("main_window::set_current_working_directory");
+
+        evmgr.post_event
           ([xdir] (void)
            {
              // INTERPRETER THREAD
@@ -1048,10 +1048,10 @@
 
   void main_window::execute_command_in_terminal (const QString& command)
   {
-    octave_link& olnk
-      = __get_octave_link__ ("main_window::execute_command_in_terminal");
-
-    olnk.post_event
+    event_manager& evmgr
+      = __get_event_manager__ ("main_window::execute_command_in_terminal");
+
+    evmgr.post_event
       ([command] (void)
        {
          // INTERPRETER THREAD
@@ -1070,10 +1070,10 @@
 
   void main_window::run_file_in_terminal (const QFileInfo& info)
   {
-    octave_link& olnk
-      = __get_octave_link__ ("main_window::run_file_in_terminal");
-
-    olnk.post_event
+    event_manager& evmgr
+      = __get_event_manager__ ("main_window::run_file_in_terminal");
+
+    evmgr.post_event
       ([info] (void)
        {
          // INTERPRETER THREAD
@@ -1091,7 +1091,7 @@
 
              std::string path = info.absolutePath ().toStdString ();
 
-             if (octave_qt_link_events::file_in_path (file_path, path))
+             if (qt_interpreter_events::file_in_path (file_path, path))
                command_editor::replace_line (function_name.toStdString ());
            }
          else
@@ -1119,10 +1119,10 @@
 
   void main_window::handle_new_figure_request (void)
   {
-    octave_link& olnk
-      = __get_octave_link__ ("main_window::handle_new_figure_request");
-
-    olnk.post_event
+    event_manager& evmgr
+      = __get_event_manager__ ("main_window::handle_new_figure_request");
+
+    evmgr.post_event
       ([] (void)
        {
          // INTERPRETER THREAD
@@ -1167,10 +1167,10 @@
 
   void main_window::debug_continue (void)
   {
-    octave_link& olnk
-      = __get_octave_link__ ("main_window::debug_continue");
-
-    olnk.post_event
+    event_manager& evmgr
+      = __get_event_manager__ ("main_window::debug_continue");
+
+    evmgr.post_event
       ([this] (void)
        {
          // INTERPRETER THREAD
@@ -1187,10 +1187,10 @@
 
   void main_window::debug_step_into (void)
   {
-    octave_link& olnk
-      = __get_octave_link__ ("main_window::debug_step_into");
-
-    olnk.post_event
+    event_manager& evmgr
+      = __get_event_manager__ ("main_window::debug_step_into");
+
+    evmgr.post_event
       ([this] (void)
        {
          // INTERPRETER THREAD
@@ -1211,10 +1211,10 @@
       {
         // We are in debug mode, just call dbstep.
 
-        octave_link& olnk
-          = __get_octave_link__ ("main_window::debug_step_over");
-
-        olnk.post_event
+        event_manager& evmgr
+          = __get_event_manager__ ("main_window::debug_step_over");
+
+        evmgr.post_event
           ([this] (void)
            {
              // INTERPRETER THREAD
@@ -1237,9 +1237,9 @@
 
   void main_window::debug_step_out (void)
   {
-    octave_link& olnk = __get_octave_link__ ("main_window::debug_step_out");
-
-    olnk.post_event
+    event_manager& evmgr = __get_event_manager__ ("main_window::debug_step_out");
+
+    evmgr.post_event
       ([this] (void)
        {
          // INTERPRETER THREAD
@@ -1256,9 +1256,9 @@
 
   void main_window::debug_quit (void)
   {
-    octave_link& olnk = __get_octave_link__ ("main_window::debug_quit");
-
-    olnk.post_event
+    event_manager& evmgr = __get_event_manager__ ("main_window::debug_quit");
+
+    evmgr.post_event
       ([this] (void)
        {
          // INTERPRETER THREAD
@@ -1805,9 +1805,9 @@
 
   void main_window::set_screen_size (int ht, int wd)
   {
-    octave_link& olnk = __get_octave_link__ ("main_window::set_screen_size");
-
-    olnk.post_event
+    event_manager& evmgr = __get_event_manager__ ("main_window::set_screen_size");
+
+    evmgr.post_event
       ([ht, wd] (void)
        {
          // INTERPRETER THREAD
@@ -1893,10 +1893,10 @@
     // interpreter.  That will eventually cause the workspace view in the
     // GUI to be updated.
 
-    octave_link& olnk
-      = __get_octave_link__ ("main_window::handle_variable_editor_update");
-
-    olnk.post_event
+    event_manager& evmgr
+      = __get_event_manager__ ("main_window::handle_variable_editor_update");
+
+    evmgr.post_event
       ([] (void)
        {
          // INTERPRETER THREAD
@@ -1906,9 +1906,9 @@
 
          tree_evaluator& tw = interp.get_evaluator ();
 
-         octave_link& xolnk = interp.get_octave_link ();
-
-         xolnk.set_workspace (true, tw.get_symbol_info (), false);
+         event_manager& xevmgr = interp.get_event_manager ();
+
+         xevmgr.set_workspace (true, tw.get_symbol_info (), false);
        });
   }
 
@@ -1916,9 +1916,9 @@
   {
     e->ignore ();
 
-    octave_link& olnk = __get_octave_link__ ("main_window::closeEvent");
-
-    olnk.post_event
+    event_manager& evmgr = __get_event_manager__ ("main_window::closeEvent");
+
+    evmgr.post_event
       ([] (void)
        {
          // INTERPRETER THREAD
@@ -1956,7 +1956,7 @@
 
     interpreter_qobject *interp_qobj = m_octave_qobj.interpreter_qobj ();
 
-    octave_qt_link_events *qt_link = interp_qobj->qt_link ();
+    qt_interpreter_events *qt_link = interp_qobj->qt_link ();
 
     connect (qt_link,
              SIGNAL (edit_variable_signal (const QString&,
@@ -2135,7 +2135,7 @@
   {
     interpreter_qobject *interp_qobj = m_octave_qobj.interpreter_qobj ();
 
-    octave_qt_link_events *qt_link = interp_qobj->qt_link ();
+    qt_interpreter_events *qt_link = interp_qobj->qt_link ();
 
     connect (qt_link,
              SIGNAL (set_workspace_signal (bool, bool, const symbol_info_list&)),
@@ -2740,7 +2740,7 @@
 
     interpreter_qobject *interp_qobj = m_octave_qobj.interpreter_qobj ();
 
-    octave_qt_link_events *qt_link = interp_qobj->qt_link ();
+    qt_interpreter_events *qt_link = interp_qobj->qt_link ();
 
     // Wait for worker to suspend
     qt_link->lock ();