summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/gfx_layout.cpp58
-rw-r--r--src/os/macosx/string_osx.cpp28
-rw-r--r--src/os/macosx/string_osx.h8
-rw-r--r--src/os/windows/string_uniscribe.cpp30
-rw-r--r--src/os/windows/string_uniscribe.h8
-rw-r--r--src/string.cpp10
6 files changed, 71 insertions, 71 deletions
diff --git a/src/gfx_layout.cpp b/src/gfx_layout.cpp
index 124f1218a..b46ac20d5 100644
--- a/src/gfx_layout.cpp
+++ b/src/gfx_layout.cpp
@@ -134,12 +134,12 @@ public:
public:
ICUVisualRun(const icu::ParagraphLayout::VisualRun *vr) : vr(vr) { }
- const Font *GetFont() const { return (const Font*)vr->getFont(); }
- int GetGlyphCount() const { return vr->getGlyphCount(); }
- const GlyphID *GetGlyphs() const { return vr->getGlyphs(); }
- const float *GetPositions() const { return vr->getPositions(); }
- int GetLeading() const { return vr->getLeading(); }
- const int *GetGlyphToCharMap() const { return vr->getGlyphToCharMap(); }
+ const Font *GetFont() const override { return (const Font*)vr->getFont(); }
+ int GetGlyphCount() const override { return vr->getGlyphCount(); }
+ const GlyphID *GetGlyphs() const override { return vr->getGlyphs(); }
+ const float *GetPositions() const override { return vr->getPositions(); }
+ int GetLeading() const override { return vr->getLeading(); }
+ const int *GetGlyphToCharMap() const override { return vr->getGlyphToCharMap(); }
};
/** A single line worth of VisualRuns. */
@@ -153,14 +153,14 @@ public:
this->push_back(new ICUVisualRun(l->getVisualRun(i)));
}
}
- ~ICULine() { delete l; }
+ ~ICULine() override { delete l; }
- int GetLeading() const { return l->getLeading(); }
- int GetWidth() const { return l->getWidth(); }
- int CountRuns() const { return l->countRuns(); }
- const ParagraphLayouter::VisualRun *GetVisualRun(int run) const { return this->at(run); }
+ int GetLeading() const override { return l->getLeading(); }
+ int GetWidth() const override { return l->getWidth(); }
+ int CountRuns() const override { return l->countRuns(); }
+ const ParagraphLayouter::VisualRun *GetVisualRun(int run) const override { return this->at(run); }
- int GetInternalCharLength(WChar c) const
+ int GetInternalCharLength(WChar c) const override
{
/* ICU uses UTF-16 internally which means we need to account for surrogate pairs. */
return Utf8CharLen(c) < 4 ? 1 : 2;
@@ -168,10 +168,10 @@ public:
};
ICUParagraphLayout(icu::ParagraphLayout *p) : p(p) { }
- ~ICUParagraphLayout() { delete p; }
- void Reflow() { p->reflow(); }
+ ~ICUParagraphLayout() override { delete p; }
+ void Reflow() override { p->reflow(); }
- ParagraphLayouter::Line *NextLine(int max_width)
+ ParagraphLayouter::Line *NextLine(int max_width) override
{
icu::ParagraphLayout::Line *l = p->nextLine(max_width);
return l == NULL ? NULL : new ICULine(l);
@@ -259,24 +259,24 @@ public:
public:
FallbackVisualRun(Font *font, const WChar *chars, int glyph_count, int x);
- ~FallbackVisualRun();
- const Font *GetFont() const;
- int GetGlyphCount() const;
- const GlyphID *GetGlyphs() const;
- const float *GetPositions() const;
- int GetLeading() const;
- const int *GetGlyphToCharMap() const;
+ ~FallbackVisualRun() override;
+ const Font *GetFont() const override;
+ int GetGlyphCount() const override;
+ const GlyphID *GetGlyphs() const override;
+ const float *GetPositions() const override;
+ int GetLeading() const override;
+ const int *GetGlyphToCharMap() const override;
};
/** A single line worth of VisualRuns. */
class FallbackLine : public AutoDeleteSmallVector<FallbackVisualRun *>, public ParagraphLayouter::Line {
public:
- int GetLeading() const;
- int GetWidth() const;
- int CountRuns() const;
- const ParagraphLayouter::VisualRun *GetVisualRun(int run) const;
+ int GetLeading() const override;
+ int GetWidth() const override;
+ int CountRuns() const override;
+ const ParagraphLayouter::VisualRun *GetVisualRun(int run) const override;
- int GetInternalCharLength(WChar c) const { return 1; }
+ int GetInternalCharLength(WChar c) const override { return 1; }
};
const WChar *buffer_begin; ///< Begin of the buffer.
@@ -284,8 +284,8 @@ public:
FontMap &runs; ///< The fonts we have to use for this paragraph.
FallbackParagraphLayout(WChar *buffer, int length, FontMap &runs);
- void Reflow();
- const ParagraphLayouter::Line *NextLine(int max_width);
+ void Reflow() override;
+ const ParagraphLayouter::Line *NextLine(int max_width) override;
};
/**
diff --git a/src/os/macosx/string_osx.cpp b/src/os/macosx/string_osx.cpp
index e14ca4183..f26421e36 100644
--- a/src/os/macosx/string_osx.cpp
+++ b/src/os/macosx/string_osx.cpp
@@ -54,13 +54,13 @@ public:
public:
CoreTextVisualRun(CTRunRef run, Font *font, const CoreTextParagraphLayoutFactory::CharType *buff);
- virtual const GlyphID *GetGlyphs() const { return &this->glyphs[0]; }
- virtual const float *GetPositions() const { return &this->positions[0]; }
- virtual const int *GetGlyphToCharMap() const { return &this->glyph_to_char[0]; }
+ const GlyphID *GetGlyphs() const override { return &this->glyphs[0]; }
+ const float *GetPositions() const override { return &this->positions[0]; }
+ const int *GetGlyphToCharMap() const override { return &this->glyph_to_char[0]; }
- virtual const Font *GetFont() const { return this->font; }
- virtual int GetLeading() const { return this->font->fc->GetHeight(); }
- virtual int GetGlyphCount() const { return (int)this->glyphs.size(); }
+ const Font *GetFont() const override { return this->font; }
+ int GetLeading() const override { return this->font->fc->GetHeight(); }
+ int GetGlyphCount() const override { return (int)this->glyphs.size(); }
int GetAdvance() const { return this->total_advance; }
};
@@ -83,12 +83,12 @@ public:
CFRelease(line);
}
- virtual int GetLeading() const;
- virtual int GetWidth() const;
- virtual int CountRuns() const { return 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 this->size(); }
+ const VisualRun *GetVisualRun(int run) const override { return this->at(run); }
- int GetInternalCharLength(WChar c) const
+ int GetInternalCharLength(WChar c) const override
{
/* CoreText uses UTF-16 internally which means we need to account for surrogate pairs. */
return c >= 0x010000U ? 2 : 1;
@@ -100,17 +100,17 @@ public:
this->Reflow();
}
- virtual ~CoreTextParagraphLayout()
+ ~CoreTextParagraphLayout() override
{
CFRelease(this->typesetter);
}
- virtual void Reflow()
+ void Reflow() override
{
this->cur_offset = 0;
}
- virtual const Line *NextLine(int max_width);
+ const Line *NextLine(int max_width) override;
};
diff --git a/src/os/macosx/string_osx.h b/src/os/macosx/string_osx.h
index d632b0a44..8c9b7058a 100644
--- a/src/os/macosx/string_osx.h
+++ b/src/os/macosx/string_osx.h
@@ -30,10 +30,10 @@ class OSXStringIterator : 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;
static StringIterator *Create();
};
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) */
diff --git a/src/string.cpp b/src/string.cpp
index 7c16489bf..208f5e856 100644
--- a/src/string.cpp
+++ b/src/string.cpp
@@ -638,13 +638,13 @@ public:
this->utf16_to_utf8.push_back(0);
}
- virtual ~IcuStringIterator()
+ ~IcuStringIterator() override
{
delete this->char_itr;
delete this->word_itr;
}
- virtual void SetString(const char *s)
+ void SetString(const char *s) override
{
const char *string_base = s;
@@ -681,7 +681,7 @@ public:
this->word_itr->first();
}
- virtual size_t SetCurPosition(size_t pos)
+ size_t SetCurPosition(size_t pos) override
{
/* Convert incoming position to an UTF-16 string index. */
uint utf16_pos = 0;
@@ -699,7 +699,7 @@ public:
return this->utf16_to_utf8[this->char_itr->current()];
}
- virtual size_t Next(IterType what)
+ size_t Next(IterType what) override
{
int32_t pos;
switch (what) {
@@ -731,7 +731,7 @@ public:
return pos == icu::BreakIterator::DONE ? END : this->utf16_to_utf8[pos];
}
- virtual size_t Prev(IterType what)
+ size_t Prev(IterType what) override
{
int32_t pos;
switch (what) {
generated by cgit v1.2.3-70-g09d2 (git 2.47.0) at 2024-11-22 23:12:14 +0000