Mercurial > octave
diff libgui/src/external-editor-interface.cc @ 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/external-editor-interface.cc Tue Dec 06 14:37:51 2022 -0500 +++ b/libgui/src/external-editor-interface.cc Tue Dec 06 14:53:00 2022 -0500 @@ -37,95 +37,95 @@ OCTAVE_BEGIN_NAMESPACE(octave) - external_editor_interface::external_editor_interface (QWidget *p, - base_qobject& oct_qobj) - : QWidget (p), m_octave_qobj (oct_qobj) - { } +external_editor_interface::external_editor_interface (QWidget *p, + base_qobject& oct_qobj) +: QWidget (p), m_octave_qobj (oct_qobj) +{ } - // Calling the external editor - bool - external_editor_interface::call_custom_editor (const QString& file, int line) - { - QString editor = external_editor (); - if (editor.isEmpty ()) - return true; +// Calling the external editor +bool +external_editor_interface::call_custom_editor (const QString& file, int line) +{ + QString editor = external_editor (); + if (editor.isEmpty ()) + return true; - if (line < 0) - line = 0; + if (line < 0) + line = 0; - // replace macros - editor.replace ("%f", file); - editor.replace ("%l", QString::number (line)); + // replace macros + editor.replace ("%f", file); + editor.replace ("%l", QString::number (line)); - QStringList arguments = editor.split (QRegExp("\\s+")); - editor = arguments.takeFirst (); + QStringList arguments = editor.split (QRegExp("\\s+")); + editor = arguments.takeFirst (); - // start the process and check for success - bool started_ok = QProcess::startDetached (editor, arguments); + // start the process and check for success + bool started_ok = QProcess::startDetached (editor, arguments); - if (started_ok != true) - { - QMessageBox *msgBox = new QMessageBox (QMessageBox::Critical, - tr ("Octave Editor"), - tr ("Could not start custom file editor\n%1"). - arg (editor), - QMessageBox::Ok); + if (started_ok != true) + { + QMessageBox *msgBox = new QMessageBox (QMessageBox::Critical, + tr ("Octave Editor"), + tr ("Could not start custom file editor\n%1"). + arg (editor), + QMessageBox::Ok); - msgBox->setWindowModality (Qt::NonModal); - msgBox->setAttribute (Qt::WA_DeleteOnClose); - msgBox->show (); - } + msgBox->setWindowModality (Qt::NonModal); + msgBox->setAttribute (Qt::WA_DeleteOnClose); + msgBox->show (); + } - return started_ok; - } + return started_ok; +} - // Slots for the several signals for invoking the editor +// Slots for the several signals for invoking the editor - void external_editor_interface::request_new_file (const QString&) - { - call_custom_editor (); - } +void external_editor_interface::request_new_file (const QString&) +{ + call_custom_editor (); +} - void external_editor_interface::request_open_file (const QString& file_name, - const QString&, int line, - bool, bool, bool, - const QString&) - { - call_custom_editor (file_name, line); - } +void external_editor_interface::request_open_file (const QString& file_name, + const QString&, int line, + bool, bool, bool, + const QString&) +{ + call_custom_editor (file_name, line); +} - void external_editor_interface::handle_edit_file_request (const QString& file) - { - call_custom_editor (file); - } +void external_editor_interface::handle_edit_file_request (const QString& file) +{ + call_custom_editor (file); +} - // Get and verify the settings of the external editor program - QString external_editor_interface::external_editor (void) - { - resource_manager& rmgr = m_octave_qobj.get_resource_manager (); - gui_settings *settings = rmgr.get_settings (); - QString editor = settings->value (global_custom_editor.key, - global_custom_editor.def).toString (); +// Get and verify the settings of the external editor program +QString external_editor_interface::external_editor (void) +{ + resource_manager& rmgr = m_octave_qobj.get_resource_manager (); + gui_settings *settings = rmgr.get_settings (); + QString editor = settings->value (global_custom_editor.key, + global_custom_editor.def).toString (); - // check the settings (avoid an empty string) - if (editor.trimmed ().isEmpty ()) - { - QMessageBox *msgBox - = new QMessageBox (QMessageBox::Warning, - tr ("Octave Editor"), - tr ("There is no custom editor configured yet.\n" - "Do you want to open the preferences?"), - QMessageBox::No | QMessageBox::Yes); - msgBox->setDefaultButton (QMessageBox::Yes); - msgBox->setAttribute (Qt::WA_DeleteOnClose); + // check the settings (avoid an empty string) + if (editor.trimmed ().isEmpty ()) + { + QMessageBox *msgBox + = new QMessageBox (QMessageBox::Warning, + tr ("Octave Editor"), + tr ("There is no custom editor configured yet.\n" + "Do you want to open the preferences?"), + QMessageBox::No | QMessageBox::Yes); + msgBox->setDefaultButton (QMessageBox::Yes); + msgBox->setAttribute (Qt::WA_DeleteOnClose); - int button = msgBox->exec (); + int button = msgBox->exec (); - if (button == QMessageBox::Yes) - emit request_settings_dialog ("editor"); - } + if (button == QMessageBox::Yes) + emit request_settings_dialog ("editor"); + } - return editor; - } + return editor; +} OCTAVE_END_NAMESPACE(octave)