Mercurial > octave-nkf
diff libinterp/corefcn/graphics.cc @ 19895:19755f4fc851
maint: Cleanup C++ code to follow Octave coding conventions.
Try to wrap long lines to < 80 characters.
Use GNU style and don't indent first brace of function definition.
"case" statement is aligned flush left with brace of switch stmt.
Remove trailing '\' line continuation from the end of #define macros.
Use 2 spaces for indent.
* files-dock-widget.cc, history-dock-widget.cc, main-window.cc, octave-cmd.cc,
octave-dock-widget.cc, octave-gui.cc, resource-manager.cc, settings-dialog.cc,
shortcut-manager.cc, welcome-wizard.cc, workspace-view.cc, cellfun.cc, data.cc,
debug.cc, debug.h, dirfns.cc, error.h, file-io.cc, gl-render.cc, gl-render.h,
gl2ps-renderer.h, graphics.cc, graphics.in.h, help.cc, input.cc, load-path.cc,
load-path.h, lookup.cc, lu.cc, oct-stream.cc, octave-default-image.h,
ordschur.cc, pr-output.cc, qz.cc, strfns.cc, symtab.cc, symtab.h, sysdep.cc,
variables.cc, zfstream.h, __fltk_uigetfile__.cc, __init_fltk__.cc,
__magick_read__.cc, __osmesa_print__.cc, audiodevinfo.cc, ov-classdef.cc,
ov-classdef.h, ov-fcn.h, ov-float.cc, ov-flt-complex.cc, ov-java.cc,
ov-range.cc, ov-re-mat.cc, ov-usr-fcn.h, ov.cc, op-int.h, options-usage.h,
pt-eval.cc, Array-C.cc, Array-fC.cc, Array.cc, Array.h, PermMatrix.cc,
Sparse.cc, chMatrix.h, dSparse.cc, dim-vector.h, bsxfun-decl.h, bsxfun-defs.cc,
oct-norm.cc, Sparse-op-defs.h, oct-inttypes.cc, oct-inttypes.h, main.in.cc,
mkoctfile.in.cc: Cleanup C++ code to follow Octave coding conventions.
| author | Rik <rik@octave.org> |
|---|---|
| date | Wed, 25 Feb 2015 11:55:49 -0800 |
| parents | 426525fb3b9f |
| children | 17d647821d61 |
line wrap: on
line diff
--- a/libinterp/corefcn/graphics.cc Wed Feb 25 16:23:45 2015 +0100 +++ b/libinterp/corefcn/graphics.cc Wed Feb 25 11:55:49 2015 -0800 @@ -1347,7 +1347,7 @@ // check dimensional size constraints until a match is found for (std::list<dim_vector>::const_iterator it = size_constraints.begin (); - ! xok && it != size_constraints.end ();++it) + ! xok && it != size_constraints.end (); ++it) { dim_vector itdims = (*it); @@ -3175,9 +3175,9 @@ base_graphics_object::build_user_defaults_map (property_list::pval_map_type &def, const std::string go_name) const { property_list local_defaults = get_defaults_list (); - property_list::plist_map_const_iterator p = + property_list::plist_map_const_iterator p = local_defaults.find (go_name); - + if (p != local_defaults.end ()) { property_list::pval_map_type pval = p->second; @@ -3199,16 +3199,16 @@ void base_graphics_object::reset_default_properties (void) - { - if (valid_object ()) - { - property_list::pval_map_type factory_pval = - gh_manager::get_object (0).get_factory_defaults_list () - .find (type ())->second; - - xreset_default_properties (get_handle (), factory_pval); - } - } +{ + if (valid_object ()) + { + property_list::pval_map_type factory_pval = + gh_manager::get_object (0).get_factory_defaults_list () + .find (type ())->second; + + xreset_default_properties (get_handle (), factory_pval); + } +} std::string base_graphics_object::values_as_string (void)