Mercurial > octave
diff libgui/src/files-dock-widget.cc @ 30398:d4d83344d653 stable
maint: style check C++ files in src/ and libgui/ ahead of 7.1 release.
* ButtonGroup.cc, Canvas.cc, CheckBoxControl.cc, Container.cc,
ContextMenu.cc, EditControl.cc, Figure.cc, Figure.h, FigureWindow.cc,
GenericEventNotify.h, ListBoxControl.cc, ListBoxControl.h, Logger.cc, Menu.cc,
Object.cc, Panel.cc, PopupMenuControl.cc, PushButtonControl.cc, PushTool.cc,
RadioButtonControl.cc, SliderControl.cc, Table.cc, Table.h, TextControl.cc,
ToggleButtonControl.cc, ToggleTool.cc, ToolBar.cc, annotation-dialog.cc,
qt-graphics-toolkit.cc, documentation-bookmarks.cc, documentation-bookmarks.h,
documentation-dock-widget.h, documentation.cc, documentation.h,
dw-main-window.h, files-dock-widget.cc, files-dock-widget.h,
find-files-dialog.cc, find-files-model.cc, gui-preferences-dw.h,
gui-preferences-ed.h, gui-preferences-global.h, gui-settings.h,
interpreter-qobject.cc, led-indicator.cc, 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, octave-qscintilla.cc,
octave-qscintilla.h, main-window.cc, main-window.h, octave-dock-widget.cc,
octave-dock-widget.h, octave-qobject.cc, octave-qobject.h, octave-qtutils.h,
qt-interpreter-events.cc, release-notes.cc, resource-manager.cc,
set-path-dialog.cc, settings-dialog.cc, settings-dialog.h, shortcut-manager.cc,
shortcut-manager.h, tab-bar.cc, tab-bar.h, variable-editor-model.cc,
variable-editor-model.h, variable-editor.cc, variable-editor.h,
workspace-model.cc, workspace-view.cc, mkoctfile.in.cc, octave-config.in.cc:
Style check C++ files in src/ and libgui/ ahead of 7.1 release.
| author | Rik <rik@octave.org> |
|---|---|
| date | Mon, 29 Nov 2021 15:58:51 -0800 |
| parents | 351dbe4da930 |
| children | 796f54d4ddbf |
line wrap: on
line diff
--- a/libgui/src/files-dock-widget.cc Mon Nov 29 12:36:04 2021 -0500 +++ b/libgui/src/files-dock-widget.cc Mon Nov 29 15:58:51 2021 -0800 @@ -205,7 +205,7 @@ m_file_system_model = new QFileSystemModel (this); m_file_system_model->setResolveSymlinks (false); m_file_system_model->setFilter ( - QDir::System | QDir::NoDotAndDotDot | QDir::AllEntries); + QDir::System | QDir::NoDotAndDotDot | QDir::AllEntries); QModelIndex rootPathIndex = m_file_system_model->setRootPath (startup_dir.absolutePath ()); @@ -286,8 +286,8 @@ // but the function textActivated was not introduced until Qt 5.14 // so we'll need a feature test. - connect (m_current_directory, SIGNAL (activated (const QString &)), - this, SLOT (set_current_directory (const QString &))); + connect (m_current_directory, SIGNAL (activated (const QString&)), + this, SLOT (set_current_directory (const QString&))); QCompleter *completer = new QCompleter (m_file_system_model, this); m_current_directory->setCompleter (completer); @@ -367,14 +367,14 @@ void files_dock_widget::do_sync_browser_directory (void) { - display_directory (m_octave_dir,false); // false: no sync of octave dir + display_directory (m_octave_dir, false); // false: no sync of octave dir } void files_dock_widget::update_octave_directory (const QString& dir) { m_octave_dir = dir; if (m_sync_octave_dir) - display_directory (m_octave_dir,false); // false: no sync of octave dir + display_directory (m_octave_dir, false); // false: no sync of octave dir } void files_dock_widget::display_directory (const QString& dir, @@ -442,7 +442,7 @@ gui_settings *settings = rmgr.get_settings (); QString key = m_columns_shown_keys.at (col); - bool shown = settings->value (key,false).toBool (); + bool shown = settings->value (key, false).toBool (); settings->setValue (key, ! shown); settings->sync (); @@ -745,12 +745,12 @@ if (multiple_files) if (it == rows.begin ()) { - dlg_answer = QMessageBox::question (this, - tr ("Delete file/directory"), - tr ("Are you sure you want to delete all %1 selected files?\n").arg (file_cnt), - QMessageBox::Yes | QMessageBox::No); - if (dlg_answer != QMessageBox::Yes) - return; + dlg_answer = QMessageBox::question (this, + tr ("Delete file/directory"), + tr ("Are you sure you want to delete all %1 selected files?\n").arg (file_cnt), + QMessageBox::Yes | QMessageBox::No); + if (dlg_answer != QMessageBox::Yes) + return; } else dlg_answer = QMessageBox::Yes; @@ -919,7 +919,7 @@ QStyle *st = style (); int icon_size = st->pixelMetric (global_icon_sizes[size_idx]); - m_navigation_tool_bar->setIconSize (QSize (icon_size,icon_size)); + m_navigation_tool_bar->setIconSize (QSize (icon_size, icon_size)); // filenames are always shown, other columns can be hidden by settings for (int i = 0; i < 3; i++) @@ -927,7 +927,7 @@ ! settings->value (m_columns_shown_keys.at (i),false).toBool ()); QDir::Filters current_filter = m_file_system_model->filter (); - if (settings->value (m_columns_shown_keys.at (3),false).toBool ()) + if (settings->value (m_columns_shown_keys.at (3), false).toBool ()) m_file_system_model->setFilter (current_filter | QDir::Hidden); else m_file_system_model->setFilter (current_filter & (~QDir::Hidden)); @@ -999,7 +999,7 @@ bool ok; QString name = QInputDialog::getText (this, tr ("Create File"), - tr ("Create file in\n","String ends with \\n!") + parent_dir, + tr ("Create file in\n", "String ends with \\n!") + parent_dir, QLineEdit::Normal, tr ("New File.txt"), &ok); if (ok && name.length () > 0) @@ -1017,7 +1017,7 @@ bool ok; QString name = QInputDialog::getText (this, tr ("Create Directory"), - tr ("Create folder in\n","String ends with \\n!") + parent_dir, + tr ("Create folder in\n", "String ends with \\n!") + parent_dir, QLineEdit::Normal, tr ("New Directory"), &ok); if (ok && name.length () > 0) @@ -1028,12 +1028,12 @@ } } - void files_dock_widget::process_set_current_dir (const QString & dir) + void files_dock_widget::process_set_current_dir (const QString& dir) { emit displayed_directory_changed (dir); } - void files_dock_widget::process_find_files (const QString & dir) + void files_dock_widget::process_find_files (const QString& dir) { emit find_files_signal (dir); }