Mercurial > octave

diff libinterp/corefcn/event-manager.h @ 28857:43ad651cf5a0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
eliminate unnecessary uses of octave:: namespace qualifier Affected files: graphics-init.cc, octave-qscintilla.cc, octave-qobject.h, qt-application.h, workspace-view.cc, call-stack.cc, dynamic-ld.cc, error.cc, error.h, event-manager.h, fcn-info.cc, ft-text-renderer.cc, gl-render.cc, gl2ps-print.cc, graphics-toolkit.cc, input.cc, load-path.cc, oct-hist.cc, oct-stream.cc, pager.cc, stack-frame.cc, symscope.cc, sysdep.cc, __ode15__.cc, cdef-class.cc, ov-fcn-handle.cc, ov.cc, ov.h, oct-parse.yy, pt-classdef.h, pt-eval.cc, Range.cc, Range.h, dir-ops.h, file-stat.cc, lo-sysdep.cc, lo-utils.cc, oct-glob.cc, and url-transfer.cc.
author John W. Eaton <jwe@octave.org>
date Mon, 05 Oct 2020 15:19:15 -0400
parents aba2c4eadb83
children 450920c987b8
line wrap: on
line diff
--- a/libinterp/corefcn/event-manager.h	Mon Oct 05 13:57:00 2020 -0400
+++ b/libinterp/corefcn/event-manager.h	Mon Oct 05 15:19:15 2020 -0400
@@ -44,7 +44,7 @@
 namespace octave
 {
   typedef std::function<void (void)> fcn_callback;
-  typedef std::function<void (octave::interpreter&)> meth_callback;
+  typedef std::function<void (interpreter&)> meth_callback;
 
   class symbol_info_list;
 
@@ -210,7 +210,7 @@
 
     virtual void
     set_workspace (bool /*top_level*/, bool /*debug*/,
-                   const octave::symbol_info_list& /*syminfo*/,
+                   const symbol_info_list& /*syminfo*/,
                    bool /*update_variable_editor*/)
     { }
 
@@ -371,7 +371,7 @@
 
     void update_path_dialog (void)
     {
-      if (octave::application::is_gui_running () && enabled ())
+      if (application::is_gui_running () && enabled ())
         instance->update_path_dialog ();
     }
 
@@ -519,19 +519,19 @@
     // Methods for removing/renaming files which might be open in editor
     void file_remove (const std::string& old_name, const std::string& new_name)
     {
-      if (octave::application::is_gui_running () && enabled ())
+      if (application::is_gui_running () && enabled ())
         instance->file_remove (old_name, new_name);
     }
 
     void file_renamed (bool load_new)
     {
-      if (octave::application::is_gui_running () && enabled ())
+      if (application::is_gui_running () && enabled ())
         instance->file_renamed (load_new);
     }
 
     void set_workspace (void);
 
-    void set_workspace (bool top_level, const octave::symbol_info_list& syminfo,
+    void set_workspace (bool top_level, const symbol_info_list& syminfo,
                         bool update_variable_editor = true)
     {
       if (enabled ())
@@ -621,10 +621,10 @@
   protected:
 
     // Semaphore to lock access to the event queue.
-    octave::mutex *event_queue_mutex;
+    mutex *event_queue_mutex;
 
     // Event Queue.
-    octave::event_queue gui_event_queue;
+    event_queue gui_event_queue;
 
     bool debugging;
     bool link_enabled;