diff libgui/src/qt-interpreter-events.h @ 31648:29d734430e5f stable

maint: Re-indent code after switch to using namespace macros. * BaseControl.cc, BaseControl.h, ButtonControl.cc, ButtonControl.h, ButtonGroup.cc, ButtonGroup.h, Canvas.cc, Canvas.h, CheckBoxControl.cc, CheckBoxControl.h, Container.cc, Container.h, ContextMenu.cc, ContextMenu.h, EditControl.cc, EditControl.h, Figure.cc, Figure.h, FigureWindow.cc, FigureWindow.h, GLCanvas.cc, GLCanvas.h, GenericEventNotify.h, KeyMap.cc, KeyMap.h, ListBoxControl.cc, ListBoxControl.h, Logger.cc, Logger.h, Menu.cc, Menu.h, MenuContainer.h, Object.cc, Object.h, ObjectProxy.cc, ObjectProxy.h, Panel.cc, Panel.h, PopupMenuControl.cc, PopupMenuControl.h, PushButtonControl.cc, PushButtonControl.h, PushTool.cc, PushTool.h, QtHandlesUtils.cc, QtHandlesUtils.h, RadioButtonControl.cc, RadioButtonControl.h, SliderControl.cc, SliderControl.h, Table.cc, Table.h, TextControl.cc, TextControl.h, TextEdit.cc, TextEdit.h, ToggleButtonControl.cc, ToggleButtonControl.h, ToggleTool.cc, ToggleTool.h, ToolBar.cc, ToolBar.h, ToolBarButton.cc, ToolBarButton.h, annotation-dialog.cc, annotation-dialog.h, gl-select.cc, gl-select.h, qopengl-functions.h, qt-graphics-toolkit.cc, qt-graphics-toolkit.h, module.mk, QTerminal.h, color-picker.cc, color-picker.h, command-widget.cc, command-widget.h, community-news.cc, community-news.h, dialog.cc, dialog.h, documentation-bookmarks.cc, documentation-bookmarks.h, documentation-dock-widget.cc, documentation-dock-widget.h, documentation.cc, documentation.h, dw-main-window.cc, dw-main-window.h, external-editor-interface.cc, external-editor-interface.h, files-dock-widget.cc, files-dock-widget.h, find-files-dialog.cc, find-files-dialog.h, find-files-model.cc, find-files-model.h, graphics-init.cc, graphics-init.h, gui-settings.cc, gui-settings.h, gui-utils.cc, gui-utils.h, history-dock-widget.cc, history-dock-widget.h, interpreter-qobject.cc, interpreter-qobject.h, led-indicator.cc, led-indicator.h, file-editor-interface.h, file-editor-tab.cc, file-editor-tab.h, file-editor.cc, file-editor.h, find-dialog.cc, find-dialog.h, marker.cc, marker.h, octave-qscintilla.cc, octave-qscintilla.h, octave-txt-lexer.cc, octave-txt-lexer.h, main-window.cc, main-window.h, news-reader.cc, news-reader.h, octave-dock-widget.cc, octave-dock-widget.h, octave-qobject.cc, octave-qobject.h, qt-application.cc, qt-application.h, qt-interpreter-events.cc, qt-interpreter-events.h, qt-utils.h, release-notes.cc, release-notes.h, resource-manager.cc, resource-manager.h, set-path-dialog.cc, set-path-dialog.h, set-path-model.cc, set-path-model.h, settings-dialog.cc, settings-dialog.h, shortcut-manager.cc, shortcut-manager.h, tab-bar.cc, tab-bar.h, terminal-dock-widget.cc, terminal-dock-widget.h, variable-editor-model.cc, variable-editor-model.h, variable-editor.cc, variable-editor.h, welcome-wizard.cc, welcome-wizard.h, workspace-model.cc, workspace-model.h, workspace-view.cc, workspace-view.h: Re-indent code after switch to using namespace macros.
author John W. Eaton <jwe@octave.org>
date Tue, 06 Dec 2022 14:53:00 -0500
parents c6d54dd31a7e
children deb553ac2c54 597f3ee61a48
line wrap: on
line diff
--- a/libgui/src/qt-interpreter-events.h	Tue Dec 06 14:37:51 2022 -0500
+++ b/libgui/src/qt-interpreter-events.h	Tue Dec 06 14:53:00 2022 -0500
@@ -47,284 +47,284 @@
 
 OCTAVE_BEGIN_NAMESPACE(octave)
 
-  class base_qobject;
+class base_qobject;
 
-  // The functions in this class are not normally called directly, but
-  // are invoked from the Octave interpreter thead by methods in the
-  // event_manager class.  In most cases, they should only translate
-  // data from the types typically used in the interpreter to whatever
-  // is required by the GUI (for example, std::string to QString) and
-  // emit a Qt signal.
-  //
-  // The use of Qt signals provides a thread-safe way for the Octave
-  // interpreter to notify the GUI of events (directory or workspace has
-  // changed, for example) or to request that the GUI perform actions
-  // (display a dialog, for example).
-  //
-  // By using this class as a wrapper around the Qt signals, we maintain
-  // a separation between the Octave interpreter and any specific GUI
-  // toolkit (no Qt headers are used in the Octave interpreter sources).
+// The functions in this class are not normally called directly, but
+// are invoked from the Octave interpreter thead by methods in the
+// event_manager class.  In most cases, they should only translate
+// data from the types typically used in the interpreter to whatever
+// is required by the GUI (for example, std::string to QString) and
+// emit a Qt signal.
+//
+// The use of Qt signals provides a thread-safe way for the Octave
+// interpreter to notify the GUI of events (directory or workspace has
+// changed, for example) or to request that the GUI perform actions
+// (display a dialog, for example).
+//
+// By using this class as a wrapper around the Qt signals, we maintain
+// a separation between the Octave interpreter and any specific GUI
+// toolkit (no Qt headers are used in the Octave interpreter sources).
 
-  class qt_interpreter_events : public QObject, public interpreter_events
-  {
-    Q_OBJECT
+class qt_interpreter_events : public QObject, public interpreter_events
+{
+  Q_OBJECT
 
-  public:
+public:
 
-    qt_interpreter_events (base_qobject& oct_qobj);
+  qt_interpreter_events (base_qobject& oct_qobj);
 
-    // No copying!
+  // No copying!
 
-    qt_interpreter_events (const qt_interpreter_events&) = delete;
+  qt_interpreter_events (const qt_interpreter_events&) = delete;
 
-    qt_interpreter_events& operator = (const qt_interpreter_events&) = delete;
+  qt_interpreter_events& operator = (const qt_interpreter_events&) = delete;
 
-    ~qt_interpreter_events (void) = default;
+  ~qt_interpreter_events (void) = default;
 
-    // Note: these functions currently do nothing with the old terminal
-    // widget.
-    void start_gui (bool gui_app = false);
-    void close_gui (void);
+  // Note: these functions currently do nothing with the old terminal
+  // widget.
+  void start_gui (bool gui_app = false);
+  void close_gui (void);
 
-    bool have_dialogs (void) const { return true; }
+  bool have_dialogs (void) const { return true; }
 
-    std::list<std::string>
-    file_dialog (const filter_list& filter, const std::string& title,
-                 const std::string& filename, const std::string& pathname,
-                 const std::string& multimode);
+  std::list<std::string>
+  file_dialog (const filter_list& filter, const std::string& title,
+               const std::string& filename, const std::string& pathname,
+               const std::string& multimode);
 
-    std::list<std::string>
-    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>
+  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::pair<std::list<int>, int>
-    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::pair<std::list<int>, int>
+  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::string
-    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::string
+  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);
 
-    void update_path_dialog (void);
+  void update_path_dialog (void);
 
-    void show_preferences (void);
+  void show_preferences (void);
 
-    void apply_preferences (void);
+  void apply_preferences (void);
 
-    void show_terminal_window (void);
+  void show_terminal_window (void);
 
-    bool show_documentation (const std::string& file);
+  bool show_documentation (const std::string& file);
 
-    void show_file_browser (void);
+  void show_file_browser (void);
 
-    void show_command_history (void);
+  void show_command_history (void);
 
-    void show_workspace (void);
+  void show_workspace (void);
 
-    void show_community_news (int serial);
-    void show_release_notes (void);
+  void show_community_news (int serial);
+  void show_release_notes (void);
 
-    bool edit_file (const std::string& file);
+  bool edit_file (const std::string& file);
 
-    void edit_variable (const std::string& name, const octave_value& val);
+  void edit_variable (const std::string& name, const octave_value& val);
 
-    bool confirm_shutdown (void);
+  bool confirm_shutdown (void);
 
-    bool prompt_new_edit_file (const std::string& file);
+  bool prompt_new_edit_file (const std::string& file);
 
-    int 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);
 
-    uint8NDArray get_named_icon (const std::string& icon_name);
+  uint8NDArray get_named_icon (const std::string& icon_name);
 
-    std::string gui_preference (const std::string& key,
-                                const std::string& value);
+  std::string gui_preference (const std::string& key,
+                              const std::string& value);
 
-    bool copy_image_to_clipboard (const std::string& file);
+  bool copy_image_to_clipboard (const std::string& file);
 
-    void focus_window (const std::string win_name);
+  void focus_window (const std::string win_name);
 
-    void execute_command_in_terminal (const std::string& command);
+  void execute_command_in_terminal (const std::string& command);
 
-    void register_documentation (const std::string& file);
+  void register_documentation (const std::string& file);
 
-    void unregister_documentation (const std::string& file);
+  void unregister_documentation (const std::string& file);
 
-    // Note: this function currently does nothing with the old terminal
-    // widget.
-    void interpreter_output (const std::string& msg);
+  // Note: this function currently does nothing with the old terminal
+  // widget.
+  void interpreter_output (const std::string& msg);
 
-    void display_exception (const execution_exception& ee, bool beep);
+  void display_exception (const execution_exception& ee, bool beep);
 
-    void gui_status_update (const std::string& feature, const std::string& status);
+  void gui_status_update (const std::string& feature, const std::string& status);
 
-    void update_gui_lexer (void);
+  void update_gui_lexer (void);
 
-    void directory_changed (const std::string& dir);
+  void directory_changed (const std::string& dir);
 
-    void file_remove (const std::string& old_name,
-                      const std::string& new_name);
+  void file_remove (const std::string& old_name,
+                    const std::string& new_name);
 
-    void file_renamed (bool load_new = true);
+  void file_renamed (bool load_new = true);
 
-    void 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 clear_workspace (void);
+  void clear_workspace (void);
 
-    void update_prompt (const std::string& prompt);
+  void update_prompt (const std::string& prompt);
 
-    void set_history (const string_vector& hist);
+  void set_history (const string_vector& hist);
 
-    void append_history (const std::string& hist_entry);
+  void append_history (const std::string& hist_entry);
 
-    void clear_history (void);
+  void clear_history (void);
 
-    void pre_input_event (void);
+  void pre_input_event (void);
 
-    void post_input_event (void);
+  void post_input_event (void);
 
-    void enter_debugger_event (const std::string& fcn_name,
-                               const std::string& fcn_file_name, int line);
+  void enter_debugger_event (const std::string& fcn_name,
+                             const std::string& fcn_file_name, int line);
 
-    void execute_in_debugger_event (const std::string& file, int line);
+  void execute_in_debugger_event (const std::string& file, int line);
 
-    void exit_debugger_event (void);
+  void exit_debugger_event (void);
 
-    void 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 lock (void) { m_mutex.lock (); }
+  void lock (void) { m_mutex.lock (); }
 
-    void wait (void) { m_waitcondition.wait (&m_mutex); }
+  void wait (void) { m_waitcondition.wait (&m_mutex); }
 
-    void unlock (void) { m_mutex.unlock (); }
+  void unlock (void) { m_mutex.unlock (); }
 
-    void wake_all (void) { m_waitcondition.wakeAll (); }
+  void wake_all (void) { m_waitcondition.wakeAll (); }
 
-  public slots:
+public slots:
 
-    void confirm_shutdown_octave (void);
+  void confirm_shutdown_octave (void);
 
-    void get_named_icon_slot (const QString& name);
+  void get_named_icon_slot (const QString& name);
 
-    void gui_preference_slot (const QString& key, const QString& value);
+  void gui_preference_slot (const QString& key, const QString& value);
 
-  signals:
+signals:
 
-    // Note: these signals are not currently used by the old terminal widget.
-    void start_gui_signal (bool gui_app);
-    void close_gui_signal (void);
+  // Note: these signals are not currently used by the old terminal widget.
+  void start_gui_signal (bool gui_app);
+  void close_gui_signal (void);
 
-    void copy_image_to_clipboard_signal (const QString& file, bool remove_file);
+  void copy_image_to_clipboard_signal (const QString& file, bool remove_file);
 
-    void focus_window_signal (const QString& win_name);
+  void focus_window_signal (const QString& win_name);
 
-    void edit_file_signal (const QString& file);
+  void edit_file_signal (const QString& file);
 
-    void directory_changed_signal (const QString& dir);
+  void directory_changed_signal (const QString& dir);
 
-    void update_path_dialog_signal (void);
+  void update_path_dialog_signal (void);
 
-    void file_remove_signal (const QString& old_name, const QString& new_name);
+  void file_remove_signal (const QString& old_name, const QString& new_name);
 
-    void file_renamed_signal (bool load_new);
+  void file_renamed_signal (bool load_new);
 
-    void execute_command_in_terminal_signal (const QString& command);
+  void execute_command_in_terminal_signal (const QString& command);
 
-    void set_workspace_signal (bool top_level, bool debug,
-                               const symbol_info_list& syminfo);
+  void set_workspace_signal (bool top_level, bool debug,
+                             const symbol_info_list& syminfo);
 
-    void clear_workspace_signal (void);
+  void clear_workspace_signal (void);
 
-    void update_prompt_signal (const QString& prompt);
+  void update_prompt_signal (const QString& prompt);
 
-    void set_history_signal (const QStringList& hist);
+  void set_history_signal (const QStringList& hist);
 
-    void append_history_signal (const QString& hist_entry);
+  void append_history_signal (const QString& hist_entry);
 
-    void clear_history_signal (void);
+  void clear_history_signal (void);
 
-    void enter_debugger_signal (void);
+  void enter_debugger_signal (void);
 
-    void exit_debugger_signal (void);
+  void exit_debugger_signal (void);
 
-    void update_breakpoint_marker_signal (bool insert, const QString& file,
-                                          int line, const QString& cond);
+  void update_breakpoint_marker_signal (bool insert, const QString& file,
+                                        int line, const QString& cond);
 
-    void insert_debugger_pointer_signal (const QString&, int);
+  void insert_debugger_pointer_signal (const QString&, int);
 
-    void delete_debugger_pointer_signal (const QString&, int);
+  void delete_debugger_pointer_signal (const QString&, int);
 
-    void show_preferences_signal (void);
+  void show_preferences_signal (void);
 
-    void gui_preference_signal (const QString& key, const QString& value);
+  void gui_preference_signal (const QString& key, const QString& value);
 
-    void show_terminal_window_signal (void);
+  void show_terminal_window_signal (void);
 
-    void show_documentation_signal (const QString& file);
+  void show_documentation_signal (const QString& file);
 
-    void register_documentation_signal (const QString& file);
+  void register_documentation_signal (const QString& file);
 
-    void unregister_documentation_signal (const QString& file);
+  void unregister_documentation_signal (const QString& file);
 
-    void show_file_browser_signal (void);
+  void show_file_browser_signal (void);
 
-    void show_command_history_signal (void);
+  void show_command_history_signal (void);
 
-    void show_workspace_signal (void);
+  void show_workspace_signal (void);
 
-    void show_community_news_signal (int serial);
-    void show_release_notes_signal (void);
+  void show_community_news_signal (int serial);
+  void show_release_notes_signal (void);
 
-    // Note: the next two signals are currently not used by the old terminal widget.
-    void interpreter_output_signal (const QString& msg);
-    void new_command_line_signal (const QString& msg = QString ());
+  // Note: the next two signals are currently not used by the old terminal widget.
+  void interpreter_output_signal (const QString& msg);
+  void new_command_line_signal (const QString& msg = QString ());
 
-    void gui_status_update_signal (const QString& feature, const QString& status);
+  void gui_status_update_signal (const QString& feature, const QString& status);
 
-    void update_gui_lexer_signal (bool update_apis_only);
+  void update_gui_lexer_signal (bool update_apis_only);
 
-    void edit_variable_signal (const QString& name, const octave_value& val);
+  void edit_variable_signal (const QString& name, const octave_value& val);
 
-    void refresh_variable_editor_signal (void);
+  void refresh_variable_editor_signal (void);
 
-    void confirm_shutdown_signal (void);
+  void confirm_shutdown_signal (void);
 
-    void get_named_icon_signal (const QString& name);
+  void get_named_icon_signal (const QString& name);
 
-    void settings_changed (const gui_settings *, bool);
+  void settings_changed (const gui_settings *, bool);
 
-    void apply_new_settings (void);
+  void apply_new_settings (void);
 
-  private:
+private:
 
-    QString gui_preference_adjust (const QString& key, const QString& value);
+  QString gui_preference_adjust (const QString& key, const QString& value);
 
-    void insert_debugger_pointer (const std::string& file, int line);
+  void insert_debugger_pointer (const std::string& file, int line);
 
-    void delete_debugger_pointer (const std::string& file, int line);
+  void delete_debugger_pointer (const std::string& file, int line);
 
-    base_qobject& m_octave_qobj;
+  base_qobject& m_octave_qobj;
 
-    QUIWidgetCreator m_uiwidget_creator;
+  QUIWidgetCreator m_uiwidget_creator;
 
-    QVariant m_result;
+  QVariant m_result;
 
-    QMutex m_mutex;
+  QMutex m_mutex;
 
-    QWaitCondition m_waitcondition;
-  };
+  QWaitCondition m_waitcondition;
+};
 
 OCTAVE_END_NAMESPACE(octave)