Mercurial > octave
changeset 27852:d053ff4321b5
gtk-manager: Simplify code by using C++11 keyword "auto".
* gtk-manager.h (gtk_manager): Remove private type definitions for iterators.
(find_toolkit): Use keyword "auto".
* gtk-manager.cc (get_toolkit): Use keyword "auto".
| author | Markus Mützel <markus.muetzel@gmx.de> |
|---|---|
| date | Thu, 19 Dec 2019 17:42:46 +0100 |
| parents | 315440604e40 |
| children | 3621f0bb50bb |
| files | libinterp/corefcn/gtk-manager.cc libinterp/corefcn/gtk-manager.h |
| diffstat | 2 files changed, 3 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/libinterp/corefcn/gtk-manager.cc Thu Dec 19 13:57:28 2019 +0100 +++ b/libinterp/corefcn/gtk-manager.cc Thu Dec 19 17:42:46 2019 +0100 @@ -40,11 +40,11 @@ if (dtk.empty ()) error ("no graphics toolkits are available!"); - const_loaded_toolkits_iterator pl = loaded_toolkits.find (dtk); + auto pl = loaded_toolkits.find (dtk); if (pl == loaded_toolkits.end ()) { - const_available_toolkits_iterator pa = available_toolkits.find (dtk); + auto pa = available_toolkits.find (dtk); if (pa == available_toolkits.end ()) error ("default graphics toolkit '%s' is not available!",
--- a/libinterp/corefcn/gtk-manager.h Thu Dec 19 13:57:28 2019 +0100 +++ b/libinterp/corefcn/gtk-manager.h Thu Dec 19 17:42:46 2019 +0100 @@ -63,7 +63,7 @@ graphics_toolkit find_toolkit (const std::string& name) const { - const_loaded_toolkits_iterator p = loaded_toolkits.find (name); + auto p = loaded_toolkits.find (name); if (p != loaded_toolkits.end ()) return p->second; @@ -121,17 +121,6 @@ // The list of toolkits we have actually loaded. std::map<std::string, graphics_toolkit> loaded_toolkits; - - typedef std::set<std::string>::iterator available_toolkits_iterator; - - typedef std::set<std::string>::const_iterator - const_available_toolkits_iterator; - - typedef std::map<std::string, graphics_toolkit>::iterator - loaded_toolkits_iterator; - - typedef std::map<std::string, graphics_toolkit>::const_iterator - const_loaded_toolkits_iterator; }; }