aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/ViewStyle.h
diff options
context:
space:
mode:
authorNeil <nyamatongwe@gmail.com>2019-04-08 08:34:52 +1000
committerNeil <nyamatongwe@gmail.com>2019-04-08 08:34:52 +1000
commit4a44fd852450d9e97032633524f92d1fad5f7187 (patch)
treee7e99b2532a0766190cba557131431b05ec4ceb2 /src/ViewStyle.h
parentbdfbc5325157c037fdaa70d6c7fe757046f08906 (diff)
downloadscintilla-mirror-4a44fd852450d9e97032633524f92d1fad5f7187.tar.gz
Backport: Rename FontNames to UniqueStringSet and move into UniqueString.
It may be useful in more situations than just font names. Backport of changeset 7409:a70a4ee51448.
Diffstat (limited to 'src/ViewStyle.h')
-rw-r--r--src/ViewStyle.h17
1 files changed, 2 insertions, 15 deletions
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<UniqueString> 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<Style> styles;