Mercurial > octave-nkf
diff libinterp/corefcn/graphics.cc @ 19898:17d647821d61
maint: More cleanup of C++ code to follow Octave coding conventions.
* gl-select.cc, betainc.cc, bitfcns.cc, bsxfun.cc, gl-render.cc,
graphics.cc, load-save.cc, ls-mat-ascii.cc, ls-mat5.cc, lu.cc,
oct-stream.cc, symtab.cc, variables.cc, __eigs__.cc,
__magick_read__.cc, chol.cc, ov-base-sparse.cc, ov-class.cc,
ov-classdef.cc, ov-fcn-inline.cc, ov-perm.cc, ov.cc, CMatrix.cc,
CSparse.cc, MSparse.cc, MatrixType.cc, MatrixType.h, dMatrix.cc,
dSparse.cc, fCMatrix.cc, fMatrix.cc, eigs-base.cc, lo-sysdep.cc,
kpse.cc: Break long lines before && and ||.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Thu, 26 Feb 2015 13:07:04 -0500 |
| parents | 19755f4fc851 |
| children | 726df008104d |
line wrap: on
line diff
--- a/libinterp/corefcn/graphics.cc Thu Feb 26 10:49:20 2015 -0500 +++ b/libinterp/corefcn/graphics.cc Thu Feb 26 13:07:04 2015 -0500 @@ -2806,9 +2806,9 @@ std::string pname = it->first; // Don't reset internal properties and handle_properties - if (! obj.has_readonly_property (pname) && - pname.find ("__") != 0 && pname.find ("current") != 0 && - pname != "uicontextmenu" && pname != "parent") + if (! obj.has_readonly_property (pname) + && pname.find ("__") != 0 && pname.find ("current") != 0 + && pname != "uicontextmenu" && pname != "parent") { // Store *mode prop/val in order to set them last if (pname.find ("mode") == (pname.length () - 4)) @@ -3222,8 +3222,8 @@ for (octave_map::const_iterator pa = m.begin (); pa != m.end (); pa++) { - if (pa->first != "children" && - ! obj.has_readonly_property (pa->first)) + if (pa->first != "children" + && ! obj.has_readonly_property (pa->first)) { property p = get_properties ().get_property (pa->first); @@ -7375,10 +7375,10 @@ void axes::update_axis_limits (const std::string& axis_type) { - if ((updating_axis_limits.find (get_handle ().value ()) != - updating_axis_limits.end ()) || - (updating_aspectratios.find (get_handle ().value ()) != - updating_aspectratios.end ())) + if ((updating_axis_limits.find (get_handle ().value ()) + != updating_axis_limits.end ()) + || (updating_aspectratios.find (get_handle ().value ()) + != updating_aspectratios.end ())) return; Matrix kids = xproperties.get_children (); @@ -8082,16 +8082,16 @@ #endif - if (autopos_tag_is ("xlabel") || autopos_tag_is ("ylabel") || - autopos_tag_is ("zlabel") || autopos_tag_is ("title")) + if (autopos_tag_is ("xlabel") || autopos_tag_is ("ylabel") + || autopos_tag_is ("zlabel") || autopos_tag_is ("title")) update_autopos ("sync"); } void text::properties::request_autopos (void) { - if (autopos_tag_is ("xlabel") || autopos_tag_is ("ylabel") || - autopos_tag_is ("zlabel") || autopos_tag_is ("title")) + if (autopos_tag_is ("xlabel") || autopos_tag_is ("ylabel") + || autopos_tag_is ("zlabel") || autopos_tag_is ("title")) update_autopos (get_autopos_tag ()); } @@ -8176,8 +8176,8 @@ NDArray cd = get_cdata ().array_value (); bad_data_msg = std::string (); - if (xd.dims () != yd.dims () || - (xd.dims () != zd.dims () && ! zd.is_empty ())) + if (xd.dims () != yd.dims () + || (xd.dims () != zd.dims () && ! zd.is_empty ())) { bad_data_msg = "x/y/zdata should have the same dimensions"; return; @@ -11234,8 +11234,8 @@ POSTSET); else { - if (args(2).is_string () && - args(2).string_value () == "persistent") + if (args(2).is_string () + && args(2).string_value () == "persistent") { go.delete_property_listener (pname, octave_value (), PERSISTENT);