summaryrefslogtreecommitdiff
path: root/src/os/windows
diff options
context:
space:
mode:
authorMichael Lutz <michi@icosahedron.de>2019-04-02 21:30:34 +0200
committerMichael Lutz <michi@icosahedron.de>2019-04-09 22:45:15 +0200
commitfbc4cef180a60d8875df6298364f0459beb3568a (patch)
tree9e98cf68e1ea19b01a16639017509c9f2d55a292 /src/os/windows
parentd95c7083ea582ea723107aa42f27b8cf3e3365e1 (diff)
downloadopenttd-fbc4cef180a60d8875df6298364f0459beb3568a.tar.xz
Codechange: Use override specifier for text layout classes.
Diffstat (limited to 'src/os/windows')
-rw-r--r--src/os/windows/string_uniscribe.cpp30
-rw-r--r--src/os/windows/string_uniscribe.h8
2 files changed, 19 insertions, 19 deletions
diff --git a/src/os/windows/string_uniscribe.cpp b/src/os/windows/string_uniscribe.cpp
index 1d17b02d7..a5d03b948 100644
--- a/src/os/windows/string_uniscribe.cpp
+++ b/src/os/windows/string_uniscribe.cpp
@@ -90,30 +90,30 @@ public:
public:
UniscribeVisualRun(const UniscribeRun &range, int x);
- virtual ~UniscribeVisualRun()
+ ~UniscribeVisualRun() override
{
free(this->glyph_to_char);
}
- virtual const GlyphID *GetGlyphs() const { return &this->glyphs[0]; }
- virtual const float *GetPositions() const { return &this->positions[0]; }
- virtual const int *GetGlyphToCharMap() const;
+ const GlyphID *GetGlyphs() const override { return &this->glyphs[0]; }
+ const float *GetPositions() const override { return &this->positions[0]; }
+ const int *GetGlyphToCharMap() const override;
- virtual const Font *GetFont() const { return this->font; }
- virtual int GetLeading() const { return this->font->fc->GetHeight(); }
- virtual int GetGlyphCount() const { return this->num_glyphs; }
+ const Font *GetFont() const override { return this->font; }
+ int GetLeading() const override { return this->font->fc->GetHeight(); }
+ int GetGlyphCount() const override { return this->num_glyphs; }
int GetAdvance() const { return this->total_advance; }
};
/** A single line worth of VisualRuns. */
class UniscribeLine : public AutoDeleteSmallVector<UniscribeVisualRun *>, public ParagraphLayouter::Line {
public:
- virtual int GetLeading() const;
- virtual int GetWidth() const;
- virtual int CountRuns() const { return (uint)this->size(); }
- virtual const VisualRun *GetVisualRun(int run) const { return this->at(run); }
+ int GetLeading() const override;
+ int GetWidth() const override;
+ int CountRuns() const override { return (uint)this->size(); }
+ const VisualRun *GetVisualRun(int run) const override { return this->at(run); }
- int GetInternalCharLength(WChar c) const
+ int GetInternalCharLength(WChar c) const override
{
/* Uniscribe uses UTF-16 internally which means we need to account for surrogate pairs. */
return c >= 0x010000U ? 2 : 1;
@@ -125,15 +125,15 @@ public:
this->Reflow();
}
- virtual ~UniscribeParagraphLayout() {}
+ ~UniscribeParagraphLayout() override {}
- virtual void Reflow()
+ void Reflow() override
{
this->cur_range = this->ranges.begin();
this->cur_range_offset = 0;
}
- virtual const Line *NextLine(int max_width);
+ const Line *NextLine(int max_width) override;
};
void UniscribeResetScriptCache(FontSize size)
diff --git a/src/os/windows/string_uniscribe.h b/src/os/windows/string_uniscribe.h
index 6af858a88..49e1123a9 100644
--- a/src/os/windows/string_uniscribe.h
+++ b/src/os/windows/string_uniscribe.h
@@ -81,10 +81,10 @@ class UniscribeStringIterator : public StringIterator {
size_t cur_pos; ///< Current iteration position.
public:
- virtual void SetString(const char *s);
- virtual size_t SetCurPosition(size_t pos);
- virtual size_t Next(IterType what);
- virtual size_t Prev(IterType what);
+ void SetString(const char *s) override;
+ size_t SetCurPosition(size_t pos) override;
+ size_t Next(IterType what) override;
+ size_t Prev(IterType what) override;
};
#endif /* defined(WITH_UNISCRIBE) */