# HG changeset patch # User John W. Eaton # Date 1424976851 18000 # Node ID 726df008104d350202bdbd098e72a6a637b4af3a # Parent e9f89866074ca4c6737caea1972aa8cb18c7f5ab maint: More cleanup of C++ code to follow Octave coding conventions. * ListBoxControl.cc, graphics.cc, ls-mat5.cc: Break long lines before comparison ops. diff -r e9f89866074c -r 726df008104d libgui/graphics/ListBoxControl.cc --- a/libgui/graphics/ListBoxControl.cc Thu Feb 26 13:13:40 2015 -0500 +++ b/libgui/graphics/ListBoxControl.cc Thu Feb 26 13:54:11 2015 -0500 @@ -98,9 +98,8 @@ if (1 <= idx && idx <= lc) { list->item (idx-1)->setSelected (true); - if (i == 0 - && list->selectionMode () == - QAbstractItemView::SingleSelection) + if (i == 0 && (list->selectionMode () + == QAbstractItemView::SingleSelection)) break; } } diff -r e9f89866074c -r 726df008104d libinterp/corefcn/graphics.cc --- a/libinterp/corefcn/graphics.cc Thu Feb 26 13:13:40 2015 -0500 +++ b/libinterp/corefcn/graphics.cc Thu Feb 26 13:54:11 2015 -0500 @@ -6145,8 +6145,8 @@ void axes::properties::update_aspectratios (void) { - if (updating_aspectratios.find (get___myhandle__ ().value ()) != - updating_aspectratios.end ()) + if (updating_aspectratios.find (get___myhandle__ ().value ()) + != updating_aspectratios.end ()) return; Matrix xlimits = get_xlim ().matrix_value (); @@ -7172,8 +7172,8 @@ axes::update_axis_limits (const std::string& axis_type, const graphics_handle& h) { - if (updating_axis_limits.find (get_handle ().value ()) != - updating_axis_limits.end ()) + if (updating_axis_limits.find (get_handle ().value ()) + != updating_axis_limits.end ()) return; Matrix kids = Matrix (1, 1, h.value ()); diff -r e9f89866074c -r 726df008104d libinterp/corefcn/ls-mat5.cc --- a/libinterp/corefcn/ls-mat5.cc Thu Feb 26 13:13:40 2015 -0500 +++ b/libinterp/corefcn/ls-mat5.cc Thu Feb 26 13:54:11 2015 -0500 @@ -1279,8 +1279,8 @@ warning ("load: unable to reconstruct object inheritance"); tc = cls; - if (load_path::find_method (classname, "loadobj") != - std::string ()) + if (load_path::find_method (classname, "loadobj") + != std::string ()) { octave_value_list tmp = feval ("loadobj", tc, 1);