X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fstyle.h;h=2c4863ac4a340e627ecd1984c9ba79f6f5cde956;hb=9678abb23abe450109e2feda081f5bba5f20cc94;hp=ee25b251dcb50ba932efe40d368f465ab78719c9;hpb=9f38197854e699a6093a906ab43f4238f3cd2388;p=libs%2Fgltk.git diff --git a/source/style.h b/source/style.h index ee25b25..2c4863a 100644 --- a/source/style.h +++ b/source/style.h @@ -36,10 +36,10 @@ public: typedef std::list PartSeq; private: - const GL::Font *font = 0; + const GL::Font *font = nullptr; unsigned font_size = 0; GL::Color font_color[N_STATES_]; - const GL::Sampler *sampler = 0; + const GL::Sampler *sampler = nullptr; PartSeq parts; public: @@ -48,7 +48,7 @@ public: const GL::Color &get_font_color(State) const; const GL::Sampler &get_sampler() const; const PartSeq &get_parts() const { return parts; } - const Part *get_part(const std::string &) const; + const Part *find_part(const std::string &) const; bool compare_states(State, State) const; };