Mercurial > octave-dspies
changeset 18678:6113e0c6920b
maint: Clean up extra spaces before/after parentheses.
line wrap: on
line diff
--- a/libgui/graphics/Figure.cc Fri Apr 25 11:18:04 2014 -0700 +++ b/libgui/graphics/Figure.cc Fri Apr 25 13:25:25 2014 -0700 @@ -467,7 +467,7 @@ if (flags & UpdateBoundingBoxSize) r.setSize (win->frameGeometry ().size ()); - if (r.isValid () && r != m_outerRect ) + if (r.isValid () && r != m_outerRect) { //qDebug() << "outer rect changed:" << m_outerRect << "->>" << r; m_outerRect = r;
--- a/libgui/qterminal/libqterminal/QTerminal.cc Fri Apr 25 11:18:04 2014 -0700 +++ b/libgui/qterminal/libqterminal/QTerminal.cc Fri Apr 25 13:25:25 2014 -0700 @@ -118,5 +118,5 @@ (cursorUseForegroundColor, settings->value ("terminal/color_c", QVariant (colors.at (3))).value<QColor> ()); - setScrollBufferSize (settings->value ("terminal/history_buffer",1000).toInt() ); + setScrollBufferSize (settings->value ("terminal/history_buffer",1000).toInt () ); }
--- a/libgui/src/files-dock-widget.cc Fri Apr 25 11:18:04 2014 -0700 +++ b/libgui/src/files-dock-widget.cc Fri Apr 25 13:25:25 2014 -0700 @@ -551,7 +551,7 @@ QItemSelectionModel *m = _file_tree_view->selectionModel (); QModelIndexList rows = m->selectedRows (); - for ( QModelIndexList::iterator it = rows.begin (); it != rows.end (); it++) + for (QModelIndexList::iterator it = rows.begin (); it != rows.end (); it++) { QFileInfo file = _file_system_model->fileInfo (*it); if (file.exists ()) @@ -661,7 +661,7 @@ QItemSelectionModel *m = _file_tree_view->selectionModel (); QModelIndexList rows = m->selectedRows (); - for ( QModelIndexList::iterator it = rows.begin (); it != rows.end (); it++) + for (QModelIndexList::iterator it = rows.begin (); it != rows.end (); it++) { QModelIndex index = *it;
--- a/libgui/src/find-files-model.cc Fri Apr 25 11:18:04 2014 -0700 +++ b/libgui/src/find-files-model.cc Fri Apr 25 13:25:25 2014 -0700 @@ -101,7 +101,7 @@ void find_files_model::addFile (const QFileInfo &info) { - beginInsertRows (QModelIndex (), _files.size (), _files.size () ); + beginInsertRows (QModelIndex (), _files.size (), _files.size ()); QList<QFileInfo>::Iterator it; find_file_less_than less_than (_sortorder);
--- a/libgui/src/history-dock-widget.cc Fri Apr 25 11:18:04 2014 -0700 +++ b/libgui/src/history-dock-widget.cc Fri Apr 25 13:25:25 2014 -0700 @@ -206,7 +206,7 @@ if (_filter_line_edit->hasFocus () && _filter_line_edit->hasSelectedText ()) { QClipboard *clipboard = QApplication::clipboard (); - clipboard->setText ( _filter_line_edit->selectedText ()); + clipboard->setText (_filter_line_edit->selectedText ()); } }
--- a/libgui/src/m-editor/file-editor-interface.h Fri Apr 25 11:18:04 2014 -0700 +++ b/libgui/src/m-editor/file-editor-interface.h Fri Apr 25 13:25:25 2014 -0700 @@ -40,7 +40,7 @@ virtual ~file_editor_interface () { } - virtual QMenu *get_mru_menu ( ) = 0; + virtual QMenu *get_mru_menu () = 0; virtual QMenu *debug_menu () = 0; virtual QToolBar *toolbar () = 0;
--- a/libgui/src/m-editor/octave-qscintilla.cc Fri Apr 25 11:18:04 2014 -0700 +++ b/libgui/src/m-editor/octave-qscintilla.cc Fri Apr 25 13:25:25 2014 -0700 @@ -115,7 +115,7 @@ void octave_qscintilla::contextMenuEvent (QContextMenuEvent *e) { - QMenu *context_menu = createStandardContextMenu ( ); // standard menu + QMenu *context_menu = createStandardContextMenu (); // standard menu // the menu's position QPoint global_pos, local_pos; @@ -203,7 +203,7 @@ { QStringList commands = selectedText ().split (QRegExp("[\r\n]"), QString::SkipEmptyParts); - for (int i = 0; i < commands.size (); i++ ) + for (int i = 0; i < commands.size (); i++) emit execute_command_in_terminal_signal (commands.at (i)); }
--- a/libgui/src/main-window.cc Fri Apr 25 11:18:04 2014 -0700 +++ b/libgui/src/main-window.cc Fri Apr 25 13:25:25 2014 -0700 @@ -1976,7 +1976,7 @@ main_window::show_gui_info (void) { QString gui_info - ( QObject::tr ("<p><strong>A Note about Octave's New GUI</strong></p>" + (QObject::tr ("<p><strong>A Note about Octave's New GUI</strong></p>" "<p>One of the biggest new features for Octave 3.8 is a graphical " "user interface. It is the one thing that users have requested " "most often over the last few years and now it is almost ready. " @@ -2373,7 +2373,7 @@ QSettings *settings = resource_manager::get_settings (); - if (settings->value ("prompt_to_exit", false ).toBool()) + if (settings->value ("prompt_to_exit", false).toBool ()) { int ans = QMessageBox::question (this, tr ("Octave"), tr ("Are you sure you want to exit Octave?"),
--- a/libgui/src/octave-dock-widget.cc Fri Apr 25 11:18:04 2014 -0700 +++ b/libgui/src/octave-dock-widget.cc Fri Apr 25 13:25:25 2014 -0700 @@ -66,7 +66,7 @@ _dock_button->setIconSize (QSize (12,12)); _close_action = new QAction - (QIcon (":/actions/icons/widget-close.png"), "", this ); + (QIcon (":/actions/icons/widget-close.png"), "", this); _close_action-> setToolTip (tr ("Hide widget")); connect (_close_action, SIGNAL (triggered (bool)), this, SLOT (change_visibility (bool))); @@ -178,7 +178,7 @@ _dock_action->setIcon (QIcon (":/actions/icons/widget-dock"+_icon_color+".png")); _dock_action->setToolTip (tr ("Dock widget")); - // restore the last geometry( when floating + // restore the last geometry when floating setGeometry (settings->value ("DockWidgets/" + objectName () + "_floating_geometry",QRect(50,100,480,480)).toRect ());
--- a/libgui/src/octave-qt-link.cc Fri Apr 25 11:18:04 2014 -0700 +++ b/libgui/src/octave-qt-link.cc Fri Apr 25 13:25:25 2014 -0700 @@ -100,7 +100,7 @@ tr ("File\n%1\ndoes not exist. Do you want to create it?"). arg (QDir::currentPath () + QDir::separator () + QString::fromStdString (file)), - tr ("Octave Editor"), "quest", btn, tr ("Yes"), role ); + tr ("Octave Editor"), "quest", btn, tr ("Yes"), role); // Wait while the user is responding to message box. uiwidget_creator.wait ();
--- a/libgui/src/qtinfo/parser.cc Fri Apr 25 11:18:04 2014 -0700 +++ b/libgui/src/qtinfo/parser.cc Fri Apr 25 13:25:25 2014 -0700 @@ -77,7 +77,7 @@ parser::open_file (QFileInfo & file_info) { QIODevice *iodevice = 0; - if ( _compressors_map.contains(file_info.suffix ())) + if (_compressors_map.contains (file_info.suffix ())) { QProcess gzip; gzip.start (_compressors_map.value (file_info.suffix ()).arg (file_info.absoluteFilePath ())); @@ -277,7 +277,7 @@ QRegExp re ("(\\*[N|n]ote|\n\\*)([ |\n]+)([^:]+):([^:\\.,]*)([:,\\.]+)"); int i = 0, f; - while ( (i = re.indexIn (text,i)) != -1) + while ((i = re.indexIn (text,i)) != -1) { QString type = re.cap (1); QString note = re.cap (3); @@ -330,7 +330,7 @@ { QRegExp re ("`([^']+)'"); int i = 0, f; - while ( (i = re.indexIn (text, i)) != -1) + while ((i = re.indexIn (text, i)) != -1) { QString t = re.cap (1); QString bold = "<font style=\"color:SteelBlue;font-weight:bold\">" + t + @@ -436,7 +436,7 @@ while (! (nodeText=get_next_node (io)).isEmpty () && foundCount < 2) { QString first_line = get_first_line (nodeText); - if (first_line.startsWith ("Tag") ) + if (first_line.startsWith ("Tag")) { foundCount++; int pos = 0; @@ -471,7 +471,7 @@ foundCount++; int pos = 0; - while ( (pos = re_files.indexIn (nodeText, pos)) != -1) + while ((pos = re_files.indexIn (nodeText, pos)) != -1) { QString fileCap = re_files.cap (1).trimmed (); int index = re_files.cap (2).toInt (); @@ -539,7 +539,7 @@ { int pos = 0; - while ( (pos = re.indexIn (text, pos)) != -1) + while ((pos = re.indexIn (text, pos)) != -1) { QString cap = text.mid (pos,re.matchedLength ()); QString a (after); @@ -579,7 +579,7 @@ } QString node_text; - while ( !(node_text = get_next_node (io)).isEmpty ()) + while (! (node_text = get_next_node (io)).isEmpty ()) { QString firstLine = get_first_line (node_text); QString node = get_node_name (node_text);
--- a/libgui/src/qtinfo/webinfo.cc Fri Apr 25 11:18:04 2014 -0700 +++ b/libgui/src/qtinfo/webinfo.cc Fri Apr 25 13:25:25 2014 -0700 @@ -182,7 +182,7 @@ _text_browser->show (); connect (_text_browser, SIGNAL (anchorClicked (const QUrl &)), this, - SLOT (link_clicked (const QUrl &)) ); + SLOT (link_clicked (const QUrl &))); disconnect(_tab_bar, SIGNAL (currentChanged(int)), this, SLOT (current_tab_changed (int)));
--- a/libgui/src/settings-dialog.cc Fri Apr 25 11:18:04 2014 -0700 +++ b/libgui/src/settings-dialog.cc Fri Apr 25 13:25:25 2014 -0700 @@ -136,7 +136,7 @@ ui->customFileEditor->setText ( settings->value ("customFileEditor").toString ()); ui->editor_showLineNumbers->setChecked ( - settings->value ("editor/showLineNumbers",true).toBool () ); + settings->value ("editor/showLineNumbers",true).toBool ()); default_var = QColor (240, 240, 240); QColor setting_color = settings->value ("editor/highlight_current_line_color", @@ -148,14 +148,14 @@ connect (ui->editor_highlightCurrentLine, SIGNAL (toggled (bool)), _editor_current_line_color, SLOT (setEnabled (bool))); ui->editor_highlightCurrentLine->setChecked ( - settings->value ("editor/highlightCurrentLine",true).toBool () ); + settings->value ("editor/highlightCurrentLine",true).toBool ()); ui->editor_long_line_marker->setChecked ( settings->value ("editor/long_line_marker",true).toBool ()); ui->editor_long_line_column->setValue ( settings->value ("editor/long_line_column",80).toInt ()); ui->editor_codeCompletion->setChecked ( - settings->value ("editor/codeCompletion", true).toBool () ); + settings->value ("editor/codeCompletion", true).toBool ()); ui->editor_spinbox_ac_threshold->setValue ( settings->value ("editor/codeCompletion_threshold",2).toInt ()); ui->editor_checkbox_ac_keywords->setChecked ( @@ -195,7 +195,7 @@ // terminal ui->terminal_fontName->setCurrentFont (QFont ( - settings->value ("terminal/fontName","Courier New").toString ()) ); + settings->value ("terminal/fontName","Courier New").toString ())); ui->terminal_fontSize->setValue ( settings->value ("terminal/fontSize", 10).toInt ()); ui->terminal_history_buffer->setValue ( @@ -254,7 +254,7 @@ int currentIndex = 0; QString proxyTypeString = settings->value ("proxyType").toString (); - while ( (currentIndex < ui->proxyType->count ()) + while ((currentIndex < ui->proxyType->count ()) && (ui->proxyType->currentText () != proxyTypeString)) { currentIndex++; @@ -543,7 +543,7 @@ settings->setValue ("toolbar_icon_size", ui->toolbar_icon_size->value ()); // promp to exit - settings->setValue ( "prompt_to_exit", ui->cb_prompt_to_exit->isChecked ()); + settings->setValue ("prompt_to_exit", ui->cb_prompt_to_exit->isChecked ()); // Octave startup settings->setValue ("restore_octave_dir", @@ -639,7 +639,7 @@ settings->setValue ("terminal/focus_after_command", ui->terminal_focus_command->isChecked ()); settings->setValue ("terminal/history_buffer", - ui->terminal_history_buffer->value() ); + ui->terminal_history_buffer->value ()); // the cursor QString cursorType;
--- a/libgui/src/shortcut-manager.cc Fri Apr 25 11:18:04 2014 -0700 +++ b/libgui/src/shortcut-manager.cc Fri Apr 25 13:25:25 2014 -0700 @@ -82,91 +82,124 @@ // actions of the main window // file - init (tr ("New File"), "main_file:new_file", QKeySequence::New ); - init (tr ("New Function"), "main_file:new_function", QKeySequence ("Ctrl+Shift+N") ); - init (tr ("New Figure"), "main_file:new_figure", QKeySequence () ); - init (tr ("Open File"), "main_file:open_file", QKeySequence::Open ); - init (tr ("Load Workspace"), "main_file:load_workspace", QKeySequence () ); - init (tr ("Save Workspace As"), "main_file:save_workspace", QKeySequence () ); - init (tr ("Preferences"), "main_file:preferences", QKeySequence () ); - init (tr ("Exit Octave"), "main_file:exit", QKeySequence::Quit ); + init (tr ("New File"), "main_file:new_file", QKeySequence::New); + init (tr ("New Function"), "main_file:new_function", + QKeySequence ("Ctrl+Shift+N")); + init (tr ("New Figure"), "main_file:new_figure", QKeySequence ()); + init (tr ("Open File"), "main_file:open_file", QKeySequence::Open); + init (tr ("Load Workspace"), "main_file:load_workspace", QKeySequence ()); + init (tr ("Save Workspace As"), "main_file:save_workspace", QKeySequence ()); + init (tr ("Preferences"), "main_file:preferences", QKeySequence ()); + init (tr ("Exit Octave"), "main_file:exit", QKeySequence::Quit); // edit init (tr ("Copy"), "main_edit:copy", QKeySequence::Copy); init (tr ("Paste"), "main_edit:paste", QKeySequence::Paste); init (tr ("Undo"), "main_edit:undo", QKeySequence::Undo); - init (tr ("Select All"), "main_edit:select_all", QKeySequence () ); - init (tr ("Clear Clipboard"), "main_edit:clear_clipboard", QKeySequence () ); - init (tr ("Find in Files"), "main_edit:find_in_files", QKeySequence (Qt::ControlModifier + Qt::ShiftModifier + Qt::Key_F) ); - init (tr ("Clear Command Window"), "main_edit:clear_command_window", QKeySequence () ); - init (tr ("Clear Command History"), "main_edit:clear_history", QKeySequence () ); - init (tr ("Clear Workspace"), "main_edit:clear_workspace", QKeySequence () ); + init (tr ("Select All"), "main_edit:select_all", QKeySequence ()); + init (tr ("Clear Clipboard"), "main_edit:clear_clipboard", QKeySequence ()); + init (tr ("Find in Files"), "main_edit:find_in_files", + QKeySequence (Qt::ControlModifier + Qt::ShiftModifier + Qt::Key_F)); + init (tr ("Clear Command Window"), "main_edit:clear_command_window", + QKeySequence ()); + init (tr ("Clear Command History"), "main_edit:clear_history", + QKeySequence ()); + init (tr ("Clear Workspace"), "main_edit:clear_workspace", QKeySequence ()); // actions of the editor // file - init (tr ("Edit Function"), "editor_file:edit_function", QKeySequence (Qt::ControlModifier + Qt::Key_E) ); - init (tr ("Save File"), "editor_file:save", QKeySequence::Save ); - init (tr ("Save File As"), "editor_file:save_as", QKeySequence::SaveAs ); - init (tr ("Close"), "editor_file:close", QKeySequence::Close ); - init (tr ("Close All"), "editor_file:close_all", QKeySequence () ); - init (tr ("Close Other"), "editor_file:close_other", QKeySequence () ); - init (tr ("Print"), "editor_file:print", QKeySequence::Print ); + init (tr ("Edit Function"), "editor_file:edit_function", + QKeySequence (Qt::ControlModifier + Qt::Key_E)); + init (tr ("Save File"), "editor_file:save", QKeySequence::Save); + init (tr ("Save File As"), "editor_file:save_as", QKeySequence::SaveAs); + init (tr ("Close"), "editor_file:close", QKeySequence::Close); + init (tr ("Close All"), "editor_file:close_all", QKeySequence ()); + init (tr ("Close Other"), "editor_file:close_other", QKeySequence ()); + init (tr ("Print"), "editor_file:print", QKeySequence::Print); // edit - init (tr ("Undo"), "editor_edit:undo", QKeySequence::Undo ); - init (tr ("Redo"), "editor_edit:redo", QKeySequence::Redo ); - init (tr ("Copy"), "editor_edit:copy", QKeySequence::Copy ); - init (tr ("Cuy"), "editor_edit:cut", QKeySequence::Cut ); - init (tr ("Paste"), "editor_edit:paste", QKeySequence::Paste ); - init (tr ("Select All"), "editor_edit:select_all", QKeySequence::SelectAll ); - init (tr ("Find and Replace"), "editor_edit:find_replace", QKeySequence::Find ); + init (tr ("Undo"), "editor_edit:undo", QKeySequence::Undo); + init (tr ("Redo"), "editor_edit:redo", QKeySequence::Redo); + init (tr ("Copy"), "editor_edit:copy", QKeySequence::Copy); + init (tr ("Cuy"), "editor_edit:cut", QKeySequence::Cut); + init (tr ("Paste"), "editor_edit:paste", QKeySequence::Paste); + init (tr ("Select All"), "editor_edit:select_all", QKeySequence::SelectAll); + init (tr ("Find and Replace"), "editor_edit:find_replace", + QKeySequence::Find); - init (tr ("Delete to Start of Word"), "editor_edit:delete_start_word", QKeySequence::DeleteStartOfWord ); - init (tr ("Delete to End of Word"), "editor_edit:delete_end_word", QKeySequence::DeleteEndOfWord ); - init (tr ("Delete to Start of Line"), "editor_edit:delete_start_line", QKeySequence (Qt::ControlModifier + Qt::SHIFT + Qt::Key_Backspace) ); - init (tr ("Delete to End of Line"), "editor_edit:delete_end_line", QKeySequence (Qt::ControlModifier + Qt::SHIFT + Qt::Key_Delete) ); - init (tr ("Delete Line"), "editor_edit:delete_line", QKeySequence (Qt::ControlModifier + Qt::SHIFT + Qt::Key_L) ); - init (tr ("Copy Line"), "editor_edit:copy_line", QKeySequence (Qt::ControlModifier + Qt::SHIFT + Qt::Key_C) ); - init (tr ("Cut Line"), "editor_edit:cut_line", QKeySequence (Qt::ControlModifier + Qt::SHIFT + Qt::Key_X) ); - init (tr ("Duplicate Selection/Line"), "editor_edit:duplicate_selection", QKeySequence (Qt::ControlModifier + Qt::Key_D) ); - init (tr ("Transpose Line"), "editor_edit:transpose_line", QKeySequence (Qt::ControlModifier + Qt::Key_T) ); - init (tr ("Completion List"), "editor_edit:completion_list", QKeySequence (Qt::ControlModifier + Qt::Key_Space) ); + init (tr ("Delete to Start of Word"), "editor_edit:delete_start_word", + QKeySequence::DeleteStartOfWord); + init (tr ("Delete to End of Word"), "editor_edit:delete_end_word", + QKeySequence::DeleteEndOfWord); + init (tr ("Delete to Start of Line"), "editor_edit:delete_start_line", + QKeySequence (Qt::ControlModifier + Qt::SHIFT + Qt::Key_Backspace)); + init (tr ("Delete to End of Line"), "editor_edit:delete_end_line", + QKeySequence (Qt::ControlModifier + Qt::SHIFT + Qt::Key_Delete)); + init (tr ("Delete Line"), "editor_edit:delete_line", + QKeySequence (Qt::ControlModifier + Qt::SHIFT + Qt::Key_L)); + init (tr ("Copy Line"), "editor_edit:copy_line", + QKeySequence (Qt::ControlModifier + Qt::SHIFT + Qt::Key_C)); + init (tr ("Cut Line"), "editor_edit:cut_line", + QKeySequence (Qt::ControlModifier + Qt::SHIFT + Qt::Key_X)); + init (tr ("Duplicate Selection/Line"), "editor_edit:duplicate_selection", + QKeySequence (Qt::ControlModifier + Qt::Key_D)); + init (tr ("Transpose Line"), "editor_edit:transpose_line", + QKeySequence (Qt::ControlModifier + Qt::Key_T)); + init (tr ("Completion List"), "editor_edit:completion_list", + QKeySequence (Qt::ControlModifier + Qt::Key_Space)); - init (tr ("Comment Selection"), "editor_edit:comment_selection", QKeySequence (Qt::ControlModifier + Qt::Key_R) ); - init (tr ("Uncomment Selection"), "editor_edit:uncomment_selection", QKeySequence (Qt::SHIFT + Qt::ControlModifier + Qt::Key_R) ); - init (tr ("Uppercase Selection"), "editor_edit:upper_case", QKeySequence (Qt::ControlModifier + Qt::Key_U) ); - init (tr ("Lowercase Selection"), "editor_edit:lower_case", QKeySequence (Qt::ControlModifier + Qt::AltModifier + Qt::Key_U) ); - init (tr ("Indent Selection"), "editor_edit:indent_selection", QKeySequence (Qt::ControlModifier + Qt::Key_Tab) ); - init (tr ("Unindent Selection"), "editor_edit:unindent_selection", QKeySequence (Qt::SHIFT + Qt::ControlModifier + Qt::Key_Tab) ); + init (tr ("Comment Selection"), "editor_edit:comment_selection", + QKeySequence (Qt::ControlModifier + Qt::Key_R)); + init (tr ("Uncomment Selection"), "editor_edit:uncomment_selection", + QKeySequence (Qt::SHIFT + Qt::ControlModifier + Qt::Key_R)); + init (tr ("Uppercase Selection"), "editor_edit:upper_case", + QKeySequence (Qt::ControlModifier + Qt::Key_U)); + init (tr ("Lowercase Selection"), "editor_edit:lower_case", + QKeySequence (Qt::ControlModifier + Qt::AltModifier + Qt::Key_U)); + init (tr ("Indent Selection"), "editor_edit:indent_selection", + QKeySequence (Qt::ControlModifier + Qt::Key_Tab)); + init (tr ("Unindent Selection"), "editor_edit:unindent_selection", + QKeySequence (Qt::SHIFT + Qt::ControlModifier + Qt::Key_Tab)); - init (tr ("Goto Line"), "editor_edit:goto_line", QKeySequence (Qt::ControlModifier+ Qt::Key_G) ); - init (tr ("Toggle Bookmark"), "editor_edit:toggle_bookmark", QKeySequence (Qt::Key_F7) ); - init (tr ("Next Bookmark"), "editor_edit:next_bookmark", QKeySequence (Qt::Key_F2) ); - init (tr ("Previous Bookmark"), "editor_edit:previous_bookmark", QKeySequence (Qt::SHIFT + Qt::Key_F2) ); - init (tr ("Remove All Bookmark"), "editor_edit:remove_bookmark", QKeySequence () ); + init (tr ("Goto Line"), "editor_edit:goto_line", + QKeySequence (Qt::ControlModifier+ Qt::Key_G)); + init (tr ("Toggle Bookmark"), "editor_edit:toggle_bookmark", + QKeySequence (Qt::Key_F7)); + init (tr ("Next Bookmark"), "editor_edit:next_bookmark", + QKeySequence (Qt::Key_F2)); + init (tr ("Previous Bookmark"), "editor_edit:previous_bookmark", + QKeySequence (Qt::SHIFT + Qt::Key_F2)); + init (tr ("Remove All Bookmark"), "editor_edit:remove_bookmark", + QKeySequence ()); - init (tr ("Preferences"), "editor_edit:preferences", QKeySequence () ); - init (tr ("Styles Preferences"), "editor_edit:styles_preferences", QKeySequence () ); + init (tr ("Preferences"), "editor_edit:preferences", QKeySequence ()); + init (tr ("Styles Preferences"), "editor_edit:styles_preferences", + QKeySequence ()); // view - init (tr ("Zoom In"), "editor_view:zoom_in", QKeySequence::ZoomIn ); - init (tr ("Zoom Out"), "editor_view:zoom_out", QKeySequence::ZoomOut ); - init (tr ("Zoom Normal"), "editor_view:zoom_normal", QKeySequence (Qt::ControlModifier + Qt::Key_Slash) ); + init (tr ("Zoom In"), "editor_view:zoom_in", QKeySequence::ZoomIn); + init (tr ("Zoom Out"), "editor_view:zoom_out", QKeySequence::ZoomOut); + init (tr ("Zoom Normal"), "editor_view:zoom_normal", + QKeySequence (Qt::ControlModifier + Qt::Key_Slash)); // debug - init (tr ("Toggle Breakpoint"), "editor_debug:toggle_breakpoint", QKeySequence () ); - init (tr ("Next Breakpoint"), "editor_debug:next_breakpoint", QKeySequence () ); - init (tr ("Previous Breakpoint"), "editor_debug:previous_breakpoint", QKeySequence () ); - init (tr ("Remove All Breakpoints"), "editor_debug:remove_breakpoints", QKeySequence () ); + init (tr ("Toggle Breakpoint"), "editor_debug:toggle_breakpoint", + QKeySequence ()); + init (tr ("Next Breakpoint"), "editor_debug:next_breakpoint", + QKeySequence ()); + init (tr ("Previous Breakpoint"), "editor_debug:previous_breakpoint", + QKeySequence ()); + init (tr ("Remove All Breakpoints"), "editor_debug:remove_breakpoints", + QKeySequence ()); // run - init (tr ("Run File"), "editor_run:run_file", QKeySequence (Qt::Key_F5) ); - init (tr ("Run Selection"), "editor_run:run_selection", QKeySequence (Qt::Key_F9) ); + init (tr ("Run File"), "editor_run:run_file", QKeySequence (Qt::Key_F5)); + init (tr ("Run Selection"), "editor_run:run_selection", QKeySequence (Qt::Key_F9)); // help - init (tr ("Help on Keyword"), "editor_help:help_keyword", QKeySequence::HelpContents ); - init (tr ("Document on Keyword"), "editor_help:doc_keyword", QKeySequence (Qt::SHIFT + Qt::Key_F1) ); + init (tr ("Help on Keyword"), "editor_help:help_keyword", QKeySequence::HelpContents); + init (tr ("Document on Keyword"), "editor_help:doc_keyword", QKeySequence (Qt::SHIFT + Qt::Key_F1)); } void @@ -280,7 +313,7 @@ int index = _action_hash[key] - 1; if (index > -1 && index < _sc.count ()) - action->setShortcut ( QKeySequence ( + action->setShortcut (QKeySequence ( _settings->value ("shortcuts/" + key, _sc.at (index).default_sc).toString ())); else qDebug () << "Key: " << key << " not found in _action_hash";
--- a/libgui/src/workspace-model.cc Fri Apr 25 11:18:04 2014 -0700 +++ b/libgui/src/workspace-model.cc Fri Apr 25 13:25:25 2014 -0700 @@ -141,7 +141,7 @@ if (role == Qt::DisplayRole || (idx.column () == 0 && role == Qt::EditRole) - || (idx.column () == 0 && role == Qt::ToolTipRole) ) + || (idx.column () == 0 && role == Qt::ToolTipRole)) { switch (idx.column ()) {
--- a/libinterp/corefcn/bitfcns.cc Fri Apr 25 11:18:04 2014 -0700 +++ b/libinterp/corefcn/bitfcns.cc Fri Apr 25 13:25:25 2014 -0700 @@ -595,7 +595,7 @@ int bits_in_type = sizeof (double) * std::numeric_limits<unsigned char>::digits; NDArray m = m_arg.array_value (); - DO_BITSHIFT ( ); + DO_BITSHIFT (); } else if (cname == "single") {
--- a/libinterp/corefcn/cellfun.cc Fri Apr 25 11:18:04 2014 -0700 +++ b/libinterp/corefcn/cellfun.cc Fri Apr 25 13:25:25 2014 -0700 @@ -1227,7 +1227,7 @@ // fewer polymorphic function calls as the function gets called // for each value of the array. - if (! symbol_table_lookup ) + if (! symbol_table_lookup) { if (func.is_function_handle ()) {
--- a/libinterp/corefcn/data.cc Fri Apr 25 11:18:04 2014 -0700 +++ b/libinterp/corefcn/data.cc Fri Apr 25 13:25:25 2014 -0700 @@ -2320,8 +2320,8 @@ %!assert (cat (3, [], [], [1,2;3,4]), [1,2;3,4]) %!assert (cat (4, [], [], [1,2;3,4]), [1,2;3,4]) -%!assert ([zeros(3,2,2); ones(1,2,2)], repmat ([0;0;0;1],[1,2,2]) ) -%!assert ([zeros(3,2,2); ones(1,2,2)], vertcat (zeros (3,2,2), ones (1,2,2)) ) +%!assert ([zeros(3,2,2); ones(1,2,2)], repmat ([0;0;0;1],[1,2,2])) +%!assert ([zeros(3,2,2); ones(1,2,2)], vertcat (zeros (3,2,2), ones (1,2,2))) %!error <dimension mismatch> cat (3, cat (3, [], []), [1,2;3,4]) %!error <dimension mismatch> cat (3, zeros (0, 0, 2), [1,2;3,4])
--- a/libinterp/corefcn/find.cc Fri Apr 25 11:18:04 2014 -0700 +++ b/libinterp/corefcn/find.cc Fri Apr 25 13:25:25 2014 -0700 @@ -169,7 +169,7 @@ // there are elements to be found using the count that we want // to find. for (octave_idx_type j = start_nc, cx = 0; j < end_nc; j++) - for (octave_idx_type i = v.cidx (j); i < v.cidx (j+1); i++ ) + for (octave_idx_type i = v.cidx (j); i < v.cidx (j+1); i++) { OCTAVE_QUIT; if (direction < 0 && i < nz - count)
--- a/libinterp/corefcn/help.cc Fri Apr 25 11:18:04 2014 -0700 +++ b/libinterp/corefcn/help.cc Fri Apr 25 13:25:25 2014 -0700 @@ -230,7 +230,7 @@ pair_type (")", "-*- texinfo -*-\n\ -@deftypefn {Operator} {} )\n\ +@deftypefn {Operator} {})\n\ Array index or function argument delimiter.\n\ @end deftypefn"),
--- a/libinterp/corefcn/ls-hdf5.cc Fri Apr 25 11:18:04 2014 -0700 +++ b/libinterp/corefcn/ls-hdf5.cc Fri Apr 25 13:25:25 2014 -0700 @@ -263,7 +263,7 @@ // Allow identifiers as all digits so we can load lists saved by // earlier versions of Octave. - if (! ident_valid ) + if (! ident_valid) { // fix the identifier, replacing invalid chars with underscores vname = make_valid_identifier (vname); @@ -616,7 +616,7 @@ len = H5Gget_objname_by_idx (hs.file_id, hs.current_item, 0, 0); var_name.resize (len+1); - H5Gget_objname_by_idx( hs.file_id, hs.current_item, &var_name[0], len+1); + H5Gget_objname_by_idx (hs.file_id, hs.current_item, &var_name[0], len+1); for (int i = argv_idx; i < argc; i++) {
--- a/libinterp/corefcn/ls-mat5.cc Fri Apr 25 11:18:04 2014 -0700 +++ b/libinterp/corefcn/ls-mat5.cc Fri Apr 25 13:25:25 2014 -0700 @@ -439,7 +439,7 @@ unsigned int upper; int32_t temp; - if (! is.read (reinterpret_cast<char *> (&temp), 4 )) + if (! is.read (reinterpret_cast<char *> (&temp), 4)) goto data_read_error; if (swap) @@ -456,7 +456,7 @@ } else { - if (! is.read (reinterpret_cast<char *> (&temp), 4 )) + if (! is.read (reinterpret_cast<char *> (&temp), 4)) goto data_read_error; if (swap) swap_bytes<4> (&temp); @@ -701,7 +701,7 @@ if (len) { - if (! is.read (name, len )) + if (! is.read (name, len)) goto data_read_error; is.seekg (tmp_pos + static_cast<std::streamoff> @@ -1163,7 +1163,7 @@ if (len) { - if (! is.read (name, len )) + if (! is.read (name, len)) goto data_read_error; is.seekg (tmp_pos + static_cast<std::streamoff> @@ -1193,7 +1193,7 @@ goto data_read_error; } - if (! is.read (reinterpret_cast<char *> (&field_name_length), fn_len )) + if (! is.read (reinterpret_cast<char *> (&field_name_length), fn_len)) goto data_read_error; if (swap)
--- a/libinterp/corefcn/lu.cc Fri Apr 25 11:18:04 2014 -0700 +++ b/libinterp/corefcn/lu.cc Fri Apr 25 13:25:25 2014 -0700 @@ -162,7 +162,7 @@ { std::string tmp = args(n++).string_value (); - if (! error_state ) + if (! error_state) { if (tmp.compare ("vector") == 0) vecout = true; @@ -174,7 +174,7 @@ { Matrix tmp = args(n++).matrix_value (); - if (! error_state ) + if (! error_state) { if (!issparse) error ("lu: can not define pivoting threshold THRES for full matrices"); @@ -211,7 +211,7 @@ SparseMatrix m = arg.sparse_matrix_value (); - if ( nargout < 4 ) + if (nargout < 4) { ColumnVector Qinit; @@ -220,7 +220,7 @@ Qinit (i) = i; SparseLU fact (m, Qinit, thres, false, true); - if ( nargout < 2 ) + if (nargout < 2) retval(0) = fact.Y (); else { @@ -233,15 +233,15 @@ PermMatrix P = fact.Pr_mat (); SparseMatrix L = fact.L (); - if ( nargout < 3 ) + if (nargout < 3) retval(0) - = octave_value ( P.transpose () * L, + = octave_value (P.transpose () * L, MatrixType (MatrixType::Permuted_Lower, nr, fact.row_perm ())); else { retval(0) = L; - if ( vecout ) + if (vecout) retval(2) = fact.Pr_vec(); else retval(2) = P; @@ -279,7 +279,7 @@ { SparseComplexMatrix m = arg.sparse_complex_matrix_value (); - if ( nargout < 4 ) + if (nargout < 4) { ColumnVector Qinit; @@ -288,7 +288,7 @@ Qinit (i) = i; SparseComplexLU fact (m, Qinit, thres, false, true); - if ( nargout < 2 ) + if (nargout < 2) retval(0) = fact.Y (); @@ -303,15 +303,15 @@ PermMatrix P = fact.Pr_mat (); SparseComplexMatrix L = fact.L (); - if ( nargout < 3 ) + if (nargout < 3) retval(0) - = octave_value ( P.transpose () * L, + = octave_value (P.transpose () * L, MatrixType (MatrixType::Permuted_Lower, nr, fact.row_perm ())); else { retval(0) = L; - if ( vecout ) + if (vecout) retval(2) = fact.Pr_vec(); else retval(2) = P;
--- a/libinterp/corefcn/luinc.cc Fri Apr 25 11:18:04 2014 -0700 +++ b/libinterp/corefcn/luinc.cc Fri Apr 25 13:25:25 2014 -0700 @@ -177,7 +177,7 @@ { std::string tmp = args(2).string_value (); - if (! error_state ) + if (! error_state) { if (tmp.compare ("vector") == 0) vecout = true;
--- a/libinterp/corefcn/matrix_type.cc Fri Apr 25 11:18:04 2014 -0700 +++ b/libinterp/corefcn/matrix_type.cc Fri Apr 25 13:25:25 2014 -0700 @@ -148,7 +148,7 @@ { mattyp = args(0).matrix_type (); - if (mattyp.is_unknown () && autocomp ) + if (mattyp.is_unknown () && autocomp) { SparseComplexMatrix m = args(0).sparse_complex_matrix_value ();
--- a/libinterp/corefcn/octave-link.cc Fri Apr 25 11:18:04 2014 -0700 +++ b/libinterp/corefcn/octave-link.cc Fri Apr 25 13:25:25 2014 -0700 @@ -432,7 +432,7 @@ DEFUN (__octave_link_show_doc__, args, , "-*- texinfo -*-\n\ -@deftypefn {Built-in Function} {} __octave_link_show_doc__ ( @var{filename} )\n\ +@deftypefn {Built-in Function} {} __octave_link_show_doc__ (@var{filename})\n\ Undocumented internal function.\n\ @end deftypefn") {
--- a/libinterp/corefcn/qz.cc Fri Apr 25 11:18:04 2014 -0700 +++ b/libinterp/corefcn/qz.cc Fri Apr 25 13:25:25 2014 -0700 @@ -928,7 +928,7 @@ std::cout << " single gen eig:" << std::endl; std::cout << " alphar(" << jj << ") = " << aa(jj,jj) << std::endl; - std::cout << " betar( " << jj << ") = " << bb(jj,jj) + std::cout << " betar(" << jj << ") = " << bb(jj,jj) << std::endl; std::cout << " alphai(" << jj << ") = 0" << std::endl; #endif @@ -1277,9 +1277,9 @@ %! [aa, bb, q, z, v, w, lambda] = qz (a, b); %! sz = length (lambda); %! observed = (b * v * diag ([lambda;0])) (:, 1:sz); -%! assert ( (a*v) (:, 1:sz), observed, norm (observed) * 1e-14); +%! assert ((a*v)(:, 1:sz), observed, norm (observed) * 1e-14); %! observed = (diag ([lambda;0]) * w' * b) (1:sz, :); -%! assert ( (w'*a) (1:sz, :) , observed, norm (observed) * 1e-13); +%! assert ((w'*a)(1:sz, :) , observed, norm (observed) * 1e-13); %! assert (q * a * z, aa, norm (aa) * 1e-14); %! assert (q * b * z, bb, norm (bb) * 1e-14);
--- a/libinterp/corefcn/sparse-xdiv.cc Fri Apr 25 11:18:04 2014 -0700 +++ b/libinterp/corefcn/sparse-xdiv.cc Fri Apr 25 13:25:25 2014 -0700 @@ -302,7 +302,7 @@ using std::min; const octave_idx_type nc = min (d_nr, a_nc); - if ( ! mx_div_conform (a, d)) + if (! mx_div_conform (a, d)) return RT (); const octave_idx_type nz = a.nnz (); @@ -569,7 +569,7 @@ using std::min; const octave_idx_type nr = min (d_nc, a_nr); - if ( ! mx_leftdiv_conform (d, a)) + if (! mx_leftdiv_conform (d, a)) return RT (); const octave_idx_type nz = a.nnz ();
--- a/libinterp/corefcn/urlwrite.cc Fri Apr 25 11:18:04 2014 -0700 +++ b/libinterp/corefcn/urlwrite.cc Fri Apr 25 13:25:25 2014 -0700 @@ -391,7 +391,7 @@ } - if (param.numel () % 2 == 1 ) + if (param.numel () % 2 == 1) { error ("urlwrite: number of elements in PARAM must be even"); return retval; @@ -539,7 +539,7 @@ return retval; } - if (param.numel () % 2 == 1 ) + if (param.numel () % 2 == 1) { error ("urlread: number of elements in PARAM must be even"); return retval;
--- a/libinterp/dldfcn/__init_fltk__.cc Fri Apr 25 11:18:04 2014 -0700 +++ b/libinterp/dldfcn/__init_fltk__.cc Fri Apr 25 13:25:25 2014 -0700 @@ -291,7 +291,7 @@ //returns the number of visible menu items int len = menubar->size (); int n = 0; - for (int t = 0; t < len; t++ ) + for (int t = 0; t < len; t++) { const Fl_Menu_Item *m = static_cast<const Fl_Menu_Item*> (& (menubar->menu ()[t])); @@ -326,7 +326,7 @@ // Kai Habel (14.10.2010) std::string menupath; - for (int t = 0; t < menubar->size (); t++ ) + for (int t = 0; t < menubar->size (); t++) { Fl_Menu_Item *m = const_cast<Fl_Menu_Item*> (&(menubar->menu ()[t])); if (m->submenu ()) @@ -336,7 +336,7 @@ menupath += "/"; menupath += m->label (); - if (menupath.compare (findname) == 0 ) + if (menupath.compare (findname) == 0) return (t); } else @@ -1056,7 +1056,7 @@ void pixel2pos (const graphics_handle& ax, int px, int py, double& xx, double& yy) const { - pixel2pos ( gh_manager::get_object (ax), px, py, xx, yy); + pixel2pos (gh_manager::get_object (ax), px, py, xx, yy); } void pixel2pos (graphics_object ax, int px, int py, double& xx, @@ -1072,7 +1072,7 @@ } } - graphics_handle pixel2axes_or_ca (int px, int py ) + graphics_handle pixel2axes_or_ca (int px, int py) { Matrix kids = fp.get_children (); int len = kids.length (); @@ -1464,7 +1464,7 @@ if (Fl::event_button () == 1) { - if ( Fl::event_clicks () == 1) + if (Fl::event_clicks () == 1) { if (ax_obj && ax_obj.isa ("axes")) {
--- a/libinterp/dldfcn/chol.cc Fri Apr 25 11:18:04 2014 -0700 +++ b/libinterp/dldfcn/chol.cc Fri Apr 25 13:25:25 2014 -0700 @@ -155,7 +155,7 @@ { std::string tmp = args(n++).string_value (); - if (! error_state ) + if (! error_state) { if (tmp.compare ("vector") == 0) vecout = true;
--- a/libinterp/dldfcn/fftw.cc Fri Apr 25 11:18:04 2014 -0700 +++ b/libinterp/dldfcn/fftw.cc Fri Apr 25 13:25:25 2014 -0700 @@ -303,7 +303,7 @@ if (args(1).is_real_scalar ()) { int nthreads = args(1).int_value(); - if ( nthreads >= 1) + if (nthreads >= 1) { #if defined (HAVE_FFTW3_THREADS) octave_fftw_planner::threads (nthreads);
--- a/libinterp/octave-value/ov-base-int.cc Fri Apr 25 11:18:04 2014 -0700 +++ b/libinterp/octave-value/ov-base-int.cc Fri Apr 25 13:25:25 2014 -0700 @@ -266,7 +266,7 @@ template <class T> bool octave_base_int_matrix<T>::load_binary (std::istream& is, bool swap, - oct_mach_info::float_format ) + oct_mach_info::float_format) { int32_t mdims; if (! is.read (reinterpret_cast<char *> (&mdims), 4))
--- a/libinterp/octave-value/ov-base-int.h Fri Apr 25 11:18:04 2014 -0700 +++ b/libinterp/octave-value/ov-base-int.h Fri Apr 25 13:25:25 2014 -0700 @@ -74,10 +74,10 @@ bool load_ascii (std::istream& is); - bool save_binary (std::ostream& os, bool& ); + bool save_binary (std::ostream& os, bool&); bool load_binary (std::istream& is, bool swap, - oct_mach_info::float_format ); + oct_mach_info::float_format); #if defined (HAVE_HDF5) bool save_hdf5 (hid_t loc_id, const char *name, bool); @@ -119,13 +119,13 @@ bool load_ascii (std::istream& is); - bool save_binary (std::ostream& os, bool& ); + bool save_binary (std::ostream& os, bool&); bool load_binary (std::istream& is, bool swap, - oct_mach_info::float_format ); + oct_mach_info::float_format); #if defined (HAVE_HDF5) - bool save_hdf5 (hid_t loc_id, const char *name, bool ); + bool save_hdf5 (hid_t loc_id, const char *name, bool); bool load_hdf5 (hid_t loc_id, const char *name); #endif
--- a/libinterp/octave-value/ov-bool-mat.h Fri Apr 25 11:18:04 2014 -0700 +++ b/libinterp/octave-value/ov-bool-mat.h Fri Apr 25 13:25:25 2014 -0700 @@ -151,10 +151,10 @@ FloatComplex float_complex_value (bool = false) const; ComplexMatrix complex_matrix_value (bool = false) const - { return ComplexMatrix (matrix.matrix_value ( )); } + { return ComplexMatrix (matrix.matrix_value ()); } FloatComplexMatrix float_complex_matrix_value (bool = false) const - { return FloatComplexMatrix (matrix.matrix_value ( )); } + { return FloatComplexMatrix (matrix.matrix_value ()); } ComplexNDArray complex_array_value (bool = false) const { return ComplexNDArray (matrix); }
--- a/libinterp/octave-value/ov-bool-sparse.cc Fri Apr 25 11:18:04 2014 -0700 +++ b/libinterp/octave-value/ov-bool-sparse.cc Fri Apr 25 13:25:25 2014 -0700 @@ -568,7 +568,7 @@ #else group_hid = H5Gopen (loc_id, name); #endif - if (group_hid < 0 ) return false; + if (group_hid < 0) return false; #if HAVE_HDF5_18 data_hid = H5Dopen (group_hid, "nr", H5P_DEFAULT);
--- a/libinterp/octave-value/ov-class.cc Fri Apr 25 11:18:04 2014 -0700 +++ b/libinterp/octave-value/ov-class.cc Fri Apr 25 13:25:25 2014 -0700 @@ -1183,10 +1183,10 @@ { std::string key = map.key (p); Cell val = map.contents (p); - if ( val(0).is_object () ) + if (val(0).is_object ()) { dbgstr = "blork"; - if ( key == val(0).class_name () ) + if (key == val(0).class_name ()) { might_have_inheritance = true; dbgstr = "cork"; @@ -1325,7 +1325,7 @@ success = false; } } - else if (len == 0 ) + else if (len == 0) { map = octave_map (dim_vector (1, 1)); c_name = classname; @@ -1469,7 +1469,7 @@ success = false; } } - else if (len == 0 ) + else if (len == 0) map = octave_map (dim_vector (1, 1)); else panic_impossible ();
--- a/libinterp/octave-value/ov-cx-sparse.cc Fri Apr 25 11:18:04 2014 -0700 +++ b/libinterp/octave-value/ov-cx-sparse.cc Fri Apr 25 13:25:25 2014 -0700 @@ -637,7 +637,7 @@ #else group_hid = H5Gopen (loc_id, name); #endif - if (group_hid < 0 ) return false; + if (group_hid < 0) return false; #if HAVE_HDF5_18 data_hid = H5Dopen (group_hid, "nr", H5P_DEFAULT);
--- a/libinterp/octave-value/ov-fcn-inline.cc Fri Apr 25 11:18:04 2014 -0700 +++ b/libinterp/octave-value/ov-fcn-inline.cc Fri Apr 25 13:25:25 2014 -0700 @@ -284,7 +284,7 @@ #else group_hid = H5Gcreate (loc_id, name, 0); #endif - if (group_hid < 0 ) return false; + if (group_hid < 0) return false; size_t len = 0; for (int i = 0; i < ifargs.length (); i++) @@ -424,7 +424,7 @@ #else group_hid = H5Gopen (loc_id, name); #endif - if (group_hid < 0 ) return false; + if (group_hid < 0) return false; #if HAVE_HDF5_18 data_hid = H5Dopen (group_hid, "args", H5P_DEFAULT);
--- a/libinterp/octave-value/ov-perm.cc Fri Apr 25 11:18:04 2014 -0700 +++ b/libinterp/octave-value/ov-perm.cc Fri Apr 25 13:25:25 2014 -0700 @@ -325,7 +325,7 @@ bool octave_perm_matrix::load_binary (std::istream& is, bool swap, - oct_mach_info::float_format ) + oct_mach_info::float_format) { int32_t sz; bool colp;
--- a/libinterp/octave-value/ov-struct.cc Fri Apr 25 11:18:04 2014 -0700 +++ b/libinterp/octave-value/ov-struct.cc Fri Apr 25 13:25:25 2014 -0700 @@ -844,7 +844,7 @@ success = false; } } - else if (len == 0 ) + else if (len == 0) map = octave_map (dv); else panic_impossible ();
--- a/libinterp/operators/op-cm-sm.cc Fri Apr 25 11:18:04 2014 -0700 +++ b/libinterp/operators/op-cm-sm.cc Fri Apr 25 13:25:25 2014 -0700 @@ -106,8 +106,8 @@ const octave_sparse_matrix&); return octave_value - (elem_xpow ( SparseComplexMatrix (v1.complex_matrix_value ()), - v2.sparse_matrix_value ())); + (elem_xpow (SparseComplexMatrix (v1.complex_matrix_value ()), + v2.sparse_matrix_value ())); } DEFBINOP (el_ldiv, complex_matrix, sparse_matrix)
--- a/libinterp/operators/op-pm-sm.cc Fri Apr 25 11:18:04 2014 -0700 +++ b/libinterp/operators/op-pm-sm.cc Fri Apr 25 13:25:25 2014 -0700 @@ -44,12 +44,12 @@ DEFUNOP (not, perm_matrix) { // Obviously negation of a permutation matrix destroys sparsity - return octave_value ( ! a.bool_array_value ()); + return octave_value (! a.bool_array_value ()); } DEFUNOP (uminus, perm_matrix) { - return octave_value ( - a.sparse_matrix_value ()); + return octave_value (- a.sparse_matrix_value ()); } // Most other logical operations cast to SparseBoolMatrix
--- a/libinterp/operators/op-sbm-sbm.cc Fri Apr 25 11:18:04 2014 -0700 +++ b/libinterp/operators/op-sbm-sbm.cc Fri Apr 25 13:25:25 2014 -0700 @@ -49,7 +49,7 @@ DEFUNOP (uminus, sparse_bool_matrix) { CAST_UNOP_ARG (const octave_sparse_bool_matrix&); - return octave_value ( - v.sparse_matrix_value ()); + return octave_value (- v.sparse_matrix_value ()); } DEFUNOP (transpose, sparse_bool_matrix)
--- a/libinterp/parse-tree/pt-select.cc Fri Apr 25 11:18:04 2014 -0700 +++ b/libinterp/parse-tree/pt-select.cc Fri Apr 25 13:25:25 2014 -0700 @@ -123,7 +123,7 @@ { octave_value label_value = label->rvalue1 (); - if (! error_state && label_value.is_defined () ) + if (! error_state && label_value.is_defined ()) { if (label_value.is_cell ()) {
--- a/liboctave/array/CSparse.cc Fri Apr 25 11:18:04 2014 -0700 +++ b/liboctave/array/CSparse.cc Fri Apr 25 13:25:25 2014 -0700 @@ -7708,7 +7708,7 @@ octave_idx_type jb_max = b.cidx (i+1); bool jb_lt_max = jb < jb_max; - while (ja_lt_max || jb_lt_max ) + while (ja_lt_max || jb_lt_max) { octave_quit (); if ((! jb_lt_max) || @@ -7724,8 +7724,8 @@ ja++; ja_lt_max= ja < ja_max; } - else if (( !ja_lt_max ) || - (jb_lt_max && (b.ridx (jb) < a.ridx (ja)) ) ) + else if ((! ja_lt_max) || + (jb_lt_max && (b.ridx (jb) < a.ridx (ja)))) { Complex tmp = xmin (0., b.data (jb)); if (tmp != 0.) @@ -7826,7 +7826,7 @@ octave_idx_type jb_max = b.cidx (i+1); bool jb_lt_max = jb < jb_max; - while (ja_lt_max || jb_lt_max ) + while (ja_lt_max || jb_lt_max) { octave_quit (); if ((! jb_lt_max) || @@ -7842,8 +7842,8 @@ ja++; ja_lt_max= ja < ja_max; } - else if (( !ja_lt_max ) || - (jb_lt_max && (b.ridx (jb) < a.ridx (ja)) ) ) + else if ((! ja_lt_max) || + (jb_lt_max && (b.ridx (jb) < a.ridx (ja)))) { Complex tmp = xmax (0., b.data (jb)); if (tmp != 0.)
--- a/liboctave/array/MSparse.cc Fri Apr 25 11:18:04 2014 -0700 +++ b/liboctave/array/MSparse.cc Fri Apr 25 13:25:25 2014 -0700 @@ -68,7 +68,7 @@ octave_idx_type jb_max = b.cidx (i+1); bool jb_lt_max = jb < jb_max; - while (ja_lt_max || jb_lt_max ) + while (ja_lt_max || jb_lt_max) { octave_quit (); if ((! jb_lt_max) || @@ -80,8 +80,8 @@ ja++; ja_lt_max= ja < ja_max; } - else if (( !ja_lt_max ) || - (jb_lt_max && (b.ridx (jb) < a.ridx (ja)) ) ) + else if ((! ja_lt_max) || + (jb_lt_max && (b.ridx (jb) < a.ridx (ja)))) { r.ridx (jx) = b.ridx (jb); r.data (jx) = op (0., b.data (jb)); @@ -340,7 +340,7 @@ octave_idx_type jb_max = b.cidx (i+1); bool jb_lt_max = jb < jb_max; - while (ja_lt_max || jb_lt_max ) + while (ja_lt_max || jb_lt_max) { octave_quit (); if ((! jb_lt_max) || @@ -352,8 +352,8 @@ ja++; ja_lt_max= ja < ja_max; } - else if (( !ja_lt_max ) || - (jb_lt_max && (b.ridx (jb) < a.ridx (ja)) ) ) + else if ((! ja_lt_max) || + (jb_lt_max && (b.ridx (jb) < a.ridx (ja)))) { r.ridx (jx) = b.ridx (jb); r.data (jx) = op (0., b.data (jb)); @@ -462,7 +462,7 @@ octave_idx_type jb_max = b.cidx (i+1); bool jb_lt_max = jb < jb_max; - while (ja_lt_max || jb_lt_max ) + while (ja_lt_max || jb_lt_max) { octave_quit (); if ((! jb_lt_max) || @@ -470,8 +470,8 @@ { ja++; ja_lt_max= ja < ja_max; } - else if (( !ja_lt_max ) || - (jb_lt_max && (b.ridx (jb) < a.ridx (ja)) ) ) + else if ((! ja_lt_max) || + (jb_lt_max && (b.ridx (jb) < a.ridx (ja)))) { jb++; jb_lt_max= jb < jb_max; } @@ -569,7 +569,7 @@ gripe_nonconformant ("quotient", a_nr, a_nc, b_nr, b_nc); else { - r = MSparse<T>( a_nr, a_nc, (Zero / Zero)); + r = MSparse<T> (a_nr, a_nc, (Zero / Zero)); for (octave_idx_type i = 0 ; i < a_nc ; i++) { @@ -581,7 +581,7 @@ octave_idx_type jb_max = b.cidx (i+1); bool jb_lt_max = jb < jb_max; - while (ja_lt_max || jb_lt_max ) + while (ja_lt_max || jb_lt_max) { octave_quit (); if ((! jb_lt_max) || @@ -590,8 +590,8 @@ r.elem (a.ridx (ja),i) = a.data (ja) / Zero; ja++; ja_lt_max= ja < ja_max; } - else if (( !ja_lt_max ) || - (jb_lt_max && (b.ridx (jb) < a.ridx (ja)) ) ) + else if ((! ja_lt_max) || + (jb_lt_max && (b.ridx (jb) < a.ridx (ja)))) { r.elem (b.ridx (jb),i) = Zero / b.data (jb); jb++; jb_lt_max= jb < jb_max;
--- a/liboctave/array/Sparse.cc Fri Apr 25 11:18:04 2014 -0700 +++ b/liboctave/array/Sparse.cc Fri Apr 25 13:25:25 2014 -0700 @@ -2435,7 +2435,7 @@ if (elem (i, i+k) != 0.) nel++; } - else if ( k < 0) + else if (k < 0) { for (octave_idx_type i = 0; i < ndiag; i++) if (elem (i-k, i) != 0.) @@ -2465,7 +2465,7 @@ } } } - else if ( k < 0) + else if (k < 0) { for (octave_idx_type i = 0; i < ndiag; i++) {
--- a/liboctave/array/dSparse.cc Fri Apr 25 11:18:04 2014 -0700 +++ b/liboctave/array/dSparse.cc Fri Apr 25 13:25:25 2014 -0700 @@ -777,7 +777,7 @@ octave_idx_type jb_max = y.cidx (i+1); bool jb_lt_max = jb < jb_max; - while (ja_lt_max || jb_lt_max ) + while (ja_lt_max || jb_lt_max) { octave_quit (); if ((! jb_lt_max) || @@ -789,8 +789,8 @@ ja++; ja_lt_max= ja < ja_max; } - else if (( !ja_lt_max ) || - (jb_lt_max && (y.ridx (jb) < x.ridx (ja)) ) ) + else if ((! ja_lt_max) || + (jb_lt_max && (y.ridx (jb) < x.ridx (ja)))) { jb++; jb_lt_max= jb < jb_max; @@ -7821,7 +7821,7 @@ octave_idx_type jb_max = b.cidx (i+1); bool jb_lt_max = jb < jb_max; - while (ja_lt_max || jb_lt_max ) + while (ja_lt_max || jb_lt_max) { octave_quit (); if ((! jb_lt_max) || @@ -7837,8 +7837,8 @@ ja++; ja_lt_max= ja < ja_max; } - else if (( !ja_lt_max ) || - (jb_lt_max && (b.ridx (jb) < a.ridx (ja)) ) ) + else if ((! ja_lt_max) || + (jb_lt_max && (b.ridx (jb) < a.ridx (ja)))) { double tmp = xmin (0., b.data (jb)); if (tmp != 0.) @@ -7972,7 +7972,7 @@ octave_idx_type jb_max = b.cidx (i+1); bool jb_lt_max = jb < jb_max; - while (ja_lt_max || jb_lt_max ) + while (ja_lt_max || jb_lt_max) { octave_quit (); if ((! jb_lt_max) || @@ -7988,8 +7988,8 @@ ja++; ja_lt_max= ja < ja_max; } - else if (( !ja_lt_max ) || - (jb_lt_max && (b.ridx (jb) < a.ridx (ja)) ) ) + else if ((! ja_lt_max) || + (jb_lt_max && (b.ridx (jb) < a.ridx (ja)))) { double tmp = xmax (0., b.data (jb)); if (tmp != 0.)
--- a/liboctave/numeric/bsxfun.h Fri Apr 25 11:18:04 2014 -0700 +++ b/liboctave/numeric/bsxfun.h Fri Apr 25 13:25:25 2014 -0700 @@ -41,7 +41,7 @@ octave_idx_type xk = dx(i); octave_idx_type yk = dy(i); // Check the three conditions for valid bsxfun dims - if (! ( (xk == yk) || (xk == 1 && yk > 1) || (xk > 1 && yk == 1))) + if (! ((xk == yk) || (xk == 1 && yk > 1) || (xk > 1 && yk == 1))) return false; } @@ -71,7 +71,7 @@ octave_idx_type xk = dx(i); // Only two valid canditions to check; can't stretch rk - if (! ( (rk == xk) || (rk > 1 && xk == 1))) + if (! ((rk == xk) || (rk > 1 && xk == 1))) return false; }
--- a/liboctave/numeric/lo-specfun.cc Fri Apr 25 11:18:04 2014 -0700 +++ b/liboctave/numeric/lo-specfun.cc Fri Apr 25 13:25:25 2014 -0700 @@ -3633,7 +3633,7 @@ double sqrt_eps = sqrt (std::numeric_limits<double>::epsilon ()); if (m < sqrt_eps) { - // For small m, ( Abramowitz and Stegun, Section 16.13 ) + // For small m, (Abramowitz and Stegun, Section 16.13) si_u = sin (u); co_u = cos (u); t = 0.25*m*(u - si_u*co_u); @@ -3643,7 +3643,7 @@ } else if ((1 - m) < sqrt_eps) { - // For m1 = (1-m) small ( Abramowitz and Stegun, Section 16.15 ) + // For m1 = (1-m) small (Abramowitz and Stegun, Section 16.15) m1 = 1 - m; si_u = sinh (u); co_u = cosh (u); @@ -3655,8 +3655,8 @@ } else { - // Arithmetic-Geometric Mean (AGM) algorithm - // ( Abramowitz and Stegun, Section 16.4 ) + // Arithmetic-Geometric Mean (AGM) algorithm + // (Abramowitz and Stegun, Section 16.4) a[0] = 1; b = sqrt (1 - m); c[0] = sqrt (m);
--- a/liboctave/operators/Sparse-op-defs.h Fri Apr 25 11:18:04 2014 -0700 +++ b/liboctave/operators/Sparse-op-defs.h Fri Apr 25 13:25:25 2014 -0700 @@ -456,7 +456,7 @@ octave_idx_type jb_max = m2.cidx (i+1); \ bool jb_lt_max = jb < jb_max; \ \ - while (ja_lt_max || jb_lt_max ) \ + while (ja_lt_max || jb_lt_max) \ { \ octave_quit (); \ if ((! jb_lt_max) || \ @@ -468,8 +468,8 @@ ja++; \ ja_lt_max= ja < ja_max; \ } \ - else if (( !ja_lt_max ) || \ - (jb_lt_max && (m2.ridx (jb) < m1.ridx (ja)) ) ) \ + else if ((! ja_lt_max) || \ + (jb_lt_max && (m2.ridx (jb) < m1.ridx (ja)))) \ { \ r.ridx (jx) = m2.ridx (jb); \ r.data (jx) = 0. OP m2.data (jb); \ @@ -564,7 +564,7 @@ octave_idx_type jb_max = m2.cidx (i+1); \ bool jb_lt_max = jb < jb_max; \ \ - while (ja_lt_max || jb_lt_max ) \ + while (ja_lt_max || jb_lt_max) \ { \ octave_quit (); \ if ((! jb_lt_max) || \ @@ -572,8 +572,8 @@ { \ ja++; ja_lt_max= ja < ja_max; \ } \ - else if (( !ja_lt_max ) || \ - (jb_lt_max && (m2.ridx (jb) < m1.ridx (ja)) ) ) \ + else if ((! ja_lt_max) || \ + (jb_lt_max && (m2.ridx (jb) < m1.ridx (ja)))) \ { \ jb++; jb_lt_max= jb < jb_max; \ } \ @@ -680,7 +680,7 @@ octave_idx_type jb_max = m2.cidx (i+1); \ bool jb_lt_max = jb < jb_max; \ \ - while (ja_lt_max || jb_lt_max ) \ + while (ja_lt_max || jb_lt_max) \ { \ octave_quit (); \ if ((! jb_lt_max) || \ @@ -691,8 +691,8 @@ ja++; \ ja_lt_max= ja < ja_max; \ } \ - else if (( !ja_lt_max ) || \ - (jb_lt_max && (m2.ridx (jb) < m1.ridx (ja)) ) ) \ + else if ((! ja_lt_max) || \ + (jb_lt_max && (m2.ridx (jb) < m1.ridx (ja)))) \ { \ /* keep those kludges coming */ \ r.elem (m2.ridx (jb),i) = Complex () OP m2.data (jb); \ @@ -1836,7 +1836,7 @@ #define SPARSE_ANY_OP(DIM) SPARSE_ANY_ALL_OP (DIM, false, false, !=, true) -#define SPARSE_SPARSE_MUL( RET_TYPE, RET_EL_TYPE, EL_TYPE ) \ +#define SPARSE_SPARSE_MUL(RET_TYPE, RET_EL_TYPE, EL_TYPE) \ octave_idx_type nr = m.rows (); \ octave_idx_type nc = m.cols (); \ \ @@ -2005,7 +2005,7 @@ } \ } -#define SPARSE_FULL_MUL( RET_TYPE, EL_TYPE, ZERO ) \ +#define SPARSE_FULL_MUL(RET_TYPE, EL_TYPE, ZERO) \ octave_idx_type nr = m.rows (); \ octave_idx_type nc = m.cols (); \ \ @@ -2040,7 +2040,7 @@ return retval; \ } -#define SPARSE_FULL_TRANS_MUL( RET_TYPE, EL_TYPE, ZERO, CONJ_OP ) \ +#define SPARSE_FULL_TRANS_MUL(RET_TYPE, EL_TYPE, ZERO, CONJ_OP) \ octave_idx_type nr = m.rows (); \ octave_idx_type nc = m.cols (); \ \ @@ -2076,7 +2076,7 @@ return retval; \ } -#define FULL_SPARSE_MUL( RET_TYPE, EL_TYPE, ZERO ) \ +#define FULL_SPARSE_MUL(RET_TYPE, EL_TYPE, ZERO) \ octave_idx_type nr = m.rows (); \ octave_idx_type nc = m.cols (); \ \ @@ -2112,7 +2112,7 @@ return retval; \ } -#define FULL_SPARSE_MUL_TRANS( RET_TYPE, EL_TYPE, ZERO, CONJ_OP ) \ +#define FULL_SPARSE_MUL_TRANS(RET_TYPE, EL_TYPE, ZERO, CONJ_OP) \ octave_idx_type nr = m.rows (); \ octave_idx_type nc = m.cols (); \ \
--- a/liboctave/util/caseless-str.h Fri Apr 25 11:18:04 2014 -0700 +++ b/liboctave/util/caseless-str.h Fri Apr 25 13:25:25 2014 -0700 @@ -57,16 +57,16 @@ char lp1 = std::tolower (*p1); char lp2 = std::tolower (*p2); - if ( lp1 > lp2 ) + if (lp1 > lp2) return false; - if ( lp1 < lp2) + if (lp1 < lp2) return true; p1++; p2++; } - if ( length () >= s.length ()) + if (length () >= s.length ()) return false; else return true;