From 4333970abdd54863a591f95df3c3e7e968aa2519 Mon Sep 17 00:00:00 2001 From: Neil Date: Mon, 8 Apr 2019 08:34:52 +1000 Subject: Rename FontNames to UniqueStringSet and move into UniqueString. It may be useful in more situations than just font names. --- src/ViewStyle.h | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) (limited to 'src/ViewStyle.h') diff --git a/src/ViewStyle.h b/src/ViewStyle.h index ba0524d86..0fb3db093 100644 --- a/src/ViewStyle.h +++ b/src/ViewStyle.h @@ -25,20 +25,7 @@ public: /** */ -class FontNames { -private: - std::vector names; -public: - FontNames(); - // FontNames objects can not be copied. - FontNames(const FontNames &) = delete; - FontNames(FontNames &&) = delete; - FontNames &operator=(const FontNames &) = delete; - FontNames &operator=(FontNames &&) = delete; - ~FontNames(); - void Clear(); - const char *Save(const char *name); -}; + class FontRealised : public FontMeasurements { public: @@ -91,7 +78,7 @@ struct EdgeProperties { /** */ class ViewStyle { - FontNames fontNames; + UniqueStringSet fontNames; FontMap fonts; public: std::vector