X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fstyle.h;h=ed1de87621e99cce33bd5dd2ee10b6ebdb6a0fa4;hb=HEAD;hp=ee25b251dcb50ba932efe40d368f465ab78719c9;hpb=9f38197854e699a6093a906ab43f4238f3cd2388;p=libs%2Fgltk.git

diff --git a/source/style.h b/source/style.h
index ee25b25..62a4511 100644
--- a/source/style.h
+++ b/source/style.h
@@ -33,22 +33,20 @@ public:
 		void unnamed_part();
 	};
 
-	typedef std::list<Part> 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;
-	PartSeq parts;
+	const GL::Sampler *sampler = nullptr;
+	std::vector<Part> parts;
 
 public:
 	const GL::Font &get_font() const;
 	unsigned get_font_size() const { return font_size; }
 	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 std::vector<Part> &get_parts() const { return parts; }
+	const Part *find_part(const std::string &) const;
 	bool compare_states(State, State) const;
 };