# HG changeset patch # User John W. Eaton # Date 1421765009 18000 # Node ID be7ac98fab43e2cae6d174437bb8840f5f014fa7 # Parent fe689210525c318816ffadfd8e8adf202667788c strip trailing whitespace from most source files * NEWS, etc/NEWS.3, libgui/graphics/Backend.h, libgui/graphics/ButtonControl.h, libgui/graphics/EditControl.cc, libgui/graphics/Object.h, libgui/graphics/QtHandlesUtils.cc, libgui/graphics/ToolBarButton.h, libgui/graphics/__init_qt__.cc, libgui/graphics/gl-select.cc, libgui/qterminal/libqterminal/unix/TerminalView.cpp, libgui/qterminal/libqterminal/unix/TerminalView.h, libgui/qterminal/libqterminal/win32/QWinTerminalImpl.cpp, libgui/src/m-editor/file-editor-tab.cc, libgui/src/m-editor/file-editor.cc, libgui/src/m-editor/file-editor.h, libgui/src/m-editor/octave-qscintilla.cc, libgui/src/settings-dialog.cc, libgui/src/shortcut-manager.cc, libgui/src/workspace-view.cc, libinterp/corefcn/graphics.cc, libinterp/corefcn/input.cc, libinterp/parse-tree/pt-unop.cc, liboctave/array/dSparse.h, scripts/pkg/pkg.m, scripts/polynomial/polyeig.m, test/io.tst: Strip trailing whitespace. diff -r fe689210525c -r be7ac98fab43 NEWS --- a/NEWS Tue Jan 20 10:05:42 2015 -0500 +++ b/NEWS Tue Jan 20 09:43:29 2015 -0500 @@ -33,12 +33,12 @@ The following functions were deprecated in Octave 3.6 and have been removed from Octave 4.0. - - cut polyderiv - cor shell_cmd - corrcoef studentize - __error_text__ sylvester_matrix - error_text + + cut polyderiv + cor shell_cmd + corrcoef studentize + __error_text__ sylvester_matrix + error_text The following functions have been deprecated in Octave 4.0 and will be removed from Octave 4.4 (or whatever version is the second major @@ -46,7 +46,7 @@ allow_noninteger_range_as_index do_braindead_shortcircuit_evaluation - + The internal function atan2 of the sparse matrix class has been deprecated in Octave 4.0 and will be removed from Octave 4.4 (or whatever version is the second major release after 4.0). Use the Fatan2 function with sparse diff -r fe689210525c -r be7ac98fab43 etc/NEWS.3 --- a/etc/NEWS.3 Tue Jan 20 10:05:42 2015 -0500 +++ b/etc/NEWS.3 Tue Jan 20 09:43:29 2015 -0500 @@ -63,7 +63,7 @@ nested function. This makes it possible to have a pseudo-global variable which can be seen by a group of functions, but which is not visible in the global namespace. - + Example: function outerfunc (...) ... @@ -105,7 +105,7 @@ ** Redundant terminal comma accepted by parser A redundant terminal comma is now accepted in matrix - definitions which allows writing code such as + definitions which allows writing code such as [a,... b,... @@ -156,7 +156,7 @@ With this addition Octave now accepts the entire set of Matlab options for regular expressions. 'noemptymatch' is the default, but 'emptymatch' has certain uses where you need to match an assertion rather than actual - characters. For example, + characters. For example, regexprep ('World', '^', 'Hello ', 'emptymatch') => Hello World @@ -167,7 +167,7 @@ functions now process backslash escape sequences in single-quoted pattern strings. In addition, the regexprep function now processes backslash escapes in single-quoted replacement strings. For example, - + regexprep (str, '\t', '\n') would search the variable str for a TAB character (escape sequence \t) @@ -188,7 +188,7 @@ \char symbol \beta Greek symbol beta \fontname font \fontname{Arial} set Arial font \fontsize fontsize \fontsize{16} set fontsize 16 - \color[rgb] fontcolor \color[rgb]{1 0 1} set magenta color + \color[rgb] fontcolor \color[rgb]{1 0 1} set magenta color \bf bold \bfBold Text bold font \it italic \itItalic Text italic font \sl slanted \slOblique Text slanted font @@ -252,18 +252,18 @@ Octave's legacy behavior strsplit ("1 2, 3", ", ") - ans = + ans = { [1,1] = 1 [1,2] = 2 - [1,3] = + [1,3] = [1,4] = 3 } Matlab compatible behavior strsplit ("1 2, 3", ", ") - ans = + ans = { [1,1] = 1 2 [1,2] = 3 @@ -287,7 +287,7 @@ ** The error function and its derivatives has been extended to accept complex arguments. The following functions now accept complex inputs: - erf erfc erfcx + erf erfc erfcx In addition two new error functions erfi (imaginary error function) and dawson (scaled imaginary error function) have been added. @@ -297,17 +297,17 @@ "relax" option has been replaced by the "rtest" option. The numeric values of error codes and of some options have also changed. - ** The kurtosis function has changed definition to be compatible with + ** The kurtosis function has changed definition to be compatible with Matlab. It now returns the base kurtosis instead of the "excess kurtosis". The old behavior can be had by changing scripts to normalize with -3. "excess kurtosis" = kurtosis (x) - 3 - ** The moment function has changed definition to be compatible with + ** The moment function has changed definition to be compatible with Matlab. It now returns the central moment instead of the raw moment. The old behavior can be had by passing the type argument "r" for raw. - ** The default name of the Octave crash dump file is now + ** The default name of the Octave crash dump file is now "octave-workspace" instead of "octave-core". The exact name can always be customized with the octave_core_file_name function. @@ -358,25 +358,25 @@ The following functions were deprecated in Octave 3.4 and have been removed from Octave 3.8. - + autocor dispatch is_global setstr autocov fstat krylovb strerror betai gammai perror values - cellidx glpkmex replot - cquad is_duplicate_entry saveimage - + cellidx glpkmex replot + cquad is_duplicate_entry saveimage + The following functions have been deprecated in Octave 3.8 and will be removed from Octave 3.12 (or whatever version is the second major release after 3.8): - default_save_options java_new - gen_doc_cache java_set + default_save_options java_new + gen_doc_cache java_set interp1q java_unsigned_conversion - isequalwithequalnans javafields - java_convert_matrix javamethods + isequalwithequalnans javafields + java_convert_matrix javamethods java_debug re_read_readline_init_file - java_get read_readline_init_file - java_invoke saving_history + java_get read_readline_init_file + java_invoke saving_history The following keywords have been deprecated in Octave 3.8 and will @@ -545,7 +545,7 @@ Octave:empty-list-elements Octave:fortran-indexing Octave:precedence-change - + ** The warning ID Octave:string-concat has been renamed to Octave:mixed-string-concat. @@ -579,22 +579,22 @@ bicg nthargout usejava is_dq_string narginchk waitbar is_sq_string python zscore - is_function_handle register_graphics_toolkit - loaded_graphics_toolkits recycle + is_function_handle register_graphics_toolkit + loaded_graphics_toolkits recycle ** Deprecated functions. The following functions were deprecated in Octave 3.2 and have been removed from Octave 3.6. - - create_set spcholinv splu + + create_set spcholinv splu dmult spcumprod spmax iscommand spcumsum spmin israwcommand spdet spprod lchol spdiag spqr loadimage spfind spsum mark_as_command sphcat spsumsq - mark_as_rawcommand spinv spvcat + mark_as_rawcommand spinv spvcat spatan2 spkron str2mat spchol splchol unmark_command spchol2inv split unmark_rawcommand @@ -604,10 +604,10 @@ release after 3.6): cut polyderiv - cor shell_cmd + cor shell_cmd corrcoef studentize __error_text__ sylvester_matrix - error_text + error_text ** The following functions have been modified for Matlab compatibility: @@ -617,7 +617,7 @@ ----------------------------------------------------------- ** Octave 3.4.3 is a bug fixing release. - + Summary of important user-visible changes for version 3.4.2: ----------------------------------------------------------- @@ -681,7 +681,7 @@ ** BLAS and LAPACK libraries are now required to build Octave. The subset of the reference BLAS and LAPACK libraries has been removed from the Octave sources. - + ** The ARPACK library is now distributed with Octave so it no longer needs to be available as an external dependency when building Octave. @@ -714,7 +714,7 @@ `times', `mtimes', `and', and `or') have been extended to accept multiple arguments. This is especially useful for summing (multiplying, etc.) lists of objects (of possibly distinct types): - + matrix_sum = plus (matrix_list{:}); ** An FTP object type based on libcurl has been implemented. These @@ -741,11 +741,11 @@ ** The behavior of library functions `ismatrix', `issquare', and `issymmetric' has been changed for better consistency. - + * The `ismatrix' function now returns true for all numeric, - logical and character 2-D or N-D matrices. Previously, `ismatrix' + logical and character 2-D or N-D matrices. Previously, `ismatrix' returned false if the first or second dimension was zero. - Hence, `ismatrix ([])' was false, + Hence, `ismatrix ([])' was false, while `ismatrix (zeros (1,2,0))' was true. * The `issquare' function now returns a logical scalar, and is @@ -755,12 +755,12 @@ The dimension is no longer returned. As a result, `issquare ([])' now yields true. - + * The `issymmetric' function now checks for symmetry instead of Hermitianness. For the latter, ishermitian was created. Also, logical scalar is returned rather than the dimension, so `issymmetric ([])' is now true. - + ** Function handles are now aware of overloaded functions. If a function is overloaded, the handle determines at the time of its reference which function to call. A non-overloaded version does not @@ -781,12 +781,12 @@ scalar, then the statement M += S; - + will operate on M's data in-place if it is not shared by another variable, usually increasing both time and memory efficiency. - + Only selected common combinations are affected, namely: - + matrix += matrix matrix -= matrix matrix .*= matrix @@ -832,10 +832,10 @@ ** More efficient matrix division handling. Octave is now able to handle the expressions - + M' \ V M.' \ V - V / M + V / M (M is a matrix and V is a vector) more efficiently in certain cases. In particular, if M is triangular, all three expressions will be @@ -846,7 +846,7 @@ ** More efficient handling of certain mixed real-complex matrix operations. For instance, if RM is a real matrix and CM a complex matrix, - + RM * CM can now be evaluated either as @@ -899,11 +899,11 @@ to Matlab. The additional Octave-specific features of returning a boolean matrix indicating which elements were successfully converted has been removed. - + ** Matlab-style ignoring input and output function arguments using tilde (~) is now supported. Ignored output arguments may be detected from a function using the built-in function `isargout'. - For more details, consult the manual. + For more details, consult the manual. ** The list datatype, deprecated since the introduction of cells, has been removed. @@ -936,9 +936,9 @@ consistently use nnz unless you really want to use nzmax (i.e., the space allocated for nonzero elements). - Sparse concatenation is also affected, and concatenating sparse - matrices, especially larger collections, is now significantly more - efficient. This applies to both the [] operator and the + Sparse concatenation is also affected, and concatenating sparse + matrices, especially larger collections, is now significantly more + efficient. This applies to both the [] operator and the cat/vertcat/horzcat functions. ** It is now possible to optionally employ the xGESDD LAPACK drivers @@ -948,33 +948,33 @@ singular vectors are requested, but is reported to be somewhat less robust on highly ill-conditioned matrices. - ** Configuration pseudo-variables, such as page_screen_output or - confirm_recursive_rmdir (or the above mentioned svd_driver), now - accept a "local" option as second argument, requesting the change + ** Configuration pseudo-variables, such as page_screen_output or + confirm_recursive_rmdir (or the above mentioned svd_driver), now + accept a "local" option as second argument, requesting the change to be undone when the current function returns: - + function [status, msg] = rm_rf (dir) confirm_recursive_rmdir (false, "local"); [status, msg] = rmdir (dir, "s"); ... endfunction - - Upon return, confirm_recursive_rmdir will be restored to the value - it had on entry to the function, even if there were subsequent + + Upon return, confirm_recursive_rmdir will be restored to the value + it had on entry to the function, even if there were subsequent changes to the variable in function rm_rf or any of the functions it calls. ** pkg now accepts a -forge option for downloading and installing - packages from Octave Forge automatically. For example, - + packages from Octave Forge automatically. For example, + pkg install -forge general - + will automatically download the latest release of the general package and attempt to install it. No automatic resolving of dependencies is provided. Further, pkg list -forge - + can be used to list all available packages. ** The internal data representation of structs has been completely @@ -1001,12 +1001,12 @@ accumdim erfcx nfields pqpnonneg uigetdir bitpack fileread nth_element quadcc uigetfile bitunpack fminbnd onCleanup randi uiputfile - blkmm fskipl pbaspect repelems uimenu - cbrt ifelse pie3 reset whitebg - curl ishermitian powerset rsf2csf - chop isindex ppder saveas - daspect luupdate ppint strread - divergence merge ppjumps textread + blkmm fskipl pbaspect repelems uimenu + cbrt ifelse pie3 reset whitebg + curl ishermitian powerset rsf2csf + chop isindex ppder saveas + daspect luupdate ppint strread + divergence merge ppjumps textread ** Using the image function to view images with external programs such as display, xv, and xloadimage is no longer supported. The @@ -1021,7 +1021,7 @@ This is no longer possible unless a is an empty matrix or cell array. - + ** The dlmread function has been extended to allow specifying a custom value for empty fields. @@ -1032,7 +1032,7 @@ anonymous function handle, if the function simply calls another function or handle with some of its parameters bound to certain values. Example: - + f = @(x) sum (x, 1); When f is called, the call is forwarded to @sum with the constant 1 @@ -1057,34 +1057,34 @@ The following functions were deprecated in Octave 3.0 and have been removed from Octave 3.4. - - beta_cdf geometric_pdf pascal_pdf - beta_inv geometric_rnd pascal_rnd - beta_pdf hypergeometric_cdf poisson_cdf - beta_rnd hypergeometric_inv poisson_inv - binomial_cdf hypergeometric_pdf poisson_pdf - binomial_inv hypergeometric_rnd poisson_rnd - binomial_pdf intersection polyinteg - binomial_rnd is_bool setstr - chisquare_cdf is_complex struct_contains - chisquare_inv is_list struct_elements - chisquare_pdf is_matrix t_cdf - chisquare_rnd is_scalar t_inv - clearplot is_square t_pdf - clg is_stream t_rnd - com2str is_struct uniform_cdf - exponential_cdf is_symmetric uniform_inv - exponential_inv is_vector uniform_pdf - exponential_pdf isstr uniform_rnd - exponential_rnd lognormal_cdf weibcdf - f_cdf lognormal_inv weibinv - f_inv lognormal_pdf weibpdf - f_pdf lognormal_rnd weibrnd - f_rnd meshdom weibull_cdf - gamma_cdf normal_cdf weibull_inv - gamma_inv normal_inv weibull_pdf - gamma_pdf normal_pdf weibull_rnd - gamma_rnd normal_rnd wiener_rnd + + beta_cdf geometric_pdf pascal_pdf + beta_inv geometric_rnd pascal_rnd + beta_pdf hypergeometric_cdf poisson_cdf + beta_rnd hypergeometric_inv poisson_inv + binomial_cdf hypergeometric_pdf poisson_pdf + binomial_inv hypergeometric_rnd poisson_rnd + binomial_pdf intersection polyinteg + binomial_rnd is_bool setstr + chisquare_cdf is_complex struct_contains + chisquare_inv is_list struct_elements + chisquare_pdf is_matrix t_cdf + chisquare_rnd is_scalar t_inv + clearplot is_square t_pdf + clg is_stream t_rnd + com2str is_struct uniform_cdf + exponential_cdf is_symmetric uniform_inv + exponential_inv is_vector uniform_pdf + exponential_pdf isstr uniform_rnd + exponential_rnd lognormal_cdf weibcdf + f_cdf lognormal_inv weibinv + f_inv lognormal_pdf weibpdf + f_pdf lognormal_rnd weibrnd + f_rnd meshdom weibull_cdf + gamma_cdf normal_cdf weibull_inv + gamma_inv normal_inv weibull_pdf + gamma_pdf normal_pdf weibull_rnd + gamma_rnd normal_rnd wiener_rnd geometric_cdf pascal_cdf geometric_inv pascal_inv @@ -1092,14 +1092,14 @@ be removed from Octave 3.6 (or whatever version is the second major release after 3.2): - create_set spcholinv splu + create_set spcholinv splu dmult spcumprod spmax iscommand spcumsum spmin israwcommand spdet spprod lchol spdiag spqr loadimage spfind spsum mark_as_command sphcat spsumsq - mark_as_rawcommand spinv spvcat + mark_as_rawcommand spinv spvcat spatan2 spkron str2mat spchol splchol unmark_command spchol2inv split unmark_rawcommand @@ -1136,15 +1136,15 @@ ** New graphics functions: - addlistener ezcontour gcbo refresh + addlistener ezcontour gcbo refresh addproperty ezcontourf ginput refreshdata allchild ezmesh gtext specular available_graphics_toolkits ezmeshc intwarning surfl graphics_toolkit ezplot ishghandle trisurf cla ezplot3 isocolors waitforbuttonpress clabel ezpolar isonormals - comet ezsurf isosurface - dellistener findall linkprop + comet ezsurf isosurface + dellistener findall linkprop diffuse gcbf plotmatrix ** New experimental OpenGL/FLTK based plotting system. @@ -1320,8 +1320,8 @@ a copy would be made, such as certain array slicing operations or conversions between cells, structs and cs-lists. This usually reduces both time and memory consumption. - Also, Octave will now attempt to detect and optimize usage of a vector - as a stack, when elements are being repeatedly inserted at/removed from + Also, Octave will now attempt to detect and optimize usage of a vector + as a stack, when elements are being repeatedly inserted at/removed from the end of the vector. ** Improved performance for reduction operations. @@ -1330,7 +1330,7 @@ max and min functions has been significantly improved. ** Sorting and searching. - + The performance of sort has been improved, especially when sorting indices are requested. An efficient built-in issorted implementation was added. The sortrows function now uses a more @@ -1471,34 +1471,34 @@ The following functions were deprecated in Octave 3.0 and will be removed from Octave 3.4 (or whatever version is the second major release after 3.0): - - beta_cdf geometric_pdf pascal_pdf - beta_inv geometric_rnd pascal_rnd - beta_pdf hypergeometric_cdf poisson_cdf - beta_rnd hypergeometric_inv poisson_inv - binomial_cdf hypergeometric_pdf poisson_pdf - binomial_inv hypergeometric_rnd poisson_rnd - binomial_pdf intersection polyinteg - binomial_rnd is_bool setstr - chisquare_cdf is_complex struct_contains - chisquare_inv is_list struct_elements - chisquare_pdf is_matrix t_cdf - chisquare_rnd is_scalar t_inv - clearplot is_square t_pdf - clg is_stream t_rnd - com2str is_struct uniform_cdf - exponential_cdf is_symmetric uniform_inv - exponential_inv is_vector uniform_pdf - exponential_pdf isstr uniform_rnd - exponential_rnd lognormal_cdf weibcdf - f_cdf lognormal_inv weibinv - f_inv lognormal_pdf weibpdf - f_pdf lognormal_rnd weibrnd - f_rnd meshdom weibull_cdf - gamma_cdf normal_cdf weibull_inv - gamma_inv normal_inv weibull_pdf - gamma_pdf normal_pdf weibull_rnd - gamma_rnd normal_rnd wiener_rnd + + beta_cdf geometric_pdf pascal_pdf + beta_inv geometric_rnd pascal_rnd + beta_pdf hypergeometric_cdf poisson_cdf + beta_rnd hypergeometric_inv poisson_inv + binomial_cdf hypergeometric_pdf poisson_pdf + binomial_inv hypergeometric_rnd poisson_rnd + binomial_pdf intersection polyinteg + binomial_rnd is_bool setstr + chisquare_cdf is_complex struct_contains + chisquare_inv is_list struct_elements + chisquare_pdf is_matrix t_cdf + chisquare_rnd is_scalar t_inv + clearplot is_square t_pdf + clg is_stream t_rnd + com2str is_struct uniform_cdf + exponential_cdf is_symmetric uniform_inv + exponential_inv is_vector uniform_pdf + exponential_pdf isstr uniform_rnd + exponential_rnd lognormal_cdf weibcdf + f_cdf lognormal_inv weibinv + f_inv lognormal_pdf weibpdf + f_pdf lognormal_rnd weibrnd + f_rnd meshdom weibull_cdf + gamma_cdf normal_cdf weibull_inv + gamma_inv normal_inv weibull_pdf + gamma_pdf normal_pdf weibull_rnd + gamma_rnd normal_rnd wiener_rnd geometric_cdf pascal_cdf geometric_inv pascal_inv diff -r fe689210525c -r be7ac98fab43 libgui/graphics/Backend.h --- a/libgui/graphics/Backend.h Tue Jan 20 10:05:42 2015 -0500 +++ b/libgui/graphics/Backend.h Tue Jan 20 09:43:29 2015 -0500 @@ -64,4 +64,4 @@ }; // namespace QtHandles -#endif +#endif diff -r fe689210525c -r be7ac98fab43 libgui/graphics/ButtonControl.h --- a/libgui/graphics/ButtonControl.h Tue Jan 20 10:05:42 2015 -0500 +++ b/libgui/graphics/ButtonControl.h Tue Jan 20 09:43:29 2015 -0500 @@ -39,7 +39,7 @@ ~ButtonControl (void); protected: - void update (int pId); + void update (int pId); private slots: void clicked (void); diff -r fe689210525c -r be7ac98fab43 libgui/graphics/EditControl.cc --- a/libgui/graphics/EditControl.cc Tue Jan 20 10:05:42 2015 -0500 +++ b/libgui/graphics/EditControl.cc Tue Jan 20 09:43:29 2015 -0500 @@ -101,7 +101,7 @@ edit->setAcceptRichText (false); // FIXME: support string_vector edit->setPlainText (Utils::fromStdString (up.get_string_string ())); - + connect (edit, SIGNAL (textChanged (void)), SLOT (textChanged (void))); connect (edit, SIGNAL (editingFinished (void)), diff -r fe689210525c -r be7ac98fab43 libgui/graphics/Object.h --- a/libgui/graphics/Object.h Tue Jan 20 10:05:42 2015 -0500 +++ b/libgui/graphics/Object.h Tue Jan 20 09:43:29 2015 -0500 @@ -47,7 +47,7 @@ base_properties& properties (void) { return object ().get_properties (); } - + const base_properties& properties (void) const { return object ().get_properties (); } @@ -57,7 +57,7 @@ return dynamic_cast (object ().get_properties ()); } - + template const typename T::properties& properties (void) const { diff -r fe689210525c -r be7ac98fab43 libgui/graphics/QtHandlesUtils.cc --- a/libgui/graphics/QtHandlesUtils.cc Tue Jan 20 10:05:42 2015 -0500 +++ b/libgui/graphics/QtHandlesUtils.cc Tue Jan 20 09:43:29 2015 -0500 @@ -118,7 +118,7 @@ if (rgb.numel () == 3) c.setRgbF (rgb(0), rgb(1), rgb(2)); - + return c; } diff -r fe689210525c -r be7ac98fab43 libgui/graphics/ToolBarButton.h --- a/libgui/graphics/ToolBarButton.h Tue Jan 20 10:05:42 2015 -0500 +++ b/libgui/graphics/ToolBarButton.h Tue Jan 20 09:43:29 2015 -0500 @@ -31,7 +31,7 @@ { class Container; - + template class ToolBarButton : public Object { diff -r fe689210525c -r be7ac98fab43 libgui/graphics/__init_qt__.cc --- a/libgui/graphics/__init_qt__.cc Tue Jan 20 10:05:42 2015 -0500 +++ b/libgui/graphics/__init_qt__.cc Tue Jan 20 09:43:29 2015 -0500 @@ -205,7 +205,7 @@ defaultFileName = defaultDirectory; else defaultFileName = defaultDirectory + "/" + defaultFileName; - + QStringList filterSpecs = makeFilterSpecs (args(0).cell_value ()); if (isMultiSelect) @@ -283,7 +283,7 @@ defaultFileName = defaultDirectory; else defaultFileName = defaultDirectory + "/" + defaultFileName; - + QStringList filterSpecs = makeFilterSpecs (args(0).cell_value ()); QString filter; diff -r fe689210525c -r be7ac98fab43 libgui/graphics/gl-select.cc --- a/libgui/graphics/gl-select.cc Tue Jan 20 10:05:42 2015 -0500 +++ b/libgui/graphics/gl-select.cc Tue Jan 20 09:43:29 2015 -0500 @@ -51,7 +51,7 @@ } void -opengl_selector::init_marker (const std::string& m, double sz, float width) +opengl_selector::init_marker (const std::string& m, double sz, float width) { opengl_renderer::init_marker (m, sz, width); apply_pick_matrix (); diff -r fe689210525c -r be7ac98fab43 libgui/qterminal/libqterminal/unix/TerminalView.cpp --- a/libgui/qterminal/libqterminal/unix/TerminalView.cpp Tue Jan 20 10:05:42 2015 -0500 +++ b/libgui/qterminal/libqterminal/unix/TerminalView.cpp Tue Jan 20 09:43:29 2015 -0500 @@ -2631,7 +2631,7 @@ { foreach (QUrl url, event->mimeData ()->urls ()) { - if(dropText.length () > 0) + if(dropText.length () > 0) dropText += "\n"; dropText += url.toLocalFile (); } diff -r fe689210525c -r be7ac98fab43 libgui/qterminal/libqterminal/unix/TerminalView.h --- a/libgui/qterminal/libqterminal/unix/TerminalView.h Tue Jan 20 10:05:42 2015 -0500 +++ b/libgui/qterminal/libqterminal/unix/TerminalView.h Tue Jan 20 09:43:29 2015 -0500 @@ -417,7 +417,7 @@ void pasteSelection(); /** - * selects all content + * selects all content */ void selectAll(); diff -r fe689210525c -r be7ac98fab43 libgui/qterminal/libqterminal/win32/QWinTerminalImpl.cpp --- a/libgui/qterminal/libqterminal/win32/QWinTerminalImpl.cpp Tue Jan 20 10:05:42 2015 -0500 +++ b/libgui/qterminal/libqterminal/win32/QWinTerminalImpl.cpp Tue Jan 20 09:43:29 2015 -0500 @@ -688,7 +688,7 @@ void QConsolePrivate::selectAll() { m_beginSelection = QPoint (0,0); - m_endSelection = QPoint(m_bufferSize.width (), + m_endSelection = QPoint(m_bufferSize.width (), m_cursorPos.y()); updateSelection(); } @@ -714,13 +714,13 @@ if (QChar(m_buffer[begin.y ()*stride + begin.x ()].Char.UnicodeChar).isSpace () == false) { // from current char, go back and fwd to find start and end of block - while(begin.x () > 0 && + while(begin.x () > 0 && QChar(m_buffer[begin.y ()*stride + begin.x () -1].Char.UnicodeChar).isSpace() == false) { begin.rx () --; } - while(end.x () < m_consoleRect.width () && + while(end.x () < m_consoleRect.width () && QChar(m_buffer[end.y ()*stride + end.x () +1].Char.UnicodeChar).isSpace() == false) { end.rx () ++; @@ -728,13 +728,13 @@ } else { - while(begin.x () > 0 && + while(begin.x () > 0 && QChar(m_buffer[begin.y ()*stride + begin.x () -1].Char.UnicodeChar).isSpace()) { begin.rx () --; } - while(end.x () < m_consoleRect.width () && + while(end.x () < m_consoleRect.width () && QChar(m_buffer[end.y ()*stride + end.x () +1].Char.UnicodeChar).isSpace ()) { end.rx () ++; @@ -1012,7 +1012,7 @@ // command editor will actually use. qputenv ("LINES", QByteArray::number (m_consoleRect.height ())); - qputenv ("COLUMNS", QByteArray::number (m_consoleRect.width ())); + qputenv ("COLUMNS", QByteArray::number (m_consoleRect.width ())); // Force the command line editor (usually readline) to notice the // change in screen size as soon as possible. @@ -1176,7 +1176,7 @@ r.Bottom = m_consoleRect.bottom (); log ("Scrolling window horizontally: (%d, %d) -> (%d, %d) [%d x %d]\n", - r.Left, r.Top, r.Right, r.Bottom, + r.Left, r.Top, r.Right, r.Bottom, r.Right - r.Left + 1, r.Bottom - r.Top + 1); if (SetConsoleWindowInfo (hStdOut, TRUE, &r)) @@ -1203,7 +1203,7 @@ r.Bottom = value + m_consoleRect.height () - 1; log ("Scrolling window vertically: (%d, %d) -> (%d, %d) [%d x %d]\n", - r.Left, r.Top, r.Right, r.Bottom, + r.Left, r.Top, r.Right, r.Bottom, r.Right - r.Left + 1, r.Bottom - r.Top + 1); if (SetConsoleWindowInfo (hStdOut, TRUE, &r)) @@ -1828,7 +1828,7 @@ { foreach (QUrl url, event->mimeData ()->urls ()) { - if(dropText.length () > 0) + if(dropText.length () > 0) dropText += "\n"; dropText += url.toLocalFile (); } diff -r fe689210525c -r be7ac98fab43 libgui/src/m-editor/file-editor-tab.cc --- a/libgui/src/m-editor/file-editor-tab.cc Tue Jan 20 10:05:42 2015 -0500 +++ b/libgui/src/m-editor/file-editor-tab.cc Tue Jan 20 09:43:29 2015 -0500 @@ -1921,7 +1921,7 @@ _edit_area->setEdgeMode (QsciScintilla::EdgeNone); // reload changed files - _always_reload_changed_files = + _always_reload_changed_files = settings->value ("editor/always_reload_changed_files",false).toBool (); } diff -r fe689210525c -r be7ac98fab43 libgui/src/m-editor/file-editor.cc --- a/libgui/src/m-editor/file-editor.cc Tue Jan 20 10:05:42 2015 -0500 +++ b/libgui/src/m-editor/file-editor.cc Tue Jan 20 09:43:29 2015 -0500 @@ -1933,7 +1933,7 @@ focus (); } -void +void file_editor::dragEnterEvent (QDragEnterEvent *e) { if (e->mimeData ()->hasUrls ()) diff -r fe689210525c -r be7ac98fab43 libgui/src/m-editor/file-editor.h --- a/libgui/src/m-editor/file-editor.h Tue Jan 20 10:05:42 2015 -0500 +++ b/libgui/src/m-editor/file-editor.h Tue Jan 20 09:43:29 2015 -0500 @@ -234,7 +234,7 @@ void dragEnterEvent(QDragEnterEvent *event); void dropEvent(QDropEvent *event); - + private: bool is_editor_console_tabbed (); diff -r fe689210525c -r be7ac98fab43 libgui/src/m-editor/octave-qscintilla.cc --- a/libgui/src/m-editor/octave-qscintilla.cc Tue Jan 20 10:05:42 2015 -0500 +++ b/libgui/src/m-editor/octave-qscintilla.cc Tue Jan 20 09:43:29 2015 -0500 @@ -106,7 +106,7 @@ QList< QsciCommand * > cmd_list_mac = cmd_set->commands (); for (int i = 0; i < cmd_list_mac.length (); i++) { - // Primary key + // Primary key int key = cmd_list_mac.at (i)->key (); if (static_cast (key | Qt::META) == key && diff -r fe689210525c -r be7ac98fab43 libgui/src/settings-dialog.cc --- a/libgui/src/settings-dialog.cc Tue Jan 20 10:05:42 2015 -0500 +++ b/libgui/src/settings-dialog.cc Tue Jan 20 09:43:29 2015 -0500 @@ -732,7 +732,7 @@ ui->sync_octave_directory->isChecked ()); settings->setValue ("filesdockwidget/restore_last_dir", ui->cb_restore_file_browser_dir->isChecked ()); - settings->setValue ("filesdockwidget/startup_dir", + settings->setValue ("filesdockwidget/startup_dir", ui->le_file_browser_dir->text ()); diff -r fe689210525c -r be7ac98fab43 libgui/src/shortcut-manager.cc --- a/libgui/src/shortcut-manager.cc Tue Jan 20 10:05:42 2015 -0500 +++ b/libgui/src/shortcut-manager.cc Tue Jan 20 09:43:29 2015 -0500 @@ -47,7 +47,7 @@ shortcut_manager::shortcut_manager () { setObjectName ("Shortcut_Manager"); - + // Mac: don't let Qt interpret CMD key ("Meta" in Qt terminology) as Ctrl #if defined (Q_OS_MAC) QCoreApplication::setAttribute (Qt::AA_MacDontSwapCtrlAndMeta, true); @@ -87,12 +87,12 @@ shortcut_manager::do_init_data () { QKeySequence ctrl; - int prefix; + int prefix; #if defined (Q_OS_MAC) // Use CMD key as an equivalent of Ctrl key on other platforms 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). + // 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. prefix = Qt::AltModifier; #else @@ -102,7 +102,7 @@ QKeySequence ctrl_shift = ctrl + Qt::ShiftModifier; QKeySequence ctrl_alt = ctrl + Qt::AltModifier; - + // actions of the main window // file @@ -130,42 +130,42 @@ QKeySequence ()); init (tr ("Clear Workspace"), "main_edit:clear_workspace", QKeySequence ()); - // debug - init (tr ("Step Over"), "main_debug:step_over", + // debug + init (tr ("Step Over"), "main_debug:step_over", QKeySequence (prefix + Qt::Key_F10)); - init (tr ("Step Into"), "main_debug:step_into", + init (tr ("Step Into"), "main_debug:step_into", QKeySequence (prefix + Qt::Key_F11)); - init (tr ("Step Out"), "main_debug:step_out", + init (tr ("Step Out"), "main_debug:step_out", QKeySequence (prefix + Qt::ShiftModifier + Qt::Key_F11)); - init (tr ("Continue"), "main_debug:continue", + init (tr ("Continue"), "main_debug:continue", QKeySequence (prefix + Qt::Key_F5)); - init (tr ("Quit Debug Mode"), "main_debug:quit", + init (tr ("Quit Debug Mode"), "main_debug:quit", QKeySequence (prefix + Qt::ShiftModifier + Qt::Key_F5)); // window - init (tr ("Show Command Window"), "main_window:show_command", + init (tr ("Show Command Window"), "main_window:show_command", prefix + ctrl_shift + Qt::Key_0); - init (tr ("Show Command History"), "main_window:show_history", + init (tr ("Show Command History"), "main_window:show_history", prefix + ctrl_shift + Qt::Key_1); - init (tr ("Show File Browser"), "main_window:show_file_browser", + init (tr ("Show File Browser"), "main_window:show_file_browser", prefix + ctrl_shift + Qt::Key_2); - init (tr ("Show Workspace"), "main_window:show_workspace", + init (tr ("Show Workspace"), "main_window:show_workspace", prefix + ctrl_shift + Qt::Key_3); - init (tr ("Show Editor"), "main_window:show_editor", + init (tr ("Show Editor"), "main_window:show_editor", prefix + ctrl_shift + Qt::Key_4); - init (tr ("Show Documentation"), "main_window:show_doc", + init (tr ("Show Documentation"), "main_window:show_doc", prefix + ctrl_shift + Qt::Key_5); - init (tr ("Command Window"), "main_window:command", + init (tr ("Command Window"), "main_window:command", prefix + ctrl + Qt::Key_0); - init (tr ("Command History"), "main_window:history", + init (tr ("Command History"), "main_window:history", prefix + ctrl + Qt::Key_1); - init (tr ("File Browser"), "main_window:file_browser", + init (tr ("File Browser"), "main_window:file_browser", prefix + ctrl + Qt::Key_2); - init (tr ("Workspace"), "main_window:workspace", + init (tr ("Workspace"), "main_window:workspace", prefix + ctrl + Qt::Key_3); - init (tr ("Editor"), "main_window:editor", + init (tr ("Editor"), "main_window:editor", prefix + ctrl + Qt::Key_4); - init (tr ("Documentation"), "main_window:doc", + init (tr ("Documentation"), "main_window:doc", prefix + ctrl + Qt::Key_5); init (tr ("Reset Window Layout"), "main_window:reset", QKeySequence ()); @@ -204,45 +204,45 @@ 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", + 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", + 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", + init (tr ("Delete to Start of Line"), "editor_edit:delete_start_line", QKeySequence (ctrl_shift + Qt::Key_Backspace)); - init (tr ("Delete to End of Line"), "editor_edit:delete_end_line", + init (tr ("Delete to End of Line"), "editor_edit:delete_end_line", QKeySequence (ctrl_shift + Qt::Key_Delete)); - init (tr ("Delete Line"), "editor_edit:delete_line", + init (tr ("Delete Line"), "editor_edit:delete_line", QKeySequence (ctrl_shift + Qt::Key_L)); - init (tr ("Copy Line"), "editor_edit:copy_line", + init (tr ("Copy Line"), "editor_edit:copy_line", QKeySequence (ctrl_shift + Qt::Key_C)); - init (tr ("Cut Line"), "editor_edit:cut_line", + init (tr ("Cut Line"), "editor_edit:cut_line", QKeySequence (ctrl_shift + Qt::Key_X)); - init (tr ("Duplicate Selection/Line"), "editor_edit:duplicate_selection", + init (tr ("Duplicate Selection/Line"), "editor_edit:duplicate_selection", QKeySequence (ctrl + Qt::Key_D)); - init (tr ("Transpose Line"), "editor_edit:transpose_line", + init (tr ("Transpose Line"), "editor_edit:transpose_line", QKeySequence (ctrl + Qt::Key_T)); - init (tr ("Completion List"), "editor_edit:completion_list", + init (tr ("Completion List"), "editor_edit:completion_list", QKeySequence (ctrl + Qt::Key_Space)); - init (tr ("Comment Selection"), "editor_edit:comment_selection", + init (tr ("Comment Selection"), "editor_edit:comment_selection", QKeySequence (ctrl + Qt::Key_R)); - init (tr ("Uncomment Selection"), "editor_edit:uncomment_selection", + init (tr ("Uncomment Selection"), "editor_edit:uncomment_selection", QKeySequence (ctrl_shift + Qt::Key_R)); - init (tr ("Uppercase Selection"), "editor_edit:upper_case", + init (tr ("Uppercase Selection"), "editor_edit:upper_case", QKeySequence (ctrl + Qt::Key_U)); - init (tr ("Lowercase Selection"), "editor_edit:lower_case", + init (tr ("Lowercase Selection"), "editor_edit:lower_case", QKeySequence (ctrl_alt + Qt::Key_U)); #if defined (Q_OS_MAC) - init (tr ("Indent Selection"), "editor_edit:indent_selection", + init (tr ("Indent Selection"), "editor_edit:indent_selection", QKeySequence (prefix + Qt::Key_Tab)); - init (tr ("Unindent Selection"), "editor_edit:unindent_selection", + init (tr ("Unindent Selection"), "editor_edit:unindent_selection", QKeySequence (prefix + Qt::ShiftModifier + Qt::Key_Tab)); #else - init (tr ("Indent Selection"), "editor_edit:indent_selection", + init (tr ("Indent Selection"), "editor_edit:indent_selection", QKeySequence (ctrl + Qt::Key_Tab)); - init (tr ("Unindent Selection"), "editor_edit:unindent_selection", + init (tr ("Unindent Selection"), "editor_edit:unindent_selection", QKeySequence (ctrl_shift + Qt::Key_Tab)); #endif @@ -253,7 +253,7 @@ init (tr ("Convert Line Ednings to Mac"), "editor_edit:conv_eol_mac", QKeySequence ()); - init (tr ("Goto Line"), "editor_edit:goto_line", + init (tr ("Goto Line"), "editor_edit:goto_line", QKeySequence (ctrl + Qt::Key_G)); init (tr ("Toggle Bookmark"), "editor_edit:toggle_bookmark", QKeySequence (prefix + Qt::Key_F7)); @@ -295,9 +295,9 @@ QKeySequence ()); // run - init (tr ("Run File"), "editor_run:run_file", + init (tr ("Run File"), "editor_run:run_file", QKeySequence (prefix + Qt::Key_F5) ); - init (tr ("Run Selection"), "editor_run:run_selection", + init (tr ("Run Selection"), "editor_run:run_selection", QKeySequence (prefix + Qt::Key_F9) ); // help diff -r fe689210525c -r be7ac98fab43 libgui/src/workspace-view.cc --- a/libgui/src/workspace-view.cc Tue Jan 20 10:05:42 2015 -0500 +++ b/libgui/src/workspace-view.cc Tue Jan 20 09:43:29 2015 -0500 @@ -382,5 +382,5 @@ { if (view->hasFocus ()) view->selectAll (); -} +} diff -r fe689210525c -r be7ac98fab43 libinterp/corefcn/graphics.cc --- a/libinterp/corefcn/graphics.cc Tue Jan 20 10:05:42 2015 -0500 +++ b/libinterp/corefcn/graphics.cc Tue Jan 20 09:43:29 2015 -0500 @@ -9629,7 +9629,7 @@ return retval; } -void +void gtk_manager::do_register_toolkit (const std::string& name) { if (dtk.empty () || name == "qt" @@ -9640,7 +9640,7 @@ available_toolkits.insert (name); } -void +void gtk_manager::do_unregister_toolkit (const std::string& name) { available_toolkits.erase (name); diff -r fe689210525c -r be7ac98fab43 libinterp/corefcn/input.cc --- a/libinterp/corefcn/input.cc Tue Jan 20 10:05:42 2015 -0500 +++ b/libinterp/corefcn/input.cc Tue Jan 20 09:43:29 2015 -0500 @@ -184,7 +184,7 @@ eof = false; std::string retval = command_editor::readline (s, eof); - + if (! eof && retval.empty ()) retval = "\n"; @@ -513,7 +513,7 @@ bool silent = tree_evaluator::quiet_breakpoint_flag; tree_evaluator::quiet_breakpoint_flag = false; - + octave_user_code *caller = octave_call_stack::caller_user_code (); std::string nm; int curr_debug_line; @@ -581,7 +581,7 @@ if (silent) command_editor::erase_empty_line (true); - + std::string msg = buf.str (); if (! msg.empty ()) diff -r fe689210525c -r be7ac98fab43 libinterp/parse-tree/pt-unop.cc --- a/libinterp/parse-tree/pt-unop.cc Tue Jan 20 10:05:42 2015 -0500 +++ b/libinterp/parse-tree/pt-unop.cc Tue Jan 20 09:43:29 2015 -0500 @@ -74,7 +74,7 @@ if (! error_state) { BEGIN_PROFILER_BLOCK (tree_prefix_expression) - + ref.do_unary_op (etype); if (! error_state) diff -r fe689210525c -r be7ac98fab43 liboctave/array/dSparse.h --- a/liboctave/array/dSparse.h Tue Jan 20 10:05:42 2015 -0500 +++ b/liboctave/array/dSparse.h Tue Jan 20 09:43:29 2015 -0500 @@ -123,7 +123,7 @@ friend OCTAVE_API SparseMatrix atan2 (const double& x, const SparseMatrix& y) GCC_ATTR_DEPRECATED ; friend OCTAVE_API SparseMatrix atan2 (const SparseMatrix& x, const double& y) - GCC_ATTR_DEPRECATED ; + GCC_ATTR_DEPRECATED ; friend OCTAVE_API SparseMatrix atan2 (const SparseMatrix& x, const SparseMatrix& y) GCC_ATTR_DEPRECATED ; diff -r fe689210525c -r be7ac98fab43 scripts/pkg/pkg.m --- a/scripts/pkg/pkg.m Tue Jan 20 10:05:42 2015 -0500 +++ b/scripts/pkg/pkg.m Tue Jan 20 09:43:29 2015 -0500 @@ -541,7 +541,7 @@ if (nargout == 0) installed_pkgs_lst = installed_packages (local_list, global_list); if (length (files) > 0) - update_lst = {}; + update_lst = {}; for i = 1:length (files) is_installed = false; for j = 1:length (installed_pkgs_lst) diff -r fe689210525c -r be7ac98fab43 scripts/polynomial/polyeig.m --- a/scripts/polynomial/polyeig.m Tue Jan 20 10:05:42 2015 -0500 +++ b/scripts/polynomial/polyeig.m Tue Jan 20 09:43:29 2015 -0500 @@ -28,7 +28,7 @@ ## @code{(@var{C0} + @var{C1} + @dots{} + @var{Cl})v = 0}. ## ## Note that the eigenvalues @var{z} are the zeros of the matrix polynomial. -## @var{z} is a row vector with @var{n*l} elements. @var{v} is a matrix +## @var{z} is a row vector with @var{n*l} elements. @var{v} is a matrix ## (@var{n} x @var{n}*@var{l}) with columns that correspond to the ## eigenvectors. ## diff -r fe689210525c -r be7ac98fab43 test/io.tst --- a/test/io.tst Tue Jan 20 10:05:42 2015 -0500 +++ b/test/io.tst Tue Jan 20 09:43:29 2015 -0500 @@ -74,8 +74,8 @@ %! %! ret = 0; %! -%! files = cellfun (@fullfile, {P_tmpdir}, -%! {"text.mat", "binary.mat", "mat5.mat", "mat7.mat"}, +%! files = cellfun (@fullfile, {P_tmpdir}, +%! {"text.mat", "binary.mat", "mat5.mat", "mat7.mat"}, %! "UniformOutput", false); %! opts = {"-z -text", "-z -binary", "-z -mat", "-v7"}; %! tols = {2*eps, 0, 0, 0}; @@ -198,7 +198,7 @@ %! STR.string_fld = "Octave"; %! STR.struct_fld.x = 0; %! STR.struct_fld.y = 1; -%! +%! %! struct_dat = fullfile (P_tmpdir, "struct.dat"); %! save (struct_dat, "-struct", "STR"); %! STR = load (struct_dat); @@ -209,8 +209,8 @@ %! STR.struct_fld.x == 0 && ... %! STR.struct_fld.y == 1 ); %! -%! -%! save ("-binary", struct_dat, +%! +%! save ("-binary", struct_dat, %! "-struct", "STR", "matrix_fld", "str*_fld"); %! STR = load (struct_dat); %!