X-Git-Url: http://git.tdb.fi/?p=libs%2Fgltk.git;a=blobdiff_plain;f=source%2Fstyle.cpp;fp=source%2Fstyle.cpp;h=acbdff54febbda18dce5df7a7cc265fb16e2a647;hp=eff93fe3c354255b9f53048b54d2022a472f68b1;hb=b4a3d651f57c46507aaa99a71a14fea15f0e430d;hpb=70e7a223a069874cda84673a4ca541aa44b12bf2 diff --git a/source/style.cpp b/source/style.cpp index eff93fe..acbdff5 100644 --- a/source/style.cpp +++ b/source/style.cpp @@ -1,3 +1,4 @@ +#include #include "resources.h" #include "style.h" @@ -36,11 +37,8 @@ const GL::Sampler &Style::get_sampler() const const Part *Style::get_part(const string &name) const { - for(PartSeq::const_iterator i=parts.begin(); i!=parts.end(); ++i) - if(i->get_name()==name) - return &*i; - - return 0; + auto i = find_if(parts, [&name](const Part &p){ return p.get_name()==name; }); + return (i!=parts.end() ? &*i : 0); } bool Style::compare_states(State s1, State s2) const @@ -53,8 +51,8 @@ bool Style::compare_states(State s1, State s2) const if(c1.r!=c2.r || c1.g!=c2.g || c1.b!=c2.b) return true; - for(PartSeq::const_iterator i=parts.begin(); i!=parts.end(); ++i) - if(i->get_graphic(s1)!=i->get_graphic(s2)) + for(const Part &p: parts) + if(p.get_graphic(s1)!=p.get_graphic(s2)) return true; return false;