Mercurial > octave

diff libinterp/corefcn/input.cc @ 23696:08036a7f3660

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
remove octave:: namespace tag from symbols used inside octave namespace * octave-gui.cc, dynamic-ld.h, ft-text-renderer.cc, gl-render.cc, gl-render.h, gl2ps-print.cc, input.cc, input.h, interpreter.cc, load-path.cc, load-path.h, oct-stream.cc, sighandlers.cc, symtab.cc, symtab.h, __ode15__.cc, gzip.cc, octave.cc, lex.ll, oct-parse.in.yy, parse.h, pt-arg-list.cc, pt-arg-list.h, pt-array-list.h, pt-classdef.h, pt-decl.h, pt-eval.cc, pt-eval.h, pt-exp.h, pt-fcn-handle.cc, pt-idx.cc, pt-misc.h, pt-select.h, pt-stmt.h, pt-tm-const.cc, pt-tm-const.h, pt.cc, aepbalance.cc, chol.cc, gepbalance.cc, gsvd.cc, hess.cc, lo-mappers.h, lo-specfun.cc, lu.cc, qr.cc, qrp.cc, schur.cc, sparse-chol.cc, sparse-lu.cc, sparse-qr.cc, svd.cc, child-list.cc, dir-ops.cc, file-ops.cc, file-stat.cc, file-stat.h, lo-sysdep.cc, oct-env.cc, oct-syscalls.cc, cmd-edit.cc, cmd-hist.cc, oct-glob.cc, oct-locbuf.cc, oct-mutex.cc, oct-mutex.h, oct-shlib.cc, oct-shlib.h, pathsearch.cc, url-transfer.cc, url-transfer.h: Remove octave:: namespace tag from symbols used inside octave namespace. * oct-conf-post.in.h (OCTAVE_USE_DEPRECATED_FUNCTIONS): Don't define.
author John W. Eaton <jwe@octave.org>
date Mon, 26 Jun 2017 09:05:37 -0400
parents 4a62da62af09
children b2d55b52ee51
line wrap: on
line diff
--- a/libinterp/corefcn/input.cc	Mon Jun 26 09:02:21 2017 -0400
+++ b/libinterp/corefcn/input.cc	Mon Jun 26 09:05:37 2017 -0400
@@ -151,7 +151,7 @@
   void
   base_reader::do_input_echo (const std::string& input_string) const
   {
-    bool forced_interactive = octave::application::forced_interactive ();
+    bool forced_interactive = application::forced_interactive ();
 
     int do_echo = reading_script_file ()
       ? (Vecho_executing_commands & ECHO_SCRIPTS)
@@ -162,12 +162,12 @@
         if (forced_interactive)
           {
             if (pflag > 0)
-              octave_stdout << octave::command_editor::decode_prompt_string (VPS1);
+              octave_stdout << command_editor::decode_prompt_string (VPS1);
             else
-              octave_stdout << octave::command_editor::decode_prompt_string (VPS2);
+              octave_stdout << command_editor::decode_prompt_string (VPS2);
           }
         else
-          octave_stdout << octave::command_editor::decode_prompt_string (VPS4);
+          octave_stdout << command_editor::decode_prompt_string (VPS4);
 
         if (! input_string.empty ())
           {
@@ -249,7 +249,7 @@
     // Process pre input event hook function prior to flushing output and
     // printing the prompt.
 
-    if (octave::application::interactive ())
+    if (application::interactive ())
       {
         if (! Vdebugging)
           octave_link::exit_debugger_event ();
@@ -263,14 +263,14 @@
 
     std::string ps = (pflag > 0) ? VPS1 : VPS2;
 
-    std::string prompt = octave::command_editor::decode_prompt_string (ps);
+    std::string prompt = command_editor::decode_prompt_string (ps);
 
-    octave::pipe_handler_error_count = 0;
+    pipe_handler_error_count = 0;
 
-    octave::flush_stdout ();
+    flush_stdout ();
 
-    octave::pager_stream::reset ();
-    octave::diary_stream::reset ();
+    pager_stream::reset ();
+    diary_stream::reset ();
 
     octave_diary << prompt;
 
@@ -281,7 +281,7 @@
     if (retval != "\n"
         && retval.find_first_not_of (" \t\n\r") != std::string::npos)
       {
-        load_path& lp = octave::__get_load_path__ ("base_reader::octave_gets");
+        load_path& lp = __get_load_path__ ("base_reader::octave_gets");
 
         lp.update ();
 
@@ -300,7 +300,7 @@
       {
         if (! history_skip_auto_repeated_debugging_command)
           {
-            if (octave::command_history::add (retval))
+            if (command_history::add (retval))
               octave_link::append_history (retval);
           }
 
@@ -317,7 +317,7 @@
     // Process post input event hook function after the internal history
     // list has been updated.
 
-    if (octave::application::interactive ())
+    if (application::interactive ())
       octave_link::post_input_event ();
 
     return retval;