Mercurial > octave
diff libgui/src/octave-qobject.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 | 1a1f47f17ed4 597f3ee61a48 |
line wrap: on
line diff
--- a/libgui/src/octave-qobject.h Tue Dec 06 14:37:51 2022 -0500 +++ b/libgui/src/octave-qobject.h Tue Dec 06 14:53:00 2022 -0500 @@ -40,280 +40,280 @@ OCTAVE_BEGIN_NAMESPACE(octave) - class community_news; - class main_window; - class qt_application; - class qt_interpreter_events; - class release_notes; +class community_news; +class main_window; +class qt_application; +class qt_interpreter_events; +class release_notes; - //! This class is a simple wrapper around QApplication so that we can - //! reimplement QApplication::notify. The octave_qapplication object - //! should behave identically to a QApplication object except that it - //! overrides the notify method so we can handle forward Octave - //! execution_exception exceptions from the GUI thread to the - //! interpreter thread. +//! This class is a simple wrapper around QApplication so that we can +//! reimplement QApplication::notify. The octave_qapplication object +//! should behave identically to a QApplication object except that it +//! overrides the notify method so we can handle forward Octave +//! execution_exception exceptions from the GUI thread to the +//! interpreter thread. - class octave_qapplication : public QApplication - { - Q_OBJECT +class octave_qapplication : public QApplication +{ + Q_OBJECT - public: +public: - octave_qapplication (int& argc, char **argv) - : QApplication (argc, argv) - { } + octave_qapplication (int& argc, char **argv) + : QApplication (argc, argv) + { } - virtual bool notify (QObject *receiver, QEvent *e) override; + virtual bool notify (QObject *receiver, QEvent *e) override; - ~octave_qapplication (void) { }; + ~octave_qapplication (void) { }; - signals: +signals: - void interpreter_event (const fcn_callback& fcn); - void interpreter_event (const meth_callback& meth); - }; + void interpreter_event (const fcn_callback& fcn); + void interpreter_event (const meth_callback& meth); +}; - //! Container for windows that may be created from the command line or - //! docked with the main GUI window. Any of these windows that are - //! created in command line mode will be adopted by the main window if - //! it is opened from the command line. Any that are undocked from - //! the main window will remain open if control returns to the command - //! line. +//! Container for windows that may be created from the command line or +//! docked with the main GUI window. Any of these windows that are +//! created in command line mode will be adopted by the main window if +//! it is opened from the command line. Any that are undocked from +//! the main window will remain open if control returns to the command +//! line. - class base_qobject; - class documentation_dock_widget; - class file_editor_interface; - class files_dock_widget; - class history_dock_widget; - class terminal_dock_widget; - class variable_editor; - class workspace_model; - class workspace_view; +class base_qobject; +class documentation_dock_widget; +class file_editor_interface; +class files_dock_widget; +class history_dock_widget; +class terminal_dock_widget; +class variable_editor; +class workspace_model; +class workspace_view; - //! Base class for Octave interfaces that use Qt. There are two - //! classes derived from this one. One provides a command-line - //! interface that may use Qt graphics and another provides the - //! full GUI experience. +//! Base class for Octave interfaces that use Qt. There are two +//! classes derived from this one. One provides a command-line +//! interface that may use Qt graphics and another provides the +//! full GUI experience. - class base_qobject : public QObject - { - Q_OBJECT +class base_qobject : public QObject +{ + Q_OBJECT - public: +public: - // Note: the GUI_APP argument is not needed with the new - // experimental terminal widget. - base_qobject (qt_application& app_context, bool gui_app = false); + // Note: the GUI_APP argument is not needed with the new + // experimental terminal widget. + base_qobject (qt_application& app_context, bool gui_app = false); - ~base_qobject (void); + ~base_qobject (void); - void config_translators (void); + void config_translators (void); - void start_main_thread (void); + void start_main_thread (void); - int exec (void); + int exec (void); - // The Octave application context. - qt_application& app_context (void) { return m_app_context; } + // The Octave application context. + qt_application& app_context (void) { return m_app_context; } - // The Qt QApplication. - QApplication * qapplication (void) { return m_qapplication; }; + // The Qt QApplication. + QApplication * qapplication (void) { return m_qapplication; }; - // Provided for convenience. Will be removed once we eliminate the - // old terminal widget. - bool experimental_terminal_widget (void) const; + // Provided for convenience. Will be removed once we eliminate the + // old terminal widget. + bool experimental_terminal_widget (void) const; - // Provided for convenience. - bool gui_running (void) const; + // Provided for convenience. + bool gui_running (void) const; - bool have_terminal_window (void) const - { - return ! m_terminal_widget.isNull (); - } + bool have_terminal_window (void) const + { + return ! m_terminal_widget.isNull (); + } - main_window * get_main_window (void) - { - return m_main_window; - } + main_window * get_main_window (void) + { + return m_main_window; + } - resource_manager& get_resource_manager (void) - { - return m_resource_manager; - } + resource_manager& get_resource_manager (void) + { + return m_resource_manager; + } - shortcut_manager& get_shortcut_manager (void) - { - return m_shortcut_manager; - } + shortcut_manager& get_shortcut_manager (void) + { + return m_shortcut_manager; + } - std::shared_ptr<qt_interpreter_events> get_qt_interpreter_events (void) - { - return m_qt_interpreter_events; - } + std::shared_ptr<qt_interpreter_events> get_qt_interpreter_events (void) + { + return m_qt_interpreter_events; + } - qt_interpreter_events * qt_link (void) - { - return m_qt_interpreter_events.get (); - } + qt_interpreter_events * qt_link (void) + { + return m_qt_interpreter_events.get (); + } - interpreter_qobject * interpreter_qobj (void) - { - return m_interpreter_qobj; - } + interpreter_qobject * interpreter_qobj (void) + { + return m_interpreter_qobj; + } - workspace_model * get_workspace_model (void) - { - return m_workspace_model; - } + workspace_model * get_workspace_model (void) + { + return m_workspace_model; + } - QPointer<terminal_dock_widget> - terminal_widget (main_window *mw = nullptr); + QPointer<terminal_dock_widget> + terminal_widget (main_window *mw = nullptr); - QPointer<documentation_dock_widget> - documentation_widget (main_window *mw = nullptr); + QPointer<documentation_dock_widget> + documentation_widget (main_window *mw = nullptr); - QPointer<files_dock_widget> - file_browser_widget (main_window *mw = nullptr); + QPointer<files_dock_widget> + file_browser_widget (main_window *mw = nullptr); - QPointer<history_dock_widget> - history_widget (main_window *mw = nullptr); + QPointer<history_dock_widget> + history_widget (main_window *mw = nullptr); - QPointer<workspace_view> - workspace_widget (main_window *mw = nullptr); + QPointer<workspace_view> + workspace_widget (main_window *mw = nullptr); - // FIXME: The file_editor_interface needs to be a proper generic - // interface for all editors (internal and external) for this to - // work properly. - QPointer<file_editor_interface> - editor_widget (main_window *mw = nullptr); + // FIXME: The file_editor_interface needs to be a proper generic + // interface for all editors (internal and external) for this to + // work properly. + QPointer<file_editor_interface> + editor_widget (main_window *mw = nullptr); - QPointer<variable_editor> - variable_editor_widget (main_window *mw = nullptr); + QPointer<variable_editor> + variable_editor_widget (main_window *mw = nullptr); - QPointer<community_news> community_news_widget (int serial = -1); + QPointer<community_news> community_news_widget (int serial = -1); - QPointer<release_notes> release_notes_widget (void); + QPointer<release_notes> release_notes_widget (void); - QThread * main_thread (void) { return m_main_thread; } + QThread * main_thread (void) { return m_main_thread; } - // Declared virtual so that a derived class may redefine this - // method. + // Declared virtual so that a derived class may redefine this + // method. - virtual bool confirm_shutdown (void); + virtual bool confirm_shutdown (void); - bool is_gui_app (void) const { return m_gui_app; } + bool is_gui_app (void) const { return m_gui_app; } - template <typename T> void connect_interpreter_events (T *widget) - { - connect (widget, QOverload<const fcn_callback&>::of (&T::interpreter_event), - this, QOverload<const fcn_callback&>::of (&base_qobject::interpreter_event)); + template <typename T> void connect_interpreter_events (T *widget) + { + connect (widget, QOverload<const fcn_callback&>::of (&T::interpreter_event), + this, QOverload<const fcn_callback&>::of (&base_qobject::interpreter_event)); - connect (widget, QOverload<const meth_callback&>::of (&T::interpreter_event), - this, QOverload<const meth_callback&>::of (&base_qobject::interpreter_event)); - } + connect (widget, QOverload<const meth_callback&>::of (&T::interpreter_event), + this, QOverload<const meth_callback&>::of (&base_qobject::interpreter_event)); + } - public slots: +public slots: - void execute_command (const QString& command); + void execute_command (const QString& command); - // Note: START_GUI and CLOSE_GUI don't currently perform any work - // with the old terminal widget. - void start_gui (bool gui_app); - void close_gui (void); + // Note: START_GUI and CLOSE_GUI don't currently perform any work + // with the old terminal widget. + void start_gui (bool gui_app); + void close_gui (void); - void show_terminal_window (void); + void show_terminal_window (void); - void show_documentation_window (const QString& file); + void show_documentation_window (const QString& file); - void show_file_browser_window (void); + void show_file_browser_window (void); - void show_command_history_window (void); + void show_command_history_window (void); - void show_workspace_window (void); + void show_workspace_window (void); - void show_variable_editor_window (const QString& name, - const octave_value& value); + void show_variable_editor_window (const QString& name, + const octave_value& value); - void handle_variable_editor_update (void); + void handle_variable_editor_update (void); - void show_community_news (int serial); + void show_community_news (int serial); - void show_release_notes (void); + void show_release_notes (void); - void interpreter_ready (void); + void interpreter_ready (void); - void interpreter_event (const fcn_callback& fcn); + void interpreter_event (const fcn_callback& fcn); - void interpreter_event (const meth_callback& meth); + void interpreter_event (const meth_callback& meth); - void interpreter_interrupt (void); + void interpreter_interrupt (void); - // Note: these currently only work with the new experimental - // terminal widget. - void interpreter_pause (void); - void interpreter_stop (void); - void interpreter_resume (void); + // Note: these currently only work with the new experimental + // terminal widget. + void interpreter_pause (void); + void interpreter_stop (void); + void interpreter_resume (void); - void copy_image_to_clipboard (const QString& file, bool remove_file); + void copy_image_to_clipboard (const QString& file, bool remove_file); - protected: +protected: - qt_application& m_app_context; + qt_application& m_app_context; - // Use these to ensure that argc and argv exist for as long as the - // QApplication object. + // Use these to ensure that argc and argv exist for as long as the + // QApplication object. - int m_argc; - char **m_argv; + int m_argc; + char **m_argv; - octave_qapplication *m_qapplication; + octave_qapplication *m_qapplication; - resource_manager m_resource_manager; + resource_manager m_resource_manager; - shortcut_manager m_shortcut_manager; + shortcut_manager m_shortcut_manager; - QTranslator *m_qt_tr; - QTranslator *m_gui_tr; - QTranslator *m_qsci_tr; + QTranslator *m_qt_tr; + QTranslator *m_gui_tr; + QTranslator *m_qsci_tr; - bool m_translators_installed; + bool m_translators_installed; - std::shared_ptr<qt_interpreter_events> m_qt_interpreter_events; + std::shared_ptr<qt_interpreter_events> m_qt_interpreter_events; - interpreter_qobject *m_interpreter_qobj; + interpreter_qobject *m_interpreter_qobj; - QThread *m_main_thread; + QThread *m_main_thread; - bool m_gui_app; + bool m_gui_app; - bool m_interpreter_ready; + bool m_interpreter_ready; - workspace_model *m_workspace_model; + workspace_model *m_workspace_model; - // Dock widgets that may be used from the command line. They are - // adopted by the desktop (main window) if it is also started from - // the command line. + // Dock widgets that may be used from the command line. They are + // adopted by the desktop (main window) if it is also started from + // the command line. - QPointer<terminal_dock_widget> m_terminal_widget; + QPointer<terminal_dock_widget> m_terminal_widget; - QPointer<documentation_dock_widget> m_documentation_widget; + QPointer<documentation_dock_widget> m_documentation_widget; - QPointer<files_dock_widget> m_file_browser_widget; + QPointer<files_dock_widget> m_file_browser_widget; - QPointer<history_dock_widget> m_history_widget; + QPointer<history_dock_widget> m_history_widget; - QPointer<workspace_view> m_workspace_widget; + QPointer<workspace_view> m_workspace_widget; - QPointer<file_editor_interface> m_editor_widget; + QPointer<file_editor_interface> m_editor_widget; - QPointer<variable_editor> m_variable_editor_widget; + QPointer<variable_editor> m_variable_editor_widget; - QPointer<community_news> m_community_news; + QPointer<community_news> m_community_news; - QPointer<release_notes> m_release_notes; + QPointer<release_notes> m_release_notes; - main_window *m_main_window; - }; + main_window *m_main_window; +}; OCTAVE_END_NAMESPACE(octave)