Mercurial > octave

diff libgui/src/m-editor/file-editor-tab.cc @ 27247:9e5a825bb966

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
replace more explicit callback functions with lambda expressions * Canvas.h, Canvas.cc (Canvas::annotation_callback): Delete. Replace uses of callback functions with equivalent lambda expressions in calls to octave_link::post_event. * file-editor-tab.h, file-editor-tab.cc (file_editor_tab::add_breakpoint_event): New function. (file_editor_tab::add_breakpoint_callback, file_editor_tab::remove_breakpoint_callback, file_editor_tab::remove_all_breakpoints_callback): Delete. Replace uses of callback functions with equivalent lambda expressions in calls to octave_link::post_event. Use add_breakpoint_event to consolidate the calls to post_event for this action to a single function. * variable-editor-model.h, variable-editor-model.cc (variable_editor_model::eval_expr_event): New function. (variable_editor_model::init_from_oct): Eliminate unnecessary function parameter. (variable_editor_model::set_data_oct, variable_editor_model::eval_oct): Delete. Replace uses of callback functions with equivalent lambda expressions in calls to octave_link::post_event. Use eval_expr_event to consolidate the calls to post_event for this action to a single function.
author John W. Eaton <jwe@octave.org>
date Fri, 12 Jul 2019 19:26:55 -0400
parents ac92aa74fa1a
children 420611c61298
line wrap: on
line diff
--- a/libgui/src/m-editor/file-editor-tab.cc	Fri Jul 12 15:34:28 2019 -0700
+++ b/libgui/src/m-editor/file-editor-tab.cc	Fri Jul 12 19:26:55 2019 -0400
@@ -434,8 +434,7 @@
       {
         info.condition = cond.toStdString ();
 
-        octave_link::post_event
-          (this, &file_editor_tab::add_breakpoint_callback, info);
+        add_breakpoint_event (info);
       }
   }
 
@@ -1065,51 +1064,6 @@
     _edit_area->markerDeleteAll (marker::bookmark);
   }
 
-  void file_editor_tab::add_breakpoint_callback (const bp_info& info)
-  {
-    bp_table::intmap line_info;
-    line_info[0] = info.line;
-
-    if (octave_qt_link::file_in_path (info.file, info.dir))
-      {
-        bp_table& bptab = __get_bp_table__ ("octave_qt_link::file_in_path");
-
-        bp_table::intmap bpmap
-          = bptab.add_breakpoint (info.function_name, "", line_info, info.condition);
-
-        // Store some info breakpoint
-        if (m_breakpoint_info.remove_next && (bpmap.size() > 0))
-          {
-            bp_table::intmap::iterator bp_it = bpmap.begin();
-            m_breakpoint_info.remove_line = bp_it->second;
-            m_breakpoint_info.remove_next = false;
-          }
-      }
-  }
-
-  void file_editor_tab::remove_breakpoint_callback (const bp_info& info)
-  {
-    bp_table::intmap line_info;
-    line_info[0] = info.line;
-
-    if (octave_qt_link::file_in_path (info.file, info.dir))
-      {
-        bp_table& bptab = __get_bp_table__ ("remove_breakpoint_callback");
-
-        bptab.remove_breakpoint (info.function_name, line_info);
-      }
-  }
-
-  void file_editor_tab::remove_all_breakpoints_callback (const bp_info& info)
-  {
-    if (octave_qt_link::file_in_path (info.file, info.dir))
-      {
-        bp_table& bptab = __get_bp_table__ ("remove_all_breakpoints_callback");
-
-        bptab.remove_all_breakpoints_in_file (info.function_name, true);
-      }
-  }
-
   file_editor_tab::bp_info::bp_info (const QString& fname, int l,
                                      const QString& cond)
     : line (l), file (fname.toStdString ()), condition (cond.toStdString ())
@@ -1146,8 +1100,7 @@
   {
     bp_info info (_file_name, line, condition);
 
-    octave_link::post_event
-      (this, &file_editor_tab::add_breakpoint_callback, info);
+    add_breakpoint_event (info);
   }
 
   void file_editor_tab::handle_request_remove_breakpoint (int line)
@@ -1155,7 +1108,18 @@
     bp_info info (_file_name, line);
 
     octave_link::post_event
-      (this, &file_editor_tab::remove_breakpoint_callback, info);
+      ([info] (void)
+       {
+         bp_table::intmap line_info;
+         line_info[0] = info.line;
+
+         if (octave_qt_link::file_in_path (info.file, info.dir))
+           {
+             bp_table& bptab = __get_bp_table__ ("file_editor_tab::handle_request_remove_breakpoint");
+
+             bptab.remove_breakpoint (info.function_name, line_info);
+           }
+       });
   }
 
   void file_editor_tab::toggle_breakpoint (const QWidget *ID)
@@ -1227,7 +1191,15 @@
     bp_info info (_file_name);
 
     octave_link::post_event
-      (this, &file_editor_tab::remove_all_breakpoints_callback, info);
+      ([info] (void)
+       {
+         if (octave_qt_link::file_in_path (info.file, info.dir))
+           {
+             bp_table& bptab = __get_bp_table__ ("file_editor_tab::remove_all_breakpoints");
+
+             bptab.remove_all_breakpoints_in_file (info.function_name, true);
+           }
+       });
   }
 
   void file_editor_tab::scintilla_command (const QWidget *ID, unsigned int sci_msg)
@@ -1345,6 +1317,32 @@
     _find_dialog->save_data (&m_find_dlg_data);
   }
 
+  void file_editor_tab::add_breakpoint_event (const bp_info& info)
+  {
+    octave_link::post_event
+      ([this, info] (void)
+       {
+         bp_table::intmap line_info;
+         line_info[0] = info.line;
+
+         if (octave_qt_link::file_in_path (info.file, info.dir))
+           {
+             bp_table& bptab = __get_bp_table__ ("file_editor_tab::add_breakpoint_event");
+
+             bp_table::intmap bpmap
+               = bptab.add_breakpoint (info.function_name, "", line_info, info.condition);
+
+             // Store some info breakpoint
+             if (m_breakpoint_info.remove_next && (bpmap.size() > 0))
+               {
+                 bp_table::intmap::iterator bp_it = bpmap.begin();
+                 m_breakpoint_info.remove_line = bp_it->second;
+                 m_breakpoint_info.remove_next = false;
+               }
+           }
+       });
+  }
+
   // This methos creates the find dialog in way that is at first suitable
   // for re-creating it after the toplevel of the editor has changed.
   // The find dialog is initially creatied, activated and shown with find ()