Mercurial > octave

diff libinterp/corefcn/event-manager.cc @ 29961:7d6709900da7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
eliminate octave:: namespace tags in DEFUN and DEFMETHOD and more Files affected: __betainc__.cc, __contourc__.cc, __eigs__.cc, __expint__.cc, __ftp__.cc, __gammainc__.cc, __ichol__.cc, __ilu__.cc, __magick_read__.cc, __pchip_deriv__.cc, __qp__.cc, amd.cc, balance.cc, besselj.cc, bsxfun.cc, call-stack.cc, ccolamd.cc, cellfun.cc, chol.cc, colamd.cc, colloc.cc, conv2.cc, daspk.cc, dasrt.cc, dassl.cc, data.cc, defaults.cc, dirfns.cc, display.cc, dlmread.cc, dmperm.cc, dot.cc, eig.cc, ellipj.cc, environment.cc, error.cc, event-manager.cc, fft.cc, fft2.cc, fftn.cc, file-io.cc, find.cc, gcd.cc, getgrent.cc, getpwent.cc, getrusage.cc, gsvd.cc, hash.cc, help.cc, hess.cc, hex2num.cc, input.cc, inv.cc, jsondecode.cc, jsonencode.cc, load-path.cc, load-save.cc, lookup.cc, lsode.cc, lu.cc, max.cc, mgorth.cc, oct-hist.cc, ordqz.cc, ordschur.cc, pager.cc, pr-output.cc, psi.cc, qr.cc, quad.cc, quadcc.cc, qz.cc, rand.cc, regexp.cc, schur.cc, settings.cc, sighandlers.cc, sparse.cc, spparms.cc, sqrtm.cc, stream-euler.cc, strfind.cc, strfns.cc, sub2ind.cc, svd.cc, symbfact.cc, symtab.cc, syscalls.cc, sysdep.cc, time.cc, toplev.cc, tril.cc, typecast.cc, urlwrite.cc, utils.cc, variables.cc, __delaunayn__.cc, __fltk_uigetfile__.cc, __glpk__.cc, __init_gnuplot__.cc, __ode15__.cc, __voronoi__.cc, audiodevinfo.cc, audioread.cc, convhulln.cc, fftw.cc, gzip.cc, ov-cell.cc, ov-class.cc, ov-classdef.cc, ov-fcn-handle.cc, ov-struct.cc, ov-typeinfo.cc, ov-usr-fcn.cc, octave.cc, lex.ll, oct-parse.yy, profiler.cc, andpt-eval.cc.
author John W. Eaton <jwe@octave.org>
date Sat, 14 Aug 2021 22:48:52 -0400
parents 939bef0b66e0
children 71d738ed015d
line wrap: on
line diff
--- a/libinterp/corefcn/event-manager.cc	Sat Aug 14 21:50:26 2021 -0400
+++ b/libinterp/corefcn/event-manager.cc	Sat Aug 14 22:48:52 2021 -0400
@@ -201,7 +201,7 @@
 {
   if (interp.experimental_terminal_widget ())
     {
-      if (! octave::application::is_gui_running ())
+      if (! application::is_gui_running ())
         {
           // FIXME: Currently, the following action is queued and
           // executed in a Qt event loop and we return immediately to
@@ -210,7 +210,7 @@
           // waiting until the GUI exits to return to the command
           // prompt, similar to the way the UI* functions work?
 
-          octave::event_manager& evmgr = interp.get_event_manager ();
+          event_manager& evmgr = interp.get_event_manager ();
 
           evmgr.start_gui ();
         }
@@ -229,7 +229,7 @@
 Undocumented internal function.
 @end deftypefn */)
 {
-  octave::event_manager& evmgr = interp.get_event_manager ();
+  event_manager& evmgr = interp.get_event_manager ();
 
   return ovl (evmgr.enabled ());
 }
@@ -242,14 +242,14 @@
 {
   octave_value retval;
 
-  octave::event_manager& evmgr = interp.get_event_manager ();
+  event_manager& evmgr = interp.get_event_manager ();
 
   if (args.length () == 1)
     {
       std::string file
         = args(0).xstring_value ("first argument must be filename");
 
-      octave::flush_stdout ();
+      flush_stdout ();
 
       retval = evmgr.edit_file (file);
     }
@@ -258,7 +258,7 @@
       std::string file
         = args(0).xstring_value ("first argument must be filename");
 
-      octave::flush_stdout ();
+      flush_stdout ();
 
       retval = evmgr.prompt_new_edit_file (file);
     }
@@ -283,9 +283,9 @@
       std::string btn3 = args(4).xstring_value ("invalid arguments");
       std::string btndef = args(5).xstring_value ("invalid arguments");
 
-      octave::flush_stdout ();
+      flush_stdout ();
 
-      octave::event_manager& evmgr = interp.get_event_manager ();
+      event_manager& evmgr = interp.get_event_manager ();
 
       retval = evmgr.question_dialog (msg, title, btn1, btn2, btn3, btndef);
     }
@@ -313,16 +313,16 @@
 
   octave_idx_type nel;
 
-  octave::event_manager::filter_list filter_lst;
+  event_manager::filter_list filter_lst;
 
   for (octave_idx_type i = 0; i < flist.rows (); i++)
     filter_lst.push_back (std::make_pair (flist(i,0),
                                           (flist.columns () > 1
                                            ? flist(i,1) : "")));
 
-  octave::flush_stdout ();
+  flush_stdout ();
 
-  octave::event_manager& evmgr = interp.get_event_manager ();
+  event_manager& evmgr = interp.get_event_manager ();
 
   std::list<std::string> items_lst
     = evmgr.file_dialog (filter_lst, title, filename, pathname, multi_on);
@@ -401,9 +401,9 @@
   std::string ok_string = args(6).string_value ();
   std::string cancel_string = args(7).string_value ();
 
-  octave::flush_stdout ();
+  flush_stdout ();
 
-  octave::event_manager& evmgr = interp.get_event_manager ();
+  event_manager& evmgr = interp.get_event_manager ();
 
   std::pair<std::list<int>, int> result
     = evmgr.list_dialog (list_lst, mode, width, height, initial_lst,
@@ -454,9 +454,9 @@
   for (octave_idx_type i = 0; i < nel; i++)
     defaults_lst.push_back (tmp(i));
 
-  octave::flush_stdout ();
+  flush_stdout ();
 
-  octave::event_manager& evmgr = interp.get_event_manager ();
+  event_manager& evmgr = interp.get_event_manager ();
 
   std::list<std::string> items_lst
     = evmgr.input_dialog (prompt_lst, title, nr, nc, defaults_lst);
@@ -483,7 +483,7 @@
     {
       std::string icon_name = args(0).xstring_value ("invalid arguments");
 
-      octave::event_manager& evmgr = interp.get_event_manager ();
+      event_manager& evmgr = interp.get_event_manager ();
 
       retval = evmgr.get_named_icon (icon_name);
     }
@@ -497,7 +497,7 @@
 Undocumented internal function.
 @end deftypefn */)
 {
-  octave::event_manager& evmgr = interp.get_event_manager ();
+  event_manager& evmgr = interp.get_event_manager ();
 
   return ovl (evmgr.show_preferences ());
 }
@@ -508,7 +508,7 @@
 Undocumented internal function.
 @end deftypefn */)
 {
-  octave::event_manager& evmgr = interp.get_event_manager ();
+  event_manager& evmgr = interp.get_event_manager ();
 
   return ovl (evmgr.apply_preferences ());
 }
@@ -531,9 +531,9 @@
   if (args.length () >= 2)
     value = args(1).string_value();
 
-  if (octave::application::is_gui_running ())
+  if (application::is_gui_running ())
     {
-      octave::event_manager& evmgr = interp.get_event_manager ();
+      event_manager& evmgr = interp.get_event_manager ();
 
       return ovl (evmgr.gui_preference (key, value));
     }
@@ -558,7 +558,7 @@
     error ("__event_manager_file_remove__: "
            "old and new name expected as arguments");
 
-  octave::event_manager& evmgr = interp.get_event_manager ();
+  event_manager& evmgr = interp.get_event_manager ();
 
   evmgr.file_remove (old_name, new_name);
 
@@ -579,7 +579,7 @@
     error ("__event_manager_file_renamed__: "
            "first argument must be boolean for reload new named file");
 
-  octave::event_manager& evmgr = interp.get_event_manager ();
+  event_manager& evmgr = interp.get_event_manager ();
 
   evmgr.file_renamed (load_new);
 
@@ -605,7 +605,7 @@
   if (val.is_undefined ())
     error ("openvar: '%s' is not a variable", name.c_str ());
 
-  octave::event_manager& evmgr = interp.get_event_manager ();
+  event_manager& evmgr = interp.get_event_manager ();
 
   evmgr.edit_variable (name, val);
 
@@ -626,7 +626,7 @@
 {
   std::string file;
 
-  octave::event_manager& evmgr = interp.get_event_manager ();
+  event_manager& evmgr = interp.get_event_manager ();
 
   evmgr.show_terminal_window ();
 
@@ -644,7 +644,7 @@
   if (args.length () >= 1)
     file = args(0).string_value();
 
-  octave::event_manager& evmgr = interp.get_event_manager ();
+  event_manager& evmgr = interp.get_event_manager ();
 
   return ovl (evmgr.show_documentation (file));
 }
@@ -660,7 +660,7 @@
   if (args.length () >= 1)
     file = args(0).string_value();
 
-  octave::event_manager& evmgr = interp.get_event_manager ();
+  event_manager& evmgr = interp.get_event_manager ();
 
   return ovl (evmgr.register_documentation (file));
 }
@@ -676,7 +676,7 @@
   if (args.length () >= 1)
     file = args(0).string_value();
 
-  octave::event_manager& evmgr = interp.get_event_manager ();
+  event_manager& evmgr = interp.get_event_manager ();
 
   return ovl (evmgr.unregister_documentation (file));
 }
@@ -687,7 +687,7 @@
 Undocumented internal function.
 @end deftypefn */)
 {
-  octave::event_manager& evmgr = interp.get_event_manager ();
+  event_manager& evmgr = interp.get_event_manager ();
 
   evmgr.show_file_browser ();
 
@@ -700,7 +700,7 @@
 Undocumented internal function.
 @end deftypefn */)
 {
-  octave::event_manager& evmgr = interp.get_event_manager ();
+  event_manager& evmgr = interp.get_event_manager ();
 
   evmgr.show_command_history ();
 
@@ -713,7 +713,7 @@
 Undocumented internal function.
 @end deftypefn */)
 {
-  octave::event_manager& evmgr = interp.get_event_manager ();
+  event_manager& evmgr = interp.get_event_manager ();
 
   evmgr.show_workspace ();
 
@@ -726,7 +726,7 @@
 Undocumented internal function.
 @end deftypefn */)
 {
-  octave::event_manager& evmgr = interp.get_event_manager ();
+  event_manager& evmgr = interp.get_event_manager ();
 
   evmgr.show_community_news ();
 
@@ -739,7 +739,7 @@
 Undocumented internal function.
 @end deftypefn */)
 {
-  octave::event_manager& evmgr = interp.get_event_manager ();
+  event_manager& evmgr = interp.get_event_manager ();
 
   evmgr.show_release_notes ();
 
@@ -775,7 +775,7 @@
   feature = args(0).string_value ();
   status = args(1).string_value ();
 
-  octave::event_manager& evmgr = interp.get_event_manager ();
+  event_manager& evmgr = interp.get_event_manager ();
 
   return ovl (evmgr.gui_status_update (feature, status));
 }
@@ -786,7 +786,7 @@
 Undocumented internal function.
 @end deftypefn */)
 {
-  octave::event_manager& evmgr = interp.get_event_manager ();
+  event_manager& evmgr = interp.get_event_manager ();
 
   return ovl (evmgr.update_gui_lexer ());
 }
@@ -802,7 +802,7 @@
   if (args.length () >= 1)
     file = args(0).string_value();
 
-  octave::event_manager& evmgr = interp.get_event_manager ();
+  event_manager& evmgr = interp.get_event_manager ();
   evmgr.copy_image_to_clipboard (file);
   return ovl ();
 }
@@ -817,7 +817,7 @@
   if (args.length () != 0)
     print_usage ();
 
-  octave::event_manager& evmgr = interp.get_event_manager ();
+  event_manager& evmgr = interp.get_event_manager ();
   evmgr.focus_window ("history");
   return ovl ();
 }
@@ -832,7 +832,7 @@
   if (args.length () != 0)
     print_usage ();
 
-  octave::event_manager& evmgr = interp.get_event_manager ();
+  event_manager& evmgr = interp.get_event_manager ();
   evmgr.focus_window ("command");
   return ovl ();
 }
@@ -847,7 +847,7 @@
   if (args.length () != 0)
     print_usage ();
 
-  octave::event_manager& evmgr = interp.get_event_manager ();
+  event_manager& evmgr = interp.get_event_manager ();
   evmgr.focus_window ("filebrowser");
   return ovl ();
 }
@@ -862,7 +862,7 @@
   if (args.length () != 0)
     print_usage ();
 
-  octave::event_manager& evmgr = interp.get_event_manager ();
+  event_manager& evmgr = interp.get_event_manager ();
   evmgr.focus_window ("workspace");
   return ovl ();
 }