Mercurial > octave
changeset 27284:1a8762e5662b
remove "do_" prefix from interpreter_events class methods
* event-manager.h, event-manager.cc, qt-interpreter-events.h,
qt-interpreter-events.cc: Remove "do_" prefix from function names.
That prefix is no longer needed to distinguish static class methods
from the corresponding virtual methods now that we've eliminated the
static methods and the virtual methods are in a separate class.
Minor style fixes.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Tue, 23 Jul 2019 10:32:32 -0400 |
| parents | 189ca5990c5d |
| children | 6c438195f4e0 |
| files | libgui/src/qt-interpreter-events.cc libgui/src/qt-interpreter-events.h libinterp/corefcn/event-manager.cc libinterp/corefcn/event-manager.h |
| diffstat | 4 files changed, 231 insertions(+), 243 deletions(-) [+] |
line wrap: on
line diff
--- a/libgui/src/qt-interpreter-events.cc Mon Jul 22 23:51:01 2019 -0400 +++ b/libgui/src/qt-interpreter-events.cc Tue Jul 23 10:32:32 2019 -0400 @@ -61,7 +61,7 @@ qRegisterMetaType<symbol_info_list> ("symbol_info_list"); } - bool qt_interpreter_events::do_confirm_shutdown (void) + bool qt_interpreter_events::confirm_shutdown (void) { // Lock the mutex before emitting signal. lock (); @@ -78,21 +78,21 @@ return m_shutdown_confirm_result; } - bool qt_interpreter_events::do_copy_image_to_clipboard (const std::string& file) + bool qt_interpreter_events::copy_image_to_clipboard (const std::string& file) { emit copy_image_to_clipboard_signal (QString::fromStdString (file), true); return true; } - bool qt_interpreter_events::do_edit_file (const std::string& file) + bool qt_interpreter_events::edit_file (const std::string& file) { emit edit_file_signal (QString::fromStdString (file)); return true; } - bool qt_interpreter_events::do_prompt_new_edit_file (const std::string& file) + bool qt_interpreter_events::prompt_new_edit_file (const std::string& file) { QSettings *settings = resource_manager::get_settings (); @@ -126,7 +126,7 @@ return (answer == tr ("Create")); } - uint8NDArray qt_interpreter_events::do_get_named_icon (const std::string& icon_name) + uint8NDArray qt_interpreter_events::get_named_icon (const std::string& icon_name) { uint8NDArray retval; QIcon icon = resource_manager::icon (QString::fromStdString (icon_name)); @@ -153,12 +153,12 @@ } std::string - qt_interpreter_events::do_question_dialog (const std::string& msg, - const std::string& title, - const std::string& btn1, - const std::string& btn2, - const std::string& btn3, - const std::string& btndef) + qt_interpreter_events::question_dialog (const std::string& msg, + const std::string& title, + const std::string& btn1, + const std::string& btn2, + const std::string& btn3, + const std::string& btndef) { QStringList btn; QStringList role; @@ -176,8 +176,7 @@ uiwidget_creator.signal_dialog (QString::fromStdString (msg), QString::fromStdString (title), - "quest", - btn, + "quest", btn, QString::fromStdString (btndef), role); @@ -238,14 +237,14 @@ } std::pair<std::list<int>, int> - qt_interpreter_events::do_list_dialog (const std::list<std::string>& list, - const std::string& mode, - int width, int height, - const std::list<int>& initial, - const std::string& name, - const std::list<std::string>& prompt, - const std::string& ok_string, - const std::string& cancel_string) + qt_interpreter_events::list_dialog (const std::list<std::string>& list, + const std::string& mode, + int width, int height, + const std::list<int>& initial, + const std::string& name, + const std::list<std::string>& prompt, + const std::string& ok_string, + const std::string& cancel_string) { // Lock mutex before signaling. uiwidget_creator.lock (); @@ -273,11 +272,11 @@ } std::list<std::string> - qt_interpreter_events::do_input_dialog (const std::list<std::string>& prompt, - const std::string& title, - const std::list<float>& nr, - const std::list<float>& nc, - const std::list<std::string>& defaults) + qt_interpreter_events::input_dialog (const std::list<std::string>& prompt, + const std::string& title, + const std::list<float>& nr, + const std::list<float>& nc, + const std::list<std::string>& defaults) { std::list<std::string> retval; @@ -306,11 +305,11 @@ } std::list<std::string> - qt_interpreter_events::do_file_dialog (const filter_list& filter, - const std::string& title, - const std::string& filename, - const std::string& dirname, - const std::string& multimode) + qt_interpreter_events::file_dialog (const filter_list& filter, + const std::string& title, + const std::string& filename, + const std::string& dirname, + const std::string& multimode) { std::list<std::string> retval; @@ -350,9 +349,9 @@ // why hang?) int - qt_interpreter_events::do_debug_cd_or_addpath_error (const std::string& file, - const std::string& dir, - bool addpath_option) + qt_interpreter_events::debug_cd_or_addpath_error (const std::string& file, + const std::string& dir, + bool addpath_option) { int retval = -1; @@ -403,13 +402,13 @@ return retval; } - void qt_interpreter_events::do_change_directory (const std::string& dir) + void qt_interpreter_events::change_directory (const std::string& dir) { emit change_directory_signal (QString::fromStdString (dir)); } - void qt_interpreter_events::do_file_remove (const std::string& old_name, - const std::string& new_name) + void qt_interpreter_events::file_remove (const std::string& old_name, + const std::string& new_name) { // Lock the mutex before signaling lock (); @@ -423,20 +422,20 @@ unlock (); } - void qt_interpreter_events::do_file_renamed (bool load_new) + void qt_interpreter_events::file_renamed (bool load_new) { emit file_renamed_signal (load_new); } - void qt_interpreter_events::do_execute_command_in_terminal - (const std::string& command) + void qt_interpreter_events::execute_command_in_terminal + (const std::string& command) { emit execute_command_in_terminal_signal (QString::fromStdString (command)); } - void qt_interpreter_events::do_set_workspace (bool top_level, bool debug, - const symbol_info_list& syminfo, - bool update_variable_editor) + void qt_interpreter_events::set_workspace (bool top_level, bool debug, + const symbol_info_list& syminfo, + bool update_variable_editor) { if (! top_level && ! debug) return; @@ -447,12 +446,12 @@ emit refresh_variable_editor_signal (); } - void qt_interpreter_events::do_clear_workspace (void) + void qt_interpreter_events::clear_workspace (void) { emit clear_workspace_signal (); } - void qt_interpreter_events::do_set_history (const string_vector& hist) + void qt_interpreter_events::set_history (const string_vector& hist) { QStringList qt_hist; @@ -462,27 +461,27 @@ emit set_history_signal (qt_hist); } - void qt_interpreter_events::do_append_history (const std::string& hist_entry) + void qt_interpreter_events::append_history (const std::string& hist_entry) { emit append_history_signal (QString::fromStdString (hist_entry)); } - void qt_interpreter_events::do_clear_history (void) + void qt_interpreter_events::clear_history (void) { emit clear_history_signal (); } - void qt_interpreter_events::do_pre_input_event (void) + void qt_interpreter_events::pre_input_event (void) { } - void qt_interpreter_events::do_post_input_event (void) + void qt_interpreter_events::post_input_event (void) { } - void qt_interpreter_events::do_enter_debugger_event (const std::string& file, - int line) + void qt_interpreter_events::enter_debugger_event (const std::string& file, + int line) { interpreter& interp - = __get_interpreter__ ("qt_interpreter_events::do_enter_debugger_event"); + = __get_interpreter__ ("qt_interpreter_events::enter_debugger_event"); octave_value_list fct = F__which__ (interp, ovl (file),0); octave_map map = fct(0).map_value (); @@ -491,42 +490,42 @@ if (type == "command-line function") return; - do_insert_debugger_pointer (file, line); + insert_debugger_pointer (file, line); emit enter_debugger_signal (); } void - qt_interpreter_events::do_execute_in_debugger_event (const std::string& file, - int line) + qt_interpreter_events::execute_in_debugger_event (const std::string& file, + int line) { - do_delete_debugger_pointer (file, line); + delete_debugger_pointer (file, line); } - void qt_interpreter_events::do_exit_debugger_event (void) + void qt_interpreter_events::exit_debugger_event (void) { emit exit_debugger_signal (); } // Display (if @insert true) or remove the appropriate symbol for a breakpoint // in @file at @line with condition @cond. - void qt_interpreter_events::do_update_breakpoint (bool insert, - const std::string& file, - int line, - const std::string& cond) + void qt_interpreter_events::update_breakpoint (bool insert, + const std::string& file, + int line, + const std::string& cond) { emit update_breakpoint_marker_signal (insert, QString::fromStdString (file), line, QString::fromStdString (cond)); } - void qt_interpreter_events::do_show_preferences (void) + void qt_interpreter_events::show_preferences (void) { emit show_preferences_signal (); } std::string - qt_interpreter_events::do_gui_preference (const std::string& key, - const std::string& value) + qt_interpreter_events::gui_preference (const std::string& key, + const std::string& value) { QString pref_value; @@ -544,23 +543,23 @@ return pref_value.toStdString (); } - void qt_interpreter_events::do_show_doc (const std::string& file) + void qt_interpreter_events::show_doc (const std::string& file) { emit show_doc_signal (QString::fromStdString (file)); } - void qt_interpreter_events::do_register_doc (const std::string& file) + void qt_interpreter_events::register_doc (const std::string& file) { emit register_doc_signal (QString::fromStdString (file)); } - void qt_interpreter_events::do_unregister_doc (const std::string& file) + void qt_interpreter_events::unregister_doc (const std::string& file) { emit unregister_doc_signal (QString::fromStdString (file)); } - void qt_interpreter_events::do_edit_variable (const std::string& expr, - const octave_value& val) + void qt_interpreter_events::edit_variable (const std::string& expr, + const octave_value& val) { emit edit_variable_signal (QString::fromStdString (expr), val); } @@ -646,15 +645,15 @@ } void - qt_interpreter_events::do_insert_debugger_pointer (const std::string& file, - int line) + qt_interpreter_events::insert_debugger_pointer (const std::string& file, + int line) { emit insert_debugger_pointer_signal (QString::fromStdString (file), line); } void - qt_interpreter_events::do_delete_debugger_pointer (const std::string& file, - int line) + qt_interpreter_events::delete_debugger_pointer (const std::string& file, + int line) { emit delete_debugger_pointer_signal (QString::fromStdString (file), line); }
--- a/libgui/src/qt-interpreter-events.h Mon Jul 22 23:51:01 2019 -0400 +++ b/libgui/src/qt-interpreter-events.h Tue Jul 23 10:32:32 2019 -0400 @@ -66,92 +66,91 @@ ~qt_interpreter_events (void) = default; - bool do_confirm_shutdown (void); + bool confirm_shutdown (void); - bool do_copy_image_to_clipboard (const std::string& file); + bool copy_image_to_clipboard (const std::string& file); - bool do_edit_file (const std::string& file); + bool edit_file (const std::string& file); - bool do_prompt_new_edit_file (const std::string& file); + bool prompt_new_edit_file (const std::string& file); std::string - do_question_dialog (const std::string& msg, const std::string& title, - const std::string& btn1, const std::string& btn2, - const std::string& btn3, const std::string& btndef); + question_dialog (const std::string& msg, const std::string& title, + const std::string& btn1, const std::string& btn2, + const std::string& btn3, const std::string& btndef); std::pair<std::list<int>, int> - do_list_dialog (const std::list<std::string>& list, - const std::string& mode, - int width, int height, - const std::list<int>& initial_value, - const std::string& name, - const std::list<std::string>& prompt, - const std::string& ok_string, - const std::string& cancel_string); + list_dialog (const std::list<std::string>& list, + const std::string& mode, int width, int height, + const std::list<int>& initial_value, + const std::string& name, + const std::list<std::string>& prompt, + const std::string& ok_string, + const std::string& cancel_string); std::list<std::string> - do_input_dialog (const std::list<std::string>& prompt, - const std::string& title, - const std::list<float>& nr, - const std::list<float>& nc, - const std::list<std::string>& defaults); + input_dialog (const std::list<std::string>& prompt, + const std::string& title, const std::list<float>& nr, + const std::list<float>& nc, + const std::list<std::string>& defaults); std::list<std::string> - do_file_dialog (const filter_list& filter, const std::string& title, - const std::string& filename, const std::string& pathname, - const std::string& multimode); + file_dialog (const filter_list& filter, const std::string& title, + const std::string& filename, const std::string& pathname, + const std::string& multimode); - int - do_debug_cd_or_addpath_error (const std::string& file, - const std::string& dir, - bool addpath_option); + int debug_cd_or_addpath_error (const std::string& file, + const std::string& dir, + bool addpath_option); - void do_change_directory (const std::string& dir); + void change_directory (const std::string& dir); + + void file_remove (const std::string& old_name, + const std::string& new_name); - void do_file_remove (const std::string& old_name, - const std::string& new_name); - void do_file_renamed (bool load_new = true); + void file_renamed (bool load_new = true); - void do_execute_command_in_terminal (const std::string& command); + void execute_command_in_terminal (const std::string& command); - uint8NDArray do_get_named_icon (const std::string& icon_name); + uint8NDArray get_named_icon (const std::string& icon_name); - void do_set_workspace (bool top_level, bool debug, - const symbol_info_list& syminfo, - bool update_variable_editor); + void set_workspace (bool top_level, bool debug, + const symbol_info_list& syminfo, + bool update_variable_editor); - void do_clear_workspace (void); + void clear_workspace (void); - void do_set_history (const string_vector& hist); + void set_history (const string_vector& hist); - void do_append_history (const std::string& hist_entry); + void append_history (const std::string& hist_entry); - void do_clear_history (void); + void clear_history (void); - void do_pre_input_event (void); + void pre_input_event (void); - void do_post_input_event (void); + void post_input_event (void); - void do_enter_debugger_event (const std::string& file, int line); + void enter_debugger_event (const std::string& file, int line); - void do_execute_in_debugger_event (const std::string& file, int line); + void execute_in_debugger_event (const std::string& file, int line); - void do_exit_debugger_event (void); + void exit_debugger_event (void); - void do_update_breakpoint (bool insert, const std::string& file, int line, - const std::string& cond); + void update_breakpoint (bool insert, const std::string& file, int line, + const std::string& cond); - void do_show_preferences (void); + void show_preferences (void); + + std::string gui_preference (const std::string& key, + const std::string& value); - std::string do_gui_preference (const std::string& key, - const std::string& value); - void do_show_doc (const std::string& file); + void show_doc (const std::string& file); + + void register_doc (const std::string& file); - void do_register_doc (const std::string& file); + void unregister_doc (const std::string& file); - void do_unregister_doc (const std::string& file); - - void do_edit_variable (const std::string& name, const octave_value& val); + void edit_variable (const std::string& name, const octave_value& val); void shutdown_confirmation (bool sd) { m_shutdown_confirm_result = sd; } @@ -167,9 +166,9 @@ private: - void do_insert_debugger_pointer (const std::string& file, int line); + void insert_debugger_pointer (const std::string& file, int line); - void do_delete_debugger_pointer (const std::string& file, int line); + void delete_debugger_pointer (const std::string& file, int line); bool m_shutdown_confirm_result;
--- a/libinterp/corefcn/event-manager.cc Mon Jul 22 23:51:01 2019 -0400 +++ b/libinterp/corefcn/event-manager.cc Tue Jul 23 10:32:32 2019 -0400 @@ -122,8 +122,8 @@ tree_evaluator& tw = __get_evaluator__ ("event_manager::set_workspace"); - instance->do_set_workspace (tw.at_top_level (), debugging, - tw.get_symbol_info (), true); + instance->set_workspace (tw.at_top_level (), debugging, + tw.get_symbol_info (), true); } } }
--- a/libinterp/corefcn/event-manager.h Mon Jul 22 23:51:01 2019 -0400 +++ b/libinterp/corefcn/event-manager.h Tue Jul 23 10:32:32 2019 -0400 @@ -55,50 +55,46 @@ virtual ~interpreter_events (void) = default; - virtual bool do_confirm_shutdown (void) { return false; } + virtual bool confirm_shutdown (void) { return false; } - virtual bool do_copy_image_to_clipboard (const std::string& /*file*/) + virtual bool copy_image_to_clipboard (const std::string& /*file*/) { return false; } - virtual bool do_edit_file (const std::string& /*file*/) { return false; } + virtual bool edit_file (const std::string& /*file*/) { return false; } - virtual bool do_prompt_new_edit_file (const std::string& /*file*/) + virtual bool prompt_new_edit_file (const std::string& /*file*/) { return false; } virtual std::string - do_question_dialog (const std::string& /*msg*/, - const std::string& /*title*/, - const std::string& /*btn1*/, - const std::string& /*btn2*/, - const std::string& /*btn3*/, - const std::string& /*btndef*/) + question_dialog (const std::string& /*msg*/, const std::string& /*title*/, + const std::string& /*btn1*/, const std::string& /*btn2*/, + const std::string& /*btn3*/, const std::string& /*btndef*/) { return ""; } virtual std::pair<std::list<int>, int> - do_list_dialog (const std::list<std::string>& /*list*/, - const std::string& /*mode*/, - int /*width*/, int /*height*/, - const std::list<int>& /*initial_value*/, - const std::string& /*name*/, - const std::list<std::string>& /*prompt*/, - const std::string& /*ok_string*/, - const std::string& /*cancel_string*/) + list_dialog (const std::list<std::string>& /*list*/, + const std::string& /*mode*/, int /*width*/, int /*height*/, + const std::list<int>& /*initial_value*/, + const std::string& /*name*/, + const std::list<std::string>& /*prompt*/, + const std::string& /*ok_string*/, + const std::string& /*cancel_string*/) { return std::pair<std::list<int>, int> (); } virtual std::list<std::string> - do_input_dialog (const std::list<std::string>& /*prompt*/, - const std::string& /*title*/, - const std::list<float>& /*nr*/, - const std::list<float>& /*nc*/, - const std::list<std::string>& /*defaults*/) + input_dialog (const std::list<std::string>& /*prompt*/, + const std::string& /*title*/, + const std::list<float>& /*nr*/, + const std::list<float>& /*nc*/, + const std::list<std::string>& /*defaults*/) { return std::list<std::string> (); } @@ -106,85 +102,86 @@ typedef std::list<std::pair<std::string, std::string>> filter_list; virtual std::list<std::string> - do_file_dialog (const filter_list& /*filter*/, - const std::string& /*title*/, - const std::string& /*filename*/, - const std::string& /*dirname*/, - const std::string& /*multimode*/) + file_dialog (const filter_list& /*filter*/, + const std::string& /*title*/, + const std::string& /*filename*/, + const std::string& /*dirname*/, + const std::string& /*multimode*/) { return std::list<std::string> (); } virtual int - do_debug_cd_or_addpath_error (const std::string& /*file*/, - const std::string& /*dir*/, - bool /*addpath_option*/) + debug_cd_or_addpath_error (const std::string& /*file*/, + const std::string& /*dir*/, + bool /*addpath_option*/) { return -1; } - virtual void do_change_directory (const std::string& /*dir*/) { } + virtual void change_directory (const std::string& /*dir*/) { } - virtual void do_file_remove (const std::string& /*old_name*/, - const std::string& /*new_name*/) + virtual void + file_remove (const std::string& /*old_nm*/, const std::string& /*new_nm*/) { } - virtual void do_file_renamed (bool) { } + virtual void file_renamed (bool) { } virtual void - do_execute_command_in_terminal (const std::string& /*command*/) { } + execute_command_in_terminal (const std::string& /*command*/) { } - virtual uint8NDArray do_get_named_icon (const std::string& /*icon_name*/) + virtual uint8NDArray get_named_icon (const std::string& /*icon_name*/) { return uint8NDArray (); } - virtual void do_set_workspace (bool /*top_level*/, bool /*debug*/, - const octave::symbol_info_list& /*syminfo*/, - bool /*update_variable_editor*/) + virtual void + set_workspace (bool /*top_level*/, bool /*debug*/, + const octave::symbol_info_list& /*syminfo*/, + bool /*update_variable_editor*/) { } - virtual void do_clear_workspace (void) { } + virtual void clear_workspace (void) { } - virtual void do_set_history (const string_vector& /*hist*/) { } + virtual void set_history (const string_vector& /*hist*/) { } - virtual void do_append_history (const std::string& /*hist_entry*/) { } + virtual void append_history (const std::string& /*hist_entry*/) { } - virtual void do_clear_history (void) { } + virtual void clear_history (void) { } - virtual void do_pre_input_event (void) { } + virtual void pre_input_event (void) { } - virtual void do_post_input_event (void) { } + virtual void post_input_event (void) { } virtual void - do_enter_debugger_event (const std::string& /*file*/, int /*line*/) { } + enter_debugger_event (const std::string& /*file*/, int /*line*/) { } + + virtual void + execute_in_debugger_event (const std::string& /*file*/, int /*line*/) { } + + virtual void exit_debugger_event (void) { } virtual void - do_execute_in_debugger_event (const std::string& /*file*/, int /*line*/) { } - - virtual void do_exit_debugger_event (void) { } - - virtual void do_update_breakpoint (bool /*insert*/, - const std::string& /*file*/, - int /*line*/, const std::string& /*cond*/) + update_breakpoint (bool /*insert*/, const std::string& /*file*/, + int /*line*/, const std::string& /*cond*/) { } - virtual void do_show_preferences (void) { } + virtual void show_preferences (void) { } - virtual std::string do_gui_preference (const std::string& /*key*/, - const std::string& /*value*/) + virtual std::string gui_preference (const std::string& /*key*/, + const std::string& /*value*/) { return ""; } - virtual void do_show_doc (const std::string& /*file*/) { } + virtual void show_doc (const std::string& /*file*/) { } - virtual void do_register_doc (const std::string& /*file*/) { } + virtual void register_doc (const std::string& /*file*/) { } - virtual void do_unregister_doc (const std::string& /*file*/) { } + virtual void unregister_doc (const std::string& /*file*/) { } - virtual void do_edit_variable (const std::string& /*name*/, - const octave_value& /*val*/) + virtual void + edit_variable (const std::string& /*name*/, const octave_value& /*val*/) { } }; @@ -195,11 +192,9 @@ //! buffering access operations to octave and executing them in the //! readline event hook, which lives in the octave thread. - class - OCTINTERP_API - event_manager + class event_manager { - public: + public: event_manager (void); @@ -244,7 +239,7 @@ bool retval = true; if (enabled ()) - retval = instance->do_confirm_shutdown (); + retval = instance->confirm_shutdown (); return retval; } @@ -271,17 +266,17 @@ bool copy_image_to_clipboard (const std::string& file) { - return enabled () ? instance->do_copy_image_to_clipboard (file) : false; + return enabled () ? instance->copy_image_to_clipboard (file) : false; } bool edit_file (const std::string& file) { - return enabled () ? instance->do_edit_file (file) : false; + return enabled () ? instance->edit_file (file) : false; } bool prompt_new_edit_file (const std::string& file) { - return enabled () ? instance->do_prompt_new_edit_file (file) : false; + return enabled () ? instance->prompt_new_edit_file (file) : false; } std::string @@ -290,8 +285,8 @@ const std::string& btn3, const std::string& btndef) { return (enabled () - ? instance->do_question_dialog (msg, title, btn1, - btn2, btn3, btndef) + ? instance->question_dialog (msg, title, btn1, + btn2, btn3, btndef) : ""); } @@ -306,9 +301,9 @@ const std::string& cancel_string) { return (enabled () - ? instance->do_list_dialog (list, mode, width, height, - initial_value, name, prompt, - ok_string, cancel_string) + ? instance->list_dialog (list, mode, width, height, + initial_value, name, prompt, + ok_string, cancel_string) : std::pair<std::list<int>, int> ()); } @@ -320,7 +315,7 @@ const std::list<std::string>& defaults) { return (enabled () - ? instance->do_input_dialog (prompt, title, nr, nc, defaults) + ? instance->input_dialog (prompt, title, nr, nc, defaults) : std::list<std::string> ()); } @@ -332,8 +327,8 @@ const std::string& multimode) { return (enabled () - ? instance->do_file_dialog (filter, title, filename, dirname, - multimode) + ? instance->file_dialog (filter, title, filename, dirname, + multimode) : std::list<std::string> ()); } @@ -341,41 +336,40 @@ const std::string& dir, bool addpath_option) { return (enabled () - ? instance->do_debug_cd_or_addpath_error (file, dir, - addpath_option) + ? instance->debug_cd_or_addpath_error (file, dir, addpath_option) : 0); } void change_directory (const std::string& dir) { if (enabled ()) - instance->do_change_directory (dir); + instance->change_directory (dir); } // 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 ()) - instance->do_file_remove (old_name, new_name); + instance->file_remove (old_name, new_name); } void file_renamed (bool load_new) { if (octave::application::is_gui_running () && enabled ()) - instance->do_file_renamed (load_new); + instance->file_renamed (load_new); } // Preserves pending input. void execute_command_in_terminal (const std::string& command) { if (enabled ()) - instance->do_execute_command_in_terminal (command); + instance->execute_command_in_terminal (command); } uint8NDArray get_named_icon (const std::string& icon_name) { return (enabled () - ? instance->do_get_named_icon (icon_name) : uint8NDArray ()); + ? instance->get_named_icon (icon_name) : uint8NDArray ()); } void set_workspace (void); @@ -384,44 +378,44 @@ bool update_variable_editor = true) { if (enabled ()) - instance->do_set_workspace (top_level, debugging, syminfo, - update_variable_editor); + instance->set_workspace (top_level, debugging, syminfo, + update_variable_editor); } void clear_workspace (void) { if (enabled ()) - instance->do_clear_workspace (); + instance->clear_workspace (); } void set_history (const string_vector& hist) { if (enabled ()) - instance->do_set_history (hist); + instance->set_history (hist); } void append_history (const std::string& hist_entry) { if (enabled ()) - instance->do_append_history (hist_entry); + instance->append_history (hist_entry); } void clear_history (void) { if (enabled ()) - instance->do_clear_history (); + instance->clear_history (); } void pre_input_event (void) { if (enabled ()) - instance->do_pre_input_event (); + instance->pre_input_event (); } void post_input_event (void) { if (enabled ()) - instance->do_post_input_event (); + instance->post_input_event (); } void enter_debugger_event (const std::string& file, int line) @@ -430,14 +424,14 @@ { debugging = true; - instance->do_enter_debugger_event (file, line); + instance->enter_debugger_event (file, line); } } void execute_in_debugger_event (const std::string& file, int line) { if (enabled ()) - instance->do_execute_in_debugger_event (file, line); + instance->execute_in_debugger_event (file, line); } void exit_debugger_event (void) @@ -446,7 +440,7 @@ { debugging = false; - instance->do_exit_debugger_event (); + instance->exit_debugger_event (); } } @@ -454,35 +448,31 @@ int line, const std::string& cond = "") { if (enabled ()) - instance->do_update_breakpoint (insert, file, line, cond); + instance->update_breakpoint (insert, file, line, cond); } bool show_preferences (void) { if (enabled ()) { - instance->do_show_preferences (); + instance->show_preferences (); return true; } else return false; } - std::string gui_preference (const std::string& key, const std::string& value) + std::string gui_preference (const std::string& key, + const std::string& value) { - if (enabled ()) - { - return instance->do_gui_preference (key, value); - } - else - return ""; + return enabled () ? instance->gui_preference (key, value) : ""; } bool show_doc (const std::string& file) { if (enabled ()) { - instance->do_show_doc (file); + instance->show_doc (file); return true; } else @@ -493,7 +483,7 @@ { if (enabled ()) { - instance->do_register_doc (file); + instance->register_doc (file); return true; } else @@ -504,7 +494,7 @@ { if (enabled ()) { - instance->do_unregister_doc (file); + instance->unregister_doc (file); return true; } else @@ -516,21 +506,21 @@ { if (enabled ()) { - instance->do_edit_variable (name, val); + instance->edit_variable (name, val); return true; } else return false; } - private: + private: // Using a shared_ptr to manage the link_events object ensures that it // will be valid until it is no longer needed. std::shared_ptr<interpreter_events> instance; - protected: + protected: // Semaphore to lock access to the event queue. octave::mutex *event_queue_mutex;