Mercurial > octave
changeset 27935:f1844e33f621
maint: Use Octave coding conventions in libgui/ directory.
* Table.cc, qt-graphics-toolkit.cc, documentation.cc, documentation.h,
files-dock-widget.cc, find-files-dialog.cc, gui-preferences-cs.h,
gui-preferences-dw.h, gui-preferences-ed.h, gui-preferences-ff.h,
gui-preferences-mw.h, gui-preferences-sc.h, history-dock-widget.cc,
file-editor-tab.cc, file-editor.cc, find-dialog.cc, octave-qscintilla.cc,
main-window.cc, octave-dock-widget.cc, octave-qobject.cc, resource-manager.cc,
set-path-dialog.cc, set-path-model.cc, settings-dialog.cc, settings-dialog.h,
shortcut-manager.cc, tab-bar.cc, variable-editor.cc, workspace-model.cc,
workspace-model.h, workspace-view.cc:
Use Octave coding conventions in libgui/ directory.
line wrap: on
line diff
--- a/libgui/graphics/Table.cc Sat Jan 11 13:55:55 2020 -0800 +++ b/libgui/graphics/Table.cc Sun Jan 12 09:33:21 2020 -0800 @@ -380,7 +380,7 @@ SCANF_AND_CONVERT(int64, int64_t, "%" PRId64 " %n") SCANF_AND_CONVERT(uint64, uint64_t, "%" PRIu64 " %n") - #undef SCANF_AND_CONVERT +#undef SCANF_AND_CONVERT else if (old_value.isnumeric () && ! old_value.isinteger ()) {
--- a/libgui/graphics/qt-graphics-toolkit.cc Sat Jan 11 13:55:55 2020 -0800 +++ b/libgui/graphics/qt-graphics-toolkit.cc Sun Jan 12 09:33:21 2020 -0800 @@ -242,9 +242,9 @@ void qt_graphics_toolkit::print_figure (const graphics_object& go, - const std::string& term, - const std::string& file_cmd, - const std::string& /*debug_file*/) const + const std::string& term, + const std::string& file_cmd, + const std::string& /*debug_file*/) const { ObjectProxy *proxy = toolkitObjectProxy (go);
--- a/libgui/src/documentation.cc Sat Jan 11 13:55:55 2020 -0800 +++ b/libgui/src/documentation.cc Sun Jan 12 09:33:21 2020 -0800 @@ -505,7 +505,7 @@ emit show_single_result (url); } } - } + } m_internal_search = QString (); } @@ -712,16 +712,16 @@ find_flags = QTextDocument::FindBackward; if (! m_doc_browser->find (m_find_line_edit->text (), find_flags)) - { - // Nothing was found, restart search from the begin or end of text - QTextCursor textcur = m_doc_browser->textCursor (); - if (backward) - textcur.movePosition (QTextCursor::End); - else - textcur.movePosition (QTextCursor::Start); - m_doc_browser->setTextCursor (textcur); - m_doc_browser->find (m_find_line_edit->text (), find_flags); - } + { + // Nothing was found, restart search from the begin or end of text + QTextCursor textcur = m_doc_browser->textCursor (); + if (backward) + textcur.movePosition (QTextCursor::End); + else + textcur.movePosition (QTextCursor::Start); + m_doc_browser->setTextCursor (textcur); + m_doc_browser->find (m_find_line_edit->text (), find_flags); + } record_anchor_position (); }
--- a/libgui/src/documentation.h Sat Jan 11 13:55:55 2020 -0800 +++ b/libgui/src/documentation.h Sun Jan 12 09:33:21 2020 -0800 @@ -70,7 +70,7 @@ protected: - void wheelEvent (QWheelEvent *we); + void wheelEvent (QWheelEvent *we); private:
--- a/libgui/src/files-dock-widget.cc Sat Jan 11 13:55:55 2020 -0800 +++ b/libgui/src/files-dock-widget.cc Sun Jan 12 09:33:21 2020 -0800 @@ -317,7 +317,8 @@ Qt::SortOrder sort_order = m_file_tree_view->header ()->sortIndicatorOrder (); settings->setValue (fb_sort_column.key, sort_column); settings->setValue (fb_sort_order.key, sort_order); - settings->setValue (fb_column_state.key, m_file_tree_view->header ()->saveState ()); + settings->setValue (fb_column_state.key, + m_file_tree_view->header ()->saveState ()); QStringList dirs; for (int i=0; i< m_current_directory->count (); i++) @@ -380,7 +381,8 @@ display_directory (m_octave_dir,false); // false: no sync of octave dir } - void files_dock_widget::display_directory (const QString& dir, bool set_octave_dir) + void files_dock_widget::display_directory (const QString& dir, + bool set_octave_dir) { QFileInfo fileInfo (dir); if (fileInfo.exists ()) @@ -549,16 +551,16 @@ QMenu *add_path_menu = menu.addMenu (tr ("Add to Path")); add_path_menu->addAction (tr ("Selected Directories"), - this, SLOT (contextmenu_add_to_path (bool))); + this, SLOT (contextmenu_add_to_path (bool))); add_path_menu->addAction (tr ("Selected Directories and Subdirectories"), - this, SLOT (contextmenu_add_to_path_subdirs (bool))); + this, SLOT (contextmenu_add_to_path_subdirs (bool))); QMenu *rm_path_menu = menu.addMenu (tr ("Remove from Path")); - rm_path_menu->addAction (tr ("Selected Directories"), - this, SLOT (contextmenu_rm_from_path (bool))); + rm_path_menu->addAction (tr ("Selected Directories"), this, + SLOT (contextmenu_rm_from_path (bool))); rm_path_menu->addAction (tr ("Selected Directories and Subdirectories"), - this, SLOT (contextmenu_rm_from_path_subdirs (bool))); + this, SLOT (contextmenu_rm_from_path_subdirs (bool))); menu.addSeparator (); @@ -772,7 +774,7 @@ QFileInfo info = m_file_system_model->fileInfo (index); if (info.exists () && - ((dir & info.isDir ()) || (! dir && info.isFile ()))) + ((dir & info.isDir ()) || (! dir && info.isFile ()))) infos.append (info); }
--- a/libgui/src/find-files-dialog.cc Sat Jan 11 13:55:55 2020 -0800 +++ b/libgui/src/find-files-dialog.cc Sun Jan 12 09:33:21 2020 -0800 @@ -397,8 +397,9 @@ QString line; QString match_str = m_contains_text_edit->text (); - Qt::CaseSensitivity cs = m_content_case_check->isChecked () ? - Qt::CaseInsensitive : Qt::CaseSensitive; + Qt::CaseSensitivity cs = m_content_case_check->isChecked () + ? Qt::CaseInsensitive + : Qt::CaseSensitive; do {
--- a/libgui/src/gui-preferences-cs.h Sat Jan 11 13:55:55 2020 -0800 +++ b/libgui/src/gui-preferences-cs.h Sun Jan 12 09:33:21 2020 -0800 @@ -65,10 +65,10 @@ }; const QStringList cs_color_names (QStringList () - << QT_TRANSLATE_NOOP ("octave::settings_dialog", "foreground") - << QT_TRANSLATE_NOOP ("octave::settings_dialog", "background") - << QT_TRANSLATE_NOOP ("octave::settings_dialog", "selection") - << QT_TRANSLATE_NOOP ("octave::settings_dialog", "cursor")); + << QT_TRANSLATE_NOOP ("octave::settings_dialog", "foreground") + << QT_TRANSLATE_NOOP ("octave::settings_dialog", "background") + << QT_TRANSLATE_NOOP ("octave::settings_dialog", "selection") + << QT_TRANSLATE_NOOP ("octave::settings_dialog", "cursor")); const gui_pref cs_focus_cmd ("terminal/focus_after_command", QVariant (false));
--- a/libgui/src/gui-preferences-dw.h Sat Jan 11 13:55:55 2020 -0800 +++ b/libgui/src/gui-preferences-dw.h Sun Jan 12 09:33:21 2020 -0800 @@ -29,7 +29,8 @@ #include "gui-preferences.h" const gui_pref -dw_title_custom_style ("DockWidgets/widget_title_custom_style", QVariant (false)); +dw_title_custom_style ("DockWidgets/widget_title_custom_style", + QVariant (false)); const gui_pref dw_title_3d ("DockWidgets/widget_title_3d", QVariant (50));
--- a/libgui/src/gui-preferences-ed.h Sat Jan 11 13:55:55 2020 -0800 +++ b/libgui/src/gui-preferences-ed.h Sun Jan 12 09:33:21 2020 -0800 @@ -37,10 +37,12 @@ // Code completion const gui_pref -ed_code_completion_octave_builtins ("editor/codeCompletion_octave_builtins", QVariant (true)); +ed_code_completion_octave_builtins ("editor/codeCompletion_octave_builtins", + QVariant (true)); const gui_pref -ed_code_completion_octave_functions ("editor/codeCompletion_octave_functions", QVariant (true)); +ed_code_completion_octave_functions ("editor/codeCompletion_octave_functions", + QVariant (true)); const gui_pref ed_code_completion_keywords ("editor/codeCompletion_keywords", QVariant (true)); @@ -72,7 +74,8 @@ ed_tab_indents_line ("editor/tab_indents_line", QVariant (false)); const gui_pref -ed_backspace_unindents_line ("editor/backspace_unindents_line", QVariant (false)); +ed_backspace_unindents_line ("editor/backspace_unindents_line", + QVariant (false)); const gui_pref ed_show_indent_guides ("editor/show_indent_guides", QVariant (false)); @@ -101,7 +104,8 @@ ed_long_line_marker_line ("editor/long_line_marker_line", QVariant (true)); const gui_pref -ed_long_line_marker_background ("editor/long_line_marker_background", QVariant (false)); +ed_long_line_marker_background ("editor/long_line_marker_background", + QVariant (false)); const gui_pref ed_wrap_lines ("editor/wrap_lines", QVariant (false)); @@ -113,7 +117,8 @@ ed_break_lines_comments ("editor/break_lines_comments", QVariant (false)); const gui_pref -ed_highlight_all_occurrences ("editor/highlight_all_occurrences", QVariant (true)); +ed_highlight_all_occurrences ("editor/highlight_all_occurrences", + QVariant (true)); const gui_pref ed_show_Line_numbers ("editor/showLineNumbers", QVariant (true)); @@ -128,7 +133,8 @@ ed_highlight_current_line ("editor/highlightCurrentLine", QVariant (true)); const gui_pref -ed_highlight_current_line_color ("editor/highlight_current_line_color", QVariant (QColor (240, 240, 240))); +ed_highlight_current_line_color ("editor/highlight_current_line_color", + QVariant (QColor (240, 240, 240))); const gui_pref ed_show_white_space ("editor/show_white_space", QVariant (false)); @@ -235,7 +241,8 @@ ed_hiding_closes_files ("editor/hiding_closes_files", QVariant (false)); const gui_pref -ed_always_reload_changed_files ("editor/always_reload_changed_files", QVariant (false)); +ed_always_reload_changed_files ("editor/always_reload_changed_files", + QVariant (false)); const gui_pref ed_mru_file_list ("editor/mru_file_list", QVariant ());
--- a/libgui/src/gui-preferences-ff.h Sat Jan 11 13:55:55 2020 -0800 +++ b/libgui/src/gui-preferences-ff.h Sun Jan 12 09:33:21 2020 -0800 @@ -61,7 +61,8 @@ ff_sort_files_by_column ("findfiles/sort_files_by_column", QVariant (0)); const gui_pref -ff_sort_files_by_order ("findfiles/sort_files_by_order", QVariant (Qt::AscendingOrder)); +ff_sort_files_by_order ("findfiles/sort_files_by_order", + QVariant (Qt::AscendingOrder)); #endif
--- a/libgui/src/gui-preferences-mw.h Sat Jan 11 13:55:55 2020 -0800 +++ b/libgui/src/gui-preferences-mw.h Sun Jan 12 09:33:21 2020 -0800 @@ -30,7 +30,8 @@ // Main window preferences -const unsigned char ba_geometry_data[] = { +const unsigned char ba_geometry_data[] = +{ 0x01,0xd9,0xd0,0xcb,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, 0x00,0x1b,0x00,0x00,0x03,0xaf,0x00,0x00,0x02,0xb8,0x00,0x00,0x00,0x00, 0x00,0x00,0x00,0x39,0x00,0x00,0x03,0xaf,0x00,0x00,0x02,0xb8,0x00,0x00, @@ -41,9 +42,11 @@ // QVariant (QByteArrayLiteral ("\x1\xd9\xd0\xcb\0\x2\0\0\0\0\0\0\0\0\0\x1b\0\0\x3\xaf\0\0\x2\xb8\0\0\0\0\0\0\0\x39\0\0\x3\xaf\0\0\x2\xb8\0\0\0\0\0\0\0\0\x5\0"))); const gui_pref mw_geometry ("MainWindow/geometry", - QVariant (QByteArray (reinterpret_cast<const char*> (ba_geometry_data), sizeof (ba_geometry_data)))); + QVariant (QByteArray (reinterpret_cast<const char*> (ba_geometry_data), + sizeof (ba_geometry_data)))); -const unsigned char ba_state_data[] = { +const unsigned char ba_state_data[] = +{ '\0','\0','\0',0xff,'\0','\0','\0','\0',0xfd,'\0','\0','\0',0x2,'\0','\0', '\0','\0','\0','\0',0x1,'&','\0','\0',0x2,'+',0xfc,0x2,'\0','\0','\0',0x3, 0xfb,'\0','\0','\0',0x1e,'\0','F','\0','i','\0','l','\0','e','\0','s','\0', @@ -84,7 +87,8 @@ // QVariant (QByteArrayLiteral ("\0\0\0\xff\0\0\0\0\xfd\0\0\0\x2\0\0\0\0\0\0\x1&\0\0\x2+\xfc\x2\0\0\0\x3\xfb\0\0\0\x1e\0\x46\0i\0l\0\x65\0s\0\x44\0o\0\x63\0k\0W\0i\0\x64\0g\0\x65\0t\x1\0\0\0?\0\0\0\xac\0\0\0\x88\0\xff\xff\xff\xfb\0\0\0\x1a\0W\0o\0r\0k\0s\0p\0\x61\0\x63\0\x65\0V\0i\0\x65\0w\x1\0\0\0\xf1\0\0\0\xca\0\0\0\x82\0\xff\xff\xff\xfb\0\0\0\"\0H\0i\0s\0t\0o\0r\0y\0\x44\0o\0\x63\0k\0W\0i\0\x64\0g\0\x65\0t\x1\0\0\x1\xc1\0\0\0\xa9\0\0\0\x82\0\xff\xff\xff\0\0\0\x1\0\0\x2\x84\0\0\x2+\xfc\x2\0\0\0\x1\xfc\0\0\0?\0\0\x2+\0\0\0\xeb\x1\0\0\x1b\xfa\0\0\0\0\x2\0\0\0\x4\xfb\0\0\0$\0T\0\x65\0r\0m\0i\0n\0\x61\0l\0\x44\0o\0\x63\0k\0W\0i\0\x64\0g\0\x65\0t\x1\0\0\0\0\xff\xff\xff\xff\0\0\0\x46\0\xff\xff\xff\xfb\0\0\0.\0\x44\0o\0\x63\0u\0m\0\x65\0n\0t\0\x61\0t\0i\0o\0n\0\x44\0o\0\x63\0k\0W\0i\0\x64\0g\0\x65\0t\x1\0\0\0\0\xff\xff\xff\xff\0\0\0\xcf\0\xff\xff\xff\xfb\0\0\0\x14\0\x46\0i\0l\0\x65\0\x45\0\x64\0i\0t\0o\0r\x1\0\0\0\0\xff\xff\xff\xff\0\0\0\x62\0\xff\xff\xff\xfb\0\0\0\x1c\0V\0\x61\0r\0i\0\x61\0\x62\0l\0\x65\0\x45\0\x64\0i\0t\0o\0r\x1\0\0\0\0\xff\xff\xff\xff\0\0\0;\0\xff\xff\xff\0\0\0\0\0\0\x2+\0\0\0\x4\0\0\0\x4\0\0\0\b\0\0\0\b\xfc\0\0\0\x1\0\0\0\x2\0\0\0\x1\0\0\0\x16\0M\0\x61\0i\0n\0T\0o\0o\0l\0\x42\0\x61\0r\x1\0\0\0\0\xff\xff\xff\xff\0\0\0\0\0\0\0\0"))); const gui_pref mw_state ("MainWindow/windowState", - QVariant (QByteArray (reinterpret_cast<const char*> (ba_state_data), sizeof (ba_state_data)))); + QVariant (QByteArray (reinterpret_cast<const char*> (ba_state_data), + sizeof (ba_state_data)))); const gui_pref mw_dir_list ("MainWindow/current_directory_list", QVariant (QStringList ()));
--- a/libgui/src/gui-preferences-sc.h Sat Jan 11 13:55:55 2020 -0800 +++ b/libgui/src/gui-preferences-sc.h Sun Jan 12 09:33:21 2020 -0800 @@ -41,11 +41,11 @@ // definition and value method for the settings class. #if defined (Q_OS_MAC) - // Use CMD key as an equivalent of Ctrl key on other platforms +// Use CMD key as an equivalent of Ctrl key on other platforms const Qt::KeyboardModifier CTRL = Qt::MetaModifier; - // Some of octave default shortcuts on windows/linux are already defined - // as system wide shortcuts on Mac Os X (almost all Function keys). - // Prefix those with Option (Alt) modifier to avoid conflicts. +// Some of octave default shortcuts on windows/linux are already defined +// as system wide shortcuts on Mac Os X (almost all Function keys). +// Prefix those with Option (Alt) modifier to avoid conflicts. const int PRE = Qt::AltModifier; #else const Qt::KeyboardModifier CTRL = Qt::ControlModifier;
--- a/libgui/src/history-dock-widget.cc Sat Jan 11 13:55:55 2020 -0800 +++ b/libgui/src/history-dock-widget.cc Sun Jan 12 09:33:21 2020 -0800 @@ -327,8 +327,7 @@ = settings->value (hw_filter_shown).toBool (); m_filter_widget->setVisible (m_filter_shown); - m_filter->addItems - (settings->value (hw_mru_list).toStringList ()); + m_filter->addItems (settings->value (hw_mru_list).toStringList ()); bool filter_state = settings->value (hw_filter_active).toBool ();
--- a/libgui/src/m-editor/file-editor-tab.cc Sat Jan 11 13:55:55 2020 -0800 +++ b/libgui/src/m-editor/file-editor-tab.cc Sun Jan 12 09:33:21 2020 -0800 @@ -179,16 +179,17 @@ m_edit_area->setMarkerBackgroundColor (QColor (192,0,0), marker::breakpoint); m_edit_area->markerDefine (QsciScintilla::Circle, marker::cond_break); m_edit_area->setMarkerBackgroundColor (QColor (255,127,0), marker::cond_break); - m_edit_area->markerDefine (QsciScintilla::RightArrow, marker::debugger_position); - m_edit_area->setMarkerBackgroundColor (QColor (255,255,0), - marker::debugger_position); m_edit_area->markerDefine (QsciScintilla::RightArrow, - marker::unsure_debugger_position); + marker::debugger_position); + m_edit_area->setMarkerBackgroundColor (QColor (255,255,0), + marker::debugger_position); + m_edit_area->markerDefine (QsciScintilla::RightArrow, + marker::unsure_debugger_position); m_edit_area->setMarkerBackgroundColor (QColor (192,192,192), - marker::unsure_debugger_position); + marker::unsure_debugger_position); connect (m_edit_area, SIGNAL (marginClicked (int, int, - Qt::KeyboardModifiers)), + Qt::KeyboardModifiers)), this, SLOT (handle_margin_clicked (int, int, Qt::KeyboardModifiers))); @@ -1263,7 +1264,8 @@ }); } - void file_editor_tab::scintilla_command (const QWidget *ID, unsigned int sci_msg) + void file_editor_tab::scintilla_command (const QWidget *ID, + unsigned int sci_msg) { if (ID != this) return; @@ -1271,7 +1273,8 @@ m_edit_area->SendScintilla (sci_msg); } - void file_editor_tab::comment_selected_text (const QWidget *ID, bool input_str) + void file_editor_tab::comment_selected_text (const QWidget *ID, + bool input_str) { if (ID != this) return; @@ -1484,7 +1487,7 @@ } //set selection on (un)indented section m_edit_area->setSelection (lineFrom, 0, lineTo, - m_edit_area->text (lineTo).length ()-1); + m_edit_area->text (lineTo).length ()-1); } else { @@ -1930,7 +1933,7 @@ rmgr.combo_encoding (enc_combo); m_new_encoding = enc_combo->currentText (); connect (enc_combo, SIGNAL (currentTextChanged (const QString&)), - this , SLOT (handle_current_enc_changed (const QString&))); + this, SLOT (handle_current_enc_changed (const QString&))); QDialogButtonBox *buttons = new QDialogButtonBox (QDialogButtonBox::Ok | QDialogButtonBox::Cancel, @@ -2638,7 +2641,7 @@ if (settings->value (ed_code_folding).toBool ()) { m_edit_area->setMarginType (3, QsciScintilla::SymbolMargin); - m_edit_area->setFolding (QsciScintilla::BoxedTreeFoldStyle , 3); + m_edit_area->setFolding (QsciScintilla::BoxedTreeFoldStyle, 3); } else { @@ -2727,7 +2730,7 @@ m_ind_char_width = m_edit_area->tabWidth (); m_edit_area->SendScintilla (QsciScintillaBase::SCI_SETHSCROLLBAR, - settings->value (ed_show_hscroll_bar).toBool ()); + settings->value (ed_show_hscroll_bar).toBool ()); m_edit_area->SendScintilla (QsciScintillaBase::SCI_SETSCROLLWIDTH,-1); m_edit_area->SendScintilla (QsciScintillaBase::SCI_SETSCROLLWIDTHTRACKING,true); @@ -3046,7 +3049,7 @@ // Obviously, we have a newline here if (m_smart_indent || m_auto_endif) m_edit_area->smart_indent (m_smart_indent, m_auto_endif, - m_line, m_ind_char_width); + m_line, m_ind_char_width); } } @@ -3159,17 +3162,17 @@ // search for first occurrence of the detected word bool find_result_available = m_edit_area->findFirst (word, - false, // no regexp - true, // case sensitive - true, // whole words only - false, // do not wrap - true, // forward - 0,0, // from the beginning - false + false, // no regexp + true, // case sensitive + true, // whole words only + false, // do not wrap + true, // forward + 0,0, // from the beginning + false #if defined (HAVE_QSCI_VERSION_2_6_0) - , true + , true #endif - ); + ); // loop over all occurrences and set the related indicator int oline, ocol;
--- a/libgui/src/m-editor/file-editor.cc Sat Jan 11 13:55:55 2020 -0800 +++ b/libgui/src/m-editor/file-editor.cc Sun Jan 12 09:33:21 2020 -0800 @@ -867,7 +867,7 @@ m_find_dialog->set_visible (true); } - void file_editor::request_find_next (bool) + void file_editor::request_find_next (bool) { if (m_find_dialog) m_find_dialog->find_next (); @@ -1183,10 +1183,10 @@ else { request_open_file (m_tmp_closed_files.at (i).file_name, - m_tmp_closed_files.at (i).encoding, - m_tmp_closed_files.at (i).line, - false, false, true, "", - m_tmp_closed_files.at (i).index); + m_tmp_closed_files.at (i).encoding, + m_tmp_closed_files.at (i).line, + false, false, true, "", + m_tmp_closed_files.at (i).index); } } @@ -1235,7 +1235,7 @@ // Style sheet for tab height QString style_sheet = QString ("QTabBar::tab {max-" + height_str + ": %1px;}") - .arg (height); + .arg (height); // Style sheet for tab height together with width if (settings->value (ed_long_window_title).toBool ()) @@ -1244,7 +1244,7 @@ " {max-" + height_str + ": %1px;" " min-" + width_str + ": %2px;" " max-" + width_str + ": %3px;}") - .arg (height).arg (tab_width_min).arg (tab_width_max); + .arg (height).arg (tab_width_min).arg (tab_width_max); m_tab_widget->setElideMode (Qt::ElideLeft); } else @@ -1499,7 +1499,8 @@ emit fetab_do_breakpoint_marker (insert, tab, line, cond); } - if (show_dbg_file && ! ((breakpoint_marker || debug_pointer) && is_editor_console_tabbed ())) + if (show_dbg_file && ! ((breakpoint_marker || debug_pointer) + && is_editor_console_tabbed ())) { emit fetab_set_focus (tab); activate ();
--- a/libgui/src/m-editor/find-dialog.cc Sat Jan 11 13:55:55 2020 -0800 +++ b/libgui/src/m-editor/find-dialog.cc Sun Jan 12 09:33:21 2020 -0800 @@ -249,14 +249,14 @@ // Store dialog's options int opts = 0 - + _extension->isVisible () * FIND_DLG_MORE - + _case_check_box->isChecked () * FIND_DLG_CASE - + _from_start_check_box->isChecked () * FIND_DLG_START - + _wrap_check_box->isChecked () * FIND_DLG_WRAP - + _regex_check_box->isChecked () * FIND_DLG_REGX - + _whole_words_check_box->isChecked () * FIND_DLG_WORDS - + _backward_check_box->isChecked () * FIND_DLG_BACK - + _search_selection_check_box->isChecked () * FIND_DLG_SEL; + + _extension->isVisible () * FIND_DLG_MORE + + _case_check_box->isChecked () * FIND_DLG_CASE + + _from_start_check_box->isChecked () * FIND_DLG_START + + _wrap_check_box->isChecked () * FIND_DLG_WRAP + + _regex_check_box->isChecked () * FIND_DLG_REGX + + _whole_words_check_box->isChecked () * FIND_DLG_WORDS + + _backward_check_box->isChecked () * FIND_DLG_BACK + + _search_selection_check_box->isChecked () * FIND_DLG_SEL; s->setValue (ed_fdlg_opts.key, opts); s->sync (); @@ -325,8 +325,7 @@ void find_dialog::handle_replace_text_changed (void) { // Return if nothing has changed - if (_replace_line_edit->currentText () - == _replace_line_edit->itemText (0)) + if (_replace_line_edit->currentText () == _replace_line_edit->itemText (0)) return; mru_update (_replace_line_edit); @@ -385,17 +384,17 @@ #if defined (HAVE_QCOMBOBOX_SETCURRENTTEXT) _search_line_edit->setCurrentText (_edit_area->selectedText ()); #else - if (_search_line_edit->isEditable ()) - { - _search_line_edit->setEditText (_edit_area->selectedText ()); - } - else - { - int i = _search_line_edit->findText (_edit_area->selectedText ()); + if (_search_line_edit->isEditable ()) + { + _search_line_edit->setEditText (_edit_area->selectedText ()); + } + else + { + int i = _search_line_edit->findText (_edit_area->selectedText ()); - if (i > -1) - _search_line_edit->setCurrentIndex (i); - } + if (i > -1) + _search_line_edit->setCurrentIndex (i); + } #endif } @@ -528,7 +527,7 @@ #if defined (HAVE_QSCI_VERSION_2_6_0) , true #endif - ); + ); if (_find_result_available) {
--- a/libgui/src/m-editor/octave-qscintilla.cc Sat Jan 11 13:55:55 2020 -0800 +++ b/libgui/src/m-editor/octave-qscintilla.cc Sun Jan 12 09:33:21 2020 -0800 @@ -418,7 +418,8 @@ comment_string = settings->value (ed_comment_str).toInt (); else // old version (combo box) - comment_string = settings->value (ed_comment_str_old.key, ed_comment_str.def).toInt (); + comment_string = settings->value (ed_comment_str_old.key, + ed_comment_str.def).toInt (); return (QStringList (ed_comment_strings.at (comment_string))); } @@ -699,7 +700,7 @@ } if (mid_block_regexp.indexIn (line_text) > -1) - indent_column -= indent_increment; + indent_column -= indent_increment; if (case_block_regexp.indexIn (line_text) > -1) { @@ -782,10 +783,10 @@ void octave_qscintilla::contextmenu_run_temp_error (void) { QMessageBox::critical (this, tr ("Octave Editor"), - tr ("Creating temporary files failed.\n" - "Make sure you have write access to temp. directory\n" - "%1\n\n" - "\"Run Selection\" requires temporary files.").arg (QDir::tempPath ())); + tr ("Creating temporary files failed.\n" + "Make sure you have write access to temp. directory\n" + "%1\n\n" + "\"Run Selection\" requires temporary files.").arg (QDir::tempPath ())); } void octave_qscintilla::contextmenu_run (bool) @@ -879,14 +880,14 @@ // %3 : command line (eval and display) // %4 : command line for history (via fprintf) code += QString ("%1 (%2, '%3', '%4');\n" - + next_bp_quiet - + "%3\n" - + next_bp_quiet_reset - + "\n") - .arg (tmp_script_name) - .arg (i) - .arg (line) - .arg (line_history); + + next_bp_quiet + + "%3\n" + + next_bp_quiet_reset + + "\n") + .arg (tmp_script_name) + .arg (i) + .arg (line) + .arg (line_history); } code += QString ("munlock (\"%1\"); clear %1;\n").arg (tmp_script_name);
--- a/libgui/src/main-window.cc Sat Jan 11 13:55:55 2020 -0800 +++ b/libgui/src/main-window.cc Sun Jan 12 09:33:21 2020 -0800 @@ -843,8 +843,7 @@ // Get desired style from preferences or take the default one if // the desired one is not found - QString preferred_style - = settings->value (global_style).toString (); + QString preferred_style = settings->value (global_style).toString (); if (preferred_style == global_style.def.toString ()) preferred_style = m_default_style; @@ -1680,8 +1679,7 @@ global_ov_startup_dir.def).toString ()); } - update_default_encoding - (settings->value (ed_default_enc).toString ()); + update_default_encoding (settings->value (ed_default_enc).toString ()); } if (! startup_dir.exists ())
--- a/libgui/src/octave-dock-widget.cc Sat Jan 11 13:55:55 2020 -0800 +++ b/libgui/src/octave-dock-widget.cc Sun Jan 12 09:33:21 2020 -0800 @@ -314,11 +314,11 @@ activateWindow (); if (vis) - { - show (); - setFocus (); - set_style (true); - } + { + show (); + setFocus (); + set_style (true); + } emit topLevelChanged (true); // Be sure signal is emitted } @@ -408,7 +408,8 @@ // low-level check of whether docked-widget became a window via // double-click or via drag-and-drop if ( (event->type () == QEvent::MouseButtonDblClick && ! isFloating ()) - || (event->type () == QEvent::ActivationChange && m_waiting_for_mouse_button_release)) + || (event->type () == QEvent::ActivationChange + && m_waiting_for_mouse_button_release)) { bool retval = QDockWidget::event (event); if (isFloating () && parent () != 0) @@ -605,7 +606,7 @@ setFocus (); } - void + void octave_dock_widget::toplevel_change (bool toplevel) { QObject *dockobj;
--- a/libgui/src/octave-qobject.cc Sat Jan 11 13:55:55 2020 -0800 +++ b/libgui/src/octave-qobject.cc Sun Jan 12 09:33:21 2020 -0800 @@ -84,12 +84,12 @@ begin_activity_with_options_selector = sel_getUid ("beginActivityWithOptions:reason:"); if (class_getInstanceMethod (process_info_class, - begin_activity_with_options_selector) + begin_activity_with_options_selector) == nullptr) return; process_info = objc_msgSend (reinterpret_cast<id> (process_info_class), - process_info_selector); + process_info_selector); if (process_info == nil) return; @@ -142,7 +142,7 @@ }); } - return false; + return false; } // We will create a QApplication object, even if START_GUI is false,
--- a/libgui/src/resource-manager.cc Sat Jan 11 13:55:55 2020 -0800 +++ b/libgui/src/resource-manager.cc Sun Jan 12 09:33:21 2020 -0800 @@ -87,7 +87,7 @@ m_settings_directory = sfile.absolutePath (); QString xdg_config_home - = QString::fromLocal8Bit (qgetenv ("XDG_CONFIG_HOME")); + = QString::fromLocal8Bit (qgetenv ("XDG_CONFIG_HOME")); if ((! sfile.exists ()) && xdg_config_home.isEmpty ()) { @@ -99,10 +99,10 @@ // indicate a first run of octave with new config file locations. #if defined (HAVE_QSTANDARDPATHS) QString home_path - = QStandardPaths::writableLocation (QStandardPaths::HomeLocation); + = QStandardPaths::writableLocation (QStandardPaths::HomeLocation); #else QString home_path - = QDesktopServices::storageLocation (QDesktopServices::HomeLocation); + = QDesktopServices::storageLocation (QDesktopServices::HomeLocation); #endif QString old_settings_directory = home_path + "/.config/octave"; @@ -346,7 +346,7 @@ if (m_settings->value (global_use_proxy.key, global_use_proxy.def).toBool ()) { QString proxyTypeString - = m_settings->value (global_proxy_type.key, global_proxy_type.def).toString (); + = m_settings->value (global_proxy_type.key, global_proxy_type.def).toString (); if (proxyTypeString == "Socks5Proxy") proxyType = QNetworkProxy::Socks5Proxy; @@ -479,16 +479,16 @@ // Create temp. file QPointer<QTemporaryFile> tmp_file - = new QTemporaryFile (tmp_dir + QDir::separator() + - "octave_XXXXXX" + ext, this); + = new QTemporaryFile (tmp_dir + QDir::separator() + + "octave_XXXXXX" + ext, this); if (tmp_file->open ()) - { - tmp_file->write (contents.toUtf8 ()); - tmp_file->close (); + { + tmp_file->write (contents.toUtf8 ()); + tmp_file->close (); - m_temporary_files << tmp_file; - } + m_temporary_files << tmp_file; + } return tmp_file; }
--- a/libgui/src/set-path-dialog.cc Sat Jan 11 13:55:55 2020 -0800 +++ b/libgui/src/set-path-dialog.cc Sun Jan 12 09:33:21 2020 -0800 @@ -169,7 +169,7 @@ resource_manager& rmgr = m_octave_qobj.get_resource_manager (); gui_settings *settings = rmgr.get_settings (); restoreGeometry ( - settings->value(pd_geometry.key).toByteArray()); + settings->value(pd_geometry.key).toByteArray()); } set_path_dialog::~set_path_dialog (void) @@ -193,17 +193,17 @@ if (! dir.isEmpty ()) { if (subdirs) - { - // Use existing method mofifying load path and updating dialog - // instead of adding string and updating load path - octave_value_list dirlist = ovl (); - dirlist.append (dir.toStdString ()); - emit modify_path_signal (dirlist, false, true); - } + { + // Use existing method mofifying load path and updating dialog + // instead of adding string and updating load path + octave_value_list dirlist = ovl (); + dirlist.append (dir.toStdString ()); + emit modify_path_signal (dirlist, false, true); + } else { set_path_model *m - = static_cast<set_path_model *> (m_path_list->model ()); + = static_cast<set_path_model *> (m_path_list->model ()); m->add_dir (dir); } }
--- a/libgui/src/set-path-model.cc Sat Jan 11 13:55:55 2020 -0800 +++ b/libgui/src/set-path-model.cc Sun Jan 12 09:33:21 2020 -0800 @@ -114,7 +114,7 @@ clear (); beginInsertRows (QModelIndex (), 0, m_orig_dirs.size () - 1); - m_dirs = m_orig_dirs; + m_dirs = m_orig_dirs; endInsertRows (); model_to_path (); @@ -125,7 +125,7 @@ clear (); beginInsertRows (QModelIndex (), 0, m_last_dirs.size () - 1); - m_dirs = m_last_dirs; + m_dirs = m_last_dirs; endInsertRows (); model_to_path (); @@ -155,7 +155,7 @@ const QModelIndex& idx = indices.at (i); beginRemoveRows (idx, idx.row (), idx.row ()); - m_dirs.removeAt (idx.row ()); + m_dirs.removeAt (idx.row ()); endRemoveRows (); } @@ -176,7 +176,7 @@ beginMoveRows (idx, idx.row (), idx.row (), this->index (idx.row () - 1), idx.row () - 1); - m_dirs.move (idx.row (), idx.row () - 1); + m_dirs.move (idx.row (), idx.row () - 1); endMoveRows (); } @@ -199,7 +199,7 @@ beginMoveRows (idx, idx.row (), idx.row (), this->index (idx.row () + 1), idx.row () + 1); - m_dirs.move (idx.row (), idx.row () + 1); + m_dirs.move (idx.row (), idx.row () + 1); endMoveRows (); } @@ -220,7 +220,7 @@ beginMoveRows (idx, idx.row (), idx.row (), this->index (i), i); - m_dirs.move (idx.row (), i); + m_dirs.move (idx.row (), i); endMoveRows (); } @@ -243,7 +243,7 @@ beginMoveRows (idx, idx.row (), idx.row (), this->index (target), target); - m_dirs.move (idx.row (), target); + m_dirs.move (idx.row (), target); endMoveRows (); }
--- a/libgui/src/settings-dialog.cc Sat Jan 11 13:55:55 2020 -0800 +++ b/libgui/src/settings-dialog.cc Sun Jan 12 09:33:21 2020 -0800 @@ -113,7 +113,8 @@ // look for available language files and the actual settings QString qm_dir_name = rmgr.get_gui_translation_dir (); QDir qm_dir (qm_dir_name); - QFileInfoList qm_files = qm_dir.entryInfoList (QStringList ("*.qm"), QDir::Files | QDir::Readable, QDir::Name); + QFileInfoList qm_files = qm_dir.entryInfoList (QStringList ("*.qm"), + QDir::Files | QDir::Readable, QDir::Name); for (int i = 0; i < qm_files.length (); i++) // insert available languages comboBox_language->addItem (qm_files.at (i).baseName ()); @@ -200,7 +201,8 @@ connect (cb_widget_custom_style, SIGNAL (toggled (bool)), m_widget_title_fg_color_active, SLOT (setEnabled (bool))); - sb_3d_title->setValue (settings->value (dw_title_3d.key, dw_title_3d.def).toInt ()); + sb_3d_title->setValue (settings->value (dw_title_3d.key, + dw_title_3d.def).toInt ()); cb_widget_custom_style->setChecked (settings->value (dw_title_custom_style).toBool ()); // Native file dialogs. @@ -373,10 +375,10 @@ for (unsigned int i = 0; i < cs_cursor_types.size (); i++) { if (cursor_type.toStdString () == cs_cursor_types[i]) - { - terminal_cursorType->setCurrentIndex (i); - break; - } + { + terminal_cursorType->setCurrentIndex (i); + break; + } } // file browser @@ -1086,7 +1088,7 @@ // Load enable settings at the end for having signals already connected bool colors_enabled = - settings->value (ws_enable_colors).toBool (); + settings->value (ws_enable_colors).toBool (); m_ws_enable_colors->setChecked (colors_enabled); m_ws_hide_tool_tips->setEnabled (colors_enabled);
--- a/libgui/src/settings-dialog.h Sat Jan 11 13:55:55 2020 -0800 +++ b/libgui/src/settings-dialog.h Sun Jan 12 09:33:21 2020 -0800 @@ -46,7 +46,7 @@ class settings_dialog : public QDialog, private Ui::settings_dialog { - Q_OBJECT public: + Q_OBJECT public: explicit settings_dialog (QWidget *parent, base_qobject& octave_qobj, const QString& desired_tab = QString ());
--- a/libgui/src/shortcut-manager.cc Sat Jan 11 13:55:55 2020 -0800 +++ b/libgui/src/shortcut-manager.cc Sun Jan 12 09:33:21 2020 -0800 @@ -302,12 +302,11 @@ // write one or all actual shortcut set(s) into a settings file void shortcut_manager::write_shortcuts (gui_settings *settings, - bool closing) + bool closing) { bool sc_ctrld = false; - QString sc_main - = sc_main_file.mid (0, sc_main_file.indexOf ('_') + 1); + QString sc_main = sc_main_file.mid (0, sc_main_file.indexOf ('_') + 1); for (int i = 0; i < m_sc.count (); i++) // loop over all shortcuts { @@ -630,7 +629,7 @@ // check whether ctrl+d is used from main window, i.e. is a global shortcut QString main_group_prefix - = sc_main_file.mid (0, sc_main_file.indexOf ('_') + 1); + = sc_main_file.mid (0, sc_main_file.indexOf ('_') + 1); if (sc.key.startsWith (main_group_prefix) && actual == QKeySequence (Qt::ControlModifier+Qt::Key_D)) settings->setValue (sc_main_ctrld.key, true);
--- a/libgui/src/tab-bar.cc Sat Jan 11 13:55:55 2020 -0800 +++ b/libgui/src/tab-bar.cc Sun Jan 12 09:33:21 2020 -0800 @@ -120,7 +120,7 @@ moveTab (tab, title); if (tab_texts.at (title) == current_title) - tab_with_focus = title; + tab_with_focus = title; break; }
--- a/libgui/src/variable-editor.cc Sat Jan 11 13:55:55 2020 -0800 +++ b/libgui/src/variable-editor.cc Sun Jan 12 09:33:21 2020 -0800 @@ -326,7 +326,8 @@ m_waiting_for_mouse_move = false; m_waiting_for_mouse_button_release = true; } - if (event->type () == QEvent::MouseButtonRelease && m_waiting_for_mouse_button_release) + if (event->type () == QEvent::MouseButtonRelease + && m_waiting_for_mouse_button_release) { m_waiting_for_mouse_button_release = false; bool retval = QDockWidget::event (event); @@ -364,11 +365,11 @@ void variable_dock_widget::unfloat_float (void) - {} + { } void variable_dock_widget::refloat (void) - {} + { } #endif @@ -1113,7 +1114,7 @@ { // Activating a floating window causes problems. if (! m_focus_widget_vdw->isFloating ()) - activateWindow (); + activateWindow (); m_focus_widget->setFocus (); } else @@ -1386,12 +1387,12 @@ // The default colors are given as color roles for // the application's palette QColor default_color = qApp->palette ().color - (static_cast<QPalette::ColorRole> (ve_colors[i].def.toInt ())); - // FIXME: use value<QPalette::ColorRole> instead of static cast after - // dropping support of Qt 5.4 + (static_cast<QPalette::ColorRole> (ve_colors[i].def.toInt ())); + // FIXME: use value<QPalette::ColorRole> instead of static cast after + // dropping support of Qt 5.4 QColor setting_color = - settings->value (ve_colors[i].key, default_color).value<QColor> (); + settings->value (ve_colors[i].key, default_color).value<QColor> (); m_table_colors.replace (i, setting_color); } @@ -1549,13 +1550,11 @@ if (m_table_colors.length () > 4 && m_alternate_rows) { - m_stylesheet - += "QTableView::item:alternate{ background-color: " - + m_table_colors[4].name () +" }"; + m_stylesheet += "QTableView::item:alternate{ background-color: " + + m_table_colors[4].name () +" }"; - m_stylesheet - += "QTableView::item:alternate:selected{ background-color: " - + m_table_colors[3].name () +" }"; + m_stylesheet += "QTableView::item:alternate:selected{ background-color: " + + m_table_colors[3].name () +" }"; } QList<QTableView *> viewlist = findChildren<QTableView *> (); @@ -1668,7 +1667,7 @@ #if defined (QOBJECT_FINDCHILDREN_ACCEPTS_FINDCHILDOPTIONS) , Qt::FindDirectChildrenOnly #endif - ); + ); for (int i = 0; i < hbuttonlist.size (); i++) { connect (hbuttonlist.at (i), SIGNAL (hovered_signal ()), @@ -1682,7 +1681,7 @@ #if defined (QOBJECT_FINDCHILDREN_ACCEPTS_FINDCHILDOPTIONS) , Qt::FindDirectChildrenOnly #endif - ); + ); for (int i = 0; i < rfbuttonlist.size (); i++) { connect (rfbuttonlist.at (i), SIGNAL (about_to_activate ()),
--- a/libgui/src/workspace-model.cc Sat Jan 11 13:55:55 2020 -0800 +++ b/libgui/src/workspace-model.cc Sun Jan 12 09:33:21 2020 -0800 @@ -198,8 +198,7 @@ void workspace_model::notice_settings (const gui_settings *settings) { - m_enable_colors = - settings->value (ws_enable_colors).toBool (); + m_enable_colors = settings->value (ws_enable_colors).toBool (); for (int i = 0; i < ws_colors_count; i++) {
--- a/libgui/src/workspace-model.h Sat Jan 11 13:55:55 2020 -0800 +++ b/libgui/src/workspace-model.h Sun Jan 12 09:33:21 2020 -0800 @@ -45,8 +45,7 @@ { class base_qobject; - class workspace_model - : public QAbstractTableModel + class workspace_model : public QAbstractTableModel { Q_OBJECT
--- a/libgui/src/workspace-view.cc Sat Jan 11 13:55:55 2020 -0800 +++ b/libgui/src/workspace-view.cc Sun Jan 12 09:33:21 2020 -0800 @@ -131,10 +131,10 @@ m_view->horizontalHeader ()->setMovable (true); #endif m_view->horizontalHeader ()->setSortIndicator ( - settings->value (ws_sort_column).toInt (), - static_cast<Qt::SortOrder> (settings->value (ws_sort_order).toUInt ())); - // FIXME: use value<Qt::SortOrder> instead of static cast after - // dropping support of Qt 5.4 + settings->value (ws_sort_column).toInt (), + static_cast<Qt::SortOrder> (settings->value (ws_sort_order).toUInt ())); + // FIXME: use value<Qt::SortOrder> instead of static cast after + // dropping support of Qt 5.4 m_view->horizontalHeader ()->setSortIndicatorShown (true);