# HG changeset patch # User John W. Eaton # Date 1386456713 18000 # Node ID ec9b35e60f9505d733666d79d3fd59eb118e2aca # Parent ca84d3c9dc24dd527112580ac5a67468eaeb3df0 style fixes in graphics.in.h and graphics.cc * graphics.in.h, graphics.cc: Pass std::string as const reference. Pass double by value, not as const or const reference. Check str.empty () instead of str == "". Minor formatting changes. diff -r ca84d3c9dc24 -r ec9b35e60f95 libinterp/corefcn/graphics.cc --- a/libinterp/corefcn/graphics.cc Sat Dec 07 15:56:43 2013 +0100 +++ b/libinterp/corefcn/graphics.cc Sat Dec 07 17:51:53 2013 -0500 @@ -1012,7 +1012,7 @@ for (std::set::const_iterator it = possible_vals.begin (); it != possible_vals.end (); it++) { - if (retval == "") + if (retval.empty ()) { if (*it == default_value ()) retval = "{" + *it + "}"; @@ -1027,8 +1027,10 @@ retval += " | " + *it; } } - if (retval != "") + + if (! retval.empty ()) retval = "[ " + retval + " ]"; + return retval; } @@ -1044,10 +1046,13 @@ } bool -color_values::str2rgb (std::string str) -{ +color_values::str2rgb (const std::string& str_arg) +{ + bool retval = true; + double tmp_rgb[3] = {0, 0, 0}; - bool retval = true; + + std::string str = str_arg; unsigned int len = str.length (); std::transform (str.begin (), str.end (), str.begin (), tolower); @@ -2976,7 +2981,8 @@ } } } - if (retval != "") + + if (! retval.empty ()) retval += "\n"; } else @@ -2986,7 +2992,7 @@ } std::string -base_graphics_object::value_as_string (std::string prop) +base_graphics_object::value_as_string (const std::string& prop) { std::string retval; @@ -2999,12 +3005,11 @@ if (p.ok () && ! p.is_hidden ()) { if (p.is_radio ()) - { - retval += p.values_as_string (); - } - } - } - if (retval != "") + retval += p.values_as_string (); + } + } + + if (! retval.empty ()) retval += "\n"; } else @@ -6918,14 +6923,14 @@ } inline -double force_in_range (const double x, const double lower, const double upper) +double force_in_range (double x, double lower, double upper) { if (x < lower) - { return lower; } + return lower; else if (x > upper) - { return upper; } + return upper; else - { return x; } + return x; } static Matrix @@ -8187,9 +8192,9 @@ // No copying! - function_event (const function_event &); - - function_event & operator = (const function_event &); + function_event (const function_event&); + + function_event & operator = (const function_event&); }; class @@ -8391,7 +8396,7 @@ } void -gh_manager::do_post_callback (const graphics_handle& h, const std::string name, +gh_manager::do_post_callback (const graphics_handle& h, const std::string& name, const octave_value& data) { gh_manager::auto_lock guard; @@ -8441,7 +8446,7 @@ } void -gh_manager::do_post_set (const graphics_handle& h, const std::string name, +gh_manager::do_post_set (const graphics_handle& h, const std::string& name, const octave_value& value, bool notify_toolkit) { gh_manager::auto_lock guard; @@ -8814,7 +8819,7 @@ } static std::string -get_graphics_object_type (const double val) +get_graphics_object_type (double val) { std::string retval; diff -r ca84d3c9dc24 -r ec9b35e60f95 libinterp/corefcn/graphics.in.h --- a/libinterp/corefcn/graphics.in.h Sat Dec 07 15:56:43 2013 +0100 +++ b/libinterp/corefcn/graphics.in.h Sat Dec 07 17:51:53 2013 -0500 @@ -296,7 +296,7 @@ graphics_handle get_parent (void) const { return parent; } - void set_parent (const graphics_handle &h) { parent = h; } + void set_parent (const graphics_handle& h) { parent = h; } bool is_hidden (void) const { return hidden; } @@ -1028,7 +1028,7 @@ validate (); } - color_values (std::string str) + color_values (const std::string& str) : xrgb (1, 3) { if (! str2rgb (str)) @@ -1076,7 +1076,7 @@ private: Matrix xrgb; - OCTINTERP_API bool str2rgb (std::string str); + OCTINTERP_API bool str2rgb (const std::string& str); }; class color_property : public base_property @@ -1631,7 +1631,7 @@ } children_property (const std::string& nm, const graphics_handle& h, - const Matrix &val) + const Matrix& val) : base_property (nm, h), children_list () { do_init_children (val); @@ -1651,12 +1651,12 @@ base_property* clone (void) const { return new children_property (*this); } - bool remove_child (const double &val) + bool remove_child (double val) { return do_remove_child (val); } - void adopt (const double &val) + void adopt (double val) { do_adopt_child (val); } @@ -1759,14 +1759,14 @@ } private: - void do_init_children (const Matrix &val) + void do_init_children (const Matrix& val) { children_list.clear (); for (octave_idx_type i = 0; i < val.numel (); i++) children_list.push_front (val.xelem (i)); } - void do_init_children (const std::list &val) + void do_init_children (const std::list& val) { children_list.clear (); for (const_children_list_iterator p = val.begin (); p != val.end (); p++) @@ -1800,7 +1800,7 @@ return false; } - void do_adopt_child (const double &val) + void do_adopt_child (double val) { children_list.push_front (val); } @@ -2600,7 +2600,7 @@ protected: struct cmp_caseless_str { - bool operator () (const caseless_str &a, const caseless_str &b) const + bool operator () (const caseless_str& a, const caseless_str& b) const { std::string a1 = a; std::transform (a1.begin (), a1.end (), a1.begin (), tolower); @@ -2706,7 +2706,7 @@ virtual std::string values_as_string (void); - virtual std::string value_as_string (std::string prop); + virtual std::string value_as_string (const std::string& prop); virtual octave_scalar_map values_as_struct (void); @@ -2979,7 +2979,7 @@ std::string values_as_string (void) { return rep->values_as_string (); } - std::string value_as_string (std::string prop) + std::string value_as_string (const std::string& prop) { return rep->value_as_string (prop); } @@ -5396,11 +5396,11 @@ // --------------------------------------------------------------------- octave_value -get_property_from_handle (double handle, const std::string &property, - const std::string &func); +get_property_from_handle (double handle, const std::string& property, + const std::string& func); bool -set_property_in_handle (double handle, const std::string &property, - const octave_value &arg, const std::string &func); +set_property_in_handle (double handle, const std::string& property, + const octave_value& arg, const std::string& func); // --------------------------------------------------------------------- @@ -5871,12 +5871,12 @@ void do_execute_callback (const graphics_handle& h, const octave_value& cb, const octave_value& data); - void do_post_callback (const graphics_handle& h, const std::string name, + void do_post_callback (const graphics_handle& h, const std::string& name, const octave_value& data); void do_post_function (graphics_event::event_fcn fcn, void* fcn_data); - void do_post_set (const graphics_handle& h, const std::string name, + void do_post_set (const graphics_handle& h, const std::string& name, const octave_value& value, bool notify_toolkit = true); int do_process_events (bool force = false);