diff options
| -rw-r--r-- | src/UniqueString.cxx | 6 | ||||
| -rw-r--r-- | src/UniqueString.h | 4 | ||||
| -rw-r--r-- | src/ViewStyle.cxx | 2 | ||||
| -rw-r--r-- | src/ViewStyle.h | 2 |
4 files changed, 6 insertions, 8 deletions
diff --git a/src/UniqueString.cxx b/src/UniqueString.cxx index 61c1e062c..0550a0b8c 100644 --- a/src/UniqueString.cxx +++ b/src/UniqueString.cxx @@ -28,11 +28,9 @@ UniqueString UniqueStringCopy(const char *text) { // A set of strings that always returns the same pointer for each string. -UniqueStringSet::UniqueStringSet() noexcept = default; +UniqueStringSet::UniqueStringSet() = default; -UniqueStringSet::~UniqueStringSet() { - strings.clear(); -} +UniqueStringSet::~UniqueStringSet() noexcept = default; void UniqueStringSet::Clear() noexcept { strings.clear(); diff --git a/src/UniqueString.h b/src/UniqueString.h index 83cb69e78..8d611992c 100644 --- a/src/UniqueString.h +++ b/src/UniqueString.h @@ -29,14 +29,14 @@ class UniqueStringSet { private: std::vector<UniqueString> strings; public: - UniqueStringSet() noexcept; + UniqueStringSet(); // UniqueStringSet objects can not be copied. UniqueStringSet(const UniqueStringSet &) = delete; UniqueStringSet &operator=(const UniqueStringSet &) = delete; // UniqueStringSet objects can be moved. UniqueStringSet(UniqueStringSet &&) = default; UniqueStringSet &operator=(UniqueStringSet &&) = default; - ~UniqueStringSet(); + ~UniqueStringSet() noexcept; void Clear() noexcept; const char *Save(const char *text); }; diff --git a/src/ViewStyle.cxx b/src/ViewStyle.cxx index 68cb5e74d..9aab26e0a 100644 --- a/src/ViewStyle.cxx +++ b/src/ViewStyle.cxx @@ -721,7 +721,7 @@ FontRealised *ViewStyle::Find(const FontSpecification &fs) { return nullptr; } -void ViewStyle::FindMaxAscentDescent() { +void ViewStyle::FindMaxAscentDescent() noexcept { for (const auto &font : fonts) { if (maxAscent < font.second->measurements.ascent) maxAscent = font.second->measurements.ascent; diff --git a/src/ViewStyle.h b/src/ViewStyle.h index 70e34acaf..f81a52c88 100644 --- a/src/ViewStyle.h +++ b/src/ViewStyle.h @@ -246,7 +246,7 @@ private: void AllocStyles(size_t sizeNew); void CreateAndAddFont(const FontSpecification &fs); FontRealised *Find(const FontSpecification &fs); - void FindMaxAscentDescent(); + void FindMaxAscentDescent() noexcept; }; } |