Mercurial > octave
changeset 22599:51b395d24782 stable
maint: strip tabs and trailing whitespace from C++ sources.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Thu, 06 Oct 2016 11:55:20 -0400 |
| parents | 5aa8f199e328 |
| children | dd80fb1ef949 |
| files | libgui/src/main-window.cc libgui/src/main-window.h libgui/src/octave-dock-widget.cc libinterp/corefcn/mex.cc libinterp/corefcn/regexp.cc src/mkoctfile.in.cc |
| diffstat | 6 files changed, 15 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/libgui/src/main-window.cc Thu Oct 06 11:52:12 2016 -0400 +++ b/libgui/src/main-window.cc Thu Oct 06 11:55:20 2016 -0400 @@ -1014,7 +1014,7 @@ main_window::handle_update_breakpoint_marker_request (bool insert, const QString& file, int line, - const QString& cond) + const QString& cond) { bool cmd_focus = command_window_has_focus (); @@ -1446,12 +1446,12 @@ connect (this, SIGNAL (update_breakpoint_marker_signal (bool, const QString&, - int, const QString&)), + int, const QString&)), editor_window, SLOT (handle_update_breakpoint_marker_request (bool, const QString&, int, - const QString&))); + const QString&))); #endif octave_link::post_event (this, @@ -1595,12 +1595,12 @@ connect (_octave_qt_link, SIGNAL (update_breakpoint_marker_signal (bool, const QString&, - int, const QString&)), + int, const QString&)), this, SLOT (handle_update_breakpoint_marker_request (bool, - const QString&, + const QString&, int, - const QString&))); + const QString&))); connect (_octave_qt_link, SIGNAL (show_doc_signal (const QString &)),
--- a/libgui/src/main-window.h Thu Oct 06 11:52:12 2016 -0400 +++ b/libgui/src/main-window.h Thu Oct 06 11:55:20 2016 -0400 @@ -168,7 +168,7 @@ void handle_delete_debugger_pointer_request (const QString& file, int line); void handle_update_breakpoint_marker_request (bool insert, const QString& file, int line, - const QString& cond); + const QString& cond); void read_settings (void); void init_terminal_size (void);
--- a/libgui/src/octave-dock-widget.cc Thu Oct 06 11:52:12 2016 -0400 +++ b/libgui/src/octave-dock-widget.cc Thu Oct 06 11:55:20 2016 -0400 @@ -211,7 +211,7 @@ // remove parent and adjust the (un)dock icon setParent (0, Qt::Window); - _dock_action->setIcon (QIcon (":/actions/icons/widget-dock" + _dock_action->setIcon (QIcon (":/actions/icons/widget-dock" + _icon_color + ".png")); _dock_action->setToolTip (tr ("Dock widget"));
--- a/libinterp/corefcn/mex.cc Thu Oct 06 11:52:12 2016 -0400 +++ b/libinterp/corefcn/mex.cc Thu Oct 06 11:55:20 2016 -0400 @@ -300,7 +300,7 @@ { request_mutation (); - return 0; + return 0; } mwSize get_number_of_elements (void) const { return val.numel (); } @@ -313,7 +313,7 @@ get_dimensions (); return ndims == 2 && dims[0] == 1 && dims[1] == 1; - } + } mxClassID get_class_id (void) const { @@ -382,8 +382,8 @@ { if (val.is_sparse_type ()) { - // For sparse arrays, return the first non-zero value. - void * data = val.mex_get_data (); + // For sparse arrays, return the first non-zero value. + void * data = val.mex_get_data (); if (data == NULL) return 0.0; @@ -775,7 +775,7 @@ { dims = static_cast<mwSize *> (mxArray::malloc (ndims * sizeof (mwSize))); - + if (dims == NULL) return 1;
--- a/libinterp/corefcn/regexp.cc Thu Oct 06 11:52:12 2016 -0400 +++ b/libinterp/corefcn/regexp.cc Thu Oct 06 11:55:20 2016 -0400 @@ -1124,7 +1124,7 @@ %!assert (regexp ("\n", "\n"), 1) # Test escape sequences are silently converted -%!test <45407> +%!test <45407> %! assert (regexprep ('s', 's', 'x\.y'), 'x.y'); %! assert (regexprep ('s', '(s)', 'x\$1y'), 'x$1y'); %! assert (regexprep ('s', '(s)', 'x\\$1y'), 'x\sy');
--- a/src/mkoctfile.in.cc Thu Oct 06 11:52:12 2016 -0400 +++ b/src/mkoctfile.in.cc Thu Oct 06 11:55:20 2016 -0400 @@ -602,7 +602,7 @@ } if (output_ext == ".mex" - && vars["ALL_CFLAGS"].find ("-g") != std::string::npos) + && vars["ALL_CFLAGS"].find ("-g") != std::string::npos) { defs += " -DMEX_DEBUG"; }