Mercurial > octave
diff libgui/src/qt-interpreter-events.h @ 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 | 99aa1bcb8848 |
| children | 6c438195f4e0 |
line wrap: on
line diff
--- 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;